From fedora-extras-commits at redhat.com Fri Jul 1 02:09:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:00 -0400 Subject: rpms/dd_rescue - New directory Message-ID: <200507010209.j612908b030174@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30150/dd_rescue Log Message: Directory /cvs/extras/rpms/dd_rescue added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 02:09:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:00 -0400 Subject: rpms/dd_rescue/devel - New directory Message-ID: <200507010209.j61290Wb030179@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30150/dd_rescue/devel Log Message: Directory /cvs/extras/rpms/dd_rescue/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 02:09:34 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:34 -0400 Subject: rpms/dd_rescue Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507010209.j6129Y4E030222@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195 Added Files: Makefile import.log Log Message: Setup of module dd_rescue --- NEW FILE Makefile --- # Top level Makefile for module dd_rescue all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 02:09:34 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:34 -0400 Subject: rpms/dd_rescue/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507010209.j6129YxN030227@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dd_rescue --- NEW 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 Jul 1 02:10:24 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:10:24 -0400 Subject: rpms/dd_rescue/devel dd_rescue.1, NONE, 1.1 dd_rescue.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507010210.j612AOmO030296@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30265/devel Modified Files: .cvsignore sources Added Files: dd_rescue.1 dd_rescue.spec Log Message: auto-import dd_rescue-1.11-1 on branch devel from dd_rescue-1.11-1.src.rpm inital import --- NEW FILE dd_rescue.1 --- .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH DDRESCUE 1 "April 16, 2003" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME dd_rescue \- copies data from one file (or block device) to another .SH SYNOPSIS .B dd_rescue .RI [ options ] " infile outfile" .SH DESCRIPTION This manual page documents briefly the .B dd_rescue command. This manual page was written for the Debian distribution because the original program does not have a manual page. .PP .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. \fBdd_rescue\fP is a program that copies data from one file or block device to another, it is a tool to help you to save data from crashed partition. It tries to read and if it fails it will go on with the next sectors, where tools like dd will fail. If the copying process is interrupted by the user it is possible to continue at any position later. It can copy backwards. .SH OPTIONS .TP .B \-s ipos start position in input file (default=0) .TP .B \-S opos start position in output file (def=ipos) .TP .B \-b softbs block size for copy operation (def=16384) .TP .B \-B hardbs fallback block size in case of errs (def=512) .TP .B \-e maxerr exit after maxerr errors (def=0=infinite) .TP .B \-m maxxfer maximum amount of data to be transfered (def=0=inf) .TP .B \-l logfile name of a file to log errors and summary to (def="") .TP .B \-r reverse direction copy (def=forward) .TP .B \-t truncate output file (def=no) .TP .B \-w abort on Write errors (def=no) .TP .B \-a spArse file writing (def=no) .TP .B \-A Always write blocks, zeroed if err (def=no) .TP .B \-i interactive: ask before overwriting data (def=no) .TP .B \-f force: skip some sanity checks (def=no) .TP .B \-q quiet operation .TP .B \-v verbose operation .TP .B \-V display version and exit .TP .B \-h Show summary of options .br .SH AUTHOR This manual page was written by Ayman Negm , for the Debian project (but may be used by others). --- NEW FILE dd_rescue.spec --- Summary: Fault tolerant "dd" utility for rescuing data from bad media Name: dd_rescue Version: 1.11 Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{version}.tar.gz Source1: dd_rescue.1 URL: http://www.garloff.de/kurt/linux/ddrescue/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description ddrescue is a utility similar to the system utility "dd" which copies data from a file or block device to another. ddrescue does however not abort on errors in the input file. This makes it suitable for rescuing data from media with errors, e.g. a disk with bad sectors. %prep %setup -q -n dd_rescue %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cp README.dd_rescue README %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} %{__install} -p -m 755 dd_rescue %{buildroot}%{_bindir}/dd_rescue %{__install} -p -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/dd_rescue.1 %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/dd_rescue %{_mandir}/man1/dd_rescue.1* %changelog * Fri Jul 01 2005 Andreas Thienemann 1.11-1 - Updated to 1.11 - Adapted specfile to extras conventions. - Renamed package to dd_rescue to reflect upstream, name. - Added manpage * Sun Sep 5 2004 Marius L. J??hndal 0:1.10-0.fdr.1 - Updated to 1.10. * Sat Dec 13 2003 Marius L. J??hndal 0:1.03-0.fdr.1 - Updated to 1.03. - Minor editing of description. * Mon Sep 29 2003 Marius L. J??hndal 0:1.02-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dd_rescue/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 02:09:32 -0000 1.1 +++ .cvsignore 1 Jul 2005 02:10:18 -0000 1.2 @@ -0,0 +1 @@ +dd_rescue-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dd_rescue/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 02:09:32 -0000 1.1 +++ sources 1 Jul 2005 02:10:18 -0000 1.2 @@ -0,0 +1 @@ +1fdd3716d5e8e33de66552efb176fe61 dd_rescue-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 02:10:23 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:10:23 -0400 Subject: rpms/dd_rescue import.log,1.1,1.2 Message-ID: <200507010210.j612AtRk030304@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30265 Modified Files: import.log Log Message: auto-import dd_rescue-1.11-1 on branch devel from dd_rescue-1.11-1.src.rpm inital import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dd_rescue/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 02:09:32 -0000 1.1 +++ import.log 1 Jul 2005 02:10:18 -0000 1.2 @@ -0,0 +1 @@ +dd_rescue-1_11-1:HEAD:dd_rescue-1.11-1.src.rpm:1120183814 From fedora-extras-commits at redhat.com Fri Jul 1 05:26:49 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 01:26:49 -0400 Subject: rpms/darcs/devel darcs.spec,1.1,1.2 Message-ID: <200507010526.j615Qn5t001425@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1405 Modified Files: darcs.spec Log Message: - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and tetex-latex, tetex-dvips, latex2html for doc generation Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- darcs.spec 13 Jun 2005 13:50:01 -0000 1.1 +++ darcs.spec 1 Jul 2005 05:26:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -9,7 +9,12 @@ Source0: http://www.darcs.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc +BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel +# for documentation +BuildRequires: tetex-latex, tetex-dvips, latex2html +# for make check +BuildRequires: which + %description Darcs is a revision control system, along the lines of CVS @@ -80,6 +85,11 @@ %changelog +* Fri Jul 1 2005 Jens Petersen - 1.0.3-2 +- fix buildrequires + - add sendmail, curl-devel, ncurses-devel, zlib-devel, and + tetex-latex, tetex-dvips, latex2html for doc generation + * Tue May 31 2005 Jens Petersen - 1.0.3-1 - initial import into Fedora Extras - 1.0.3 release From fedora-extras-commits at redhat.com Fri Jul 1 05:27:42 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 01:27:42 -0400 Subject: common tobuild,1.1644,1.1645 Message-ID: <200507010527.j615Rgbr001491@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1474 Modified Files: tobuild Log Message: request build of rpms/darcs/devel darcs-1_0_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1644 retrieving revision 1.1645 diff -u -r1.1644 -r1.1645 --- tobuild 30 Jun 2005 21:54:12 -0000 1.1644 +++ tobuild 1 Jul 2005 05:27:39 -0000 1.1645 @@ -36,3 +36,4 @@ zkota rpms/pybliographer/devel pybliographer-1_2_6_2-4 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5 devel +petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 05:36:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 01:36:46 -0400 Subject: common tobuild,1.1645,1.1646 Message-ID: <200507010536.j615akqP001584@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1567 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1645 retrieving revision 1.1646 diff -u -r1.1645 -r1.1646 --- tobuild 1 Jul 2005 05:27:39 -0000 1.1645 +++ tobuild 1 Jul 2005 05:36:43 -0000 1.1646 @@ -37,3 +37,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5 devel petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 06:07:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 02:07:33 -0400 Subject: common tobuild,1.1646,1.1647 Message-ID: <200507010607.j6167XHn002777@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760 Modified Files: tobuild Log Message: request build of rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1646 retrieving revision 1.1647 diff -u -r1.1646 -r1.1647 --- tobuild 1 Jul 2005 05:36:43 -0000 1.1646 +++ tobuild 1 Jul 2005 06:07:31 -0000 1.1647 @@ -38,3 +38,4 @@ petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 +pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 06:08:15 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 02:08:15 -0400 Subject: common tobuild,1.1647,1.1648 Message-ID: <200507010608.j6168FP3002841@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2824 Modified Files: tobuild Log Message: request build of rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1647 retrieving revision 1.1648 diff -u -r1.1647 -r1.1648 --- tobuild 1 Jul 2005 06:07:31 -0000 1.1647 +++ tobuild 1 Jul 2005 06:08:12 -0000 1.1648 @@ -39,3 +39,4 @@ petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 +pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 06:57:02 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 02:57:02 -0400 Subject: rpms/anthy/FC-4 .cvsignore, 1.4, 1.5 anthy.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507010657.j616v2Xf003028@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007 Modified Files: .cvsignore anthy.spec sources Log Message: * Fri Jul 1 2005 Akira TAGOH - 6700-1.fc4 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Mar 2005 14:17:31 -0000 1.4 +++ .cvsignore 1 Jul 2005 06:57:00 -0000 1.5 @@ -4,3 +4,4 @@ anthy-6024.tar.gz anthy-6131.tar.gz anthy-6300d.tar.gz +anthy-6700.tar.gz Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- anthy.spec 1 Apr 2005 14:11:56 -0000 1.7 +++ anthy.spec 1 Jul 2005 06:57:00 -0000 1.8 @@ -1,8 +1,8 @@ -%define version 6300d +%define version 6700 Name: anthy Version: %{version} -Release: 3 +Release: 1.%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ @@ -110,6 +110,9 @@ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jul 1 2005 Akira TAGOH - 6700-1.fc4 +- New upstream release. + * Fri Apr 1 2005 Michael Schwendt - 6300d-3 - include anthy datadir in main package, and anthy site directory in -el and -el-xemacs packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Mar 2005 14:17:31 -0000 1.4 +++ sources 1 Jul 2005 06:57:00 -0000 1.5 @@ -1 +1 @@ -7bbb58cb2c759ca065dad40b194ff118 anthy-6300d.tar.gz +14c604f26d7626838058b257c835e293 anthy-6700.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 06:57:47 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 02:57:47 -0400 Subject: rpms/anthy/FC-4 anthy.spec,1.8,1.9 Message-ID: <200507010657.j616vlBh003053@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3036 Modified Files: anthy.spec Log Message: Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- anthy.spec 1 Jul 2005 06:57:00 -0000 1.8 +++ anthy.spec 1 Jul 2005 06:57:45 -0000 1.9 @@ -2,7 +2,7 @@ Name: anthy Version: %{version} -Release: 1.%{?dist} +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ From fedora-extras-commits at redhat.com Fri Jul 1 06:58:59 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 02:58:59 -0400 Subject: common tobuild,1.1648,1.1649 Message-ID: <200507010658.j616wxFv003121@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3104 Modified Files: tobuild Log Message: request build of rpms/anthy/FC-4 anthy-6700-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1648 retrieving revision 1.1649 diff -u -r1.1648 -r1.1649 --- tobuild 1 Jul 2005 06:08:12 -0000 1.1648 +++ tobuild 1 Jul 2005 06:58:57 -0000 1.1649 @@ -40,3 +40,4 @@ petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 +tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 07:07:06 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:07:06 -0400 Subject: rpms/anthy/FC-3 .cvsignore, 1.3, 1.4 anthy.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507010707.j61776Gi004222@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4201 Modified Files: .cvsignore anthy.spec sources Log Message: * Fri Jul 1 2005 Akira TAGOH - 6700-1.fc3 - New upstream release. - include anthy datadir in main package, and anthy site directory in -el and -el-xemacs packages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Feb 2005 14:31:30 -0000 1.3 +++ .cvsignore 1 Jul 2005 07:07:04 -0000 1.4 @@ -3,3 +3,4 @@ *.rpm anthy-6024.tar.gz anthy-6131.tar.gz +anthy-6700.tar.gz Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-3/anthy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- anthy.spec 24 Feb 2005 14:31:31 -0000 1.2 +++ anthy.spec 1 Jul 2005 07:07:04 -0000 1.3 @@ -1,8 +1,8 @@ -%define version 6131 +%define version 6700 Name: anthy Version: %{version} -Release: 1 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ @@ -12,7 +12,7 @@ Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el -Summary: A Japanese character set input library +Summary: Japanese character set input library %description Anthy provides the library to input Japanese on the applications, such as X applications and emacs. and the user dictionaries and the users information @@ -85,7 +85,7 @@ %doc AUTHORS COPYING ChangeLog DIARY NEWS README doc %{_bindir}/* %{_sysconfdir}/* -%{_datadir}/anthy/* +%{_datadir}/anthy/ %files libs %defattr (-, root, root) @@ -101,15 +101,20 @@ %files el %defattr (-, root, root) -%{_datadir}/emacs/site-lisp/anthy/* +%{_datadir}/emacs/site-lisp/anthy/ %{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el %files el-xemacs %defattr (-, root, root) -%{_datadir}/xemacs/xemacs-packages/lisp/anthy/* +%{_datadir}/xemacs/xemacs-packages/lisp/anthy/ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jul 1 2005 Akira TAGOH - 6700-1.fc3 +- New upstream release. +- include anthy datadir in main package, and anthy site directory + in -el and -el-xemacs packages + * Thu Feb 24 2005 Akira TAGOH - 6131-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Feb 2005 14:31:31 -0000 1.3 +++ sources 1 Jul 2005 07:07:04 -0000 1.4 @@ -1 +1 @@ -ee094243b33fc75f144da56f5ebb580e anthy-6131.tar.gz +14c604f26d7626838058b257c835e293 anthy-6700.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 07:07:56 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:07:56 -0400 Subject: common tobuild,1.1649,1.1650 Message-ID: <200507010707.j6177u58004315@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298 Modified Files: tobuild Log Message: request build of rpms/anthy/FC-3 anthy-6700-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1649 retrieving revision 1.1650 diff -u -r1.1649 -r1.1650 --- tobuild 1 Jul 2005 06:58:57 -0000 1.1649 +++ tobuild 1 Jul 2005 07:07:54 -0000 1.1650 @@ -41,3 +41,4 @@ pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 +tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 07:09:42 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:09:42 -0400 Subject: rpms/anthy/devel anthy.spec,1.8,1.9 Message-ID: <200507010709.j6179g1u004363@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Modified Files: anthy.spec Log Message: * Fri Jul 1 2005 Akira TAGOH - 6700-2.fc5 - added %%{?dist} to Release. Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- anthy.spec 29 Jun 2005 13:46:03 -0000 1.8 +++ anthy.spec 1 Jul 2005 07:09:40 -0000 1.9 @@ -2,7 +2,7 @@ Name: anthy Version: %{version} -Release: 1 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ @@ -110,6 +110,9 @@ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jul 1 2005 Akira TAGOH - 6700-2.fc5 +- added %%{?dist} to Release. + * Wed Jun 29 2005 Akira TAGOH - 6700-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Jul 1 07:10:41 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:10:41 -0400 Subject: common tobuild,1.1650,1.1651 Message-ID: <200507010710.j617Afcb004436@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4417 Modified Files: tobuild Log Message: request build of rpms/anthy/devel anthy-6700-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1650 retrieving revision 1.1651 diff -u -r1.1650 -r1.1651 --- tobuild 1 Jul 2005 07:07:54 -0000 1.1650 +++ tobuild 1 Jul 2005 07:10:39 -0000 1.1651 @@ -42,3 +42,4 @@ pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 +tagoh rpms/anthy/devel anthy-6700-2_fc5 devel From rc040203 at freenet.de Fri Jul 1 08:07:03 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 01 Jul 2005 10:07:03 +0200 Subject: APPROVED: lout Message-ID: <1120205223.3741.105.camel@mccallum.corsepiu.local> Description: Lout is a document formatting system designed and implemented by Jeffrey Kingston at the Basser Department of Computer Science, University of Sydney, Australia. The system reads a high-level description of a document similar in style to LaTeX and produces a PostScript file which can be printed on most laser printers and graphic display devices. Plain text output is also available, PDF output is limited but working (e.g. no graphics). Reviewer: Ralf Cors?pius Maintainer: Tom "Spot" Callaway From fedora-extras-commits at redhat.com Fri Jul 1 10:44:40 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:44:40 -0400 Subject: rpms/rblcheck/devel rblcheck-1.5-res_query.patch, NONE, 1.1 rblcheck.spec, 1.1, 1.2 Message-ID: <200507011044.j61AieqP008766@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8746 Modified Files: rblcheck.spec Added Files: rblcheck-1.5-res_query.patch Log Message: * Add compile fix patch for x86_64 rblcheck-1.5-res_query.patch: --- NEW FILE rblcheck-1.5-res_query.patch --- --- rblcheck-1.5/configure 2005-07-01 10:50:36.000000000 +0100 +++ rblcheck-1.5/configure 2005-07-01 10:57:05.000000000 +0100 @@ -1529,13 +1529,12 @@ cat > conftest.$ac_ext < to get macro definition for res_query */ +#include int main() { -res_query() +res_query("",0,0,"",0) ; return 0; } EOF if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/devel/rblcheck.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rblcheck.spec 29 Jun 2005 08:33:44 -0000 1.1 +++ rblcheck.spec 1 Jul 2005 10:44:37 -0000 1.2 @@ -29,6 +29,9 @@ # http://sourceforge.net/mailarchive/forum.php?thread_id=1371771&forum_id=4256 Patch2: rblcheck-names.patch +# Compile fix for x86_64 systems +Patch3: rblcheck-1.5-res_query.patch + BuildRequires: docbook-utils %description @@ -42,6 +45,7 @@ %patch0 -p1 -b .texttweak %patch1 -p0 -b .txt %patch2 -p0 -b .names +%patch3 -p1 -b .res_query %build %configure @@ -65,6 +69,9 @@ %config(noreplace) %{_sysconfdir}/rblcheckrc %changelog +* Fri Jul 01 2005 Oliver Falk - 1.5-10 +- Add compile fix patch for x86_64 + * Wed Jun 29 2005 Oliver Falk - 1.5-9 - Applied patch from Matthias (readability changes in specfile) From fedora-extras-commits at redhat.com Fri Jul 1 10:45:31 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:45:31 -0400 Subject: rpms/rblcheck/devel rblcheck.spec,1.2,1.3 Message-ID: <200507011045.j61AjVAE008826@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809 Modified Files: rblcheck.spec Log Message: * Update the release Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/devel/rblcheck.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rblcheck.spec 1 Jul 2005 10:44:37 -0000 1.2 +++ rblcheck.spec 1 Jul 2005 10:45:29 -0000 1.3 @@ -4,7 +4,7 @@ Summary: Command-line interface to RBL-style listings Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz Source1: rblcheckrc From fedora-extras-commits at redhat.com Fri Jul 1 10:45:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:45:54 -0400 Subject: common tobuild,1.1651,1.1652 Message-ID: <200507011045.j61AjsLA008888@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8871 Modified Files: tobuild Log Message: request build of rpms/rblcheck/devel rblcheck-1_5-10_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1651 retrieving revision 1.1652 diff -u -r1.1651 -r1.1652 --- tobuild 1 Jul 2005 07:10:39 -0000 1.1651 +++ tobuild 1 Jul 2005 10:45:52 -0000 1.1652 @@ -43,3 +43,4 @@ tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel +oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 10:46:33 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:46:33 -0400 Subject: rpms/rblcheck/FC-3 rblcheck-1.5-res_query.patch, NONE, 1.1 rblcheck.spec, 1.1, 1.2 Message-ID: <200507011046.j61AkXsp008929@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8909 Modified Files: rblcheck.spec Added Files: rblcheck-1.5-res_query.patch Log Message: * Add compile fix patch for x86_64 rblcheck-1.5-res_query.patch: --- NEW FILE rblcheck-1.5-res_query.patch --- --- rblcheck-1.5/configure 2005-07-01 10:50:36.000000000 +0100 +++ rblcheck-1.5/configure 2005-07-01 10:57:05.000000000 +0100 @@ -1529,13 +1529,12 @@ cat > conftest.$ac_ext < to get macro definition for res_query */ +#include int main() { -res_query() +res_query("",0,0,"",0) ; return 0; } EOF if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/FC-3/rblcheck.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rblcheck.spec 29 Jun 2005 08:33:44 -0000 1.1 +++ rblcheck.spec 1 Jul 2005 10:46:30 -0000 1.2 @@ -4,7 +4,7 @@ Summary: Command-line interface to RBL-style listings Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz Source1: rblcheckrc @@ -29,6 +29,9 @@ # http://sourceforge.net/mailarchive/forum.php?thread_id=1371771&forum_id=4256 Patch2: rblcheck-names.patch +# Compile fix for x86_64 systems +Patch3: rblcheck-1.5-res_query.patch + BuildRequires: docbook-utils %description @@ -42,6 +45,7 @@ %patch0 -p1 -b .texttweak %patch1 -p0 -b .txt %patch2 -p0 -b .names +%patch3 -p1 -b .res_query %build %configure @@ -65,6 +69,9 @@ %config(noreplace) %{_sysconfdir}/rblcheckrc %changelog +* Fri Jul 01 2005 Oliver Falk - 1.5-10 +- Add compile fix patch for x86_64 + * Wed Jun 29 2005 Oliver Falk - 1.5-9 - Applied patch from Matthias (readability changes in specfile) From fedora-extras-commits at redhat.com Fri Jul 1 10:46:50 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:46:50 -0400 Subject: common tobuild,1.1652,1.1653 Message-ID: <200507011046.j61AkoqQ008991@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8974 Modified Files: tobuild Log Message: request build of rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1652 retrieving revision 1.1653 diff -u -r1.1652 -r1.1653 --- tobuild 1 Jul 2005 10:45:52 -0000 1.1652 +++ tobuild 1 Jul 2005 10:46:48 -0000 1.1653 @@ -44,3 +44,4 @@ tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel +oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 10:47:23 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:47:23 -0400 Subject: rpms/rblcheck/FC-4 rblcheck-1.5-res_query.patch, NONE, 1.1 rblcheck.spec, 1.1, 1.2 Message-ID: <200507011047.j61AlNsF009027@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9007 Modified Files: rblcheck.spec Added Files: rblcheck-1.5-res_query.patch Log Message: * Add compile fix patch for x86_64 rblcheck-1.5-res_query.patch: --- NEW FILE rblcheck-1.5-res_query.patch --- --- rblcheck-1.5/configure 2005-07-01 10:50:36.000000000 +0100 +++ rblcheck-1.5/configure 2005-07-01 10:57:05.000000000 +0100 @@ -1529,13 +1529,12 @@ cat > conftest.$ac_ext < to get macro definition for res_query */ +#include int main() { -res_query() +res_query("",0,0,"",0) ; return 0; } EOF if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/FC-4/rblcheck.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rblcheck.spec 29 Jun 2005 08:33:44 -0000 1.1 +++ rblcheck.spec 1 Jul 2005 10:47:21 -0000 1.2 @@ -4,7 +4,7 @@ Summary: Command-line interface to RBL-style listings Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz Source1: rblcheckrc @@ -29,6 +29,9 @@ # http://sourceforge.net/mailarchive/forum.php?thread_id=1371771&forum_id=4256 Patch2: rblcheck-names.patch +# Compile fix for x86_64 systems +Patch3: rblcheck-1.5-res_query.patch + BuildRequires: docbook-utils %description @@ -42,6 +45,7 @@ %patch0 -p1 -b .texttweak %patch1 -p0 -b .txt %patch2 -p0 -b .names +%patch3 -p1 -b .res_query %build %configure @@ -65,6 +69,9 @@ %config(noreplace) %{_sysconfdir}/rblcheckrc %changelog +* Fri Jul 01 2005 Oliver Falk - 1.5-10 +- Add compile fix patch for x86_64 + * Wed Jun 29 2005 Oliver Falk - 1.5-9 - Applied patch from Matthias (readability changes in specfile) From fedora-extras-commits at redhat.com Fri Jul 1 10:47:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:47:44 -0400 Subject: common tobuild,1.1653,1.1654 Message-ID: <200507011047.j61Aliuq009089@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9072 Modified Files: tobuild Log Message: request build of rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1653 retrieving revision 1.1654 diff -u -r1.1653 -r1.1654 --- tobuild 1 Jul 2005 10:46:48 -0000 1.1653 +++ tobuild 1 Jul 2005 10:47:42 -0000 1.1654 @@ -45,3 +45,4 @@ tagoh rpms/anthy/devel anthy-6700-2_fc5 devel oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 +oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 11:00:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:00:43 -0400 Subject: rpms/fish - New directory Message-ID: <200507011100.j61B0hd3009441@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417/fish Log Message: Directory /cvs/extras/rpms/fish added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 11:00:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:00:43 -0400 Subject: rpms/fish/devel - New directory Message-ID: <200507011100.j61B0hSQ009446@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417/fish/devel Log Message: Directory /cvs/extras/rpms/fish/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 11:01:02 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:01:02 -0400 Subject: rpms/fish Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011101.j61B12N3010354@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9462 Added Files: Makefile import.log Log Message: Setup of module fish --- NEW FILE Makefile --- # Top level Makefile for module fish all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 11:01:01 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:01:01 -0400 Subject: rpms/fish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011101.j61B11bP010392@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9462/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fish --- NEW 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 Jul 1 11:02:49 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:02:49 -0400 Subject: rpms/fish import.log,1.1,1.2 Message-ID: <200507011103.j61B3orI010592@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558 Modified Files: import.log Log Message: auto-import fish-1.11.1-9 on branch devel from fish-1.11.1-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fish/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 11:00:59 -0000 1.1 +++ import.log 1 Jul 2005 11:02:47 -0000 1.2 @@ -0,0 +1 @@ +fish-1_11_1-9:HEAD:fish-1.11.1-9.src.rpm:1120215740 From fedora-extras-commits at redhat.com Fri Jul 1 11:03:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:03:20 -0400 Subject: rpms/fish/devel fish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011104.j61B3ooC010594@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558/devel Modified Files: .cvsignore sources Added Files: fish.spec Log Message: auto-import fish-1.11.1-9 on branch devel from fish-1.11.1-9.src.rpm --- NEW FILE fish.spec --- Summary: A friendly interactive shell Name: fish Version: 1.11.1 Release: 9 License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are focused on user friendlieness and discoverability. The language syntax is simple but incompatible with other shell languages. %prep %setup -q %build %configure docdir=%_datadir/doc/%{name}-%{version} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" %clean rm -rf $RPM_BUILD_ROOT %post if ! grep %_bindir/fish %_sysconfdir/shells >/dev/null; then echo %_bindir/fish >>%_sysconfdir/shells fi %postun if [ "$1" = 0 ]; then grep -v %_bindir/fish %_sysconfdir/shells >%_sysconfdir/fish.tmp mv %_sysconfdir/fish.tmp %_sysconfdir/shells fi %files %defattr(-,root,root,-) %doc %_datadir/doc/%{name}-%{version} %_mandir/man1/fish.1* %_mandir/man1/xsel.1x* %_mandir/man1/mimedb.1* %_mandir/man1/set_color.1* %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize %attr(0755,root,root) %_bindir/mimedb %attr(0755,root,root) %_bindir/count %config %_sysconfdir/fish %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish %changelog * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way * Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog * Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null * Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' - Fix typo in post install scriptlet test - Set CFLAGS from spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 11:01:00 -0000 1.1 +++ .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 @@ -0,0 +1 @@ +fish-1.11.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 11:01:00 -0000 1.1 +++ sources 1 Jul 2005 11:03:18 -0000 1.2 @@ -0,0 +1 @@ +b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 11:08:36 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:08:36 -0400 Subject: rpms/fish/devel fish.spec,1.1,1.2 Message-ID: <200507011108.j61B8aEI010707@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10684 Modified Files: fish.spec Log Message: - Added dist macro to the release - Small spec beautifying Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fish.spec 1 Jul 2005 11:03:18 -0000 1.1 +++ fish.spec 1 Jul 2005 11:08:34 -0000 1.2 @@ -1,13 +1,17 @@ -Summary: A friendly interactive shell -Name: fish -Version: 1.11.1 -Release: 9 -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +Summary: A friendly interactive shell +Name: fish + +Version: 1.11.1 +Release: 9%{?dist} + +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ + +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -61,16 +65,20 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 +* 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 -* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' From fedora-extras-commits at redhat.com Fri Jul 1 11:09:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:09:54 -0400 Subject: common tobuild,1.1654,1.1655 Message-ID: <200507011109.j61B9sZj010777@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760 Modified Files: tobuild Log Message: request build of rpms/fish/devel fish-1_11_1-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1654 retrieving revision 1.1655 diff -u -r1.1654 -r1.1655 --- tobuild 1 Jul 2005 10:47:42 -0000 1.1654 +++ tobuild 1 Jul 2005 11:09:50 -0000 1.1655 @@ -46,3 +46,4 @@ oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 +oliver rpms/fish/devel fish-1_11_1-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:10:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:10:45 -0400 Subject: common tobuild,1.1655,1.1656 Message-ID: <200507011110.j61BAjTX010800@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783 Modified Files: tobuild Log Message: * Oops, don't want to build this release Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1655 retrieving revision 1.1656 diff -u -r1.1655 -r1.1656 --- tobuild 1 Jul 2005 11:09:50 -0000 1.1655 +++ tobuild 1 Jul 2005 11:10:42 -0000 1.1656 @@ -46,4 +46,3 @@ oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 -oliver rpms/fish/devel fish-1_11_1-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:11:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:11:13 -0400 Subject: rpms/fish/devel fish.spec,1.2,1.3 Message-ID: <200507011111.j61BBDfs010828@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10811 Modified Files: fish.spec Log Message: * Update release (forgot to do that) Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fish.spec 1 Jul 2005 11:08:34 -0000 1.2 +++ fish.spec 1 Jul 2005 11:11:11 -0000 1.3 @@ -2,7 +2,7 @@ Name: fish Version: 1.11.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: System Environment/Shells From fedora-extras-commits at redhat.com Fri Jul 1 11:11:31 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:11:31 -0400 Subject: common tobuild,1.1656,1.1657 Message-ID: <200507011111.j61BBVpK010890@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10873 Modified Files: tobuild Log Message: request build of rpms/fish/devel fish-1_11_1-10_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1656 retrieving revision 1.1657 diff -u -r1.1656 -r1.1657 --- tobuild 1 Jul 2005 11:10:42 -0000 1.1656 +++ tobuild 1 Jul 2005 11:11:29 -0000 1.1657 @@ -46,3 +46,4 @@ oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 +oliver rpms/fish/devel fish-1_11_1-10_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:15:39 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 07:15:39 -0400 Subject: rpms/perl-MailTools/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 perl-MailTools.spec, 1.9, 1.10 Message-ID: <200507011115.j61BFdUN010983@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957 Modified Files: sources .cvsignore perl-MailTools.spec Log Message: * Fri Jul 1 2005 Paul Howarth - 1.67-1 - update to 1.67 (#161830) - assume perl_vendorlib is set - license is same as perl (GPL or Artistic) according to README - don't include module name in summary - use macros consistently Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2005 11:50:32 -0000 1.4 +++ sources 1 Jul 2005 11:15:37 -0000 1.5 @@ -1 +1 @@ -fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz +7871c38e42792c5e0920b3817e1523fd MailTools-1.67.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 +++ .cvsignore 1 Jul 2005 11:15:37 -0000 1.5 @@ -1 +1 @@ -MailTools-1.66.tar.gz +MailTools-1.67.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-MailTools.spec 6 Apr 2005 22:13:07 -0000 1.9 +++ perl-MailTools.spec 1 Jul 2005 11:15:37 -0000 1.10 @@ -1,19 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - -Summary: MailTools module for Perl +Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.66 -Release: 2 +Version: 1.67 +Release: 1 -License: Artistic +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MailTools is a set of Perl modules related to mail applications. @@ -25,26 +23,26 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +%{__rm} -rf "$RPM_BUILD_ROOT" +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';' +%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';' %check || : -make test +%{__make} test %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf "$RPM_BUILD_ROOT" %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog README* examples/ %{perl_vendorlib}/auto/Mail/ %{perl_vendorlib}/Mail/ @@ -52,6 +50,13 @@ %changelog +* Fri Jul 1 2005 Paul Howarth - 1.67-1 +- update to 1.67 (#161830) +- assume perl_vendorlib is set +- license is same as perl (GPL or Artistic) according to README +- don't include module name in summary +- use macros consistently + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Jul 1 11:16:49 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 07:16:49 -0400 Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.10,1.11 Message-ID: <200507011116.j61BGoXB011006@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989 Modified Files: perl-MailTools.spec Log Message: add dist tag Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-MailTools.spec 1 Jul 2005 11:15:37 -0000 1.10 +++ perl-MailTools.spec 1 Jul 2005 11:16:47 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Various mail-related perl modules Name: perl-MailTools Version: 1.67 -Release: 1 +Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -56,6 +56,7 @@ - license is same as perl (GPL or Artistic) according to README - don't include module name in summary - use macros consistently +- add dist tag * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Jul 1 11:33:54 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 07:33:54 -0400 Subject: common tobuild,1.1657,1.1658 Message-ID: <200507011133.j61BXsIC011270@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1657 retrieving revision 1.1658 diff -u -r1.1657 -r1.1658 --- tobuild 1 Jul 2005 11:11:29 -0000 1.1657 +++ tobuild 1 Jul 2005 11:33:52 -0000 1.1658 @@ -1,45 +1,3 @@ -mschwendt rpms/gai-temp/FC-3 gai-temp-0_1_1-2_fc3 fc3 -mschwendt rpms/libkipi/devel libkipi-0_1_1-1_2_fc5 devel -petersen rpms/darcs/FC-4 darcs-1_0_3-1_fc4 fc4 -awjb rpms/fluxconf/devel fluxconf-0_9_8-1_fc5 devel -caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel -tagoh rpms/uim/devel uim-0_4_6-5 devel -tagoh rpms/anthy/devel anthy-6700-1 devel -shahms rpms/bazaar/devel bazaar-1_4_2-1_fc5 devel -shahms rpms/bazaar/FC-4 bazaar-1_4_2-1_fc4 fc4 -Tian rpms/gcfilms/devel gcfilms-5_2-1 devel -shahms rpms/bazaar/FC-3 bazaar-1_4_2-1_fc3 fc3 -steve rpms/cone/devel cone-0_64-5_fc5 devel -sheltren rpms/cfengine/FC-4 cfengine-2_1_15-2_fc4 fc4 -sheltren rpms/cfengine/devel cfengine-2_1_15-2_fc5 devel -sheltren rpms/cfengine/FC-3 cfengine-2_1_15-2_fc3 fc3 -scop rpms/xemacs/devel xemacs-21_4_17-4 devel -ausil rpms/konversation/devel konversation-0_18-3_fc5 devel -oliver rpms/rblcheck/FC-3 rblcheck-1_5-9_fc3 fc3 -oliver rpms/rblcheck/FC-4 rblcheck-1_5-9_fc4 fc4 -thomasvs rpms/directfb/FC-4 directfb-0_9_22-2_fc4 fc4 -ivazquez rpms/gnome-theme-clearlooks/FC-3 gnome-theme-clearlooks-0_6_2-1 fc3 -tagoh rpms/kinput2/FC-4 kinput2-v3_1-24_fc4 fc4 -tagoh rpms/kinput2/devel kinput2-v3_1-25_fc5 devel -petersen rpms/scim-anthy/devel scim-anthy-0_5_0-1_fc5 devel -kaboom devel/fping fping-2_4b2-5_fc5 devel -ausil rpms/konversation/FC-4 konversation-0_18-3_fc4 fc4 -mschwendt rpms/id3lib/devel id3lib-3_8_3-11_fc5 devel -jpo rpms/splint/FC-4 splint-3_1_1-9_fc4 fc4 -jpo rpms/splint/devel splint-3_1_1-9_fc5 devel -spot rpms/libotr/FC-3 libotr-2_0_2-7_fc3 fc3 -spot rpms/libotr/FC-4 libotr-2_0_2-7_fc4 fc4 -davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-1 devel -kaboom devel/rinetd rinetd-0_62-4_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-3_fc4 FC4 -zkota rpms/python-bibtex/devel python-bibtex-1_2_1-3 devel -zkota rpms/pybliographer/devel pybliographer-1_2_6_2-4 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5 devel - -petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 -pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 -pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:51:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:28 -0400 Subject: extras-buildsys ChangeLog,1.41,1.42 plague.spec,1.6,1.7 Message-ID: <200507011151.j61BpwDr011398@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305 Modified Files: ChangeLog plague.spec Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ChangeLog 29 Jun 2005 20:27:11 -0000 1.41 +++ ChangeLog 1 Jul 2005 11:51:26 -0000 1.42 @@ -1,3 +1,18 @@ +2005-07-01 Dan Williams + + * We now use lighttpd as the fileserver in both the server and the builder. It's + a lot more robust than the python implementation, but the python implementation + code still exists and can be used. + + * The server key and certificate must now be in the same file. You can 'cat' them + together with 'cat key.pem cert.pem > key_and_cert.pem' + + * Initialize m2crypto threading in buildservery.py and builder.py + + * Change some config options for the builder that said 'client' to 'builder' + + * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py + 2005-06-29 Dan Williams * Add the ability to search jobs on current job status from plague-client Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plague.spec 29 Jun 2005 21:32:33 -0000 1.6 +++ plague.spec 1 Jul 2005 11:51:26 -0000 1.7 @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-sqlite, m2crypto, createrepo Requires: %{name}-common = %{version}-%{release} +Requires: lighttpd %description The Plague build system is a client/server distributed build system for @@ -42,6 +43,7 @@ Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: m2crypto +Requires: lighttpd %description client Client program for enqueueing package builds and interrogating the build system. From fedora-extras-commits at redhat.com Fri Jul 1 11:51:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:29 -0400 Subject: extras-buildsys/builder CONFIG.py,1.2,1.3 builder.py,1.3,1.4 Message-ID: <200507011151.j61BpxRF011402@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CONFIG.py 28 Jun 2005 02:03:12 -0000 1.2 +++ CONFIG.py 1 Jul 2005 11:51:27 -0000 1.3 @@ -1,4 +1,4 @@ -# Configuration file for archwelder.py +# Configuration file for plague builder config_opts = {} config_opts['debug'] = True @@ -7,7 +7,7 @@ # Distro and Repo: # -# The build client constructs the buildroot name that it +# The builder constructs the buildroot name that it # passes to mock from a few things. The format is: # # --- @@ -26,12 +26,11 @@ # SSL Certs and keys # MUST be full path to cert -config_opts['client_cert'] = BUILDER_DIR + "/certs/client_cert.pem" -config_opts['client_key'] = BUILDER_DIR + "/certs/client_key.pem" +config_opts['builder_key_and_cert'] = BUILDER_DIR + "/certs/builder_key_and_cert.pem" config_opts['ca_cert'] = BUILDER_DIR + "/certs/ca_cert.pem" # Where to keep SRPMs to build and the finished products # and logs. # WARNING: this directory is world-readable via HTTP! -config_opts['client_work_dir'] = "/tmp/build_client_work" +config_opts['builder_work_dir'] = "/tmp/builder_work" Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- builder.py 29 Jun 2005 05:22:54 -0000 1.3 +++ builder.py 1 Jul 2005 11:51:27 -0000 1.4 @@ -15,8 +15,6 @@ # copyright 2005 Duke University # written by Seth Vidal -# TODO: xml-rpc communication using 2-way ssl-cert-verified xmlrpc connection - import SimpleXMLRPCServer import xmlrpclib @@ -32,19 +30,21 @@ import fcntl import urllib import errno -from plague import SimpleHTTPSServer from plague import FileDownloader from plague import SimpleSSLXMLRPCServer +from plague import lighttpdManager +from plague import SimpleHTTPSServer +from M2Crypto import threading as m2thread # Load in the config execfile("/etc/plague/builder/CONFIG.py") +use_lighttpd = True g_our_hostname = None certs = {} -certs['cert'] = config_opts['client_cert'] -certs['key'] = config_opts['client_key'] +certs['key_and_cert'] = config_opts['builder_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] @@ -52,10 +52,10 @@ def get_url_for_file(file_path): """ Return a URL pointing to a particular file in our work dir """ - # Ensure the file we're turning into a URL lives in our client work dir - if not file_path.startswith(config_opts["client_work_dir"]): + # Ensure the file we're turning into a URL lives in our builder work dir + if not file_path.startswith(config_opts["builder_work_dir"]): return None - file_part = file_path[len(config_opts["client_work_dir"]) + 1:] + file_part = file_path[len(config_opts["builder_work_dir"]) + 1:] port = "%s" % config_opts['fileserver_port'] full_url = "https://" + g_our_hostname + ":" + port + "/" + file_part return urllib.quote(full_url) @@ -77,15 +77,15 @@ self._log_fd = None self._mock_config = None - self._result_dir = os.path.join(config_opts['client_work_dir'], self._uniqid, "result") + self._result_dir = os.path.join(config_opts['builder_work_dir'], self._uniqid, "result") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) - self._state_dir = os.path.join(config_opts['client_work_dir'], self._uniqid, "mock-state") + self._state_dir = os.path.join(config_opts['builder_work_dir'], self._uniqid, "mock-state") if not os.path.exists(self._state_dir): os.makedirs(self._state_dir) - logfile = os.path.join(self._result_dir, "buildclient.log") + logfile = os.path.join(self._result_dir, "builder.log") self._log_fd = open(logfile, "w+") self.log("""Starting job: @@ -101,7 +101,7 @@ self._srpm_path = None self.log("Failed in __init__, couldn't extract SRPM filename.\n") else: - self._srpm_path = os.path.join(config_opts['client_work_dir'], self._uniqid, "source", srpm_filename) + self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename) def die(self, sig=15): if self._pobj and self._pobj.pid: # Can't kill the package download from build server @@ -433,7 +433,7 @@ } def getBuildClient(uniqid, target, buildarch, srpm_url, localarches): - """hand it an arch it hands you back the build client instance you need""" + """hand it an arch it hands you back the builder instance you need""" if not builder_dict.has_key(buildarch): # raise an exception here bitching about no place to build for that arch @@ -554,6 +554,8 @@ print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + m2thread.init() + xmlrpc_port = config_opts['xmlrpc_port'] xmlserver = SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer(certs, (g_our_hostname, xmlrpc_port)) bcs = XMLRPCBuildClientServer(localarches) @@ -561,9 +563,13 @@ # Start up the HTTP server thread which the build server # pulls completed RPMs from - work_dir = config_opts['client_work_dir'] - fs_port = config_opts['fileserver_port'] - http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, fs_port), work_dir) + work_dir = config_opts['builder_work_dir'] + port = config_opts['fileserver_port'] + if use_lighttpd: + http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid() + http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, config_opts['builder_key_and_cert']) + else: + http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, port), work_dir) http_server.start() last_time = time.time() @@ -587,4 +593,7 @@ bcs.process() last_time = time.time() + http_server.stop() + time.sleep(2) + m2thread.cleanup() os._exit(0) From fedora-extras-commits at redhat.com Fri Jul 1 11:51:30 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:30 -0400 Subject: extras-buildsys/client client.py,1.4,1.5 Message-ID: <200507011152.j61Bq0pS011405@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/client Modified Files: client.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- client.py 29 Jun 2005 20:27:12 -0000 1.4 +++ client.py 1 Jul 2005 11:51:27 -0000 1.5 @@ -28,7 +28,6 @@ config = ConfigParser.ConfigParser() config.add_section('Certs') config.set('Certs', 'user-cert', '~/.fedora.cert') -config.set('Certs', 'user-key', '') config.set('Certs', 'user-ca-cert', '~/.fedora-upload-ca.cert') config.set('Certs', 'server-ca-cert', '~/.fedora-server-ca.cert') @@ -187,12 +186,7 @@ raise ServerException("Error: '%s' is not an SSL server, but the use_ssl config option set to True. See %s" % (addr, config_file_path)) else: certs = {} - certs['cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) - client_key = config.get('Certs', 'user-key') - # If client-key is empty, key assumed to be in user-cert - certs['key'] = None - if len(client_key) > 0: - certs['key'] = os.path.expanduser(client_key) + certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert')) certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert')) server = SSLXMLRPCServerProxy.SSLXMLRPCServerProxy(certs, config.get('Server', 'address')) From fedora-extras-commits at redhat.com Fri Jul 1 11:51:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:35 -0400 Subject: extras-buildsys/server BuildJob.py, 1.14, 1.15 CONFIG.py, 1.13, 1.14 buildserver.py, 1.11, 1.12 client_manager.py, 1.26, 1.27 Message-ID: <200507011152.j61Bq6fd011414@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/server Modified Files: BuildJob.py CONFIG.py buildserver.py client_manager.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: BuildJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildJob.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- BuildJob.py 29 Jun 2005 21:32:33 -0000 1.14 +++ BuildJob.py 1 Jul 2005 11:51:33 -0000 1.15 @@ -410,7 +410,7 @@ # Only some stages need to sleep because we stay in # them for a while. if do_sleep: - time.sleep(3) + time.sleep(5) def _start_unspawned_builds(self): for arch in self.buildarches: Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- CONFIG.py 27 Jun 2005 02:33:27 -0000 1.13 +++ CONFIG.py 1 Jul 2005 11:51:33 -0000 1.14 @@ -23,8 +23,7 @@ # SSL Cert and key bits # MUST be full path to cert -config_opts['server_cert'] = SERVER_BASE_DIR + "/certs/server_cert.pem" -config_opts['server_key'] = SERVER_BASE_DIR + "/certs/server_key.pem" +config_opts['server_key_and_cert'] = SERVER_BASE_DIR + "/certs/server_key_and_cert.pem" # CA cert that signs build client certificates config_opts['ca_cert'] = SERVER_BASE_DIR + "/certs/ca_cert.pem" Index: buildserver.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/buildserver.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- buildserver.py 28 Jun 2005 01:41:33 -0000 1.11 +++ buildserver.py 1 Jul 2005 11:51:33 -0000 1.12 @@ -18,9 +18,11 @@ import sys import os -from plague import SimpleHTTPSServer from plague import SimpleSSLXMLRPCServer +from plague import lighttpdManager +from plague import SimpleHTTPSServer import SimpleXMLRPCServer +from M2Crypto import threading as m2thread sys.path.append('/usr/share/plague/server') @@ -34,6 +36,8 @@ # Load in the config execfile("/etc/plague/server/CONFIG.py") +use_lighttpd = True + class AuthenticatedSSLXMLRPCServer(SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer): """ @@ -86,6 +90,8 @@ hostname = sys.argv[1] + m2thread.init() + bcm = BuildClientManager() # Create the BuildMaster thread @@ -93,15 +99,8 @@ bm.start() # SSL certificate and key filenames - srpm_server_certs = {} - srpm_server_certs['cert'] = config_opts['server_cert'] - srpm_server_certs['key'] = config_opts['server_key'] - srpm_server_certs['ca_cert'] = config_opts['ca_cert'] - srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] - ui_certs = {} - ui_certs['cert'] = config_opts['server_cert'] - ui_certs['key'] = config_opts['server_key'] + ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] ui_certs['ca_cert'] = config_opts['ca_cert'] ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] @@ -117,7 +116,15 @@ # SRPM fileserver http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") - srpm_server = SimpleHTTPSServer.SimpleHTTPSServer(srpm_server_certs, (hostname, 8886), http_dir) + if use_lighttpd: + http_cnf_file = "/var/tmp/plague-server.conf" + srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, 8886, http_dir, config_opts['server_key_and_cert']) + else: + srpm_server_certs = {} + srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] + srpm_server_certs['ca_cert'] = config_opts['ca_cert'] + srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] + srpm_server = SimpleHTTPSServer.SimpleHTTPSServer(srpm_server_certs, (hostname, 8886), http_dir) srpm_server.start() print "Build Server accepting requests on %s:8887.\n" % hostname @@ -127,9 +134,11 @@ # Make sure the BuildMaster thread shuts down print "Shutting down..." bm.stop() + srpm_server.stop() del bm print "Done." + m2thread.cleanup() os._exit(0) Index: client_manager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/client_manager.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- client_manager.py 29 Jun 2005 21:37:12 -0000 1.26 +++ client_manager.py 1 Jul 2005 11:51:33 -0000 1.27 @@ -34,8 +34,7 @@ # SSL certificate and key filenames certs = {} -certs['cert'] = config_opts['server_cert'] -certs['key'] = config_opts['server_key'] +certs['key_and_cert'] = config_opts['server_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] From fedora-extras-commits at redhat.com Fri Jul 1 11:51:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:35 -0400 Subject: extras-buildsys/common lighttpdManager.py, NONE, 1.1 FileDownloader.py, 1.8, 1.9 Makefile, 1.2, 1.3 SSLCommon.py, 1.6, 1.7 SimpleHTTPSServer.py, 1.5, 1.6 Message-ID: <200507011151.j61BpZjl011388@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/common Modified Files: FileDownloader.py Makefile SSLCommon.py SimpleHTTPSServer.py Added Files: lighttpdManager.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py --- NEW FILE lighttpdManager.py --- #!/usr/bin/python -t # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. # import os import shutil import fcntl import threading import time import popen2 class lighttpdManager(threading.Thread): def __init__(self, conffile, hostname, port, basedir, key_and_cert): self._stop = False self._pobj = None self._conffile = conffile self._port = port self._hostname = hostname self._basedir = basedir self._key_and_cert = key_and_cert threading.Thread.__init__(self) if not self._setup(): os._exit(1) self._start_server() def _setup(self): if not os.path.exists(self._basedir): os.makedirs(self._basedir) if not os.access(self._key_and_cert, os.R_OK): print "%s does not exist or is not readable." % self._key_and_cert return False if not os.path.exists(os.path.dirname(self._conffile)): os.makedirs(os.path.dirname(self._conffile)) cnf = ''' server.chroot = "%s" server.document-root = "/" mimetype.assign = ( ".rpm" => "application/x-rpm", ".log" => "text/plain" ) server.port = %d server.bind = "%s" server.username = "lighttpd" server.groupname = "lighttpd" server.dir-listing = "disable" ssl.engine = "enable" ssl.pemfile = "%s" ''' % (self._basedir, self._port, self._hostname, self._key_and_cert) f = open(self._conffile, "w") f.write(cnf) f.close() return True def _start_server(self): cmd = "/usr/sbin/lighttpd -f %s -D" % self._conffile self._pobj = popen2.Popen4(cmd=cmd, bufsize=1024) fcntl.fcntl(self._pobj.fromchild.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) def run(self): while not self._stop: if self._pobj: st = self._pobj.poll() # Restart it if it fails if st >= 0: print "HTTP server failed, trying to restart..." print "----------------------------------------" for line in self._pobj.fromchild.readlines(): print line print "----------------------------------------\n" del self._pobj if not self._setup(): os._exit(1) self._start_server() time.sleep(5) if self._pobj: os.kill(self._pobj.pid, 15) os.remove(self._conffile) def stop(self): self._stop = True Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- FileDownloader.py 21 Jun 2005 17:54:58 -0000 1.8 +++ FileDownloader.py 1 Jul 2005 11:51:33 -0000 1.9 @@ -102,9 +102,83 @@ except socket.error, e: if CommonErrors.canIgnoreSocketError(e): pass + except IOError, e: + if CommonErrors.canIgnoreSocketError(e): + pass if result: self._callback('done', self._cb_data) else: self._callback('failed', self._cb_data) + + +########################################################### +# Testing stuff +########################################################### + +import sys, time +from M2Crypto import threading as m2thread + +class dlwr: + def __init__(self, x, t): + self.num = x + self.tracker = t + self.dl = None + + def set_dl(self, dl): + self.dl = dl + + +class dl_tracker: + def __init__(self): + self.lst = [] + + def add(self, dlwr): + self.lst.append(dlwr) + + def remove(self, dlwr): + self.lst.remove(dlwr) + + def num(self): + return len(self.lst) + + +def dl_callback(status, dlwr): + print "Finished with %d (%s)" % (dlwr.num, status) + dlwr.tracker.remove(dlwr) + + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python FileDownloader.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + print "Starting..." + dlt = dl_tracker() + + m2thread.init() + x = 0 + while x < 100: + wr = dlwr(x, dlt) + dstdir = os.path.join("/tmp", "client_dir", "%s" % x) + if not os.path.exists(dstdir): + os.makedirs(dstdir) + time.sleep(0.25) + dl = FileDownloader(dl_callback, wr, "https://localhost:8886/testfile.dat", dstdir, ['.dat'], certs) + dlt.add(wr) + dl.start() + x = x + 1 + + while dlt.num() > 0: + try: + time.sleep(1) + except KeyboardInterrupt: + print "Quitting..." + m2thread.cleanup() + os._exit(0) Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 28 Jun 2005 01:41:28 -0000 1.2 +++ Makefile 1 Jul 2005 11:51:33 -0000 1.3 @@ -15,6 +15,7 @@ SimpleSSLXMLRPCServer.py \ SSLCommon.py \ SSLXMLRPCServerProxy.py \ + lighttpdManager.py \ __init__.py clean: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SSLCommon.py 27 Jun 2005 02:40:54 -0000 1.6 +++ SSLCommon.py 1 Jul 2005 11:51:33 -0000 1.7 @@ -29,17 +29,16 @@ """ Helper method for m2crypto's SSL libraries. """ - cert = certs['cert'] - key = certs['key'] + key_and_cert = certs['key_and_cert'] ca_cert = certs['ca_cert'] peer_ca_cert = certs['peer_ca_cert'] - for f in cert, key, ca_cert, peer_ca_cert: + for f in key_and_cert, ca_cert, peer_ca_cert: if f and not os.access(f, os.R_OK): print "%s does not exist or is not readable." % f os._exit(1) ctx = SSL.Context('sslv3') # SSLv3 only - ctx.load_cert(cert, key) + ctx.load_cert(key_and_cert) ctx.load_client_ca(ca_cert) ctx.load_verify_info(peer_ca_cert) ctx.set_allow_unknown_ca(False) @@ -58,6 +57,7 @@ # because it hung or tracebacked timeout = SSL.timeout(10) self.socket.set_socket_read_timeout(timeout) + self.socket.set_socket_write_timeout(timeout) def handle_request(self): request = None @@ -66,6 +66,7 @@ request, client_address = self.get_request() timeout = SSL.timeout(10) request.set_socket_read_timeout(timeout) + request.set_socket_write_timeout(timeout) if self.verify_request(request, client_address): self.process_request(request, client_address) except SSL.SSLError, e: Index: SimpleHTTPSServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SimpleHTTPSServer.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SimpleHTTPSServer.py 27 Jun 2005 02:40:54 -0000 1.5 +++ SimpleHTTPSServer.py 1 Jul 2005 11:51:33 -0000 1.6 @@ -19,7 +19,6 @@ import SimpleHTTPServer import SocketServer import threading -import os import urllib import posixpath import os, sys @@ -29,6 +28,7 @@ import SSLCommon import socket import time +from M2Crypto import threading as m2thread class HttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): @@ -90,6 +90,7 @@ # because it hung or tracebacked timeout = SSL.timeout(10) self.socket.set_socket_read_timeout(timeout) + self.socket.set_socket_write_timeout(timeout) def finish(self): if self.request: @@ -116,8 +117,55 @@ def __init__(self, certs, addr, http_dir): self._server = ThreadingHTTPSServer(certs, addr, http_dir) + self._stop = False threading.Thread.__init__(self) def run(self): - self._server.serve_forever() + while not self._stop: + self._server.handle_request() + def stop(self): + self._stop = True + + +########################################################### +# Testing stuff +########################################################### + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python SimpleHTTPSServer.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + print "Starting..." + + srcdir = os.path.join("/tmp", "server_dir") + if not os.path.exists(srcdir): + os.makedirs(srcdir) + + print "Creating random test data..." + f = open(os.path.join(srcdir, "testfile.dat"), "w") + x = 1 + while x < 10000: + f.write(os.urandom(50)) + x = x + 1 + f.close() + + m2thread.init() + + print "Starting the server." + server = SimpleHTTPSServer(certs, ('localhost', 8886), srcdir) + server.start() + + while True: + try: + time.sleep(1) + except KeyboardInterrupt: + print "Quitting..." + m2thread.cleanup() + os._exit(0) From fedora-extras-commits at redhat.com Fri Jul 1 12:00:42 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:00:42 -0400 Subject: common tobuild,1.1658,1.1659 Message-ID: <200507011200.j61C0gX0011542@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11525 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1658 retrieving revision 1.1659 diff -u -r1.1658 -r1.1659 --- tobuild 1 Jul 2005 11:33:52 -0000 1.1658 +++ tobuild 1 Jul 2005 12:00:40 -0000 1.1659 @@ -5,3 +5,4 @@ oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 oliver rpms/fish/devel fish-1_11_1-10_fc5 devel +petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 12:03:37 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:03:37 -0400 Subject: rpms/darcs/FC-4 darcs.spec,1.1,1.2 Message-ID: <200507011204.j61C473N012637@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12618 Modified Files: darcs.spec Log Message: - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and tetex-latex, tetex-dvips, latex2html for doc generation Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- darcs.spec 13 Jun 2005 13:50:01 -0000 1.1 +++ darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -9,7 +9,12 @@ Source0: http://www.darcs.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc +BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel +# for documentation +BuildRequires: tetex-latex, tetex-dvips, latex2html +# for make check +BuildRequires: which + %description Darcs is a revision control system, along the lines of CVS @@ -80,6 +85,11 @@ %changelog +* Fri Jul 1 2005 Jens Petersen - 1.0.3-2 +- fix buildrequires + - add sendmail, curl-devel, ncurses-devel, zlib-devel, and + tetex-latex, tetex-dvips, latex2html for doc generation + * Tue May 31 2005 Jens Petersen - 1.0.3-1 - initial import into Fedora Extras - 1.0.3 release From oliver at linux-kernel.at Fri Jul 1 12:05:01 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 01 Jul 2005 14:05:01 +0200 Subject: APPROVED: fish In-Reply-To: <42C51D09.9090000@linux-kernel.at> References: <42C51D09.9090000@linux-kernel.at> Message-ID: <42C5316D.8090203@linux-kernel.at> On 07/01/2005 12:38 PM, Oliver Falk wrote: > Name: fish > Summary: A friendly interactive shell > > Description: > fish is a shell geared towards interactive use. It's features are > focused on user friendlieness and discoverability. The language syntax > is simple but incompatible with other shell languages. > > Maintainer: Axel Liljencrantz > Reviewer: Oliver Falk > From fedora-extras-commits at redhat.com Fri Jul 1 12:06:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 08:06:45 -0400 Subject: common tobuild,1.1659,1.1660 Message-ID: <200507011206.j61C6jMQ012709@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12687 Modified Files: tobuild Log Message: restore table header Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1659 retrieving revision 1.1660 diff -u -r1.1659 -r1.1660 --- tobuild 1 Jul 2005 12:00:40 -0000 1.1659 +++ tobuild 1 Jul 2005 12:06:28 -0000 1.1660 @@ -1,3 +1,6 @@ +# this is the build control file. the format is +# user repo tag target status +# tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 12:18:07 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:18:07 -0400 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 Message-ID: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12804 Modified Files: darcs.spec Log Message: microbump release - to workround running make tag before committing Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 +++ darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: David's advanced revision control system Group: Development/Tools From fedora-extras-commits at redhat.com Fri Jul 1 12:19:45 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:19:45 -0400 Subject: rpms/darcs/FC-3 darcs.spec,1.1,1.2 Message-ID: <200507011219.j61CJjPN012890@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12866 Modified Files: darcs.spec Log Message: - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and tetex-latex, tetex-dvips, latex2html for doc generation Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-3/darcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- darcs.spec 13 Jun 2005 13:50:01 -0000 1.1 +++ darcs.spec 1 Jul 2005 12:19:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -9,7 +9,12 @@ Source0: http://www.darcs.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc +BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel +# for documentation +BuildRequires: tetex-latex, tetex-dvips, latex2html +# for make check +BuildRequires: which + %description Darcs is a revision control system, along the lines of CVS @@ -80,6 +85,11 @@ %changelog +* Fri Jul 1 2005 Jens Petersen - 1.0.3-2 +- fix buildrequires + - add sendmail, curl-devel, ncurses-devel, zlib-devel, and + tetex-latex, tetex-dvips, latex2html for doc generation + * Tue May 31 2005 Jens Petersen - 1.0.3-1 - initial import into Fedora Extras - 1.0.3 release From fedora-extras-commits at redhat.com Fri Jul 1 12:20:12 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:20:12 -0400 Subject: common tobuild,1.1660,1.1661 Message-ID: <200507011220.j61CKCBG012953@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12935 Modified Files: tobuild Log Message: request build of rpms/darcs/FC-3 darcs-1_0_3-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1660 retrieving revision 1.1661 diff -u -r1.1660 -r1.1661 --- tobuild 1 Jul 2005 12:06:28 -0000 1.1660 +++ tobuild 1 Jul 2005 12:20:10 -0000 1.1661 @@ -9,3 +9,4 @@ oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 oliver rpms/fish/devel fish-1_11_1-10_fc5 devel petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 +petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 12:25:11 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:25:11 -0400 Subject: common tobuild,1.1661,1.1662 Message-ID: <200507011225.j61CPBaV013026@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13009 Modified Files: tobuild Log Message: request build of rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1661 retrieving revision 1.1662 diff -u -r1.1661 -r1.1662 --- tobuild 1 Jul 2005 12:20:10 -0000 1.1661 +++ tobuild 1 Jul 2005 12:25:09 -0000 1.1662 @@ -10,3 +10,4 @@ oliver rpms/fish/devel fish-1_11_1-10_fc5 devel petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 +petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 From rc040203 at freenet.de Fri Jul 1 12:27:07 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 01 Jul 2005 14:27:07 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Message-ID: <1120220827.3741.189.camel@mccallum.corsepiu.local> On Fri, 2005-07-01 at 08:18 -0400, Jens Petersen wrote: > Author: petersen > diff -u -r1.2 -r1.3 > --- darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 > +++ darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 > @@ -1,6 +1,6 @@ > Name: darcs > Version: 1.0.3 > -Release: 2%{?dist} > +Release: 2%{?dist}.1 Would you mind to explain this weird choice of Release-tag? Ralf From fedora-extras-commits at redhat.com Fri Jul 1 12:33:27 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 08:33:27 -0400 Subject: common tobuild,1.1662,1.1663 Message-ID: <200507011233.j61CXRrF013106@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13089 Modified Files: tobuild Log Message: request build of rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1662 retrieving revision 1.1663 diff -u -r1.1662 -r1.1663 --- tobuild 1 Jul 2005 12:25:09 -0000 1.1662 +++ tobuild 1 Jul 2005 12:33:25 -0000 1.1663 @@ -11,3 +11,4 @@ petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 +spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 12:33:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 08:33:49 -0400 Subject: common tobuild,1.1663,1.1664 Message-ID: <200507011233.j61CXnd2013168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13151 Modified Files: tobuild Log Message: request build of rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1663 retrieving revision 1.1664 diff -u -r1.1663 -r1.1664 --- tobuild 1 Jul 2005 12:33:25 -0000 1.1663 +++ tobuild 1 Jul 2005 12:33:47 -0000 1.1664 @@ -12,3 +12,4 @@ petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 +spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 From petersen at redhat.com Fri Jul 1 12:40:01 2005 From: petersen at redhat.com (Jens Petersen) Date: Fri, 01 Jul 2005 21:40:01 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <1120220827.3741.189.camel@mccallum.corsepiu.local> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <1120220827.3741.189.camel@mccallum.corsepiu.local> Message-ID: <42C539A1.7070301@redhat.com> Ralf Corsepius wrote: > On Fri, 2005-07-01 at 08:18 -0400, Jens Petersen wrote: > >>diff -u -r1.2 -r1.3 >>--- darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 >>+++ darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 >>@@ -1,6 +1,6 @@ >> Name: darcs >> Version: 1.0.3 >>-Release: 2%{?dist} >>+Release: 2%{?dist}.1 > > Would you mind to explain this weird choice of Release-tag? I accidently ran "make tag" before committing head, which left it in a state where I could no longer "make tag" after actually committing. :( So I bumped the release... It seems like an extras-cvs bug to me? Jens From fedora-extras-commits at redhat.com Fri Jul 1 12:41:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 1 Jul 2005 08:41:28 -0400 Subject: rpms/most/devel .cvsignore, 1.2, 1.3 most.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200507011241.j61CfSGN013235@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13214 Modified Files: .cvsignore most.spec sources Log Message: updated to 4.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:52:46 -0000 1.2 +++ .cvsignore 1 Jul 2005 12:41:26 -0000 1.3 @@ -1 +1 @@ -most-4.9.5.tar.gz +most-4.10.1.tar.bz2 Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- most.spec 30 Mar 2005 14:32:43 -0000 1.6 +++ most.spec 1 Jul 2005 12:41:26 -0000 1.7 @@ -1,13 +1,13 @@ -Summary: more, less, most -Name: most -Version: 4.9.5 -Release: 4 -License: GPL -URL: ftp://space.mit.edu/pub/davis/most/ -Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: slang-devel +Summary: more, less, most +Name: most +Version: 4.10.1 +Release: 1 +License: GPL +URL: ftp://space.mit.edu/pub/davis/most/ +Group: Applications/Text +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: slang-devel %description most is a paging program that displays, one windowful at a time, the @@ -43,6 +43,9 @@ %changelog +* Fri Jul 01 2005 Adrian Reber - 4.10.1-1 +- updated to 4.10.1 + * Wed Mar 30 2005 Adrian Reber - 4.9.5-4 - fix build on ppc/ppc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:52:46 -0000 1.2 +++ sources 1 Jul 2005 12:41:26 -0000 1.3 @@ -1 +1 @@ -5c0922952485b0a5822ef994603dcc2f most-4.9.5.tar.gz +9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 12:48:41 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 1 Jul 2005 08:48:41 -0400 Subject: common tobuild,1.1664,1.1665 Message-ID: <200507011248.j61CmfqG013400@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13383 Modified Files: tobuild Log Message: request build of rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1664 retrieving revision 1.1665 diff -u -r1.1664 -r1.1665 --- tobuild 1 Jul 2005 12:33:47 -0000 1.1664 +++ tobuild 1 Jul 2005 12:48:38 -0000 1.1665 @@ -13,3 +13,4 @@ petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 +abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 12:49:34 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 1 Jul 2005 08:49:34 -0400 Subject: common tobuild,1.1665,1.1666 Message-ID: <200507011249.j61CnYtl013443@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13426 Modified Files: tobuild Log Message: request build of rpms/libvisual/devel libvisual-0_2_0-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1665 retrieving revision 1.1666 diff -u -r1.1665 -r1.1666 --- tobuild 1 Jul 2005 12:48:38 -0000 1.1665 +++ tobuild 1 Jul 2005 12:49:32 -0000 1.1666 @@ -14,3 +14,4 @@ spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 +abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 12:53:18 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 1 Jul 2005 08:53:18 -0400 Subject: common tobuild,1.1666,1.1667 Message-ID: <200507011253.j61CrIAC013483@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13466 Modified Files: tobuild Log Message: request build of rpms/most/devel most-4_10_1-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1666 retrieving revision 1.1667 diff -u -r1.1666 -r1.1667 --- tobuild 1 Jul 2005 12:49:32 -0000 1.1666 +++ tobuild 1 Jul 2005 12:53:16 -0000 1.1667 @@ -15,3 +15,4 @@ spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel +adrian rpms/most/devel most-4_10_1-1 devel From fedora-extras-commits at redhat.com Fri Jul 1 13:03:06 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 09:03:06 -0400 Subject: common tobuild,1.1667,1.1668 Message-ID: <200507011303.j61D3bgr014592@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14575 Modified Files: tobuild Log Message: request build of rpms/rinetd/FC-4 rinetd-0_62-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1667 retrieving revision 1.1668 diff -u -r1.1667 -r1.1668 --- tobuild 1 Jul 2005 12:53:16 -0000 1.1667 +++ tobuild 1 Jul 2005 13:02:41 -0000 1.1668 @@ -16,3 +16,4 @@ abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel adrian rpms/most/devel most-4_10_1-1 devel +kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 From kaboom at oobleck.net Fri Jul 1 13:26:50 2005 From: kaboom at oobleck.net (Chris Ricker) Date: Fri, 1 Jul 2005 09:26:50 -0400 (EDT) Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Message-ID: On Fri, 1 Jul 2005, Jens Petersen wrote: > microbump release - to workround running make tag before committing Everyone's favorite CVS mistake ;-) > -Release: 2%{?dist} > +Release: 2%{?dist}.1 It'd be preferable to increment the release, rather than monkeying around with new numbers after the dist stuff darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a hypothetical FC 4.1 release darcs-1.0.3-3.fc4 is unambiguous later, chris From oliver at linux-kernel.at Fri Jul 1 13:41:00 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 01 Jul 2005 15:41:00 +0200 Subject: APPROVED: perl-Want Message-ID: <42C547EC.9020601@linux-kernel.at> Name: perl-Want Summary: Perl module implementing a generalisation of wantarray This module generalises the mechanism of the wantarray function, allowing a function to determine in some detail how its return value is going to be immediately used. Maintainer: Ralf Corsepius Reviewer: Oliver Falk From fedora-extras-commits at redhat.com Fri Jul 1 13:40:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:42 -0400 Subject: rpms/lout - New directory Message-ID: <200507011340.j61DegBG015125@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15104/lout Log Message: Directory /cvs/extras/rpms/lout added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 13:40:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:42 -0400 Subject: rpms/lout/devel - New directory Message-ID: <200507011340.j61Degsq015130@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15104/lout/devel Log Message: Directory /cvs/extras/rpms/lout/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 13:40:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:58 -0400 Subject: rpms/lout Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011340.j61DewmK015189@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15158 Added Files: Makefile import.log Log Message: Setup of module lout --- NEW FILE Makefile --- # Top level Makefile for module lout all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 13:40:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:58 -0400 Subject: rpms/lout/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011340.j61DewT5015194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15158/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lout --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From tcallawa at redhat.com Fri Jul 1 13:43:36 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 01 Jul 2005 08:43:36 -0500 Subject: APPROVED: lout Message-ID: <1120225416.8990.156.camel@localhost.localdomain> Name: lout Summary: A document formatting system Description: Lout is a document formatting system designed and implemented by Jeffrey Kingston at the Basser Department of Computer Science, University of Sydney, Australia. The system reads a high-level description of a document similar in style to LaTeX and produces a PostScript file which can be printed on most laser printers and graphic display devices. Plain text output is also available, PDF output is limited but working (e.g. no graphics). Lout is inherently multilingual. Adding new languages is easy. Reviewer: Ralf Corsepius Maintainer: Tom 'spot' Callaway ~spot -- Tom "spot" Callaway: Red Hat Sales Engineer || GPG Fingerprint: 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 Jul 1 13:42:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:42:22 -0400 Subject: rpms/lout/devel lout-3.30-Fedora-makefile-new.patch, NONE, 1.1 lout.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011342.j61DgMor015310@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/devel Modified Files: .cvsignore sources Added Files: lout-3.30-Fedora-makefile-new.patch lout.spec Log Message: auto-import lout-3.30-4 on branch devel from lout-3.30-4.src.rpm lout-3.30-Fedora-makefile-new.patch: --- NEW FILE lout-3.30-Fedora-makefile-new.patch --- --- lout-3.30/makefile.BAD 2005-06-30 07:55:49.000000000 -0500 +++ lout-3.30/makefile 2005-06-30 08:14:29.000000000 -0500 @@ -280,15 +280,15 @@ COLLATE = 1 -PDF_COMPRESSION = 0 -ZLIB = -ZLIBPATH = +PDF_COMPRESSION = 1 +ZLIB = -lz +ZLIBPATH = CC = gcc RCOPY = cp -r -COPTS = -ansi -pedantic -Wall -O3 +COPTS = $(RPM_OPT_FLAGS) CFLAGS = -DOS_UNIX=$(OSUNIX) \ -DOS_DOS=$(OSDOS) \ @@ -336,91 +336,91 @@ install: lout prg2lout @echo "" @echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)" - cp lout $(BINDIR)/lout - chmod 755 $(BINDIR)/lout - cp prg2lout $(BINDIR)/prg2lout - chmod 755 $(BINDIR)/prg2lout + cp lout $(DESTDIR)$(BINDIR)/lout + chmod 755 $(DESTDIR)$(BINDIR)/lout + cp prg2lout $(DESTDIR)$(BINDIR)/prg2lout + chmod 755 $(DESTDIR)$(BINDIR)/prg2lout @echo "" @echo "(b) Installing library files into LIBDIR $(LIBDIR)" - mkdir $(LIBDIR) - chmod 755 $(LIBDIR) + mkdir $(DESTDIR)$(LIBDIR) + chmod 755 $(DESTDIR)$(LIBDIR) @echo "" - mkdir $(LIBDIR)/$(LIBINCL) - chmod 755 $(LIBDIR)/$(LIBINCL) - cp include/* $(LIBDIR)/$(LIBINCL) - chmod 644 $(LIBDIR)/$(LIBINCL)/* - @echo "" - mkdir $(LIBDIR)/$(LIBDATA) - chmod 755 $(LIBDIR)/$(LIBDATA) - cp data/* $(LIBDIR)/$(LIBDATA) - chmod 644 $(LIBDIR)/$(LIBDATA)/* - @echo "" - mkdir $(LIBDIR)/$(LIBHYPH) - chmod 755 $(LIBDIR)/$(LIBHYPH) - cp hyph/* $(LIBDIR)/$(LIBHYPH) - chmod 644 $(LIBDIR)/$(LIBHYPH)/* - @echo "" - mkdir $(LIBDIR)/$(LIBFONT) - chmod 755 $(LIBDIR)/$(LIBFONT) - cp font/* $(LIBDIR)/$(LIBFONT) - chmod 644 $(LIBDIR)/$(LIBFONT)/* - @echo "" - mkdir $(LIBDIR)/$(LIBMAPS) - chmod 755 $(LIBDIR)/$(LIBMAPS) - cp maps/* $(LIBDIR)/$(LIBMAPS) - chmod 644 $(LIBDIR)/$(LIBMAPS)/* + mkdir $(DESTDIR)$(LIBDIR)/$(LIBINCL) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBINCL) + cp include/* $(DESTDIR)$(LIBDIR)/$(LIBINCL) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBINCL)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBDATA) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBDATA) + cp data/* $(DESTDIR)$(LIBDIR)/$(LIBDATA) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBDATA)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBHYPH) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBHYPH) + cp hyph/* $(DESTDIR)$(LIBDIR)/$(LIBHYPH) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBFONT) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBFONT) + cp font/* $(DESTDIR)$(LIBDIR)/$(LIBFONT) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBFONT)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBMAPS) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBMAPS) + cp maps/* $(DESTDIR)$(LIBDIR)/$(LIBMAPS) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBMAPS)/* @echo "" - mkdir $(LIBDIR)/$(LIBLOCA) - chmod 755 $(LIBDIR)/$(LIBLOCA) + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA) @echo "" @echo "(c) Initializing run (should be silent, no errors expected)" - $(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init + $(DESTDIR)$(BINDIR)/lout -x -s $(DESTDIR)$(LIBDIR)/$(LIBINCL)/init -I $(DESTDIR)$(LIBDIR)/$(LIBINCL) -H $(DESTDIR)$(LIBDIR)/$(LIBHYPH) -D $(DESTDIR)$(LIBDIR)/$(LIBDATA) @echo "" @echo "(d) Changing mode of files just created by initializing run" - chmod 644 $(LIBDIR)/$(LIBDATA)/* - chmod 644 $(LIBDIR)/$(LIBHYPH)/* + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBDATA)/* + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)/* installman: @echo "" @echo "Installing manual entries into MANDIR $(MANDIR)" sed -e "s@@$(BINDIR)@" -e "s@@$(LIBDIR)@" \ -e "s@@$(DOCDIR)@" -e "s@@$(MANDIR)@" \ - man/lout.1 > $(MANDIR)/lout.1 - chmod 644 $(MANDIR)/lout.1 - cp man/prg2lout.1 $(MANDIR)/prg2lout.1 - chmod 644 $(MANDIR)/prg2lout.1 + man/lout.1 > $(DESTDIR)$(MANDIR)/lout.1 + chmod 644 $(DESTDIR)$(MANDIR)/lout.1 + cp man/prg2lout.1 $(DESTDIR)$(MANDIR)/prg2lout.1 + chmod 644 $(DESTDIR)$(MANDIR)/prg2lout.1 installdoc: @echo "" @echo "Creating DOCDIR $(DOCDIR) and copying documentation into it" - $(RCOPY) doc $(DOCDIR) - chmod 755 $(DOCDIR) - chmod 755 $(DOCDIR)/* - chmod 644 $(DOCDIR)/*/* + $(RCOPY) doc $(DESTDIR)$(DOCDIR) + chmod 755 $(DESTDIR)$(DOCDIR) + chmod 755 $(DESTDIR)$(DOCDIR)/* + chmod 644 $(DESTDIR)$(DOCDIR)/*/* installfr: @echo "" @echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)" - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES - cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) - gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ - $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) - chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/* + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR) + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES + cp locale/msgs.fr $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) + gencat $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ + $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/* installde: @echo "" @echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)" - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES - cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) - gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ - $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) - chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/* + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE) + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES + cp locale/msgs.de $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) + gencat $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ + $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/* uninstall: -rm -f $(BINDIR)/lout $(BINDIR)/prg2lout --- NEW FILE lout.spec --- Name: lout Summary: A document formatting system Version: 3.30 Release: 4%{?dist} License: GPL Group: Applications/Publishing URL: http://lout.sourceforge.net/ Source0: http://dl.sourceforge.net/lout/%{name}-%{version}.tar.gz Source1: http://snark.ptc.spbu.ru/~uwe/lout/user.ps.gz Patch0: lout-3.30-Fedora-makefile-new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel %description Lout is a document formatting system designed and implemented by Jeffrey Kingston at the Basser Department of Computer Science, University of Sydney, Australia. The system reads a high-level description of a document similar in style to LaTeX and produces a PostScript file which can be printed on most laser printers and graphic display devices. Plain text output is also available, PDF output is limited but working (e.g. no graphics). Lout is inherently multilingual. Adding new languages is easy. %prep %setup -q %patch0 -p1 %build make BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} DOCDIR=%{_datadir}/%{name}/doc \ MANDIR=%{_mandir}/man1 prg2lout lout %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 make DESTDIR=$RPM_BUILD_ROOT \ BINDIR=%{_bindir} \ LIBDIR=%{_datadir}/%{name} \ DOCDIR=%{_datadir}/%{name}/doc \ MANDIR=%{_mandir}/man1 \ install installman installdoc cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc gunzip $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc/user.ps.gz # looks like a vim dump, just taking up space rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/user/.pie_intr.swp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, 0755) %doc gnu.gpl README READMEPDF %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_mandir}/man1/*.1* %changelog * Fri Jul 1 2005 Tom "spot" Callaway 3.30-4 - delete hidden trash file * Thu Jun 30 2005 Tom "spot" Callaway 3.30-3 - cleanups, macro consistency * Thu Jun 30 2005 Tom "spot" Callaway 3.30-2 - remove hardcoded directory definitions - link with shared zlib, not static * Thu Jun 30 2005 Tom "spot" Callaway 3.30-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lout/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 13:40:56 -0000 1.1 +++ .cvsignore 1 Jul 2005 13:42:20 -0000 1.2 @@ -0,0 +1,2 @@ +lout-3.30.tar.gz +user.ps.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lout/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 13:40:56 -0000 1.1 +++ sources 1 Jul 2005 13:42:20 -0000 1.2 @@ -0,0 +1,2 @@ +770930dec05f136a29ff078e66e59881 lout-3.30.tar.gz +7786e5363c5716a22fc5bd7666a24826 user.ps.gz From fedora-extras-commits at redhat.com Fri Jul 1 13:42:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:42:22 -0400 Subject: rpms/lout import.log,1.1,1.2 Message-ID: <200507011342.j61DgqTU015331@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275 Modified Files: import.log Log Message: auto-import lout-3.30-4 on branch devel from lout-3.30-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lout/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 13:40:56 -0000 1.1 +++ import.log 1 Jul 2005 13:42:20 -0000 1.2 @@ -0,0 +1 @@ +lout-3_30-4:HEAD:lout-3.30-4.src.rpm:1120225402 From fedora-extras-commits at redhat.com Fri Jul 1 13:46:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:46:00 -0400 Subject: common tobuild,1.1668,1.1669 Message-ID: <200507011346.j61Dk07q015736@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15717 Modified Files: tobuild Log Message: request build of rpms/lout/FC-3 lout-3_30-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1668 retrieving revision 1.1669 diff -u -r1.1668 -r1.1669 --- tobuild 1 Jul 2005 13:02:41 -0000 1.1668 +++ tobuild 1 Jul 2005 13:45:58 -0000 1.1669 @@ -17,3 +17,4 @@ abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel adrian rpms/most/devel most-4_10_1-1 devel kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 +spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 13:46:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:46:20 -0400 Subject: common tobuild,1.1669,1.1670 Message-ID: <200507011346.j61DkKok015807@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15789 Modified Files: tobuild Log Message: request build of rpms/lout/FC-4 lout-3_30-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1669 retrieving revision 1.1670 diff -u -r1.1669 -r1.1670 --- tobuild 1 Jul 2005 13:45:58 -0000 1.1669 +++ tobuild 1 Jul 2005 13:46:18 -0000 1.1670 @@ -18,3 +18,4 @@ adrian rpms/most/devel most-4_10_1-1 devel kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 +spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 13:48:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 09:48:11 -0400 Subject: rpms/id3lib/FC-3 .cvsignore, 1.2, 1.3 id3lib.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200507011348.j61DmCgG015897@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15874 Modified Files: .cvsignore id3lib.spec sources Log Message: * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:34:28 -0000 1.2 +++ .cvsignore 1 Jul 2005 13:48:09 -0000 1.3 @@ -1 +1,2 @@ id3lib-3.8.3.tar.gz +id3lib-3.8.3-libtool-autofoo.patch.bz2 Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/id3lib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- id3lib.spec 10 Dec 2004 22:03:03 -0000 1.5 +++ id3lib.spec 1 Jul 2005 13:48:09 -0000 1.6 @@ -1,23 +1,22 @@ -Summary: An Open-Source library for manipulating ID3v1 and ID3v2 tags. -Name: id3lib -Version: 3.8.3 -Release: 9 -Epoch: 0 -License: LGPL -Group: System Environment/Libraries -URL: http://id3lib.sourceforge.net/ -Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz +Summary: Library for manipulating ID3v1 and ID3v2 tags +Name: id3lib +Version: 3.8.3 +Release: 11%{?dist} +License: LGPL +Group: System Environment/Libraries +URL: http://id3lib.sourceforge.net/ +Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen %package devel -Summary: Development tools for the id3lib. +Summary: Development tools for the id3lib library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: zlib-devel -#--------------------------------------------------------------------- %description This package provides a software library for manipulating ID3v1 and @@ -31,40 +30,36 @@ %description devel This package provides files needed to develop with the id3lib. -#--------------------------------------------------------------------- %prep %setup -q %patch0 -p0 +%patch1 -p1 -b .libtool-autofoo -#--------------------------------------------------------------------- %build %configure make %{?_smp_mflags} -#--------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT %makeinstall make docs -#--------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -#--------------------------------------------------------------------- %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) -%exclude %{_libdir}/libid3.la %doc AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO -%doc doc +%doc doc/ %{_libdir}/libid3-3.8.so.* %{_bindir}/id3convert %{_bindir}/id3cp @@ -76,10 +71,16 @@ %{_includedir}/id3.h %{_includedir}/id3/ %{_libdir}/libid3.a +%exclude %{_libdir}/libid3.la %{_libdir}/libid3.so -#--------------------------------------------------------------------- %changelog +* Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 +- Make libtool link against libstdc++ (bug #162127). + +* Thu Apr 7 2005 Michael Schwendt - 3.8.3-10 +- rebuilt + * Wed Oct 29 2003 Ville Skytta - 0:3.8.3-0.fdr.9 - Rebuild. @@ -105,5 +106,5 @@ * Thu Apr 3 2003 Dams 0:3.8.3-0.fdr.2 - Added missing epoch requirement -* Wed Apr 2 2003 Dams +* Wed Apr 2 2003 Dams - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:34:28 -0000 1.2 +++ sources 1 Jul 2005 13:48:09 -0000 1.3 @@ -1 +1,2 @@ 19f27ddd2dda4b2d26a559a4f0f402a7 id3lib-3.8.3.tar.gz +ce106e4386e4fbc0d49aea9fbd14eb4b id3lib-3.8.3-libtool-autofoo.patch.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 13:50:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:50:51 -0400 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 Message-ID: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16031/devel Modified Files: gambas.spec Log Message: ExcludeArch lines added for x86_64 and ppc Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambas.spec 13 Jun 2005 16:43:05 -0000 1.1 +++ gambas.spec 1 Jul 2005 13:50:49 -0000 1.2 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -10,6 +10,10 @@ BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +# Code is not 64 bit clean. +ExcludeArch: x86_64 +# Code is not endian clean. +ExcludeArch: ppc Patch0: gambas-1.0.6-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,5 +125,8 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 +- added ExcludeArch for x86_64 and ppc + * Mon May 23 2005 Tom "spot" Callaway 1.0.6-1 - initial package for Fedora Extras (based on package by Dries Verachtert) From fedora-extras-commits at redhat.com Fri Jul 1 13:56:21 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 09:56:21 -0400 Subject: common tobuild,1.1670,1.1671 Message-ID: <200507011356.j61DuL68016089@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1670 retrieving revision 1.1671 diff -u -r1.1670 -r1.1671 --- tobuild 1 Jul 2005 13:46:18 -0000 1.1670 +++ tobuild 1 Jul 2005 13:56:19 -0000 1.1671 @@ -19,3 +19,4 @@ kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 +mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 14:30:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:02 -0400 Subject: rpms/perl-Want - New directory Message-ID: <200507011430.j61EU2Zl017343@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17319/perl-Want Log Message: Directory /cvs/extras/rpms/perl-Want added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:30:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:03 -0400 Subject: rpms/perl-Want/devel - New directory Message-ID: <200507011430.j61EU3IE017348@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17319/perl-Want/devel Log Message: Directory /cvs/extras/rpms/perl-Want/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:30:38 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:38 -0400 Subject: rpms/perl-Want Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011430.j61EUcpT017396@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17365 Added Files: Makefile import.log Log Message: Setup of module perl-Want --- NEW FILE Makefile --- # Top level Makefile for module perl-Want all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 14:30:40 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:40 -0400 Subject: rpms/perl-Want/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011430.j61EUeir017401@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17365/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Want --- NEW 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 Jul 1 14:31:32 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:31:32 -0400 Subject: rpms/perl-Want import.log,1.1,1.2 Message-ID: <200507011432.j61EW3tP017463@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17429 Modified Files: import.log Log Message: auto-import perl-Want-0.08-2 on branch devel from perl-Want-0.08-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Want/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 14:30:36 -0000 1.1 +++ import.log 1 Jul 2005 14:31:30 -0000 1.2 @@ -0,0 +1 @@ +perl-Want-0_08-2:HEAD:perl-Want-0.08-2.src.rpm:1120228276 From fedora-extras-commits at redhat.com Fri Jul 1 14:31:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:31:33 -0400 Subject: rpms/perl-Want/devel perl-Want.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011432.j61EW32w017467@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17429/devel Modified Files: .cvsignore sources Added Files: perl-Want.spec Log Message: auto-import perl-Want-0.08-2 on branch devel from perl-Want-0.08-2.src.rpm --- NEW FILE perl-Want.spec --- Name: perl-Want Version: 0.08 Release: 2%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Want/ Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module generalises the mechanism of the wantarray function, allowing a function to determine in some detail how its return value is going to be immediately used. %prep %setup -q -n Want-%{version} %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ -o -name perllocal.pod \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %clean rm -rf $RPM_BUILD_ROOT %check || : make test %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/Want* %{perl_vendorarch}/auto/Want* %{_mandir}/man3/* %changelog * Fri Jul 01 2005 Ralf Corsepius - 0.08-2 - Pass OPTIMIZE during generation of Makefile. - Use perl instead of %%__perl. * Fri Jul 01 2005 Ralf Corsepius - 0.08-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 14:30:37 -0000 1.1 +++ .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 @@ -0,0 +1 @@ +Want-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 14:30:37 -0000 1.1 +++ sources 1 Jul 2005 14:31:31 -0000 1.2 @@ -0,0 +1 @@ +72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz From nphilipp at redhat.com Fri Jul 1 14:41:20 2005 From: nphilipp at redhat.com (Nils Philippsen) Date: Fri, 01 Jul 2005 16:41:20 +0200 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 In-Reply-To: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> References: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> Message-ID: <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> On Fri, 2005-07-01 at 09:50 -0400, Tom Callaway wrote: > BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel > +# Code is not 64 bit clean. > +ExcludeArch: x86_64 > +# Code is not endian clean. > +ExcludeArch: ppc I don't think we build many packages for ppc64, but wouldn't it be good to "ExcludeArch: ppc64" for both of these reasons despite that? Nils -- Nils Philippsen / Red Hat / nphilipp at redhat.com "They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety." -- B. Franklin, 1759 PGP fingerprint: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011 From fedora-extras-commits at redhat.com Fri Jul 1 14:55:15 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:15 -0400 Subject: rpms/perl-Time-modules - New directory Message-ID: <200507011455.j61EtFTK017587@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17563/perl-Time-modules Log Message: Directory /cvs/extras/rpms/perl-Time-modules added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:55:15 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:15 -0400 Subject: rpms/perl-Time-modules/devel - New directory Message-ID: <200507011455.j61EtFdX017592@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17563/perl-Time-modules/devel Log Message: Directory /cvs/extras/rpms/perl-Time-modules/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:55:23 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:23 -0400 Subject: rpms/perl-Time-modules Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011455.j61EtND4017635@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17608 Added Files: Makefile import.log Log Message: Setup of module perl-Time-modules --- NEW FILE Makefile --- # Top level Makefile for module perl-Time-modules all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 14:55:23 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:23 -0400 Subject: rpms/perl-Time-modules/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011455.j61EtNJM017640@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17608/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Time-modules --- NEW 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 Jul 1 14:55:41 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:41 -0400 Subject: rpms/perl-Time-modules import.log,1.1,1.2 Message-ID: <200507011455.j61EtfHi017703@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17672 Modified Files: import.log Log Message: auto-import perl-Time-modules-0.2003.1126-2 on branch devel from perl-Time-modules-0.2003.1126-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Time-modules/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 14:55:21 -0000 1.1 +++ import.log 1 Jul 2005 14:55:39 -0000 1.2 @@ -0,0 +1 @@ +perl-Time-modules-0_2003_1126-2:HEAD:perl-Time-modules-0.2003.1126-2.src.rpm:1120229542 From fedora-extras-commits at redhat.com Fri Jul 1 14:55:42 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:42 -0400 Subject: rpms/perl-Time-modules/devel perl-Time-modules.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011455.j61Etg7g017710@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17672/devel Modified Files: .cvsignore sources Added Files: perl-Time-modules.spec Log Message: auto-import perl-Time-modules-0.2003.1126-2 on branch devel from perl-Time-modules-0.2003.1126-2.src.rpm --- NEW FILE perl-Time-modules.spec --- Name: perl-Time-modules Version: 0.2003.1126 Release: 2 Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable URL: http://search.cpan.org/dist/Time-modules/ Source0: http://www.cpan.org/authors/id/M/MU/MUIR/modules/Time-modules-2003.1126.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Time-modules provides several Perl modules, including Time::CTime, Time::DaysInMonth, Time::JulianDay, Time::ParseDate, and Time::Timezone. These modules can be useful for parsing and manipulating dates and times. %prep %setup -q -n Time-modules-2003.1126 %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 * Fri Jul 01 2005 Chris Ricker 0.2003.1126-2 - license change, include README, simplify build (Ville Skytt??) * Fri May 27 2005 Chris Ricker 0.2003.1126-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Time-modules/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 14:55:21 -0000 1.1 +++ .cvsignore 1 Jul 2005 14:55:40 -0000 1.2 @@ -0,0 +1 @@ +Time-modules-2003.1126.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Time-modules/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 14:55:21 -0000 1.1 +++ sources 1 Jul 2005 14:55:40 -0000 1.2 @@ -0,0 +1 @@ +b3bda3a2935c2d7d099c8001f583c4cb Time-modules-2003.1126.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:00:45 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:45 -0400 Subject: rpms/diction - New directory Message-ID: <200507011500.j61F0jEY017824@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804/diction Log Message: Directory /cvs/extras/rpms/diction added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 15:00:45 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:45 -0400 Subject: rpms/diction/devel - New directory Message-ID: <200507011500.j61F0jY4017829@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804/diction/devel Log Message: Directory /cvs/extras/rpms/diction/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 15:00:57 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:57 -0400 Subject: rpms/diction Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011500.j61F0vLd017876@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17849 Added Files: Makefile import.log Log Message: Setup of module diction --- NEW FILE Makefile --- # Top level Makefile for module diction all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 15:00:57 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:57 -0400 Subject: rpms/diction/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011500.j61F0vGS017881@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17849/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module diction --- NEW 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 Jul 1 15:02:18 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:02:18 -0400 Subject: rpms/diction/devel diction.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011502.j61F2mvH018979@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18944/devel Modified Files: .cvsignore sources Added Files: diction.spec Log Message: auto-import diction-1.08-1 on branch devel from diction-1.08-1.src.rpm --- NEW FILE diction.spec --- Name: diction Version: 1.08 Release: 1%{?dist} Summary: Identifies diction and style errors Group: Applications/Text License: GPL URL: http://www.gnu.org/software/diction/diction.html Source0: http://www.moria.de/~michael/diction/diction-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext %description Diction and style are two old standard UNIX commands. Diction identifies wordy and commonly misused phrases. Style analyses surface characteristics of a document, including sentence length and other readability measures. These programs cannot help you structure a document well, but they can help to avoid poor wording and compare the readability (not the understandability!) of your documents with others. Both commands support English and German documents. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README NEWS %{_bindir}/* %{_datadir}/diction %{_mandir}/man*/* %changelog * Thu Jun 30 2005 Konstantin Ryabitsev - 1.08-1 - Version 1.08 - Do not list locale files namely in addition to findlang - Add NEWS to doc - Disttagging - Remove epoch * Fri Jul 23 2004 Michel Salim - 0:1.06-0.fdr.2 - Added version info to changelog entries - Use find_lang * Tue Jul 20 2004 Michel Salim - 0:1.06-0.fdr.1 - Update to new version * Sat Jul 17 2004 Michel Salim - 0:1.05-0.fdr.1 - Initial Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/diction/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 15:00:55 -0000 1.1 +++ .cvsignore 1 Jul 2005 15:02:16 -0000 1.2 @@ -0,0 +1 @@ +diction-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/diction/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 15:00:55 -0000 1.1 +++ sources 1 Jul 2005 15:02:16 -0000 1.2 @@ -0,0 +1 @@ +18bf7dbd4776772a8208a8cc7eed5f9b diction-1.08.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:01:49 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:01:49 -0400 Subject: rpms/diction import.log,1.1,1.2 Message-ID: <200507011502.j61F2nch018982@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18944 Modified Files: import.log Log Message: auto-import diction-1.08-1 on branch devel from diction-1.08-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/diction/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 15:00:54 -0000 1.1 +++ import.log 1 Jul 2005 15:01:47 -0000 1.2 @@ -0,0 +1 @@ +diction-1_08-1:HEAD:diction-1.08-1.src.rpm:1120230085 From oliver at linux-kernel.at Fri Jul 1 15:04:44 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 01 Jul 2005 17:04:44 +0200 Subject: ebtables (WAS: Re: Reviews still needed) In-Reply-To: <1120226047.8990.162.camel@localhost.localdomain> References: <1120226047.8990.162.camel@localhost.localdomain> Message-ID: <42C55B8C.2020101@linux-kernel.at> On 07/01/2005 03:54 PM, Tom 'spot' Callaway wrote: > ebtables: > https://www.redhat.com/archives/fedora-extras-list/2005-June/msg00704.html TODO * Don't include the INSTALL file in %doc section, as it is not of interesst for end-users and it contains wrong paths (eg /usr/local stuff). OK * Builds fine on FCdev i386 (don't know about x86_64) * Installs fine * Uninstalls fine * Starting via initscript works * License OK * Source matches upstream * install cleans out the build root * clean exists * No BuildRequires needed * No need for subpackages * Use of macros is consistant Call it an approval, if you kick out the INSTALL file. :-) Best, Oliver From fedora-extras-commits at redhat.com Fri Jul 1 15:20:28 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 11:20:28 -0400 Subject: rpms/perl-Want/devel perl-Want.spec,1.1,1.2 Message-ID: <200507011520.j61FKSpl019090@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19073 Modified Files: perl-Want.spec Log Message: Cosmetics. Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/perl-Want.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Want.spec 1 Jul 2005 14:31:31 -0000 1.1 +++ perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-Want Version: 0.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Want/ Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -36,7 +36,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%check || : +%check make test %files @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Fri Jul 01 2005 Ralf Corsepius - 0.08-3 +- Remove ||: in %%check. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-2 - Pass OPTIMIZE during generation of Makefile. - Use perl instead of %%__perl. From fedora-extras-commits at redhat.com Fri Jul 1 15:21:19 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 11:21:19 -0400 Subject: common tobuild,1.1671,1.1672 Message-ID: <200507011521.j61FLJIE019152@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19135 Modified Files: tobuild Log Message: request build of rpms/perl-Want/devel perl-Want-0_08-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1671 retrieving revision 1.1672 diff -u -r1.1671 -r1.1672 --- tobuild 1 Jul 2005 13:56:19 -0000 1.1671 +++ tobuild 1 Jul 2005 15:21:17 -0000 1.1672 @@ -20,3 +20,4 @@ spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 +corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 15:26:42 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:26:42 -0400 Subject: rpms/gramps/devel .cvsignore, 1.7, 1.8 gramps.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200507011526.j61FQgLo019191@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19170 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Jun 2005 13:10:05 -0000 1.7 +++ .cvsignore 1 Jul 2005 15:26:39 -0000 1.8 @@ -1 +1 @@ -gramps-2.0.3.tar.gz +gramps-2.0.4.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gramps.spec 25 Jun 2005 13:10:05 -0000 1.7 +++ gramps.spec 1 Jul 2005 15:26:39 -0000 1.8 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jun 29 2005 Brian Pepple - 2.0.4-1 +- Update to 2.0.4. + * Sat Jun 18 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Jun 2005 13:10:05 -0000 1.7 +++ sources 1 Jul 2005 15:26:39 -0000 1.8 @@ -1 +1 @@ -c103968d314245b994ce004bfc6db8f0 gramps-2.0.3.tar.gz +7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:27:11 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:27:11 -0400 Subject: common tobuild,1.1672,1.1673 Message-ID: <200507011527.j61FRBWi019248@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19231 Modified Files: tobuild Log Message: request build of rpms/gramps/devel gramps-2_0_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1672 retrieving revision 1.1673 diff -u -r1.1672 -r1.1673 --- tobuild 1 Jul 2005 15:21:17 -0000 1.1672 +++ tobuild 1 Jul 2005 15:27:09 -0000 1.1673 @@ -21,3 +21,4 @@ spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel +bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 15:29:21 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:29:21 -0400 Subject: rpms/gramps/FC-4 .cvsignore, 1.7, 1.8 gramps.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200507011529.j61FTLYR019286@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19265 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Jun 2005 21:14:15 -0000 1.7 +++ .cvsignore 1 Jul 2005 15:29:19 -0000 1.8 @@ -1 +1 @@ -gramps-2.0.3.tar.gz +gramps-2.0.4.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gramps.spec 25 Jun 2005 21:14:15 -0000 1.7 +++ gramps.spec 1 Jul 2005 15:29:19 -0000 1.8 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jun 29 2005 Brian Pepple - 2.0.4-1 +- Update to 2.0.4. + * Sat Jun 18 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Jun 2005 21:14:15 -0000 1.7 +++ sources 1 Jul 2005 15:29:19 -0000 1.8 @@ -1 +1 @@ -c103968d314245b994ce004bfc6db8f0 gramps-2.0.3.tar.gz +7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:29:38 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:29:38 -0400 Subject: common tobuild,1.1673,1.1674 Message-ID: <200507011529.j61FTcn1019343@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326 Modified Files: tobuild Log Message: request build of rpms/gramps/FC-4 gramps-2_0_4-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1673 retrieving revision 1.1674 diff -u -r1.1673 -r1.1674 --- tobuild 1 Jul 2005 15:27:09 -0000 1.1673 +++ tobuild 1 Jul 2005 15:29:36 -0000 1.1674 @@ -22,3 +22,4 @@ mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel +bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 15:41:43 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 11:41:43 -0400 Subject: devel/perl-Time-modules perl-Time-modules.spec,1.1,1.2 Message-ID: <200507011541.j61Ffhr4019395@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19378 Modified Files: perl-Time-modules.spec Log Message: Add dist tag Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/extras/devel/perl-Time-modules/perl-Time-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Time-modules.spec 1 Jul 2005 14:55:40 -0000 1.1 +++ perl-Time-modules.spec 1 Jul 2005 15:41:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Time-modules Version: 0.2003.1126 -Release: 2 +Release: 2%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable @@ -45,6 +45,7 @@ %changelog * Fri Jul 01 2005 Chris Ricker 0.2003.1126-2 - license change, include README, simplify build (Ville Skytt??) +- Add dist tag * Fri May 27 2005 Chris Ricker 0.2003.1126-1 - Initial package From ville.skytta at iki.fi Fri Jul 1 15:43:20 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Fri, 01 Jul 2005 18:43:20 +0300 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 In-Reply-To: <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> References: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> Message-ID: <1120232600.2815.366.camel@localhost.localdomain> On Fri, 2005-07-01 at 16:41 +0200, Nils Philippsen wrote: > On Fri, 2005-07-01 at 09:50 -0400, Tom Callaway wrote: > > BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel > > +# Code is not 64 bit clean. > > +ExcludeArch: x86_64 > > +# Code is not endian clean. > > +ExcludeArch: ppc > > I don't think we build many packages for ppc64, but wouldn't it be good > to "ExcludeArch: ppc64" for both of these reasons despite that? Or even change the whole shebang to "ExclusiveArch: %{ix86}"? From fedora-extras-commits at redhat.com Fri Jul 1 15:54:37 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:54:37 -0400 Subject: rpms/exim/devel .cvsignore, 1.4, 1.5 exim.spec, 1.4, 1.5 sources, 1.4, 1.5 exim-4.24-no_libc5.patch, 1.1, NONE exim-csa.patch, 1.1, NONE Message-ID: <200507011554.j61Fsb0Z019498@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19476 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.24-no_libc5.patch exim-csa.patch Log Message: import 4.52 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 11:17:05 -0000 1.4 +++ .cvsignore 1 Jul 2005 15:54:35 -0000 1.5 @@ -1,2 +1,3 @@ exim-4.51.tar.bz2 sa-exim-4.2.tar.gz +exim-4.52.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim.spec 16 Jun 2005 11:27:34 -0000 1.4 +++ exim.spec 1 Jul 2005 15:54:35 -0000 1.5 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.51 -Release: 3 +Version: 4.52 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -20,12 +20,10 @@ Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz Patch4: exim-rhl.patch Patch6: exim-4.50-config.patch -Patch7: exim-4.24-no_libc5.patch Patch8: exim-4.24-libdir.patch Patch12: exim-4.33-cyrus.patch Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch -Patch15: http://www.cus.cam.ac.uk/~fanf2/hermes/doc/antiforgery/exim-csa.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel @@ -73,12 +71,10 @@ %patch4 -p1 -b .rhl %patch6 -p1 -b .config -%patch7 -p1 -b .no_libc5 %patch8 -p1 -b .libdir %patch12 -p1 -b .cyrus %patch13 -p1 -b .pam %patch14 -p1 -b .spamd -%patch15 -p0 -b .csa %build %ifnarch s390 s390x @@ -287,6 +283,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Fri Jul 1 2005 David Woodhouse 4.52-1 +- Update to Exim 4.52 + * Thu Jun 16 2005 David Woodhouse 4.51-3 - Rebuild for -devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 11:17:05 -0000 1.4 +++ sources 1 Jul 2005 15:54:35 -0000 1.5 @@ -1,2 +1,3 @@ 36c0c005e012d13beb7edfd8d124c049 exim-4.51.tar.bz2 ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz +89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 --- exim-4.24-no_libc5.patch DELETED --- --- exim-csa.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 1 15:56:30 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:56:30 -0400 Subject: rpms/exim/FC-4 .cvsignore, 1.4, 1.5 exim.spec, 1.4, 1.5 sources, 1.4, 1.5 exim-4.24-no_libc5.patch, 1.1, NONE exim-csa.patch, 1.1, NONE Message-ID: <200507011556.j61FuUMq019577@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19556 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.24-no_libc5.patch exim-csa.patch Log Message: import 4.52 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 11:16:22 -0000 1.4 +++ .cvsignore 1 Jul 2005 15:56:28 -0000 1.5 @@ -1,2 +1,2 @@ -exim-4.51.tar.bz2 sa-exim-4.2.tar.gz +exim-4.52.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim.spec 16 Jun 2005 11:28:31 -0000 1.4 +++ exim.spec 1 Jul 2005 15:56:28 -0000 1.5 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.51 -Release: 2 +Version: 4.52 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -20,12 +20,10 @@ Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz Patch4: exim-rhl.patch Patch6: exim-4.50-config.patch -Patch7: exim-4.24-no_libc5.patch Patch8: exim-4.24-libdir.patch Patch12: exim-4.33-cyrus.patch Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch -Patch15: http://www.cus.cam.ac.uk/~fanf2/hermes/doc/antiforgery/exim-csa.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel @@ -73,12 +71,10 @@ %patch4 -p1 -b .rhl %patch6 -p1 -b .config -%patch7 -p1 -b .no_libc5 %patch8 -p1 -b .libdir %patch12 -p1 -b .cyrus %patch13 -p1 -b .pam %patch14 -p1 -b .spamd -%patch15 -p0 -b .csa %build %ifnarch s390 s390x @@ -287,6 +283,12 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Fri Jul 1 2005 David Woodhouse 4.52-1 +- Update to Exim 4.52 + +* Thu Jun 16 2005 David Woodhouse 4.51-3 +- Rebuild for -devel + * Thu Jun 16 2005 David Woodhouse 4.51-2 - Update CSA patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 11:16:22 -0000 1.4 +++ sources 1 Jul 2005 15:56:28 -0000 1.5 @@ -1,2 +1,2 @@ -36c0c005e012d13beb7edfd8d124c049 exim-4.51.tar.bz2 ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz +89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 --- exim-4.24-no_libc5.patch DELETED --- --- exim-csa.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 1 15:56:55 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:56:55 -0400 Subject: rpms/exim/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200507011556.j61FutK9019605@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19586 Modified Files: .cvsignore sources Log Message: remove 4.51 from sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jul 2005 15:54:35 -0000 1.5 +++ .cvsignore 1 Jul 2005 15:56:53 -0000 1.6 @@ -1,3 +1,2 @@ -exim-4.51.tar.bz2 sa-exim-4.2.tar.gz exim-4.52.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jul 2005 15:54:35 -0000 1.5 +++ sources 1 Jul 2005 15:56:53 -0000 1.6 @@ -1,3 +1,2 @@ -36c0c005e012d13beb7edfd8d124c049 exim-4.51.tar.bz2 ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz 89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 15:57:14 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:57:14 -0400 Subject: common tobuild,1.1674,1.1675 Message-ID: <200507011557.j61FvEbH019662@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19645 Modified Files: tobuild Log Message: request build of rpms/exim/devel exim-4_52-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1674 retrieving revision 1.1675 diff -u -r1.1674 -r1.1675 --- tobuild 1 Jul 2005 15:29:36 -0000 1.1674 +++ tobuild 1 Jul 2005 15:57:12 -0000 1.1675 @@ -23,3 +23,4 @@ corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 +dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 15:57:38 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:57:38 -0400 Subject: common tobuild,1.1675,1.1676 Message-ID: <200507011557.j61Fvcxs019719@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19702 Modified Files: tobuild Log Message: request build of rpms/exim/FC-4 exim-4_52-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1675 retrieving revision 1.1676 diff -u -r1.1675 -r1.1676 --- tobuild 1 Jul 2005 15:57:12 -0000 1.1675 +++ tobuild 1 Jul 2005 15:57:36 -0000 1.1676 @@ -24,3 +24,4 @@ bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel +dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 16:00:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:00:49 -0400 Subject: rpms/ebtables - New directory Message-ID: <200507011600.j61G0nWI019793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19773/ebtables Log Message: Directory /cvs/extras/rpms/ebtables added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 16:00:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:00:49 -0400 Subject: rpms/ebtables/devel - New directory Message-ID: <200507011600.j61G0nqI019798@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19773/ebtables/devel Log Message: Directory /cvs/extras/rpms/ebtables/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 16:01:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:01:03 -0400 Subject: rpms/ebtables Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011601.j61G13dv020871@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20676 Added Files: Makefile import.log Log Message: Setup of module ebtables --- NEW FILE Makefile --- # Top level Makefile for module ebtables all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 16:01:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:01:03 -0400 Subject: rpms/ebtables/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011601.j61G13Bi020874@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20676/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ebtables --- NEW 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 Jul 1 16:03:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:03:00 -0400 Subject: rpms/ebtables import.log,1.1,1.2 Message-ID: <200507011603.j61G3rwp020990@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945 Modified Files: import.log Log Message: auto-import ebtables-2.0.6-4 on branch devel from ebtables-2.0.6-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ebtables/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 16:01:01 -0000 1.1 +++ import.log 1 Jul 2005 16:02:58 -0000 1.2 @@ -0,0 +1 @@ +ebtables-2_0_6-4:HEAD:ebtables-2.0.6-4.src.rpm:1120233817 From fedora-extras-commits at redhat.com Fri Jul 1 16:03:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:03:26 -0400 Subject: rpms/ebtables/devel ebtables-2.0.6-gcc34.patch, NONE, 1.1 ebtables-2.0.6-gcc4.patch, NONE, 1.1 ebtables.spec, NONE, 1.1 ebtables.sysv, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011603.j61G3Qqp020983@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945/devel Modified Files: .cvsignore sources Added Files: ebtables-2.0.6-gcc34.patch ebtables-2.0.6-gcc4.patch ebtables.spec ebtables.sysv Log Message: auto-import ebtables-2.0.6-4 on branch devel from ebtables-2.0.6-4.src.rpm ebtables-2.0.6-gcc34.patch: --- NEW FILE ebtables-2.0.6-gcc34.patch --- --- ebtables-v2.0.6/ebtables.c.old Thu Sep 9 22:39:49 2004 +++ ebtables-v2.0.6/ebtables.c Thu Sep 9 22:40:18 2004 @@ -1170,7 +1170,7 @@ static int check_rule_exists(int rule_nr if (!t->compare(t->t, u_e->t)) continue; return i; -letscontinue: +letscontinue:; } return -1; } ebtables-2.0.6-gcc4.patch: --- NEW FILE ebtables-2.0.6-gcc4.patch --- --- ebtables-v2.0.6/extensions/ebt_ip.c.BAD 2005-05-31 11:45:44.000000000 -0500 +++ ebtables-v2.0.6/extensions/ebt_ip.c 2005-05-31 11:48:53.000000000 -0500 @@ -244,6 +244,7 @@ struct ebt_ip_info *ipinfo = (struct ebt_ip_info *)(*match)->data; char *end; long int i; + unsigned char j; switch (c) { case IP_SOURCE: @@ -313,7 +314,7 @@ ipinfo->invflags |= EBT_IP_PROTO; if (optind > argc) print_error("Missing IP protocol argument"); - (unsigned char) i = strtoul(argv[optind - 1], &end, 10); + j = strtoul(argv[optind - 1], &end, 10); if (*end != '\0') { struct protoent *pe; @@ -324,7 +325,7 @@ argv[optind - 1]); ipinfo->protocol = pe->p_proto; } else { - ipinfo->protocol = (unsigned char) i; + ipinfo->protocol = j; } ipinfo->bitmask |= EBT_IP_PROTO; break; --- ebtables-v2.0.6/extensions/ebt_vlan.c.BAD 2005-05-31 11:44:12.000000000 -0500 +++ ebtables-v2.0.6/extensions/ebt_vlan.c 2005-05-31 11:54:06.000000000 -0500 @@ -135,14 +135,16 @@ (struct ebt_vlan_info *) (*match)->data; char *end; struct ebt_vlan_info local; + unsigned short id, encap; + unsigned char prio; switch (c) { case VLAN_ID: check_option(flags, OPT_VLAN_ID); CHECK_INV_FLAG(EBT_VLAN_ID); CHECK_IF_MISSING_VALUE; - (unsigned short) local.id = - strtoul(argv[optind - 1], &end, 10); + id = strtoul(argv[optind - 1], &end, 10); + local.id = (uint16_t) id; CHECK_RANGE(local.id > 4094 || *end != '\0'); vlaninfo->id = local.id; SET_BITMASK(EBT_VLAN_ID); @@ -152,8 +154,8 @@ check_option(flags, OPT_VLAN_PRIO); CHECK_INV_FLAG(EBT_VLAN_PRIO); CHECK_IF_MISSING_VALUE; - (unsigned char) local.prio = - strtoul(argv[optind - 1], &end, 10); + prio = strtoul(argv[optind - 1], &end, 10); + local.prio = (uint8_t) prio; CHECK_RANGE(local.prio >= 8 || *end != '\0'); vlaninfo->prio = local.prio; SET_BITMASK(EBT_VLAN_PRIO); @@ -163,8 +165,8 @@ check_option(flags, OPT_VLAN_ENCAP); CHECK_INV_FLAG(EBT_VLAN_ENCAP); CHECK_IF_MISSING_VALUE; - (unsigned short) local.encap = - strtoul(argv[optind - 1], &end, 16); + encap = strtoul(argv[optind - 1], &end, 16); + local.encap = (uint16_t) encap; if (*end != '\0') { ethent = getethertypebyname(argv[optind - 1]); if (ethent == NULL) --- ebtables-v2.0.6/extensions/ebt_limit.c.BAD 2005-05-31 11:55:53.000000000 -0500 +++ ebtables-v2.0.6/extensions/ebt_limit.c 2005-05-31 11:56:16.000000000 -0500 @@ -203,15 +203,15 @@ static struct ebt_u_match limit_match = { - .name EBT_LIMIT_MATCH, - .size sizeof(struct ebt_limit_info), - .help print_help, - .init init, - .parse parse, - .final_check final_check, - .print print, - .compare compare, - .extra_ops opts, + .name = EBT_LIMIT_MATCH, + .size = sizeof(struct ebt_limit_info), + .help = print_help, + .init = init, + .parse = parse, + .final_check = final_check, + .print = print, + .compare = compare, + .extra_ops = opts, }; static void _init(void) __attribute((constructor)); --- NEW FILE ebtables.spec --- Name: ebtables Version: 2.0.6 Release: 4%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base URL: http://ebtables.sourceforge.net/ Source0: http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz Source1: ebtables.sysv Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Ethernet bridge tables is a firewalling tool to transparantly filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. %prep %setup -n ebtables-v%{version} %patch0 -p1 %patch1 -p1 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add ebtables %preun if [ $1 -eq 0 ]; then /sbin/service ebtables stop &>/dev/null || : /sbin/chkconfig --del ebtables fi %postun /sbin/service ebtables condrestart &>/dev/null || : %files %defattr(-, root, root, 0755) %doc ChangeLog COPYING THANKS %doc %{_mandir}/man8/ebtables.8* %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables %changelog * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras - add gcc4 fix - move init file into SOURCE1 * Thu Dec 02 2004 Dag Wieers - 2.0.6-2 - Added patch for gcc 3.4. (Nigel Smith) * Tue Apr 27 2004 Dag Wieers - 2.0.6-2 - Cosmetic changes. * Tue Apr 27 2004 Dag Wieers - 2.0.6-1 - Initial package. (using DAR) --- NEW FILE ebtables.sysv --- #!/bin/bash # # init script for the Ethernet Bridge filter tables # # Original written by Dag Wieers . # Modified by Tom "spot" Callaway # # chkconfig: - 15 85 # description: Ethernet Bridge filtering tables # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat # config: /etc/sysconfig/ebtables.route source /etc/init.d/functions source /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 [ -x /sbin/ebtables ] || exit 1 RETVAL=0 RETVAL_FILTER=0 RETVAL_NAT=0 RETVAL_BROUTE=0 prog="ebtables" desc="Ethernet bridge filtering" initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " if [ -r /etc/sysconfig/ebtables.$TYPE ]; then /sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE --atomic-commit > /dev/null || RETVAL=1 else echo -n "not configured" fi if [ $RETVAL -eq 0 ]; then success "$TYPE startup" else failure "$TYPE startup" fi return $RETVAL } start() { echo "Starting $desc ($prog): " # Initialize filter tables TYPE=filter initialize RETVAL_FILTER=$RETVAL RETVAL=0 # Initialize NAT tables echo TYPE=nat initialize RETVAL_NAT=$RETVAL RETVAL=0 # Initialize broute tables echo TYPE=broute initialize RETVAL_BROUTE=$RETVAL RETVAL=0 RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/$prog fi echo return $RETVAL } stop() { echo -n $"Stopping $desc ($prog): " /sbin/ebtables -t filter --init-table || RETVAL=1 /sbin/ebtables -t nat --init-table || RETVAL=1 /sbin/ebtables -t broute --init-table || RETVAL=1 for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do /sbin/rmmod $mod || RETVAL=1 done if [ $RETVAL -eq 0 ]; then success "$prog shutdown" rm -f /var/lock/subsys/$prog else failure "$prog shutdown" fi echo return $RETVAL } restart() { stop start } save() { echo -n $"Saving $desc ($prog): " /sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1 /sbin/ebtables -t nat --atomic-file /etc/sysconfig/ebtables.nat --atomic-save || RETVAL=1 /sbin/ebtables -t broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1 if [ $RETVAL -eq 0 ]; then success "$prog saved" else failure "$prog saved" fi echo } case "$1" in start) start ;; stop) stop ;; restart|reload) restart ;; condrestart) [ -e /var/lock/subsys/$prog ] && restart RETVAL=$? ;; save) save ;; status) status $prog RETVAL=$? ;; *) echo $"Usage $0 {start|stop|restart|condrestart|save|status}" RETVAL=1 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 16:01:02 -0000 1.1 +++ .cvsignore 1 Jul 2005 16:03:23 -0000 1.2 @@ -0,0 +1 @@ +ebtables-v2.0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 16:01:02 -0000 1.1 +++ sources 1 Jul 2005 16:03:23 -0000 1.2 @@ -0,0 +1 @@ +c4559af2366c764c6c42a3fdd40d60d3 ebtables-v2.0.6.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 16:04:47 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 12:04:47 -0400 Subject: devel/perl-Time-modules perl-Time-modules.spec,1.2,1.3 Message-ID: <200507011605.j61G5H3x021046@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20995 Modified Files: perl-Time-modules.spec Log Message: Fixed version Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/extras/devel/perl-Time-modules/perl-Time-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Time-modules.spec 1 Jul 2005 15:41:41 -0000 1.2 +++ perl-Time-modules.spec 1 Jul 2005 16:04:44 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Time-modules -Version: 0.2003.1126 -Release: 2%{?dist} +Version: 2003.1126 +Release: 1%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable @@ -43,6 +43,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 01 2005 Chris Ricker 2003.1126-1 +- Version is 2003.1126, not 0.2003.1126 (Ville Skytt??) + * Fri Jul 01 2005 Chris Ricker 0.2003.1126-2 - license change, include README, simplify build (Ville Skytt??) - Add dist tag From rc040203 at freenet.de Fri Jul 1 16:05:55 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 01 Jul 2005 18:05:55 +0200 Subject: APPROVED: perl-Time-modules Message-ID: <1120233955.3741.252.camel@mccallum.corsepiu.local> Time-modules provides several Perl modules, including Time::CTime, Time::DaysInMonth, Time::JulianDay, Time::ParseDate, and Time::Timezone. These modules can be useful for parsing and manipulating dates and times. Maintainer: Chris Ricker Reviewer: Ralf Cors?pius From tcallawa at redhat.com Fri Jul 1 16:12:53 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 01 Jul 2005 11:12:53 -0500 Subject: APPROVED: ebtables Message-ID: <1120234373.8990.176.camel@localhost.localdomain> Name: ebtables Summary: Ethernet Bridge frame table administration tool Description: Ethernet bridge tables is a firewalling tool to transparantly filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. Reviewer: Oliver Falk Maintainer: Tom 'spot' Callaway ~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 dwmw2 at infradead.org Fri Jul 1 16:14:43 2005 From: dwmw2 at infradead.org (David Woodhouse) Date: Fri, 01 Jul 2005 17:14:43 +0100 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 In-Reply-To: <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> References: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> Message-ID: <1120234483.8058.116.camel@baythorne.infradead.org> On Fri, 2005-07-01 at 16:41 +0200, Nils Philippsen wrote: > On Fri, 2005-07-01 at 09:50 -0400, Tom Callaway wrote: > > BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel > > +# Code is not 64 bit clean. > > +ExcludeArch: x86_64 > > +# Code is not endian clean. > > +ExcludeArch: ppc > > I don't think we build many packages for ppc64, but wouldn't it be good > to "ExcludeArch: ppc64" for both of these reasons despite that? Or perhaps just veto the package on code quality grounds? We don't want Extras to be a dumping ground for dross -- if the problems are so bad that it _can't_ be made endian and wordsize-clean, then perhaps we shouldn't be shipping it. And if it _can_ be fixed, we should fix it. -- dwmw2 From fedora-extras-commits at redhat.com Fri Jul 1 16:15:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 1 Jul 2005 12:15:18 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.1,1.2 Message-ID: <200507011615.j61GFI1B021172@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21136 Modified Files: python-matplotlib.spec Log Message: * Fri Jul 01 2005 Orion Poplawski 0.82-3 - Use %{python_sitearch} Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-matplotlib.spec 30 Jun 2005 21:40:07 -0000 1.1 +++ python-matplotlib.spec 1 Jul 2005 16:15:16 -0000 1.2 @@ -1,6 +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.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -38,10 +40,13 @@ %doc license/LICENSE_PAINT license/LICENSE_PIL license/PYTZ_LICENSE.txt %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS %doc NUMARRAY_ISSUES PKG-INFO TODO -%dir %{_libdir}/python2.4/site-packages/matplotlib +%dir %{python_sitearch}/matplotlib %dir %{_datadir}/matplotlib %changelog +* Fri Jul 01 2005 Orion Poplawski 0.82-3 +- Use %{python_sitearch} + * Thu Jun 30 2005 Orion Poplawski 0.82-2 - Rename to python-matplotlib - Remove unneeded Requires: python From fedora-extras-commits at redhat.com Fri Jul 1 16:23:52 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 1 Jul 2005 12:23:52 -0400 Subject: common tobuild,1.1676,1.1677 Message-ID: <200507011623.j61GNqZX021413@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396 Modified Files: tobuild Log Message: request build of rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1676 retrieving revision 1.1677 diff -u -r1.1676 -r1.1677 --- tobuild 1 Jul 2005 15:57:36 -0000 1.1676 +++ tobuild 1 Jul 2005 16:23:50 -0000 1.1677 @@ -25,3 +25,4 @@ bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 +orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 16:26:04 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 12:26:04 -0400 Subject: devel/perl-Time-modules perl-Time-modules.spec,1.3,1.4 Message-ID: <200507011626.j61GQ4Xh021440@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21423 Modified Files: perl-Time-modules.spec Log Message: Remove perl version requirement Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/extras/devel/perl-Time-modules/perl-Time-modules.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Time-modules.spec 1 Jul 2005 16:04:44 -0000 1.3 +++ perl-Time-modules.spec 1 Jul 2005 16:26:01 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Time-modules Version: 2003.1126 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/M/MU/MUIR/modules/Time-modules-2003.1126.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -43,6 +43,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 01 2005 Chris Ricker 2003.1126-2 +- Remove overly high perl version BuildRequires (Ralf Corsepius) + * Fri Jul 01 2005 Chris Ricker 2003.1126-1 - Version is 2003.1126, not 0.2003.1126 (Ville Skytt??) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:12 -0400 Subject: rpms/ebtables/FC-3 ebtables.spec,1.1,1.2 ebtables.sysv,1.1,1.2 Message-ID: <200507011627.j61GRCGP021525@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475/FC-3 Modified Files: ebtables.spec ebtables.sysv Log Message: Resolve blockers that Chris Ricker pointed out. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.spec 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.spec 1 Jul 2005 16:27:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,12 +10,17 @@ Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +PreReq: /sbin/chkconfig +PreReq: /sbin/service %description -Ethernet bridge tables is a firewalling tool to transparantly filter network +Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. +This tool is the userspace control for the bridge and ebtables kernel +components (built by default in Fedora Core kernels). + The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. @@ -47,7 +52,9 @@ fi %postun -/sbin/service ebtables condrestart &>/dev/null || : +if [ $1 -ge 1 ] + /sbin/service ebtables condrestart &> /dev/null || : +fi %files %defattr(-, root, root, 0755) @@ -56,10 +63,20 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables +%ghost %{_sysconfdir}/ebtables.filter +%ghost %{_sysconfdir}/ebtables.nat +%ghost %{_sysconfdir}/ebtables.broute %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 +- fix sysv file + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file +- add some text to description, correct typos +- fix %postun +- add PreReqs +- add %ghost config files * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras Index: ebtables.sysv =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.sysv 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.sysv 1 Jul 2005 16:27:10 -0000 1.2 @@ -10,7 +10,7 @@ # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat -# config: /etc/sysconfig/ebtables.route +# config: /etc/sysconfig/ebtables.broute source /etc/init.d/functions source /etc/sysconfig/network @@ -27,6 +27,8 @@ prog="ebtables" desc="Ethernet bridge filtering" +lockfile=/var/lock/subsys/$prog + initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " @@ -68,7 +70,7 @@ RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$prog + touch $lockfile fi echo @@ -87,7 +89,7 @@ if [ $RETVAL -eq 0 ]; then success "$prog shutdown" - rm -f /var/lock/subsys/$prog + rm -f $lockfile else failure "$prog shutdown" fi @@ -126,7 +128,7 @@ restart ;; condrestart) - [ -e /var/lock/subsys/$prog ] && restart + [ -e $lockfile ] && restart RETVAL=$? ;; save) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:13 -0400 Subject: rpms/ebtables/devel ebtables.spec,1.1,1.2 ebtables.sysv,1.1,1.2 Message-ID: <200507011627.j61GRDxR021539@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475/devel Modified Files: ebtables.spec ebtables.sysv Log Message: Resolve blockers that Chris Ricker pointed out. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.spec 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,12 +10,17 @@ Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +PreReq: /sbin/chkconfig +PreReq: /sbin/service %description -Ethernet bridge tables is a firewalling tool to transparantly filter network +Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. +This tool is the userspace control for the bridge and ebtables kernel +components (built by default in Fedora Core kernels). + The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. @@ -47,7 +52,9 @@ fi %postun -/sbin/service ebtables condrestart &>/dev/null || : +if [ $1 -ge 1 ] + /sbin/service ebtables condrestart &> /dev/null || : +fi %files %defattr(-, root, root, 0755) @@ -56,10 +63,20 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables +%ghost %{_sysconfdir}/ebtables.filter +%ghost %{_sysconfdir}/ebtables.nat +%ghost %{_sysconfdir}/ebtables.broute %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 +- fix sysv file + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file +- add some text to description, correct typos +- fix %postun +- add PreReqs +- add %ghost config files * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras Index: ebtables.sysv =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.sysv 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.sysv 1 Jul 2005 16:27:11 -0000 1.2 @@ -10,7 +10,7 @@ # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat -# config: /etc/sysconfig/ebtables.route +# config: /etc/sysconfig/ebtables.broute source /etc/init.d/functions source /etc/sysconfig/network @@ -27,6 +27,8 @@ prog="ebtables" desc="Ethernet bridge filtering" +lockfile=/var/lock/subsys/$prog + initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " @@ -68,7 +70,7 @@ RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$prog + touch $lockfile fi echo @@ -87,7 +89,7 @@ if [ $RETVAL -eq 0 ]; then success "$prog shutdown" - rm -f /var/lock/subsys/$prog + rm -f $lockfile else failure "$prog shutdown" fi @@ -126,7 +128,7 @@ restart ;; condrestart) - [ -e /var/lock/subsys/$prog ] && restart + [ -e $lockfile ] && restart RETVAL=$? ;; save) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:13 -0400 Subject: rpms/ebtables/FC-4 ebtables.spec,1.1,1.2 ebtables.sysv,1.1,1.2 Message-ID: <200507011627.j61GRDc7021532@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475/FC-4 Modified Files: ebtables.spec ebtables.sysv Log Message: Resolve blockers that Chris Ricker pointed out. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.spec 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,12 +10,17 @@ Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +PreReq: /sbin/chkconfig +PreReq: /sbin/service %description -Ethernet bridge tables is a firewalling tool to transparantly filter network +Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. +This tool is the userspace control for the bridge and ebtables kernel +components (built by default in Fedora Core kernels). + The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. @@ -47,7 +52,9 @@ fi %postun -/sbin/service ebtables condrestart &>/dev/null || : +if [ $1 -ge 1 ] + /sbin/service ebtables condrestart &> /dev/null || : +fi %files %defattr(-, root, root, 0755) @@ -56,10 +63,20 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables +%ghost %{_sysconfdir}/ebtables.filter +%ghost %{_sysconfdir}/ebtables.nat +%ghost %{_sysconfdir}/ebtables.broute %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 +- fix sysv file + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file +- add some text to description, correct typos +- fix %postun +- add PreReqs +- add %ghost config files * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras Index: ebtables.sysv =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.sysv 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.sysv 1 Jul 2005 16:27:11 -0000 1.2 @@ -10,7 +10,7 @@ # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat -# config: /etc/sysconfig/ebtables.route +# config: /etc/sysconfig/ebtables.broute source /etc/init.d/functions source /etc/sysconfig/network @@ -27,6 +27,8 @@ prog="ebtables" desc="Ethernet bridge filtering" +lockfile=/var/lock/subsys/$prog + initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " @@ -68,7 +70,7 @@ RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$prog + touch $lockfile fi echo @@ -87,7 +89,7 @@ if [ $RETVAL -eq 0 ]; then success "$prog shutdown" - rm -f /var/lock/subsys/$prog + rm -f $lockfile else failure "$prog shutdown" fi @@ -126,7 +128,7 @@ restart ;; condrestart) - [ -e /var/lock/subsys/$prog ] && restart + [ -e $lockfile ] && restart RETVAL=$? ;; save) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:33 -0400 Subject: common tobuild,1.1677,1.1678 Message-ID: <200507011627.j61GRXs5021606@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21589 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1677 retrieving revision 1.1678 diff -u -r1.1677 -r1.1678 --- tobuild 1 Jul 2005 16:23:50 -0000 1.1677 +++ tobuild 1 Jul 2005 16:27:31 -0000 1.1678 @@ -26,3 +26,4 @@ dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel +spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 16:27:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:52 -0400 Subject: common tobuild,1.1678,1.1679 Message-ID: <200507011627.j61GRqcm021673@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1678 retrieving revision 1.1679 diff -u -r1.1678 -r1.1679 --- tobuild 1 Jul 2005 16:27:31 -0000 1.1678 +++ tobuild 1 Jul 2005 16:27:50 -0000 1.1679 @@ -27,3 +27,4 @@ dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 +spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 16:28:32 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 12:28:32 -0400 Subject: devel/common tobuild,1.1679,1.1680 Message-ID: <200507011628.j61GSWSe021737@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21720 Modified Files: tobuild Log Message: request build of devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1679 retrieving revision 1.1680 diff -u -r1.1679 -r1.1680 --- tobuild 1 Jul 2005 16:27:50 -0000 1.1679 +++ tobuild 1 Jul 2005 16:28:29 -0000 1.1680 @@ -28,3 +28,4 @@ orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 +kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 17:05:35 2005 From: fedora-extras-commits at redhat.com (Christian Jodar (Tian)) Date: Fri, 1 Jul 2005 13:05:35 -0400 Subject: rpms/gcfilms/devel gcfilms.spec,1.2,1.3 Message-ID: <200507011706.j61H68vZ023438@cvs-int.fedora.redhat.com> Author: Tian Update of /cvs/extras/rpms/gcfilms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23411 Modified Files: gcfilms.spec Log Message: Added dist tag Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcfilms.spec 29 Jun 2005 16:58:41 -0000 1.2 +++ gcfilms.spec 1 Jul 2005 17:05:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: gcfilms Version: 5.2 -Release: 1 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases From fedora-extras-commits at redhat.com Fri Jul 1 17:10:12 2005 From: fedora-extras-commits at redhat.com (Christian Jodar (Tian)) Date: Fri, 1 Jul 2005 13:10:12 -0400 Subject: common tobuild,1.1680,1.1681 Message-ID: <200507011710.j61HACg3023547@cvs-int.fedora.redhat.com> Author: Tian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23530 Modified Files: tobuild Log Message: request build of rpms/gcfilms/devel gcfilms-5_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1680 retrieving revision 1.1681 diff -u -r1.1680 -r1.1681 --- tobuild 1 Jul 2005 16:28:29 -0000 1.1680 +++ tobuild 1 Jul 2005 17:10:10 -0000 1.1681 @@ -29,3 +29,4 @@ spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel +Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 17:23:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 13:23:03 -0400 Subject: rpms/QuantLib/devel QuantLib.spec,1.7,1.8 Message-ID: <200507011723.j61HN3PK023686@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639/devel Modified Files: QuantLib.spec Log Message: Fix URL to resolve BZ 161674 Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- QuantLib.spec 3 Jun 2005 14:49:51 -0000 1.7 +++ QuantLib.spec 1 Jul 2005 17:23:01 -0000 1.8 @@ -2,12 +2,12 @@ Name: QuantLib Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries URL: http://www.quantlib.org -Source0: http://prdownloads.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz +Source0: http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz Patch0: QuantLib-0.3.8-installdatahookfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel, tetex, tetex-latex, tetex-dvips, emacs @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Sat Jun 25 2005 Colin Charles 0.3.9-2 +- Fix download URL + * Fri Jun 3 2005 Tom "spot" Callaway 0.3.9-1 - cleanup spec - add emacs,xemacs BuildRequires From fedora-extras-commits at redhat.com Fri Jul 1 17:22:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 13:22:57 -0400 Subject: rpms/QuantLib/FC-3 QuantLib.spec,1.7,1.8 Message-ID: <200507011723.j61HNRxA023689@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639/FC-3 Modified Files: QuantLib.spec Log Message: Fix URL to resolve BZ 161674 Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-3/QuantLib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- QuantLib.spec 3 Jun 2005 14:49:46 -0000 1.7 +++ QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 @@ -2,12 +2,12 @@ Name: QuantLib Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries URL: http://www.quantlib.org -Source0: http://prdownloads.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz +Source0: http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz Patch0: QuantLib-0.3.8-installdatahookfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel, tetex, tetex-latex, tetex-dvips, emacs @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Sat Jun 25 2005 Colin Charles 0.3.9-2 +- Fix download URL + * Fri Jun 3 2005 Tom "spot" Callaway 0.3.9-1 - cleanup spec - add emacs,xemacs BuildRequires From fedora-extras-commits at redhat.com Fri Jul 1 17:22:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 13:22:58 -0400 Subject: rpms/QuantLib/FC-4 QuantLib.spec,1.7,1.8 Message-ID: <200507011723.j61HNSPe023692@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639/FC-4 Modified Files: QuantLib.spec Log Message: Fix URL to resolve BZ 161674 Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/QuantLib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- QuantLib.spec 3 Jun 2005 14:49:46 -0000 1.7 +++ QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 @@ -2,12 +2,12 @@ Name: QuantLib Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries URL: http://www.quantlib.org -Source0: http://prdownloads.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz +Source0: http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz Patch0: QuantLib-0.3.8-installdatahookfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel, tetex, tetex-latex, tetex-dvips, emacs @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Sat Jun 25 2005 Colin Charles 0.3.9-2 +- Fix download URL + * Fri Jun 3 2005 Tom "spot" Callaway 0.3.9-1 - cleanup spec - add emacs,xemacs BuildRequires From tcallawa at redhat.com Fri Jul 1 18:04:33 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 01 Jul 2005 13:04:33 -0500 Subject: APPROVAL: diction Message-ID: <1120241073.8990.202.camel@localhost.localdomain> Name: diction Summary: Identifies diction and style errors Description: Diction and style are two old standard UNIX commands. Diction identifies wordy and commonly misused phrases. Style analyses surface characteristics of a document, including sentence length and other readability measures. These programs cannot help you structure a document well, but they can help to avoid poor wording and compare the readability (not the understandability!) of your documents with others. Both commands support English and German documents. Reviewer: Tom 'spot' Callaway Maintainer: Konstantin Ryabitsev ~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 Jul 1 18:21:03 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 14:21:03 -0400 Subject: common tobuild,1.1681,1.1682 Message-ID: <200507011821.j61IL3xr025246@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25229 Modified Files: tobuild Log Message: request build of rpms/diction/FC-4 diction-1_08-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1681 retrieving revision 1.1682 diff -u -r1.1681 -r1.1682 --- tobuild 1 Jul 2005 17:10:10 -0000 1.1681 +++ tobuild 1 Jul 2005 18:21:01 -0000 1.1682 @@ -30,3 +30,4 @@ spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel +icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 18:21:25 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 14:21:25 -0400 Subject: common tobuild,1.1682,1.1683 Message-ID: <200507011821.j61ILQkC025313@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25294 Modified Files: tobuild Log Message: request build of rpms/diction/devel diction-1_08-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1682 retrieving revision 1.1683 diff -u -r1.1682 -r1.1683 --- tobuild 1 Jul 2005 18:21:01 -0000 1.1682 +++ tobuild 1 Jul 2005 18:21:23 -0000 1.1683 @@ -31,3 +31,4 @@ kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 +icon rpms/diction/devel diction-1_08-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 18:41:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 14:41:13 -0400 Subject: common tobuild,1.1683,1.1684 Message-ID: <200507011841.j61IfDLu025437@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25418 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1683 retrieving revision 1.1684 diff -u -r1.1683 -r1.1684 --- tobuild 1 Jul 2005 18:21:23 -0000 1.1683 +++ tobuild 1 Jul 2005 18:41:11 -0000 1.1684 @@ -32,3 +32,4 @@ Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 icon rpms/diction/devel diction-1_08-1_fc5 devel +mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 18:45:36 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 1 Jul 2005 14:45:36 -0400 Subject: rpms/exo/devel exo.spec,1.8,1.9 Message-ID: <200507011845.j61IjaIg025505@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/exo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25488 Modified Files: exo.spec Log Message: Bump release for a new build Index: exo.spec =================================================================== RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- exo.spec 20 Jun 2005 20:28:34 -0000 1.8 +++ exo.spec 1 Jul 2005 18:45:33 -0000 1.9 @@ -3,7 +3,7 @@ Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.0 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPL URL: http://libexo.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2 @@ -71,6 +71,9 @@ %{python_sitearch}/pyexo.* %changelog +* Fri Jul 1 2005 Kevin Fenzi - 0.3.0-9.fc5 +- Bump release for a new build + * Mon Jun 20 2005 Kevin Fenzi - 0.3.0-8.fc5 - Add patch to make x86_64 package build From fedora-extras-commits at redhat.com Fri Jul 1 18:45:52 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 1 Jul 2005 14:45:52 -0400 Subject: common tobuild,1.1684,1.1685 Message-ID: <200507011845.j61Ijq59025568@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25550 Modified Files: tobuild Log Message: request build of rpms/exo/devel exo-0_3_0-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1684 retrieving revision 1.1685 diff -u -r1.1684 -r1.1685 --- tobuild 1 Jul 2005 18:41:11 -0000 1.1684 +++ tobuild 1 Jul 2005 18:45:50 -0000 1.1685 @@ -33,3 +33,4 @@ icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 icon rpms/diction/devel diction-1_08-1_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 +kevin rpms/exo/devel exo-0_3_0-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 18:46:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 14:46:45 -0400 Subject: common tobuild,1.1685,1.1686 Message-ID: <200507011846.j61IkjBB025597@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1685 retrieving revision 1.1686 diff -u -r1.1685 -r1.1686 --- tobuild 1 Jul 2005 18:45:50 -0000 1.1685 +++ tobuild 1 Jul 2005 18:46:43 -0000 1.1686 @@ -1,25 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 -tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 -tagoh rpms/anthy/devel anthy-6700-2_fc5 devel -oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel -oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 -oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 -oliver rpms/fish/devel fish-1_11_1-10_fc5 devel -petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 -petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 -petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 -spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 -spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 -abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 -abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel -adrian rpms/most/devel most-4_10_1-1 devel -kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 -spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 -spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 -mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 19:47:18 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 15:47:18 -0400 Subject: rpms/moodss import.log,1.7,1.8 Message-ID: <200507011947.j61JlIJp026901@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26870 Modified Files: import.log Log Message: auto-import moodss-20.2-1 on branch FC-4 from moodss-20.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/moodss/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 26 May 2005 19:36:38 -0000 1.7 +++ import.log 1 Jul 2005 19:47:16 -0000 1.8 @@ -4,3 +4,4 @@ moodss-20_0-1:HEAD:moodss-20.0-1.src.rpm:1115576777 moodss-20_0-1:FC-3:moodss-20.0-1.src.rpm:1115577017 moodss-20_1-1:HEAD:moodss-20.1-1.src.rpm:1117136187 +moodss-20_2-1:FC-4:moodss-20.2-1.src.rpm:1120247225 From fedora-extras-commits at redhat.com Fri Jul 1 19:47:19 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 15:47:19 -0400 Subject: rpms/moodss/FC-4 .cvsignore, 1.4, 1.5 moodss.spec, 1.15, 1.16 sources, 1.4, 1.5 Message-ID: <200507011947.j61JlJ30026909@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26870/FC-4 Modified Files: .cvsignore moodss.spec sources Log Message: auto-import moodss-20.2-1 on branch FC-4 from moodss-20.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 May 2005 19:36:38 -0000 1.4 +++ .cvsignore 1 Jul 2005 19:47:17 -0000 1.5 @@ -1 +1 @@ -moodss-20.1.tar.bz2 +moodss-20.2.tar.bz2 Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- moodss.spec 31 May 2005 19:31:42 -0000 1.15 +++ moodss.spec 1 Jul 2005 19:47:17 -0000 1.16 @@ -1,10 +1,10 @@ Name: moodss -Version: 20.1 -Release: 4%{?dist} +Version: 20.2 +Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-20.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: tcl-devel >= 8.4.8 @@ -58,8 +58,8 @@ %changelog -* Tue May 31 2005 Jean-Luc Fontaine 20.1-4 -- increased release for FC-4 +* Sun Jun 26 2005 Jean-Luc Fontaine 20.2-1 +- 20.2 source release * Sun May 22 2005 Jean-Luc Fontaine 20.1-3 - 20.1 source release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 May 2005 19:36:38 -0000 1.4 +++ sources 1 Jul 2005 19:47:17 -0000 1.5 @@ -1 +1 @@ -b55e2aff0ff05e55a6b1f4dff6e58fa9 moodss-20.1.tar.bz2 +151a823de023ddb1961d046d8adfaa0b moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 19:48:35 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 15:48:35 -0400 Subject: common tobuild,1.1686,1.1687 Message-ID: <200507011948.j61JmZ85027005@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26988 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-4 moodss-20_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1686 retrieving revision 1.1687 diff -u -r1.1686 -r1.1687 --- tobuild 1 Jul 2005 18:46:43 -0000 1.1686 +++ tobuild 1 Jul 2005 19:48:33 -0000 1.1687 @@ -15,3 +15,4 @@ icon rpms/diction/devel diction-1_08-1_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 kevin rpms/exo/devel exo-0_3_0-9_fc5 devel +jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 19:52:30 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:30 -0400 Subject: rpms/mercurial - New directory Message-ID: <200507011952.j61JqU5Z027095@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27071/mercurial Log Message: Directory /cvs/extras/rpms/mercurial added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 19:52:30 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:30 -0400 Subject: rpms/mercurial/devel - New directory Message-ID: <200507011952.j61JqUbk027100@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27071/mercurial/devel Log Message: Directory /cvs/extras/rpms/mercurial/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 19:52:51 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:51 -0400 Subject: rpms/mercurial Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011952.j61Jqph8027143@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27116 Added Files: Makefile import.log Log Message: Setup of module mercurial --- NEW FILE Makefile --- # Top level Makefile for module mercurial all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 19:52:51 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:51 -0400 Subject: rpms/mercurial/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011952.j61JqpJj027148@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27116/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mercurial --- NEW 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 Jul 1 19:53:17 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:53:17 -0400 Subject: rpms/mercurial import.log,1.1,1.2 Message-ID: <200507011953.j61JrlF5027214@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27180 Modified Files: import.log Log Message: auto-import mercurial-0.6-1 on branch devel from mercurial-0.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mercurial/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 19:52:49 -0000 1.1 +++ import.log 1 Jul 2005 19:53:15 -0000 1.2 @@ -0,0 +1 @@ +mercurial-0_6-1:HEAD:mercurial-0.6-1.src.rpm:1120247533 From fedora-extras-commits at redhat.com Fri Jul 1 19:53:18 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:53:18 -0400 Subject: rpms/mercurial/devel mercurial.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011953.j61JrmZP027218@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27180/devel Modified Files: .cvsignore sources Added Files: mercurial.spec Log Message: auto-import mercurial-0.6-1 on branch devel from mercurial-0.6-1.src.rpm --- NEW FILE mercurial.spec --- Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 0.6 Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python-devel %description Mercurial is a fast, lightweight source control management system designed for efficient handling of very large distributed projects. %prep %setup -q %build python ./setup.py build %install rm -rf $RPM_BUILD_ROOT python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.files %defattr(-,root,root,-) %doc doc/FAQ.txt README doc/hg.1.txt %changelog * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 19:52:49 -0000 1.1 +++ .cvsignore 1 Jul 2005 19:53:16 -0000 1.2 @@ -0,0 +1 @@ +mercurial-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 19:52:49 -0000 1.1 +++ sources 1 Jul 2005 19:53:16 -0000 1.2 @@ -0,0 +1 @@ +25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz From katzj at redhat.com Fri Jul 1 19:53:15 2005 From: katzj at redhat.com (Jeremy Katz) Date: Fri, 01 Jul 2005 15:53:15 -0400 Subject: APPROVED: mercurial Message-ID: <1120247595.25441.24.camel@bree.local.net> Name: mercurial Mercurial is a fast, lightweight source control management system designed for efficient handling of very large distributed projects. Reviewer: Jason Tibbits III Maintainer: Jeremy Katz Jeremy From fedora-extras-commits at redhat.com Fri Jul 1 19:55:37 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:55:37 -0400 Subject: common tobuild,1.1687,1.1688 Message-ID: <200507011955.j61JtbbQ027522@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27499 Modified Files: tobuild Log Message: request build of rpms/mercurial/devel mercurial-0_6-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1687 retrieving revision 1.1688 diff -u -r1.1687 -r1.1688 --- tobuild 1 Jul 2005 19:48:33 -0000 1.1687 +++ tobuild 1 Jul 2005 19:55:35 -0000 1.1688 @@ -16,3 +16,4 @@ mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 kevin rpms/exo/devel exo-0_3_0-9_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 +katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 19:56:25 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:56:25 -0400 Subject: common tobuild,1.1688,1.1689 Message-ID: <200507011956.j61JuPVN027592@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27575 Modified Files: tobuild Log Message: request build of rpms/mercurial/FC-4 mercurial-0_6-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1688 retrieving revision 1.1689 diff -u -r1.1688 -r1.1689 --- tobuild 1 Jul 2005 19:55:35 -0000 1.1688 +++ tobuild 1 Jul 2005 19:56:23 -0000 1.1689 @@ -17,3 +17,4 @@ kevin rpms/exo/devel exo-0_3_0-9_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel +katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 19:57:06 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:57:06 -0400 Subject: common tobuild,1.1689,1.1690 Message-ID: <200507011957.j61Jv6OV027658@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27639 Modified Files: tobuild Log Message: request build of rpms/mercurial/FC-3 mercurial-0_6-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1689 retrieving revision 1.1690 diff -u -r1.1689 -r1.1690 --- tobuild 1 Jul 2005 19:56:23 -0000 1.1689 +++ tobuild 1 Jul 2005 19:57:04 -0000 1.1690 @@ -18,3 +18,4 @@ jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 +katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 21:01:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:01:08 -0400 Subject: devel/aalib aalib-1.4rc5-bug149361.patch, NONE, 1.1 aalib.spec, 1.8, 1.9 Message-ID: <200507012101.j61L18tc029887@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/aalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29862 Modified Files: aalib.spec Added Files: aalib-1.4rc5-bug149361.patch Log Message: * Fri Jul 1 2005 Michael Schwendt 1.4.0-0.rc5.5 - fix missing return value (#149361) aalib-1.4rc5-bug149361.patch: --- NEW FILE aalib-1.4rc5-bug149361.patch --- diff -Nur aalib-1.4.0-orig/src/aalinuxkbd.c aalib-1.4.0/src/aalinuxkbd.c --- aalib-1.4.0-orig/src/aalinuxkbd.c 2001-04-26 16:37:31.000000000 +0200 +++ aalib-1.4.0/src/aalinuxkbd.c 2005-07-01 22:57:59.000000000 +0200 @@ -200,7 +200,7 @@ static int rawmode_init(void) { if (!closed) - return; + return 0; mypid = getpid(); if (tty_fd == -1) { tty_fd = fileno(stdin); Index: aalib.spec =================================================================== RCS file: /cvs/extras/devel/aalib/aalib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aalib.spec 6 Apr 2005 22:10:46 -0000 1.8 +++ aalib.spec 1 Jul 2005 21:01:06 -0000 1.9 @@ -3,7 +3,7 @@ Summary: An ASCII art library. Name: aalib Version: 1.4.0 -Release: 0.%{rc_subver}.4 +Release: 0.%{rc_subver}.5 License: LGPL Group: System Environment/Libraries @@ -11,6 +11,7 @@ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz Patch0: %{name}-aclocal.patch Patch1: %{name}-config-rpath.patch +Patch2: aalib-1.4rc5-bug149361.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: slang-devel XFree86-devel gpm-devel @@ -39,6 +40,7 @@ %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p1 -b .bug149361 %build @@ -91,7 +93,10 @@ %{_datadir}/aclocal/aalib.m4 %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 1 2005 Michael Schwendt 1.4.0-0.rc5.5 +- fix missing return value (#149361) + +* Thu Apr 7 2005 Michael Schwendt 1.4.0-0.rc5.4 - rebuilt * Thu Dec 16 2004 Michael Schwendt 1.4.0-0.rc5.3 From fedora-extras-commits at redhat.com Fri Jul 1 21:03:58 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:03:58 -0400 Subject: common tobuild,1.1690,1.1691 Message-ID: <200507012104.j61L4SJG029953@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29936 Modified Files: tobuild Log Message: request build of devel/aalib aalib-1_4_0-0_rc5_5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1690 retrieving revision 1.1691 diff -u -r1.1690 -r1.1691 --- tobuild 1 Jul 2005 19:57:04 -0000 1.1690 +++ tobuild 1 Jul 2005 21:03:56 -0000 1.1691 @@ -19,3 +19,4 @@ katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 +mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel From fedora-extras-commits at redhat.com Fri Jul 1 21:21:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:21:52 -0400 Subject: rpms/meld/FC-3 .cvsignore, 1.4, 1.5 meld.spec, 1.6, 1.7 sources, 1.4, 1.5 meld, 1.2, NONE Message-ID: <200507012121.j61LLq5G030091@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/meld/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071 Modified Files: .cvsignore meld.spec sources Removed Files: meld Log Message: Sync with FC-4/Devel for erratum (#154918). * Wed Jun 8 2005 Michael Schwendt - 0.9.6-1 - Remove unused meld shell script from src.rpm. - Add scriptlets for scrollkeeper-update. - Use %find_lang macro. - Simplify %install (let included Makefile do the installation). - Update to 0.9.6 (fixes manual). - BR scrollkeeper (#156235). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Feb 2005 02:29:21 -0000 1.4 +++ .cvsignore 1 Jul 2005 21:21:50 -0000 1.5 @@ -1 +1 @@ -meld-0.9.5.tar.bz2 +meld-0.9.6.tar.bz2 Index: meld.spec =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/meld.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- meld.spec 9 Feb 2005 02:29:21 -0000 1.6 +++ meld.spec 1 Jul 2005 21:21:50 -0000 1.7 @@ -1,25 +1,29 @@ Name: meld -Version: 0.9.5 -Release: 1 -Summary: Visual diff and merge tool. +Version: 0.9.6 +# temporarily use 0 for FC-3 erratum +Release: 0%{?dist} +Summary: Visual diff and merge tool -Group: Development/Tools +Group: Development/Tools License: GPL URL: http://meld.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-0.9.5.tar.bz2 -Source1: meld +Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2 Patch0: desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: scrollkeeper Requires: gnome-python2 >= 1.99.14 Requires: gnome-python2-canvas Requires: gnome-python2-gconf Requires: pygtk2 >= 1.99.15 Requires: pygtk2-libglade +Requires(post): scrollkeeper +Requires(postun): scrollkeeper + BuildArch: noarch %description @@ -36,42 +40,60 @@ %build -make +make prefix=%{_prefix} libdir=%{_datadir} %install rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/pixmaps/ -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/meld/po/ -install -p -D -m0755 meld ${RPM_BUILD_ROOT}%{_datadir}/meld/meld -install -p -D -m0644 *.py ${RPM_BUILD_ROOT}%{_datadir}/meld/ -install -p -D -m0644 glade2/*.glade* ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/ -install -p -D -m0644 glade2/pixmaps/* ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/pixmaps/ -install -p -D -m0644 glade2/pixmaps/icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/meld.png -install -p -D -m0644 po/*.po ${RPM_BUILD_ROOT}%{_datadir}/meld/po/ -install -p -D -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/meld +make prefix=%{_prefix} libdir=%{_datadir} \ + DESTDIR=${RPM_BUILD_ROOT} install desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - meld.desktop + --delete-original \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/meld.desktop + +%find_lang %{name} + + +%post +scrollkeeper-update -q || : + + +%postun +scrollkeeper-update -q || : %clean rm -rf ${RPM_BUILD_ROOT} -%files +%files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING +%doc AUTHORS COPYING %{_bindir}/meld -%{_datadir}/meld +%{_datadir}/meld/ %{_datadir}/applications/fedora-meld.desktop +%{_datadir}/application-registry/%{name}* %{_datadir}/pixmaps/meld.png +%{_datadir}/gnome/help/%{name}/ +%{_datadir}/omf/%{name}/ %changelog +* Wed Jun 8 2005 Michael Schwendt - 0.9.6-1 +- Remove unused meld shell script from src.rpm. +- Add scriptlets for scrollkeeper-update. +- Use %%find_lang macro. +- Simplify %%install (let included Makefile do the installation). +- Update to 0.9.6 (fixes manual). +- BR scrollkeeper (#156235). + +* Thu Apr 7 2005 Michael Schwendt - 0.9.5-2 +- rebuilt + * Sun Feb 06 2005 Phillip Compton - 0.9.5-1 - 0.9.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Feb 2005 02:29:21 -0000 1.4 +++ sources 1 Jul 2005 21:21:50 -0000 1.5 @@ -1 +1 @@ -dc86bf6f5ed1887da6a28ac1d91eb78d meld-0.9.5.tar.bz2 +73419987b125c0cfbb1f04cfe454a8e5 meld-0.9.6.tar.bz2 --- meld DELETED --- From fedora-extras-commits at redhat.com Fri Jul 1 21:22:31 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:22:31 -0400 Subject: common tobuild,1.1691,1.1692 Message-ID: <200507012122.j61LMVP1030156@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30139 Modified Files: tobuild Log Message: request build of rpms/meld/FC-3 meld-0_9_6-0_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1691 retrieving revision 1.1692 diff -u -r1.1691 -r1.1692 --- tobuild 1 Jul 2005 21:03:56 -0000 1.1691 +++ tobuild 1 Jul 2005 21:22:29 -0000 1.1692 @@ -20,3 +20,4 @@ katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel +mschwendt rpms/meld/FC-3 meld-0_9_6-0_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 21:58:50 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 17:58:50 -0400 Subject: common tobuild,1.1692,1.1693 Message-ID: <200507012158.j61LwoCU030232@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30215 Modified Files: tobuild Log Message: mod_suphp enqueued for devel, fc4, fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1692 retrieving revision 1.1693 diff -u -r1.1692 -r1.1693 --- tobuild 1 Jul 2005 21:22:29 -0000 1.1692 +++ tobuild 1 Jul 2005 21:58:48 -0000 1.1693 @@ -21,3 +21,6 @@ katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel mschwendt rpms/meld/FC-3 meld-0_9_6-0_fc3 fc3 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 22:21:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 18:21:28 -0400 Subject: common tobuild,1.1693,1.1694 Message-ID: <200507012221.j61MLSXm031382@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31365 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1693 retrieving revision 1.1694 diff -u -r1.1693 -r1.1694 --- tobuild 1 Jul 2005 21:58:48 -0000 1.1693 +++ tobuild 1 Jul 2005 22:21:26 -0000 1.1694 @@ -1,19 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel -bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel -bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 -dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel -dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 -orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel -spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 -spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 -kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel -Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel -icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 -icon rpms/diction/devel diction-1_08-1_fc5 devel -mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 kevin rpms/exo/devel exo-0_3_0-9_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 22:31:01 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:01 -0400 Subject: rpms/libpqxx - New directory Message-ID: <200507012231.j61MV1va031511@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31487/libpqxx Log Message: Directory /cvs/extras/rpms/libpqxx added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:31:01 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:01 -0400 Subject: rpms/libpqxx/devel - New directory Message-ID: <200507012231.j61MV1Ga031516@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31487/libpqxx/devel Log Message: Directory /cvs/extras/rpms/libpqxx/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:31:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:31 -0400 Subject: rpms/libpqxx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507012231.j61MVVx9031559@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532 Added Files: Makefile import.log Log Message: Setup of module libpqxx --- NEW FILE Makefile --- # Top level Makefile for module libpqxx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 22:31:32 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:32 -0400 Subject: rpms/libpqxx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507012231.j61MVWcf031564@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libpqxx --- NEW 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 Jul 1 22:34:15 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:34:15 -0400 Subject: rpms/libpqxx import.log,1.1,1.2 Message-ID: <200507012234.j61MYk8h031630@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31596 Modified Files: import.log Log Message: auto-import libpqxx-2.5.4-3 on branch devel from libpqxx-2.5.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libpqxx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 22:31:29 -0000 1.1 +++ import.log 1 Jul 2005 22:34:13 -0000 1.2 @@ -0,0 +1 @@ +libpqxx-2_5_4-3:HEAD:libpqxx-2.5.4-3.src.rpm:1120257235 From fedora-extras-commits at redhat.com Fri Jul 1 22:34:16 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:34:16 -0400 Subject: rpms/libpqxx/devel libpqxx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507012234.j61MYkXM031634@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31596/devel Modified Files: .cvsignore sources Added Files: libpqxx.spec Log Message: auto-import libpqxx-2.5.4-3 on branch devel from libpqxx-2.5.4-3.src.rpm --- NEW FILE libpqxx.spec --- Name: libpqxx Version: 2.5.4 Release: 3 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel BuildRequires: pkgconfig %description C++ client API for PostgreSQL. The standard front-end (in the sense of "language binding") for writing C++ programs that use PostgreSQL. Supersedes older libpq++ interface. %package devel Summary: Development tools for libpqxx Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: postgresql-devel %description devel The libpgxx-devel package contains the header files and static libraries necessary for developing programs which use libpqxx. %prep %setup -q %build %configure --enable-shared # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; %{__perl} -pi -e 's,-R/usr/lib,,' $RPM_BUILD_ROOT%{_bindir}/pqxx-config %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION %{_libdir}/libpqxx-2.5.4.so %files devel %doc README-UPGRADE %{_bindir}/pqxx-config %{_libdir}/libpqxx.a %{_libdir}/libpqxx.so %{_includedir}/pqxx %{_libdir}/pkgconfig/libpqxx.pc %changelog * Fri Jul 01 2005 Andreas Bierfert 2.5.4-3 - add postgresql-devel to Requires for devel package - get rid of -R option in pqxx-config - don't need BuildRequires perl * Thu Jun 30 2005 Andreas Bierfert 2.5.4-2 - Drop explicit Requires for ldconfig * Sat Jun 25 2005 Andreas Bierfert 2.5.4-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 22:31:30 -0000 1.1 +++ .cvsignore 1 Jul 2005 22:34:14 -0000 1.2 @@ -0,0 +1 @@ +libpqxx-2.5.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 22:31:30 -0000 1.1 +++ sources 1 Jul 2005 22:34:14 -0000 1.2 @@ -0,0 +1 @@ +b0951e530dc9b35171f8ff015ab43920 libpqxx-2.5.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 22:35:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 18:35:04 -0400 Subject: devel/aalib aalib-1.4rc5-bug149361.patch,1.1,1.2 Message-ID: <200507012235.j61MZ41O031686@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/aalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31666 Modified Files: aalib-1.4rc5-bug149361.patch Log Message: inverted aalib-1.4rc5-bug149361.patch: Index: aalib-1.4rc5-bug149361.patch =================================================================== RCS file: /cvs/extras/devel/aalib/aalib-1.4rc5-bug149361.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aalib-1.4rc5-bug149361.patch 1 Jul 2005 21:01:06 -0000 1.1 +++ aalib-1.4rc5-bug149361.patch 1 Jul 2005 22:35:02 -0000 1.2 @@ -6,7 +6,7 @@ { if (!closed) - return; -+ return 0; ++ return 1; mypid = getpid(); if (tty_fd == -1) { tty_fd = fileno(stdin); From fedora-extras-commits at redhat.com Fri Jul 1 22:36:34 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:36:34 -0400 Subject: rpms/wv2 - New directory Message-ID: <200507012236.j61MaY2v031783@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/wv2 Log Message: Directory /cvs/extras/rpms/wv2 added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:36:34 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:36:34 -0400 Subject: rpms/wv2/devel - New directory Message-ID: <200507012236.j61MaYvL031788@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/wv2/devel Log Message: Directory /cvs/extras/rpms/wv2/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:37:09 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:37:09 -0400 Subject: rpms/wv2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507012237.j61Mb9D1031831@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804 Added Files: Makefile import.log Log Message: Setup of module wv2 --- NEW FILE Makefile --- # Top level Makefile for module wv2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 22:37:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:37:10 -0400 Subject: rpms/wv2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507012237.j61MbAX9031836@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module wv2 --- NEW 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 Jul 1 22:40:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:40:31 -0400 Subject: rpms/wv2 import.log,1.1,1.2 Message-ID: <200507012240.j61MeVjP031899@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31868 Modified Files: import.log Log Message: auto-import wv2-0.2.2-4 on branch devel from wv2-0.2.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/wv2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 22:37:07 -0000 1.1 +++ import.log 1 Jul 2005 22:40:29 -0000 1.2 @@ -0,0 +1 @@ +wv2-0_2_2-4:HEAD:wv2-0.2.2-4.src.rpm:1120257607 From fedora-extras-commits at redhat.com Fri Jul 1 22:40:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:40:31 -0400 Subject: rpms/wv2/devel wv2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507012240.j61MeVSK031906@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31868/devel Modified Files: .cvsignore sources Added Files: wv2.spec Log Message: auto-import wv2-0.2.2-4 on branch devel from wv2-0.2.2-4.src.rpm --- NEW FILE wv2.spec --- Name: wv2 Version: 0.2.2 Release: 4 Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries License: LGPL URL: http://wvware.sourceforge.net Source0: http://dl.sf.net/wvware/wv2-0.2.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgsf-devel BuildRequires: libxml2-devel BuildRequires: glib2-devel BuildRequires: zlib-devel BuildRequires: pkgconfig %description wv is a library which allows access to Microsoft?? Word files. It can load and parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known internally as Word 9, 8, 7 and 6.) There is some support for reading earlier formats as well: Word 2 docs are converted to plaintext. %package devel Summary: Development tools for programs which will use the wv2 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libgsf-devel Requires: glib2-devel Requires: libxml2-devel %description devel The wv2-devel package includes the header files necessary for developing. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/* %{_bindir}/wv2-config %{_libdir}/*.so %{_includedir}/wv2 %changelog * Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 - add some Requires for the devel package - changed some files around - added missing defattr to devel package * Thu Jun 30 2005 Andreas Bierfert 0.2.2-3 - drop explicit Requires for ldconfig * Wed Jun 29 2005 Andreas Bierfert 0.2.2-2 - added trademarks - added missing ldconfig * Sun Jun 26 2005 Andreas Bierfert 0.2.2-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 22:37:08 -0000 1.1 +++ .cvsignore 1 Jul 2005 22:40:29 -0000 1.2 @@ -0,0 +1 @@ +wv2-0.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 22:37:08 -0000 1.1 +++ sources 1 Jul 2005 22:40:29 -0000 1.2 @@ -0,0 +1 @@ +d05318852b6c599270c7e0376834c413 wv2-0.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 23:24:55 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:24:55 -0400 Subject: rpms/moomps import.log,1.3,1.4 Message-ID: <200507012325.j61NPQqt000675@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv641 Modified Files: import.log Log Message: auto-import moomps-5.2-1 on branch FC-4 from moomps-5.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/moomps/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 26 May 2005 19:39:10 -0000 1.3 +++ import.log 1 Jul 2005 23:24:53 -0000 1.4 @@ -1,2 +1,3 @@ moomps-5_0-4:HEAD:moomps-5.0-4.src.rpm:1116618196 moomps-5_1-1:HEAD:moomps-5.1-1.src.rpm:1117136339 +moomps-5_2-1:FC-4:moomps-5.2-1.src.rpm:1120260283 From fedora-extras-commits at redhat.com Fri Jul 1 23:24:56 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:24:56 -0400 Subject: rpms/moomps/FC-4 .cvsignore, 1.3, 1.4 moomps.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507012325.j61NPQ1S000680@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv641/FC-4 Modified Files: .cvsignore moomps.spec sources Log Message: auto-import moomps-5.2-1 on branch FC-4 from moomps-5.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 May 2005 19:39:10 -0000 1.3 +++ .cvsignore 1 Jul 2005 23:24:54 -0000 1.4 @@ -1 +1 @@ -moomps-5.1.tar.bz2 +moomps-5.2.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- moomps.spec 7 Jun 2005 18:21:57 -0000 1.4 +++ moomps.spec 1 Jul 2005 23:24:54 -0000 1.5 @@ -1,10 +1,10 @@ Name: moomps -Version: 5.1 -Release: 6%{?dist} +Version: 5.2 +Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildArchitectures: noarch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -13,7 +13,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 20.1, tclx >= 8.3 +Requires: moodss >= 20.2, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -78,6 +78,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 +- 5.2 source release + * Tue Jun 7 2005 Jean-Luc Fontaine 5.1-6 - at build time, only require tcl 8.4.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 May 2005 19:39:10 -0000 1.3 +++ sources 1 Jul 2005 23:24:54 -0000 1.4 @@ -1 +1 @@ -57d6cb67a9323ca0b83eb401c7323fb7 moomps-5.1.tar.bz2 +d4bbbfa04a5e858be3810ebe7f110a21 moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 23:26:36 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:26:36 -0400 Subject: common tobuild,1.1694,1.1695 Message-ID: <200507012326.j61NQagN000806@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv789 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-4 moomps-5_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1694 retrieving revision 1.1695 diff -u -r1.1694 -r1.1695 --- tobuild 1 Jul 2005 22:21:26 -0000 1.1694 +++ tobuild 1 Jul 2005 23:26:34 -0000 1.1695 @@ -11,3 +11,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 +jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 23:30:49 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:30:49 -0400 Subject: rpms/moodss/FC-3 moodss.spec,1.8,1.9 Message-ID: <200507012330.j61NUnQs000829@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv812 Modified Files: moodss.spec Log Message: 20.2 source release. Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- moodss.spec 26 May 2005 19:54:54 -0000 1.8 +++ moodss.spec 1 Jul 2005 23:30:47 -0000 1.9 @@ -1,11 +1,11 @@ Name: moodss -Version: 20.1 -Release: 2 +Version: 20.2 +Release: 1 Epoch: 0 Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-20.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: tcl-devel >= 0:8.4.7 @@ -59,6 +59,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 0:20.2-1 +- 20.2 source release + * Sun May 22 2005 Jean-Luc Fontaine 0:20.1-2 - 20.1 source release - require sqlite2-tcl as it is now in extras starting from FC3 From fedora-extras-commits at redhat.com Fri Jul 1 23:32:28 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:32:28 -0400 Subject: rpms/moodss/FC-3 moodss.spec,1.9,1.10 Message-ID: <200507012332.j61NWSes000882@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865 Modified Files: moodss.spec Log Message: added distribution to release. Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- moodss.spec 1 Jul 2005 23:30:47 -0000 1.9 +++ moodss.spec 1 Jul 2005 23:32:26 -0000 1.10 @@ -1,6 +1,6 @@ Name: moodss Version: 20.2 -Release: 1 +Release: 1%{?dist} Epoch: 0 Summary: Powerful modular monitoring graphical application Group: Applications/System From fedora-extras-commits at redhat.com Fri Jul 1 23:33:05 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:33:05 -0400 Subject: common tobuild,1.1695,1.1696 Message-ID: <200507012333.j61NX5hp000944@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv927 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1695 retrieving revision 1.1696 diff -u -r1.1695 -r1.1696 --- tobuild 1 Jul 2005 23:26:34 -0000 1.1695 +++ tobuild 1 Jul 2005 23:33:03 -0000 1.1696 @@ -12,3 +12,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 23:36:34 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:36:34 -0400 Subject: rpms/moomps/FC-3 moomps.spec,1.5,1.6 Message-ID: <200507012336.j61NaYAB000982@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv965 Modified Files: moomps.spec Log Message: 5.2 source release. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/moomps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moomps.spec 7 Jun 2005 18:15:29 -0000 1.5 +++ moomps.spec 1 Jul 2005 23:36:32 -0000 1.6 @@ -1,11 +1,11 @@ Name: moomps -Version: 5.1 -Release: 5%{?dist} +Version: 5.2 +Release: 1%{?dist} Epoch: 0 Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildArchitectures: noarch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -14,7 +14,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 0:20.1, tclx >= 0:8.3 +Requires: moodss >= 0:20.2, tclx >= 0:8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -79,6 +79,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 0:5.2-1 +- 5.2 source release + * Tue Jun 7 2005 Jean-Luc Fontaine 0:5.1-5 - at build time, only require tcl 8.4.7 From fedora-extras-commits at redhat.com Fri Jul 1 23:37:18 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:37:18 -0400 Subject: common tobuild,1.1696,1.1697 Message-ID: <200507012337.j61NbI94001049@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1032 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1696 retrieving revision 1.1697 diff -u -r1.1696 -r1.1697 --- tobuild 1 Jul 2005 23:33:03 -0000 1.1696 +++ tobuild 1 Jul 2005 23:37:16 -0000 1.1697 @@ -13,3 +13,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:03:45 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:03:45 -0400 Subject: rpms/moomps/FC-3 sources,1.3,1.4 Message-ID: <200507020003.j6203jQ2002217@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2203 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 May 2005 19:39:10 -0000 1.3 +++ sources 2 Jul 2005 00:03:42 -0000 1.4 @@ -1 +1 @@ -57d6cb67a9323ca0b83eb401c7323fb7 moomps-5.1.tar.bz2 +d4bbbfa04a5e858be3810ebe7f110a21 moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 00:05:36 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:05:36 -0400 Subject: rpms/moodss/FC-3 sources,1.4,1.5 Message-ID: <200507020006.j6206RBR002249@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2227 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 May 2005 20:00:34 -0000 1.4 +++ sources 2 Jul 2005 00:05:17 -0000 1.5 @@ -1 +1 @@ -b55e2aff0ff05e55a6b1f4dff6e58fa9 moodss-20.1.tar.bz2 +151a823de023ddb1961d046d8adfaa0b moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 00:07:45 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:07:45 -0400 Subject: common tobuild,1.1697,1.1698 Message-ID: <200507020007.j6207jKx002308@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2282 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1697 retrieving revision 1.1698 diff -u -r1.1697 -r1.1698 --- tobuild 1 Jul 2005 23:37:16 -0000 1.1697 +++ tobuild 2 Jul 2005 00:07:43 -0000 1.1698 @@ -14,3 +14,4 @@ jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:08:34 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:08:34 -0400 Subject: common tobuild,1.1698,1.1699 Message-ID: <200507020008.j6208YDs002351@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2334 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1698 retrieving revision 1.1699 diff -u -r1.1698 -r1.1699 --- tobuild 2 Jul 2005 00:07:43 -0000 1.1698 +++ tobuild 2 Jul 2005 00:08:31 -0000 1.1699 @@ -15,3 +15,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:51:27 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 20:51:27 -0400 Subject: common tobuild,1.1699,1.1700 Message-ID: <200507020051.j620pRfL002515@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2498 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1699 retrieving revision 1.1700 diff -u -r1.1699 -r1.1700 --- tobuild 2 Jul 2005 00:08:31 -0000 1.1699 +++ tobuild 2 Jul 2005 00:51:25 -0000 1.1700 @@ -16,3 +16,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 00:52:14 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 20:52:14 -0400 Subject: common tobuild,1.1700,1.1701 Message-ID: <200507020052.j620qE8K002582@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2565 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1700 retrieving revision 1.1701 diff -u -r1.1700 -r1.1701 --- tobuild 2 Jul 2005 00:51:25 -0000 1.1700 +++ tobuild 2 Jul 2005 00:52:12 -0000 1.1701 @@ -17,3 +17,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:52:43 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 20:52:43 -0400 Subject: common tobuild,1.1701,1.1702 Message-ID: <200507020052.j620qhXF002644@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2627 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1701 retrieving revision 1.1702 diff -u -r1.1701 -r1.1702 --- tobuild 2 Jul 2005 00:52:12 -0000 1.1701 +++ tobuild 2 Jul 2005 00:52:41 -0000 1.1702 @@ -18,3 +18,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 01:18:03 2005 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 1 Jul 2005 21:18:03 -0400 Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.1,1.2 Message-ID: <200507020118.j621I3Ts003814@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3797 Modified Files: NetworkManager-vpnc.spec Log Message: * Fri Jul 1 2005 David Zeuthen 0.2-2 - Add missing changelog entry for last commit - Temporarily BuildReq libpng-devel as it is not pulled in by gtk2-devel (should be fixed in Core shortly) - Pull in latest D-BUS (which features automatic reloading of policy files) so users do not have to restart the messagebus after installing this package Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NetworkManager-vpnc.spec 30 Jun 2005 20:25:29 -0000 1.1 +++ NetworkManager-vpnc.spec 2 Jul 2005 01:18:01 -0000 1.2 @@ -1,5 +1,5 @@ %define nm_version 0.4-32.cvs20050629 -%define dbus_version 0.33 +%define dbus_version 0.34 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-1 %define shared_mime_version 0.16-3 @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Version: 0.2 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -19,6 +19,7 @@ BuildRequires: libgnomeui-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel +BuildRequires: libpng-devel PreReq: /usr/bin/update-desktop-database PreReq: /usr/bin/gtk-update-icon-cache Requires: gtk2 >= %{gtk2_version} @@ -83,6 +84,18 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Fri Jul 1 2005 David Zeuthen 0.2-2 +- Add missing changelog entry for last commit +- Temporarily BuildReq libpng-devel as it is not pulled in by gtk2-devel + (should be fixed in Core shortly) +- Pull in latest D-BUS (which features automatic reloading of policy files) + so users do not have to restart the messagebus after installing this package + +* Thu Jun 30 2005 David Zeuthen 0.2-1 +- New upsteam version +- Add the new gnome-mime-application-x-cisco-vpn-settings.png icon and call + gtk-update-icon-cache as appropriate + * Fri Jun 17 2005 David Zeuthen 0.1-2.cvs20050617 - Add Prereq: /usr/bin/update-desktop-database - Nuke .la and .a files From fedora-extras-commits at redhat.com Sat Jul 2 01:18:24 2005 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 1 Jul 2005 21:18:24 -0400 Subject: common tobuild,1.1702,1.1703 Message-ID: <200507020118.j621IOL6003878@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3861 Modified Files: tobuild Log Message: request build of rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1702 retrieving revision 1.1703 diff -u -r1.1702 -r1.1703 --- tobuild 2 Jul 2005 00:52:41 -0000 1.1702 +++ tobuild 2 Jul 2005 01:18:22 -0000 1.1703 @@ -19,3 +19,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 +davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 devel From fedora-extras-commits at redhat.com Sat Jul 2 03:49:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 23:49:03 -0400 Subject: common tobuild,1.1703,1.1704 Message-ID: <200507020349.j623n3uu006612@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6595 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1703 retrieving revision 1.1704 diff -u -r1.1703 -r1.1704 --- tobuild 2 Jul 2005 01:18:22 -0000 1.1703 +++ tobuild 2 Jul 2005 03:49:01 -0000 1.1704 @@ -20,3 +20,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 devel +corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 03:49:44 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 23:49:44 -0400 Subject: common tobuild,1.1704,1.1705 Message-ID: <200507020349.j623nisF006644@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6625 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1704 retrieving revision 1.1705 diff -u -r1.1704 -r1.1705 --- tobuild 2 Jul 2005 03:49:01 -0000 1.1704 +++ tobuild 2 Jul 2005 03:49:42 -0000 1.1705 @@ -1,23 +1 @@ -# this is the build control file. the format is -# user repo tag target status -# -kevin rpms/exo/devel exo-0_3_0-9_fc5 devel -jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 -katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel -katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 -katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 -mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel -mschwendt rpms/meld/FC-3 meld-0_9_6-0_fc3 fc3 -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 -jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 -davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 devel -corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 +corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 05:08:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:08:23 -0400 Subject: common tobuild,1.1705,1.1706 Message-ID: <200507020508.j6258NFF008914@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8897 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1705 retrieving revision 1.1706 diff -u -r1.1705 -r1.1706 --- tobuild 2 Jul 2005 03:49:42 -0000 1.1705 +++ tobuild 2 Jul 2005 05:08:21 -0000 1.1706 @@ -1 +1,2 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 +corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 05:29:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:29:57 -0400 Subject: rpms/perl-Want/devel .cvsignore, 1.2, 1.3 perl-Want.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507020529.j625TvF1008978@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8957 Modified Files: .cvsignore perl-Want.spec sources Log Message: Upstream update to 0.09. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 +++ .cvsignore 2 Jul 2005 05:29:55 -0000 1.3 @@ -1 +1 @@ -Want-0.08.tar.gz +Want-0.09.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/perl-Want.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 +++ perl-Want.spec 2 Jul 2005 05:29:55 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Want -Version: 0.08 -Release: 3%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Sat Jul 02 2005 Ralf Corsepius - 0.09-1 +- Upstream update to 0.09. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-3 - Remove ||: in %%check. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 14:31:31 -0000 1.2 +++ sources 2 Jul 2005 05:29:55 -0000 1.3 @@ -1 +1 @@ -72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz +90ab551867c986b748128609f95b3666 Want-0.09.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 05:32:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:32:18 -0400 Subject: rpms/perl-Want/FC-3 .cvsignore, 1.2, 1.3 perl-Want.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507020532.j625WmTB009024@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8984/FC-3 Modified Files: .cvsignore perl-Want.spec sources Log Message: Upstream update to 0.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 +++ .cvsignore 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -Want-0.08.tar.gz +Want-0.09.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-3/perl-Want.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 +++ perl-Want.spec 2 Jul 2005 05:32:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Want -Version: 0.08 -Release: 3%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Sat Jul 02 2005 Ralf Corsepius - 0.09-1 +- Upstream update to 0.09. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-3 - Remove ||: in %%check. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 14:31:31 -0000 1.2 +++ sources 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz +90ab551867c986b748128609f95b3666 Want-0.09.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 05:32:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:32:18 -0400 Subject: rpms/perl-Want/FC-4 .cvsignore, 1.2, 1.3 perl-Want.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507020532.j625WnaR009029@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8984/FC-4 Modified Files: .cvsignore perl-Want.spec sources Log Message: Upstream update to 0.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 +++ .cvsignore 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -Want-0.08.tar.gz +Want-0.09.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-4/perl-Want.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 +++ perl-Want.spec 2 Jul 2005 05:32:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Want -Version: 0.08 -Release: 3%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Sat Jul 02 2005 Ralf Corsepius - 0.09-1 +- Upstream update to 0.09. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-3 - Remove ||: in %%check. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 14:31:31 -0000 1.2 +++ sources 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz +90ab551867c986b748128609f95b3666 Want-0.09.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 05:35:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:35:02 -0400 Subject: common tobuild,1.1706,1.1707 Message-ID: <200507020535.j625Z2tY009184@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9167 Modified Files: tobuild Log Message: request build of rpms/perl-Want/devel perl-Want-0_09-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1706 retrieving revision 1.1707 diff -u -r1.1706 -r1.1707 --- tobuild 2 Jul 2005 05:08:21 -0000 1.1706 +++ tobuild 2 Jul 2005 05:35:00 -0000 1.1707 @@ -1,2 +1,3 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 +corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 05:35:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:35:33 -0400 Subject: common tobuild,1.1707,1.1708 Message-ID: <200507020535.j625ZXPS009217@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9200 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1707 retrieving revision 1.1708 diff -u -r1.1707 -r1.1708 --- tobuild 2 Jul 2005 05:35:00 -0000 1.1707 +++ tobuild 2 Jul 2005 05:35:30 -0000 1.1708 @@ -1,3 +1,4 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel +corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 05:36:01 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:36:01 -0400 Subject: common tobuild,1.1708,1.1709 Message-ID: <200507020536.j625a1kZ009251@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9233 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1708 retrieving revision 1.1709 diff -u -r1.1708 -r1.1709 --- tobuild 2 Jul 2005 05:35:30 -0000 1.1708 +++ tobuild 2 Jul 2005 05:35:58 -0000 1.1709 @@ -2,3 +2,4 @@ corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 +corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 From rc040203 at freenet.de Sat Jul 2 05:44:13 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sat, 02 Jul 2005 07:44:13 +0200 Subject: rpms/ebtables/devel ebtables.spec, 1.1, 1.2 ebtables.sysv, 1.1, 1.2 In-Reply-To: <200507011627.j61GRDxR021539@cvs-int.fedora.redhat.com> References: <200507011627.j61GRDxR021539@cvs-int.fedora.redhat.com> Message-ID: <1120283053.3741.308.camel@mccallum.corsepiu.local> On Fri, 2005-07-01 at 12:27 -0400, Tom Callaway wrote: > +PreReq: /sbin/chkconfig > +PreReq: /sbin/service Requires(pre): /sbin/chkconfig Requires(pre): /sbin/service Requires(postun): /sbin/service Ralf From fedora-extras-commits at redhat.com Sat Jul 2 07:28:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:28:32 -0400 Subject: rpms/libassuan/FC-4 .cvsignore, 1.3, 1.4 libassuan.spec, 1.7, 1.8 sources, 1.3, 1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE Message-ID: <200507020728.j627SW7J011756@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11721/FC-4 Modified Files: .cvsignore libassuan.spec sources Removed Files: libassuan-0.6.9.tar.gz.sig Log Message: 0.6.10, ack'd by Rex. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:30:20 -0000 1.3 +++ .cvsignore 2 Jul 2005 07:28:30 -0000 1.4 @@ -1 +1,2 @@ -libassuan-0.6.9.tar.gz +libassuan-0.6.10.tar.gz +libassuan-0.6.10.tar.gz.sig Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/libassuan.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libassuan.spec 8 May 2005 19:05:00 -0000 1.7 +++ libassuan.spec 2 Jul 2005 07:28:30 -0000 1.8 @@ -1,10 +1,9 @@ Summary: GnuPG IPC library Name: libassuan -Version: 0.6.9 -Release: 4%{?dist_tag} -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig -Patch0: %{name}-macro.patch +Version: 0.6.10 +Release: 1%{?dist_tag} +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ License: GPL Group: System Environment/Libraries @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -80,6 +78,9 @@ %changelog +* Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 +- 0.6.10, macro patch no longer needed (#162262). + * Sun May 8 2005 Michael Schwendt - 0.6.9-4 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:30:20 -0000 1.3 +++ sources 2 Jul 2005 07:28:30 -0000 1.4 @@ -1 +1,2 @@ -7f8aff75d034159b84faf2358263f444 libassuan-0.6.9.tar.gz +4cde037c3fcb2f0eeb695b1db6e56bba libassuan-0.6.10.tar.gz +c36f1a8597c4836809005325dfa40244 libassuan-0.6.10.tar.gz.sig --- libassuan-0.6.9.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:28:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:28:33 -0400 Subject: rpms/libassuan/devel .cvsignore, 1.3, 1.4 libassuan.spec, 1.7, 1.8 sources, 1.3, 1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE Message-ID: <200507020728.j627SXIN011764@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11721/devel Modified Files: .cvsignore libassuan.spec sources Removed Files: libassuan-0.6.9.tar.gz.sig Log Message: 0.6.10, ack'd by Rex. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:30:20 -0000 1.3 +++ .cvsignore 2 Jul 2005 07:28:31 -0000 1.4 @@ -1 +1,2 @@ -libassuan-0.6.9.tar.gz +libassuan-0.6.10.tar.gz +libassuan-0.6.10.tar.gz.sig Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libassuan.spec 8 May 2005 19:05:00 -0000 1.7 +++ libassuan.spec 2 Jul 2005 07:28:31 -0000 1.8 @@ -1,10 +1,9 @@ Summary: GnuPG IPC library Name: libassuan -Version: 0.6.9 -Release: 4%{?dist_tag} -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig -Patch0: %{name}-macro.patch +Version: 0.6.10 +Release: 1%{?dist_tag} +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ License: GPL Group: System Environment/Libraries @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -80,6 +78,9 @@ %changelog +* Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 +- 0.6.10, macro patch no longer needed (#162262). + * Sun May 8 2005 Michael Schwendt - 0.6.9-4 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:30:20 -0000 1.3 +++ sources 2 Jul 2005 07:28:31 -0000 1.4 @@ -1 +1,2 @@ -7f8aff75d034159b84faf2358263f444 libassuan-0.6.9.tar.gz +4cde037c3fcb2f0eeb695b1db6e56bba libassuan-0.6.10.tar.gz +c36f1a8597c4836809005325dfa40244 libassuan-0.6.10.tar.gz.sig --- libassuan-0.6.9.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:29:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:29:08 -0400 Subject: common tobuild,1.1709,1.1710 Message-ID: <200507020729.j627T8FF011826@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11809 Modified Files: tobuild Log Message: request build of rpms/libassuan/FC-4 libassuan-0_6_10-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1709 retrieving revision 1.1710 diff -u -r1.1709 -r1.1710 --- tobuild 2 Jul 2005 05:35:58 -0000 1.1709 +++ tobuild 2 Jul 2005 07:29:06 -0000 1.1710 @@ -3,3 +3,4 @@ corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 +scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 07:31:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:31:47 -0400 Subject: rpms/libassuan/FC-4 libassuan.spec,1.8,1.9 Message-ID: <200507020731.j627Vlhm011914@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11885/FC-4 Modified Files: libassuan.spec Log Message: Fix disttag. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/libassuan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libassuan.spec 2 Jul 2005 07:28:30 -0000 1.8 +++ libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist_tag} +Release: 1%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ From fedora-extras-commits at redhat.com Sat Jul 2 07:31:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:31:47 -0400 Subject: rpms/libassuan/devel libassuan.spec,1.8,1.9 Message-ID: <200507020731.j627Vlg8011920@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11885/devel Modified Files: libassuan.spec Log Message: Fix disttag. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libassuan.spec 2 Jul 2005 07:28:31 -0000 1.8 +++ libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist_tag} +Release: 1%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ From fedora-extras-commits at redhat.com Sat Jul 2 07:33:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:33:39 -0400 Subject: rpms/libassuan/FC-4 libassuan-macro.patch,1.1,NONE Message-ID: <200507020733.j627XdrH011993@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11971/FC-4 Removed Files: libassuan-macro.patch Log Message: Remove unneeded patch. --- libassuan-macro.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:33:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:33:40 -0400 Subject: rpms/libassuan/devel libassuan-macro.patch,1.1,NONE Message-ID: <200507020733.j627XeFV011998@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11971/devel Removed Files: libassuan-macro.patch Log Message: Remove unneeded patch. --- libassuan-macro.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:34:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:34:07 -0400 Subject: common tobuild,1.1710,1.1711 Message-ID: <200507020734.j627Y72x012035@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12018 Modified Files: tobuild Log Message: request build of rpms/libassuan/devel libassuan-0_6_10-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1710 retrieving revision 1.1711 diff -u -r1.1710 -r1.1711 --- tobuild 2 Jul 2005 07:29:06 -0000 1.1710 +++ tobuild 2 Jul 2005 07:34:04 -0000 1.1711 @@ -4,3 +4,4 @@ corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 +scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 08:26:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 04:26:46 -0400 Subject: rpms/gnupg2/FC-3 gnupg2.spec,1.2,1.3 Message-ID: <200507020826.j628QkJ4013778@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13761/FC-3 Modified Files: gnupg2.spec Log Message: Fix disttag. Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnupg2.spec 2 Feb 2005 17:20:20 -0000 1.2 +++ gnupg2.spec 2 Jul 2005 08:26:44 -0000 1.3 @@ -4,7 +4,7 @@ Name: gnupg2 Epoch: 0 Version: 1.9.15 -Release: 1%{?dist_tag} +Release: 1%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 08:39:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 04:39:53 -0400 Subject: rpms/gnupg2/devel gnupg-1.9.17-lvalue.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnupg2.spec, 1.11, 1.12 sources, 1.4, 1.5 gnupg-1.9.16-signal-info.patch, 1.1, NONE gnupg-1.9.16.tar.bz2.sig, 1.1, NONE Message-ID: <200507020839.j628drpV013905@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881 Modified Files: .cvsignore gnupg2.spec sources Added Files: gnupg-1.9.17-lvalue.patch Removed Files: gnupg-1.9.16-signal-info.patch gnupg-1.9.16.tar.bz2.sig Log Message: 1.9.17 (#162264). gnupg-1.9.17-lvalue.patch: --- NEW FILE gnupg-1.9.17-lvalue.patch --- --- g10/misc.c~ 2005-06-15 18:34:29.000000000 +0300 +++ g10/misc.c 2005-07-01 21:02:05.000000000 +0300 @@ -986,10 +986,10 @@ } else { int rc; - char *buffer; + unsigned char *buffer; rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX, - &(unsigned char*)buffer, NULL, a ); + &buffer, NULL, a ); assert( !rc ); fputs( buffer, fp ); n += strlen(buffer); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2005 16:23:11 -0000 1.3 +++ .cvsignore 2 Jul 2005 08:39:51 -0000 1.4 @@ -1 +1,2 @@ -gnupg-1.9.16.tar.bz2 +gnupg-1.9.17.tar.bz2 +gnupg-1.9.17.tar.bz2.sig Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnupg2.spec 13 May 2005 18:01:21 -0000 1.11 +++ gnupg2.spec 2 Jul 2005 08:39:51 -0000 1.12 @@ -1,7 +1,12 @@ +# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) +# Note: this is just the name of the default shared lib to load in scdaemon, +# it can use other implementations too (including non-pcsc ones). +%define pcsc_lib libpcsclite.so.0 + Summary: GNU utility for secure communication and data storage Name: gnupg2 -Version: 1.9.16 -Release: 4%{?dist} +Version: 1.9.17 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -10,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: gnupg-1.9.16-pth.patch -Patch1: gnupg-1.9.16-signal-info.patch +Patch1: gnupg-1.9.17-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch Obsoletes: newpg < 0.9.5 @@ -28,10 +33,9 @@ BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 Requires: libgpg-error >= 1.0 -BuildRequires: libassuan-devel >= 0.6.9 +BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libksba-devel >= 0.9.11 BuildRequires: opensc-devel >= 0.9 -BuildRequires: pcsc-lite-devel BuildRequires: gettext BuildRequires: openldap-devel BuildRequires: libusb-devel @@ -64,9 +68,11 @@ %setup -q -n gnupg-%{version} %patch0 -p1 -b .pth -%patch1 -p1 -b .strsignal +%patch1 -p0 -b .lvalue %patch2 -p1 -b .testverbose +sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c + %build @@ -114,10 +120,10 @@ %{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf +%{_bindir}/gpgkey2ssh %{_bindir}/gpgsm* %{_bindir}/gpgv2 %{_bindir}/kbxutil -%{_bindir}/sc-copykeys %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* @@ -132,6 +138,12 @@ %changelog +* Fri Jul 1 2005 Ville Skytt?? - 1.9.17-1 +- 1.9.17, signal info patch applied upstream (#162264). +- Patch to fix lvalue build error with gcc4 (upstream #485). +- Patch scdaemon and pcsc-wrapper to load the versioned (non-devel) + pcsc-lite lib by default. + * Fri May 13 2005 Michael Schwendt - 1.9.16-3 - Include upstream's patch for signal.c. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 May 2005 16:23:11 -0000 1.4 +++ sources 2 Jul 2005 08:39:51 -0000 1.5 @@ -1 +1,2 @@ -1282755dce9cf4a84e904ca0191017a3 gnupg-1.9.16.tar.bz2 +a1bf98c5ec0c5c316b4ae6f017f02fa3 gnupg-1.9.17.tar.bz2 +9c60e57f39a65d7be048344f2c03a4b2 gnupg-1.9.17.tar.bz2.sig --- gnupg-1.9.16-signal-info.patch DELETED --- --- gnupg-1.9.16.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 08:44:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 04:44:02 -0400 Subject: common tobuild,1.1711,1.1712 Message-ID: <200507020844.j628i2Gh013991@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13974 Modified Files: tobuild Log Message: request build of rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1711 retrieving revision 1.1712 diff -u -r1.1711 -r1.1712 --- tobuild 2 Jul 2005 07:34:04 -0000 1.1711 +++ tobuild 2 Jul 2005 08:44:00 -0000 1.1712 @@ -5,3 +5,4 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel +scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 09:42:36 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:42:36 -0400 Subject: common tobuild,1.1712,1.1713 Message-ID: <200507020942.j629gaZ7015282@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15263 Modified Files: tobuild Log Message: request build of rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1712 retrieving revision 1.1713 diff -u -r1.1712 -r1.1713 --- tobuild 2 Jul 2005 08:44:00 -0000 1.1712 +++ tobuild 2 Jul 2005 09:42:34 -0000 1.1713 @@ -6,3 +6,4 @@ scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel +pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 09:45:19 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:45:19 -0400 Subject: rpms/perl-MailTools/FC-4 perl-MailTools.spec, 1.9, 1.10 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 Message-ID: <200507020945.j629jJaE015334@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15313 Modified Files: perl-MailTools.spec sources .cvsignore Log Message: resync with devel Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-4/perl-MailTools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-MailTools.spec 6 Apr 2005 22:13:07 -0000 1.9 +++ perl-MailTools.spec 2 Jul 2005 09:45:17 -0000 1.10 @@ -1,19 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - -Summary: MailTools module for Perl +Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.66 -Release: 2 +Version: 1.67 +Release: 1%{?dist} -License: Artistic +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MailTools is a set of Perl modules related to mail applications. @@ -25,26 +23,26 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +%{__rm} -rf "$RPM_BUILD_ROOT" +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';' +%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';' %check || : -make test +%{__make} test %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf "$RPM_BUILD_ROOT" %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog README* examples/ %{perl_vendorlib}/auto/Mail/ %{perl_vendorlib}/Mail/ @@ -52,6 +50,14 @@ %changelog +* Fri Jul 1 2005 Paul Howarth - 1.67-1 +- update to 1.67 (#161830) +- assume perl_vendorlib is set +- license is same as perl (GPL or Artistic) according to README +- don't include module name in summary +- use macros consistently +- add dist tag + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2005 11:50:32 -0000 1.4 +++ sources 2 Jul 2005 09:45:17 -0000 1.5 @@ -1 +1 @@ -fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz +7871c38e42792c5e0920b3817e1523fd MailTools-1.67.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 +++ .cvsignore 2 Jul 2005 09:45:17 -0000 1.5 @@ -1 +1 @@ -MailTools-1.66.tar.gz +MailTools-1.67.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 09:46:01 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:46:01 -0400 Subject: common tobuild,1.1713,1.1714 Message-ID: <200507020946.j629k2Jp015396@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15379 Modified Files: tobuild Log Message: request build of rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1713 retrieving revision 1.1714 diff -u -r1.1713 -r1.1714 --- tobuild 2 Jul 2005 09:42:34 -0000 1.1713 +++ tobuild 2 Jul 2005 09:45:59 -0000 1.1714 @@ -7,3 +7,4 @@ scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel +pghmcfc rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 09:47:09 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:47:09 -0400 Subject: rpms/perl-MailTools/FC-3 perl-MailTools.spec, 1.6, 1.7 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 Message-ID: <200507020947.j629l9lq015429@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15408 Modified Files: perl-MailTools.spec sources .cvsignore Log Message: resync with devel Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-3/perl-MailTools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-MailTools.spec 22 Jan 2005 11:50:32 -0000 1.6 +++ perl-MailTools.spec 2 Jul 2005 09:47:07 -0000 1.7 @@ -1,19 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - -Summary: MailTools module for Perl +Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.66 -Release: 1 -Epoch: 0 -License: Artistic +Version: 1.67 +Release: 1%{?dist} + +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MailTools is a set of Perl modules related to mail applications. @@ -25,26 +23,26 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +%{__rm} -rf "$RPM_BUILD_ROOT" +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';' +%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';' %check || : -make test +%{__make} test %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf "$RPM_BUILD_ROOT" %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog README* examples/ %{perl_vendorlib}/auto/Mail/ %{perl_vendorlib}/Mail/ @@ -52,6 +50,17 @@ %changelog +* Fri Jul 1 2005 Paul Howarth - 1.67-1 +- update to 1.67 (#161830) +- assume perl_vendorlib is set +- license is same as perl (GPL or Artistic) according to README +- don't include module name in summary +- use macros consistently +- add dist tag + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sat Jan 22 2005 Ville Skytt?? - 0:1.66-1 - Update to 1.66. @@ -87,5 +96,5 @@ - Modified Summary according to Michael Schwendt suggestion - Modified tarball permissions to 0644 -* Sun Jun 15 2003 Dams +* Sun Jun 15 2003 Dams - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2005 11:50:32 -0000 1.4 +++ sources 2 Jul 2005 09:47:07 -0000 1.5 @@ -1 +1 @@ -fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz +7871c38e42792c5e0920b3817e1523fd MailTools-1.67.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 +++ .cvsignore 2 Jul 2005 09:47:07 -0000 1.5 @@ -1 +1 @@ -MailTools-1.66.tar.gz +MailTools-1.67.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 09:47:55 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:47:55 -0400 Subject: common tobuild,1.1714,1.1715 Message-ID: <200507020947.j629ltYC015491@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15474 Modified Files: tobuild Log Message: request build of rpms/perl-MailTools/FC-3 perl-MailTools-1_67-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1714 retrieving revision 1.1715 diff -u -r1.1714 -r1.1715 --- tobuild 2 Jul 2005 09:45:59 -0000 1.1714 +++ tobuild 2 Jul 2005 09:47:53 -0000 1.1715 @@ -8,3 +8,4 @@ scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel pghmcfc rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 fc4 +pghmcfc rpms/perl-MailTools/FC-3 perl-MailTools-1_67-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 10:18:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 2 Jul 2005 06:18:04 -0400 Subject: common tobuild,1.1715,1.1716 Message-ID: <200507021018.j62AI4ni016957@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16940 Modified Files: tobuild Log Message: restore table header -- if you clean up the tobuild file, please say so in a comment, so removal of entries doesn't look like an accident Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1715 retrieving revision 1.1716 diff -u -r1.1715 -r1.1716 --- tobuild 2 Jul 2005 09:47:53 -0000 1.1715 +++ tobuild 2 Jul 2005 10:18:02 -0000 1.1716 @@ -1,3 +1,6 @@ +# this is the build control file. the format is +# user repo tag target status +# corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 10:32:49 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 06:32:49 -0400 Subject: common tobuild,1.1716,1.1717 Message-ID: <200507021032.j62AWnqh017013@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16996 Modified Files: tobuild Log Message: Clean up Build queue is now empty - request those builds! P.S. It wasn't me that deleted the headers... Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1716 retrieving revision 1.1717 diff -u -r1.1716 -r1.1717 --- tobuild 2 Jul 2005 10:18:02 -0000 1.1716 +++ tobuild 2 Jul 2005 10:32:47 -0000 1.1717 @@ -1,14 +1,3 @@ # this is the build control file. the format is # user repo tag target status # -corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 -corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 -corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel -corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 -corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 -scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 -scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel -scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel -pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel -pghmcfc rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 fc4 -pghmcfc rpms/perl-MailTools/FC-3 perl-MailTools-1_67-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 10:43:09 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:43:09 -0400 Subject: rpms/moodss/devel moodss.spec,1.15,1.16 sources,1.4,1.5 Message-ID: <200507021043.j62Ah9pp017058@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17039 Modified Files: moodss.spec sources Log Message: Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- moodss.spec 31 May 2005 19:30:47 -0000 1.15 +++ moodss.spec 2 Jul 2005 10:43:07 -0000 1.16 @@ -1,10 +1,10 @@ Name: moodss -Version: 20.1 -Release: 5%{?dist} +Version: 20.2 +Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-20.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: tcl-devel >= 8.4.8 @@ -58,8 +58,8 @@ %changelog -* Tue May 31 2005 Jean-Luc Fontaine 20.1-5 -- increased release above the one in FC-4 +* Sun Jun 26 2005 Jean-Luc Fontaine 20.2-1 +- 20.2 source release * Sun May 22 2005 Jean-Luc Fontaine 20.1-3 - 20.1 source release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 May 2005 19:36:38 -0000 1.4 +++ sources 2 Jul 2005 10:43:07 -0000 1.5 @@ -1 +1 @@ -b55e2aff0ff05e55a6b1f4dff6e58fa9 moodss-20.1.tar.bz2 +151a823de023ddb1961d046d8adfaa0b moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 10:44:13 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:44:13 -0400 Subject: common tobuild,1.1717,1.1718 Message-ID: <200507021044.j62AiDFK017121@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17104 Modified Files: tobuild Log Message: request build of rpms/moodss/devel moodss-20_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1717 retrieving revision 1.1718 diff -u -r1.1717 -r1.1718 --- tobuild 2 Jul 2005 10:32:47 -0000 1.1717 +++ tobuild 2 Jul 2005 10:44:11 -0000 1.1718 @@ -1,3 +1,4 @@ # this is the build control file. the format is # user repo tag target status # +jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 10:45:38 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:45:38 -0400 Subject: rpms/moomps/devel moomps.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200507021045.j62AjceX017163@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17144 Modified Files: moomps.spec sources Log Message: Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- moomps.spec 11 Jun 2005 13:34:33 -0000 1.4 +++ moomps.spec 2 Jul 2005 10:45:36 -0000 1.5 @@ -1,10 +1,10 @@ Name: moomps -Version: 5.1 -Release: 6%{?dist} +Version: 5.2 +Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildArchitectures: noarch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -13,7 +13,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 20.1, tclx >= 8.3 +Requires: moodss >= 20.2, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -78,6 +78,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 +- 5.2 source release + * Tue Jun 7 2005 Jean-Luc Fontaine 5.1-6 - at build time, only require tcl 8.4.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 May 2005 19:39:10 -0000 1.3 +++ sources 2 Jul 2005 10:45:36 -0000 1.4 @@ -1 +1 @@ -57d6cb67a9323ca0b83eb401c7323fb7 moomps-5.1.tar.bz2 +d4bbbfa04a5e858be3810ebe7f110a21 moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 10:46:20 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:46:20 -0400 Subject: common tobuild,1.1718,1.1719 Message-ID: <200507021046.j62AkKD5017229@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17212 Modified Files: tobuild Log Message: request build of rpms/moomps/devel moomps-5_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1718 retrieving revision 1.1719 diff -u -r1.1718 -r1.1719 --- tobuild 2 Jul 2005 10:44:11 -0000 1.1718 +++ tobuild 2 Jul 2005 10:46:18 -0000 1.1719 @@ -2,3 +2,4 @@ # user repo tag target status # jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel +jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 11:28:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 07:28:50 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad-console.perms, NONE, 1.1 kernel-module-thinkpad.modules, NONE, 1.1 kernel-module-thinkpad.spec, 1.7, 1.8 kernel-module-thinkpad-README.Fedora, 1.1, NONE Message-ID: <200507021128.j62BSots018406@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18387 Modified Files: kernel-module-thinkpad.spec Added Files: kernel-module-thinkpad-console.perms kernel-module-thinkpad.modules Removed Files: kernel-module-thinkpad-README.Fedora Log Message: Update according to recent kernel module discussions and new cool stuff in FC4+ --- NEW FILE kernel-module-thinkpad-console.perms --- # console.perms definitions for ThinkPad devices, http://tpctl.sourceforge.net/ 0600 /dev/thinkpad 0600 root --- NEW FILE kernel-module-thinkpad.modules --- #!/bin/sh # Script for loading ThinkPad modules at boot time. modprobe thinkpad >/dev/null 2>&1 Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kernel-module-thinkpad.spec 2 Apr 2005 18:01:09 -0000 1.7 +++ kernel-module-thinkpad.spec 2 Jul 2005 11:28:48 -0000 1.8 @@ -1,48 +1,39 @@ -%{!?kernel: %define kernel %(uname -r)} -%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu} +%{!?kver: %define kver %(uname -r)} + +%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} +%define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 1 -Summary: IBM ThinkPad support kernel modules +Release: 2.%(echo %{kver} | tr - _) +Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL Group: System Environment/Kernel URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz -Source1: %{name}-README.Fedora +Source1: %{name}-console.perms +Source2: %{name}.modules Patch0: %{name}-percpu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i586 i686 -BuildRequires: kernel-devel-%{_target_cpu} = %{kernel} - -%description -IBM ThinkPad support kernel modules. -The following rpmbuild options can be used to build this package -for a specific kernel: ---define "kernel " - Specify the `uname -r` string of the target kernel, for example: - "kernel 2.6.6-1.435.2.3". The default is `uname -r` for the running kernel. ---target - Build for the given architecture instead of the default. - -%package %{kernel} -Summary: %{summary} -Group: System Environment/Kernel -Provides: kernel-module -Provides: %{name} = %{version}-%{release} -Obsoletes: kernel-mod-thinkpad -Requires(pre): %{_sbindir}/groupadd +BuildRequires: kernel-devel-%{_target_cpu} = %{kver} +Requires: kernel-%{_target_cpu} = %{kver} +Requires: pam >= 0.79-8 +Requires: initscripts >= 8.08-1 Requires(post): /sbin/depmod Requires(postun): /sbin/depmod -Requires: kernel-%{_target_cpu} = %{kernel} +Provides: kernel-modules + +%description +This package contains kernel modules that interface the System +Management Application Program Interface (SMAPI) BIOS found in some +ThinkPad?? laptop computers, and drivers for certain ThinkPad hardware +components. -%description %{kernel} -IBM ThinkPad support kernel modules, built for kernel -%{kernel} (%{_target_cpu}). See -%{_docdir}/%{name}-%{kernel}-%{version}/README.Fedora -for post-installation configuration instructions. +ThinkPad is a registered trademark of Lenovo in the United States, +other countries, or both. %prep @@ -53,15 +44,18 @@ %build -make %{?_smp_mflags} -C 2.6/drivers KVER=%{kernel} KSRC=%{ksrc} V=1 +make %{?_smp_mflags} -C 2.6/drivers KVER=%{kver} KSRC=%{ksrc} V=1 %install rm -rf $RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/90-thinkpad.perms +install -Dpm 755 %{SOURCE2} \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/thinkpad.modules +install -dm 755 $RPM_BUILD_ROOT%{moddir}/thinkpad # 744 to allow stripping, will be reset in %%files -install -pm 744 2.6/drivers/*.ko \ - $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad +install -pm 744 2.6/drivers/*.ko $RPM_BUILD_ROOT%{moddir}/thinkpad install -Dpm 644 man/thinkpad.4 $RPM_BUILD_ROOT%{_mandir}/man4/thinkpad.4 @@ -69,30 +63,38 @@ rm -rf $RPM_BUILD_ROOT -%post %{kernel} -/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%post +[ $1 -eq 1 ] && \ +/sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : -%postun %{kernel} -/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%postun +/sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : -%files %{kernel} +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README* SUPPORTED-MODELS TECHNOTES -%dir /lib/modules/%{kernel}/updates -%dir /lib/modules/%{kernel}/updates/thinkpad -%attr(644,root,root) /lib/modules/%{kernel}/updates/thinkpad/*.ko +%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms +%{_sysconfdir}/sysconfig/modules/thinkpad.modules +%dir %{moddir} +%dir %{moddir}/thinkpad +%attr(644,root,root) %{moddir}/thinkpad/*.ko %{_mandir}/man4/thinkpad.4* %changelog +* Fri Jul 1 2005 Ville Skytt?? - 5.8-2 +- Change towards new (in-progress) kernel module packaging guidelines. +- Automatically load modules at boot time. +- Add console.perms.d snippet, drop obsolete README.Fedora. + * Sat Apr 2 2005 Ville Skytt?? - 5.8-1 - Adjust for FC4 kernel-devel. - Drop console.perms munging, document it in README.Fedora instead. * Sat Jan 8 2005 Ville Skytt?? - 0:5.8-0.fdr.3 - Patch to work with kernel 2.6.10. -- Drop udev stuff and thinkpad group, intruduce console.perms munging. +- Drop udev stuff and thinkpad group, introduce console.perms munging. * Sun Dec 5 2004 Ville Skytt?? - 0:5.8-0.fdr.2 - Drop support for kernels < 2.6, require udev, clean up specfile. --- kernel-module-thinkpad-README.Fedora DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 11:36:44 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:36:44 -0400 Subject: rpms/pygsl - New directory Message-ID: <200507021136.j62Baiu7018487@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18463/pygsl Log Message: Directory /cvs/extras/rpms/pygsl added to the repository From fedora-extras-commits at redhat.com Sat Jul 2 11:36:44 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:36:44 -0400 Subject: rpms/pygsl/devel - New directory Message-ID: <200507021136.j62Baiwb018492@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18463/pygsl/devel Log Message: Directory /cvs/extras/rpms/pygsl/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 2 11:37:06 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:06 -0400 Subject: rpms/pygsl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507021137.j62Bb63W018535@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508 Added Files: Makefile import.log Log Message: Setup of module pygsl --- NEW FILE Makefile --- # Top level Makefile for module pygsl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 2 11:37:06 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:06 -0400 Subject: rpms/pygsl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507021137.j62Bb6xW018540@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pygsl --- NEW 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 Jul 2 11:37:56 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:56 -0400 Subject: rpms/pygsl/devel COPYING, NONE, 1.1 pygsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507021137.j62Bbu15018607@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577/devel Modified Files: .cvsignore sources Added Files: COPYING pygsl.spec Log Message: auto-import pygsl-0.3.2-4 on branch devel from pygsl-0.3.2-4.src.rpm --- NEW FILE COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE pygsl.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: GNU Scientific Library Interface for python Name: pygsl Version: 0.3.2 Release: 4%{?dist} Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: COPYING License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python python-numeric gsl >= 1.6 Url: http://pygsl.sourceforge.net BuildRequires: python-numeric gsl-devel >= 1.6 python-devel %description This project provides a python interface for the GNU scientific library (gsl) %prep %setup %build cp %{SOURCE1} . 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 ChangeLog README CREDITS doc/ examples/ %{python_sitearch}/pygsl/ %changelog * Sat Jul 2 2005 Jos?? Matos - 0.3.2-4 - Add license file from cvs. * Fri Jul 1 2005 Jose Matos - 0.3.2-3 - Remove duplicated "setup" entry. * Fri Jul 1 2005 Jose Matos - 0.3.2-2 - Clean spec file. * Thu Jun 30 2005 Jose Matos - 0.3.2-1 - New version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pygsl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2005 11:37:04 -0000 1.1 +++ .cvsignore 2 Jul 2005 11:37:54 -0000 1.2 @@ -0,0 +1 @@ +pygsl-0.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pygsl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2005 11:37:04 -0000 1.1 +++ sources 2 Jul 2005 11:37:54 -0000 1.2 @@ -0,0 +1 @@ +dde5f5a23dba8e63818dbfadb12e9a09 pygsl-0.3.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 11:37:56 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:56 -0400 Subject: rpms/pygsl import.log,1.1,1.2 Message-ID: <200507021138.j62BcQL5018620@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577 Modified Files: import.log Log Message: auto-import pygsl-0.3.2-4 on branch devel from pygsl-0.3.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pygsl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Jul 2005 11:37:04 -0000 1.1 +++ import.log 2 Jul 2005 11:37:54 -0000 1.2 @@ -0,0 +1 @@ +pygsl-0_3_2-4:HEAD:pygsl-0.3.2-4.src.rpm:1120304265 From jamatos at fc.up.pt Sat Jul 2 11:23:44 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Sat, 2 Jul 2005 12:23:44 +0100 Subject: APPROVED: pygsl Message-ID: <200507021223.45174.jamatos@fc.up.pt> Name: pygsl python interface for the GNU scientific library (gsl) Reviewer: Tom "spot" Callaway Packager: Jos? Matos -- Jos? Ab?lio From fedora-extras-commits at redhat.com Sat Jul 2 12:27:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 08:27:03 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.8, 1.9 Message-ID: <200507021227.j62CR3FP019936@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19917 Modified Files: kernel-module-thinkpad.spec Log Message: Sacrifice no-args-builds-for-current-kernel for benefit of CVS tag sanity. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kernel-module-thinkpad.spec 2 Jul 2005 11:28:48 -0000 1.8 +++ kernel-module-thinkpad.spec 2 Jul 2005 12:27:01 -0000 1.9 @@ -1,11 +1,9 @@ -%{!?kver: %define kver %(uname -r)} - %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} %define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 2.%(echo %{kver} | tr - _) +Release: 2%{?kver:.%(echo %{kver} | tr - _)} Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL From fedora-extras-commits at redhat.com Sat Jul 2 21:37:58 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:37:58 -0400 Subject: rpms/denyhosts/devel denyhosts-0.6.0-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 denyhosts.cron, 1.1, 1.2 denyhosts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507022137.j62Lbw7g031003@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30977 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Added Files: denyhosts-0.6.0-version.patch Log Message: * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. denyhosts-0.6.0-version.patch: --- NEW FILE denyhosts-0.6.0-version.patch --- --- denyhosts.py.orig 2005-07-02 16:10:46.004999307 -0500 +++ denyhosts.py 2005-07-02 16:11:18.259173082 -0500 @@ -7,7 +7,8 @@ import time import socket from types import ListType, TupleType -from version import VERSION +#from version import VERSION +VERSION = "0.6.0" global DEBUG DEBUG=0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:57:02 -0000 1.2 +++ .cvsignore 2 Jul 2005 21:37:55 -0000 1.3 @@ -1 +1 @@ -DenyHosts-0.5.5.tar.gz +DenyHosts-0.6.0.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.cron 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.cron 2 Jul 2005 21:37:55 -0000 1.2 @@ -1,2 +1,6 @@ +# This defaults to running once every ten minutes, but if your host is being +# heavily attacked then it is reasonable to make it run as frequently as once +# every minute. DenyHosts runs quickly once it has initially processed your +# logs and should not take a significant amount of CPU time. */10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.spec 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.spec 2 Jul 2005 21:37:55 -0000 1.2 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.5.5 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,6 +11,7 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Patch0: denyhosts-0.5.5-workdir.patch +Patch1: denyhosts-0.6.0-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -28,7 +29,8 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,10 @@ %{_initrddir}/denyhosts %changelog +* Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 +- Update to 0.6.0 +- Add fix for "from version import VERSION" issue. + * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:57:02 -0000 1.2 +++ sources 2 Jul 2005 21:37:55 -0000 1.3 @@ -1 +1 @@ -e5b49f8e949d3afd3bbd9d4611267dae DenyHosts-0.5.5.tar.gz +6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 21:38:49 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:38:49 -0400 Subject: rpms/denyhosts/FC-4 .cvsignore, 1.2, 1.3 denyhosts.cron, 1.1, 1.2 denyhosts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507022138.j62LcnCg031037@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31014 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Log Message: * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:57:02 -0000 1.2 +++ .cvsignore 2 Jul 2005 21:38:47 -0000 1.3 @@ -1 +1,2 @@ DenyHosts-0.5.5.tar.gz +DenyHosts-0.6.0.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.cron,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.cron 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.cron 2 Jul 2005 21:38:47 -0000 1.2 @@ -1,2 +1,6 @@ +# This defaults to running once every ten minutes, but if your host is being +# heavily attacked then it is reasonable to make it run as frequently as once +# every minute. DenyHosts runs quickly once it has initially processed your +# logs and should not take a significant amount of CPU time. */10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.spec 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.spec 2 Jul 2005 21:38:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.5.5 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,6 +11,7 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Patch0: denyhosts-0.5.5-workdir.patch +Patch1: denyhosts-0.6.0-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -28,7 +29,8 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,10 @@ %{_initrddir}/denyhosts %changelog +* Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 +- Update to 0.6.0 +- Add fix for "from version import VERSION" issue. + * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:57:02 -0000 1.2 +++ sources 2 Jul 2005 21:38:47 -0000 1.3 @@ -1 +1 @@ -e5b49f8e949d3afd3bbd9d4611267dae DenyHosts-0.5.5.tar.gz +6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 21:40:10 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:40:10 -0400 Subject: rpms/denyhosts/FC-4 denyhosts-0.6.0-version.patch,NONE,1.1 Message-ID: <200507022140.j62LeALq031081@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31058 Added Files: denyhosts-0.6.0-version.patch Log Message: Forgot to add this first. denyhosts-0.6.0-version.patch: --- NEW FILE denyhosts-0.6.0-version.patch --- --- denyhosts.py.orig 2005-07-02 16:10:46.004999307 -0500 +++ denyhosts.py 2005-07-02 16:11:18.259173082 -0500 @@ -7,7 +7,8 @@ import time import socket from types import ListType, TupleType -from version import VERSION +#from version import VERSION +VERSION = "0.6.0" global DEBUG DEBUG=0 From fedora-extras-commits at redhat.com Sat Jul 2 21:41:47 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:41:47 -0400 Subject: rpms/denyhosts/FC-3 denyhosts-0.6.0-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 denyhosts.cron, 1.1, 1.2 denyhosts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507022141.j62LflRl031128@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31102 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Added Files: denyhosts-0.6.0-version.patch Log Message: * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. denyhosts-0.6.0-version.patch: --- NEW FILE denyhosts-0.6.0-version.patch --- --- denyhosts.py.orig 2005-07-02 16:10:46.004999307 -0500 +++ denyhosts.py 2005-07-02 16:11:18.259173082 -0500 @@ -7,7 +7,8 @@ import time import socket from types import ListType, TupleType -from version import VERSION +#from version import VERSION +VERSION = "0.6.0" global DEBUG DEBUG=0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:57:02 -0000 1.2 +++ .cvsignore 2 Jul 2005 21:41:44 -0000 1.3 @@ -1 +1,2 @@ DenyHosts-0.5.5.tar.gz +DenyHosts-0.6.0.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.cron,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.cron 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.cron 2 Jul 2005 21:41:44 -0000 1.2 @@ -1,2 +1,6 @@ +# This defaults to running once every ten minutes, but if your host is being +# heavily attacked then it is reasonable to make it run as frequently as once +# every minute. DenyHosts runs quickly once it has initially processed your +# logs and should not take a significant amount of CPU time. */10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.spec 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.spec 2 Jul 2005 21:41:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.5.5 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,6 +11,7 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Patch0: denyhosts-0.5.5-workdir.patch +Patch1: denyhosts-0.6.0-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -28,7 +29,8 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,10 @@ %{_initrddir}/denyhosts %changelog +* Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 +- Update to 0.6.0 +- Add fix for "from version import VERSION" issue. + * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:57:02 -0000 1.2 +++ sources 2 Jul 2005 21:41:44 -0000 1.3 @@ -1 +1 @@ -e5b49f8e949d3afd3bbd9d4611267dae DenyHosts-0.5.5.tar.gz +6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 21:42:28 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:42:28 -0400 Subject: common tobuild,1.1719,1.1720 Message-ID: <200507022142.j62LgS9k031190@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31173 Modified Files: tobuild Log Message: request build of rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1719 retrieving revision 1.1720 diff -u -r1.1719 -r1.1720 --- tobuild 2 Jul 2005 10:46:18 -0000 1.1719 +++ tobuild 2 Jul 2005 21:42:26 -0000 1.1720 @@ -3,3 +3,4 @@ # jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel +tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 21:42:57 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:42:57 -0400 Subject: common tobuild,1.1720,1.1721 Message-ID: <200507022142.j62LgvnN031252@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31235 Modified Files: tobuild Log Message: request build of rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1720 retrieving revision 1.1721 diff -u -r1.1720 -r1.1721 --- tobuild 2 Jul 2005 21:42:26 -0000 1.1720 +++ tobuild 2 Jul 2005 21:42:55 -0000 1.1721 @@ -4,3 +4,4 @@ jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 +tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 21:43:27 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:43:27 -0400 Subject: common tobuild,1.1721,1.1722 Message-ID: <200507022143.j62LhRcl031314@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31297 Modified Files: tobuild Log Message: request build of rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1721 retrieving revision 1.1722 diff -u -r1.1721 -r1.1722 --- tobuild 2 Jul 2005 21:42:55 -0000 1.1721 +++ tobuild 2 Jul 2005 21:43:25 -0000 1.1722 @@ -5,3 +5,4 @@ jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 +tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 22:37:02 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:37:02 -0400 Subject: rpms/gnome-applet-sensors/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-sensors.spec, 1.1, 1.2 Message-ID: <200507022237.j62Mb2VY001143@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-serv1114 Modified Files: .cvsignore sources gnome-applet-sensors.spec Log Message: * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:45:56 -0000 1.2 +++ .cvsignore 2 Jul 2005 22:37:00 -0000 1.3 @@ -1 +1 @@ -sensors-applet-0.7.3.tar.gz +sensors-applet-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:45:56 -0000 1.2 +++ sources 2 Jul 2005 22:37:00 -0000 1.3 @@ -1 +1 @@ -d19c76b4ceeb51664c32d54422b45080 sensors-applet-0.7.3.tar.gz +d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-sensors.spec 20 May 2005 04:45:56 -0000 1.1 +++ gnome-applet-sensors.spec 2 Jul 2005 22:37:00 -0000 1.2 @@ -1,12 +1,12 @@ Name: gnome-applet-sensors -Version: 0.7.3 +Version: 1.0 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops License: GPL URL: http://sensors-applet.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-0.7.3.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Sat Jul 02 2005 Aaron Kurtz - 1.0-1 +- bump to stable release 1.0 + * Wed May 18 2005 Aaron Kurtz - 0.7.3-1 - Minor specfile cleanup From fedora-extras-commits at redhat.com Sat Jul 2 22:40:45 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:40:45 -0400 Subject: rpms/gnome-applet-sensors/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-sensors.spec, 1.1, 1.2 Message-ID: <200507022240.j62MejIV001653@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-serv1632 Modified Files: .cvsignore sources gnome-applet-sensors.spec Log Message: * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:45:56 -0000 1.2 +++ .cvsignore 2 Jul 2005 22:40:43 -0000 1.3 @@ -1 +1 @@ -sensors-applet-0.7.3.tar.gz +sensors-applet-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:45:56 -0000 1.2 +++ sources 2 Jul 2005 22:40:43 -0000 1.3 @@ -1 +1 @@ -d19c76b4ceeb51664c32d54422b45080 sensors-applet-0.7.3.tar.gz +d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-sensors.spec 20 May 2005 04:45:56 -0000 1.1 +++ gnome-applet-sensors.spec 2 Jul 2005 22:40:43 -0000 1.2 @@ -1,12 +1,12 @@ Name: gnome-applet-sensors -Version: 0.7.3 +Version: 1.0 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops License: GPL URL: http://sensors-applet.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-0.7.3.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Sat Jul 02 2005 Aaron Kurtz - 1.0-1 +- bump to stable release 1.0 + * Wed May 18 2005 Aaron Kurtz - 0.7.3-1 - Minor specfile cleanup From fedora-extras-commits at redhat.com Sat Jul 2 22:41:08 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:41:08 -0400 Subject: rpms/gnome-applet-sensors/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-sensors.spec, 1.1, 1.2 Message-ID: <200507022241.j62Mf8JP001680@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-serv1659 Modified Files: .cvsignore sources gnome-applet-sensors.spec Log Message: * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:45:56 -0000 1.2 +++ .cvsignore 2 Jul 2005 22:41:06 -0000 1.3 @@ -1 +1 @@ -sensors-applet-0.7.3.tar.gz +sensors-applet-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:45:56 -0000 1.2 +++ sources 2 Jul 2005 22:41:06 -0000 1.3 @@ -1 +1 @@ -d19c76b4ceeb51664c32d54422b45080 sensors-applet-0.7.3.tar.gz +d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-sensors.spec 20 May 2005 04:45:56 -0000 1.1 +++ gnome-applet-sensors.spec 2 Jul 2005 22:41:06 -0000 1.2 @@ -1,12 +1,12 @@ Name: gnome-applet-sensors -Version: 0.7.3 +Version: 1.0 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops License: GPL URL: http://sensors-applet.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-0.7.3.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Sat Jul 02 2005 Aaron Kurtz - 1.0-1 +- bump to stable release 1.0 + * Wed May 18 2005 Aaron Kurtz - 0.7.3-1 - Minor specfile cleanup From fedora-extras-commits at redhat.com Sat Jul 2 22:41:38 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:41:38 -0400 Subject: common tobuild,1.1722,1.1723 Message-ID: <200507022241.j62MfcMj001742@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1725 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1722 retrieving revision 1.1723 diff -u -r1.1722 -r1.1723 --- tobuild 2 Jul 2005 21:43:25 -0000 1.1722 +++ tobuild 2 Jul 2005 22:41:35 -0000 1.1723 @@ -6,3 +6,4 @@ tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel +dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 22:42:03 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:42:03 -0400 Subject: common tobuild,1.1723,1.1724 Message-ID: <200507022242.j62Mg33a001804@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1787 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1723 retrieving revision 1.1724 diff -u -r1.1723 -r1.1724 --- tobuild 2 Jul 2005 22:41:35 -0000 1.1723 +++ tobuild 2 Jul 2005 22:42:00 -0000 1.1724 @@ -7,3 +7,4 @@ tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 +dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 3 02:36:51 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 2 Jul 2005 22:36:51 -0400 Subject: common tobuild,1.1724,1.1725 Message-ID: <200507030236.j632api6006618@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1724 retrieving revision 1.1725 diff -u -r1.1724 -r1.1725 --- tobuild 2 Jul 2005 22:42:00 -0000 1.1724 +++ tobuild 3 Jul 2005 02:36:49 -0000 1.1725 @@ -8,3 +8,4 @@ tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 3 02:37:25 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 2 Jul 2005 22:37:25 -0400 Subject: common tobuild,1.1725,1.1726 Message-ID: <200507030237.j632bPi6006651@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6634 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1725 retrieving revision 1.1726 diff -u -r1.1725 -r1.1726 --- tobuild 3 Jul 2005 02:36:49 -0000 1.1725 +++ tobuild 3 Jul 2005 02:37:23 -0000 1.1726 @@ -9,3 +9,4 @@ dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 3 02:38:16 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 2 Jul 2005 22:38:16 -0400 Subject: common tobuild,1.1726,1.1727 Message-ID: <200507030238.j632cGbK006684@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6667 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1726 retrieving revision 1.1727 diff -u -r1.1726 -r1.1727 --- tobuild 3 Jul 2005 02:37:23 -0000 1.1726 +++ tobuild 3 Jul 2005 02:38:14 -0000 1.1727 @@ -10,3 +10,4 @@ dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 3 14:07:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 3 Jul 2005 10:07:34 -0400 Subject: rpms/gambas/devel gambas.spec,1.2,1.3 Message-ID: <200507031407.j63E7YMt025058@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019/devel Modified Files: gambas.spec Log Message: Get garbage character out of description, clean up %{_libdir} in %files. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gambas.spec 1 Jul 2005 13:50:49 -0000 1.2 +++ gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 @@ -20,7 +20,7 @@ %description Gambas is a free development environment based on a Basic interpreter -with object extensions, like Visual Basic?(but it is NOT a clone !).. +with object extensions, like Visual Basic (but it is NOT a clone !). With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL databases, pilot KDE applications with DCOP, translate your program into many languages, create network applications easily, and so @@ -95,18 +95,15 @@ %files %defattr(-, root, root, 0755) %doc README AUTHORS COPYING INSTALL README README.REDHAT TODO -%dir %{_libdir}/gambas -%{_libdir}/gambas/*.so.* -%{_libdir}/gambas/lib.gb*.component +# Normally the .so file should be in the -devel package +# However, gambas can't run without it. :P +%{_libdir}/gambas %{_bindir}/gambas %{_bindir}/gbc %{_bindir}/gba %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager -# Normally, this file should be in the -devel package -# However, gambas can't run without the .so. :P -%{_libdir}/gambas/*.so %files devel %defattr(-, root, root, 0755) From fedora-extras-commits at redhat.com Sun Jul 3 17:26:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 3 Jul 2005 13:26:04 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.9, 1.10 Message-ID: <200507031726.j63HQ41g028820@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28803 Modified Files: kernel-module-thinkpad.spec Log Message: Really drop README.Fedora, thanks to Thorsten. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kernel-module-thinkpad.spec 2 Jul 2005 12:27:01 -0000 1.9 +++ kernel-module-thinkpad.spec 3 Jul 2005 17:26:02 -0000 1.10 @@ -37,7 +37,6 @@ %prep %setup -q -n thinkpad-%{version} %patch0 -install -pm 644 %{SOURCE1} README.Fedora %{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile @@ -71,7 +70,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README* SUPPORTED-MODELS TECHNOTES +%doc AUTHORS ChangeLog COPYING README SUPPORTED-MODELS TECHNOTES %config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms %{_sysconfdir}/sysconfig/modules/thinkpad.modules %dir %{moddir} @@ -81,7 +80,7 @@ %changelog -* Fri Jul 1 2005 Ville Skytt?? - 5.8-2 +* Sun Jul 3 2005 Ville Skytt?? - 5.8-2 - Change towards new (in-progress) kernel module packaging guidelines. - Automatically load modules at boot time. - Add console.perms.d snippet, drop obsolete README.Fedora. From fedora-extras-commits at redhat.com Sun Jul 3 17:48:01 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:48:01 -0400 Subject: rpms/konversation/FC-4 konversation.spec,1.1,1.2 Message-ID: <200507031748.j63Hm19L028899@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/konversation/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28870/FC-4 Modified Files: konversation.spec Log Message: explictly define QT's Include and lib dirs so konversation will build on FC4 and devel x86_64 Index: konversation.spec =================================================================== RCS file: /cvs/extras/rpms/konversation/FC-4/konversation.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- konversation.spec 29 Jun 2005 19:44:46 -0000 1.1 +++ konversation.spec 3 Jul 2005 17:47:59 -0000 1.2 @@ -1,6 +1,6 @@ Name: konversation Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Konversation is a user friendly IRC client for KDE Group: Applications/Internet @@ -27,6 +27,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure make %{?_smp_mflags} @@ -74,6 +75,8 @@ %changelog +* Sun Jul 03 2005 Dennis Gilmore - 0.18-4 +- Explicly export QT lib and include dirs for x86_64 build issue * Tue Jun 28 2005 Dennis Gilmore - 0.18-3 - Destop-file-install, change gcc4 patch to configure remove unneeded build deps. From fedora-extras-commits at redhat.com Sun Jul 3 17:48:02 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:48:02 -0400 Subject: rpms/konversation/devel konversation.spec,1.1,1.2 Message-ID: <200507031748.j63Hm2bd028905@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/konversation/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28870/devel Modified Files: konversation.spec Log Message: explictly define QT's Include and lib dirs so konversation will build on FC4 and devel x86_64 Index: konversation.spec =================================================================== RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- konversation.spec 29 Jun 2005 19:44:46 -0000 1.1 +++ konversation.spec 3 Jul 2005 17:48:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: konversation Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Konversation is a user friendly IRC client for KDE Group: Applications/Internet @@ -27,6 +27,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure make %{?_smp_mflags} @@ -74,6 +75,8 @@ %changelog +* Sun Jul 03 2005 Dennis Gilmore - 0.18-4 +- Explicly export QT lib and include dirs for x86_64 build issue * Tue Jun 28 2005 Dennis Gilmore - 0.18-3 - Destop-file-install, change gcc4 patch to configure remove unneeded build deps. From fedora-extras-commits at redhat.com Sun Jul 3 17:49:04 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:49:04 -0400 Subject: common tobuild,1.1727,1.1728 Message-ID: <200507031749.j63Hn4v5028972@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28955 Modified Files: tobuild Log Message: request build of rpms/konversation/devel konversation-0_18-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1727 retrieving revision 1.1728 diff -u -r1.1727 -r1.1728 --- tobuild 3 Jul 2005 02:38:14 -0000 1.1727 +++ tobuild 3 Jul 2005 17:49:02 -0000 1.1728 @@ -11,3 +11,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 +ausil rpms/konversation/devel konversation-0_18-4_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 3 17:49:27 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:49:27 -0400 Subject: common tobuild,1.1728,1.1729 Message-ID: <200507031749.j63HnR5g029049@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29032 Modified Files: tobuild Log Message: request build of rpms/konversation/FC-4 konversation-0_18-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1728 retrieving revision 1.1729 diff -u -r1.1728 -r1.1729 --- tobuild 3 Jul 2005 17:49:02 -0000 1.1728 +++ tobuild 3 Jul 2005 17:49:25 -0000 1.1729 @@ -12,3 +12,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ausil rpms/konversation/devel konversation-0_18-4_fc5 devel +ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 3 18:24:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 3 Jul 2005 14:24:00 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.10, 1.11 Message-ID: <200507031824.j63IO0tA030186@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30169 Modified Files: kernel-module-thinkpad.spec Log Message: Allow building for the current kernel without specifying kver. That results in -debuginfo problems though, and I'm not sure if we need to support that anyway. But here goes at least temporarily for the record. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kernel-module-thinkpad.spec 3 Jul 2005 17:26:02 -0000 1.10 +++ kernel-module-thinkpad.spec 3 Jul 2005 18:23:58 -0000 1.11 @@ -1,9 +1,12 @@ +%{?kver: %define mkver .%(echo %{kver} | tr - _)} +%{!?kver: %define kver %(uname -r)} + %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} %define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 2%{?kver:.%(echo %{kver} | tr - _)} +Release: 2%{?mkver} Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL From fedora-extras-commits at redhat.com Mon Jul 4 05:10:41 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 01:10:41 -0400 Subject: common tobuild,1.1729,1.1730 Message-ID: <200507040510.j645AfdH011210@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11193 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1729 retrieving revision 1.1730 diff -u -r1.1729 -r1.1730 --- tobuild 3 Jul 2005 17:49:25 -0000 1.1729 +++ tobuild 4 Jul 2005 05:10:38 -0000 1.1730 @@ -13,3 +13,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ausil rpms/konversation/devel konversation-0_18-4_fc5 devel ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 +petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 05:21:44 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 4 Jul 2005 01:21:44 -0400 Subject: common tobuild,1.1730,1.1731 Message-ID: <200507040521.j645LiNN011270@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1730 retrieving revision 1.1731 diff -u -r1.1730 -r1.1731 --- tobuild 4 Jul 2005 05:10:38 -0000 1.1730 +++ tobuild 4 Jul 2005 05:21:42 -0000 1.1731 @@ -14,3 +14,4 @@ ausil rpms/konversation/devel konversation-0_18-4_fc5 devel ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 05:22:12 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 4 Jul 2005 01:22:12 -0400 Subject: common tobuild,1.1731,1.1732 Message-ID: <200507040522.j645MCka011303@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11286 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1731 retrieving revision 1.1732 diff -u -r1.1731 -r1.1732 --- tobuild 4 Jul 2005 05:21:42 -0000 1.1731 +++ tobuild 4 Jul 2005 05:22:10 -0000 1.1732 @@ -15,3 +15,4 @@ ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From petersen at redhat.com Mon Jul 4 05:39:47 2005 From: petersen at redhat.com (Jens Petersen) Date: Mon, 04 Jul 2005 14:39:47 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Message-ID: <42C8CBA3.4020703@redhat.com> Chris Ricker wrote: > On Fri, 1 Jul 2005, Jens Petersen wrote: >>-Release: 2%{?dist} >>+Release: 2%{?dist}.1 > > It'd be preferable to increment the release, rather than monkeying around > with new numbers after the dist stuff It would be preferable not to have a cvs system wh > darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a > hypothetical FC 4.1 release > > darcs-1.0.3-3.fc4 is unambiguous True, but it is greater than darcs-1.0.3-2.fc5, which I was trying to avoid. :) Jens From rc040203 at freenet.de Mon Jul 4 05:53:57 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Mon, 04 Jul 2005 07:53:57 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C8CBA3.4020703@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> Message-ID: <1120456437.6657.4.camel@mccallum.corsepiu.local> On Mon, 2005-07-04 at 14:39 +0900, Jens Petersen wrote: > Chris Ricker wrote: > > On Fri, 1 Jul 2005, Jens Petersen wrote: > >>-Release: 2%{?dist} > >>+Release: 2%{?dist}.1 > > > > It'd be preferable to increment the release, rather than monkeying around > > with new numbers after the dist stuff > > It would be preferable not to have a cvs system wh Does FE's CVS still disallow "cvs tag -F"? > > darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a > > hypothetical FC 4.1 release > > > > darcs-1.0.3-3.fc4 is unambiguous > > True, but it is greater than darcs-1.0.3-2.fc5, which I was trying > to avoid. :) "cvs tag -F" would be a work-around. It would allow shifting existing "tags" to where they you actually want them to be. Ralf From paul at city-fan.org Mon Jul 4 06:23:09 2005 From: paul at city-fan.org (Paul Howarth) Date: Mon, 04 Jul 2005 07:23:09 +0100 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <1120456437.6657.4.camel@mccallum.corsepiu.local> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> Message-ID: <1120458190.15736.161.camel@laurel.intra.city-fan.org> On Mon, 2005-07-04 at 07:53 +0200, Ralf Corsepius wrote: > On Mon, 2005-07-04 at 14:39 +0900, Jens Petersen wrote: > > Chris Ricker wrote: > > > On Fri, 1 Jul 2005, Jens Petersen wrote: > > >>-Release: 2%{?dist} > > >>+Release: 2%{?dist}.1 > > > > > > It'd be preferable to increment the release, rather than monkeying around > > > with new numbers after the dist stuff > > > > It would be preferable not to have a cvs system wh > > Does FE's CVS still disallow "cvs tag -F"? > > > > darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a > > > hypothetical FC 4.1 release > > > > > > darcs-1.0.3-3.fc4 is unambiguous > > > > True, but it is greater than darcs-1.0.3-2.fc5, which I was trying > > to avoid. :) > > "cvs tag -F" would be a work-around. It would allow shifting existing > "tags" to where they you actually want them to be. I've moved tags before; I think I did it with the -F and -r options of the tag command. Paul. -- Paul Howarth From fedora-extras-commits at redhat.com Mon Jul 4 06:36:50 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 4 Jul 2005 02:36:50 -0400 Subject: common tobuild,1.1732,1.1733 Message-ID: <200507040636.j646aoGL012629@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12612 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-3 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1732 retrieving revision 1.1733 diff -u -r1.1732 -r1.1733 --- tobuild 4 Jul 2005 05:22:10 -0000 1.1732 +++ tobuild 4 Jul 2005 06:36:47 -0000 1.1733 @@ -16,3 +16,4 @@ petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel From petersen at redhat.com Mon Jul 4 08:25:09 2005 From: petersen at redhat.com (Jens Petersen) Date: Mon, 04 Jul 2005 17:25:09 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <1120456437.6657.4.camel@mccallum.corsepiu.local> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> Message-ID: <42C8F265.5040607@redhat.com> Ralf Corsepius wrote: > "cvs tag -F" would be a work-around. It would allow shifting existing > "tags" to where they you actually want them to be. What about the case when there is no tag to move? :) darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " For more information on using the Fedora CVS repositories, please visit http://fedoraproject.org/wiki/UsingCvs cvs status: Examining . darcs/FC-4% Jens From fedora-extras-commits at redhat.com Mon Jul 4 08:42:09 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 4 Jul 2005 04:42:09 -0400 Subject: rpms/gnumeric/devel gnumeric.spec,1.3,1.4 Message-ID: <200507040842.j648g99N015679@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662 Modified Files: gnumeric.spec Log Message: Fixup BuildReqs Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnumeric.spec 17 Jun 2005 18:01:54 -0000 1.3 +++ gnumeric.spec 4 Jul 2005 08:42:06 -0000 1.4 @@ -4,7 +4,7 @@ Summary: A spreadsheet program for GNOME. Name: gnumeric Version: 1.4.3 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: Applications/Productivity @@ -25,9 +25,12 @@ BuildRequires: python-devel BuildRequires: libgsf-devel >= 1.12 BuildRequires: automake autoconf libtool -BuildRequires: intltool scrollkeeper gettext desktop-file-utils +BuildRequires: intltool scrollkeeper gettext BuildRequires: libgnomedb-devel >= 1.0.4 BuildRequires: pango-devel >= 1.4.0 +BuildRequires: gtk2-devel >= 2.2.0 +BuildRequires: libart_lgpl-devel >= 2.3.0 +BuildRequires: pygtk2-devel >= 2.6.0 Patch0: gnumeric-1.4.1-desktop.patch Patch1: gnumeric-1.4.1-excelcrash.patch Patch2: gnumeric-1.4.1-configure.patch @@ -140,6 +143,13 @@ %dir %{_libdir}/gnumeric/%{gnumeric_version} %changelog +* Mon Jul 4 2005 Hans de Goede 1.4.3-4 +- For some reason gtk2-devel no longer gets sucked in by our other + buildrequires so explicitly add it. +- libart_lgpl-devel is now needed for building, so add this. +- I also noticed in the configure output that gnumeric can + use pygtk2, so add this. + * Fri Jun 17 2005 Hans de Goede 1.4.3-3 - Add patch3: fix excell export with libgsf >= 0.12 (bugzilla #160075), Thanks to Caolan McNamara. From fedora-extras-commits at redhat.com Mon Jul 4 08:43:18 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 4 Jul 2005 04:43:18 -0400 Subject: common tobuild,1.1733,1.1734 Message-ID: <200507040843.j648hJSV015797@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1733 retrieving revision 1.1734 diff -u -r1.1733 -r1.1734 --- tobuild 4 Jul 2005 06:36:47 -0000 1.1733 +++ tobuild 4 Jul 2005 08:43:16 -0000 1.1734 @@ -17,3 +17,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel From fedora-extras-commits at redhat.com Mon Jul 4 08:48:21 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 4 Jul 2005 04:48:21 -0400 Subject: rpms/most/devel most.spec,1.7,1.8 Message-ID: <200507040848.j648mL6B015860@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15843 Modified Files: most.spec Log Message: added dist tag Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- most.spec 1 Jul 2005 12:41:26 -0000 1.7 +++ most.spec 4 Jul 2005 08:48:19 -0000 1.8 @@ -1,7 +1,7 @@ Summary: more, less, most Name: most Version: 4.10.1 -Release: 1 +Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text From fedora-extras-commits at redhat.com Mon Jul 4 08:48:45 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 4 Jul 2005 04:48:45 -0400 Subject: common tobuild,1.1734,1.1735 Message-ID: <200507040848.j648mjn8015917@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15900 Modified Files: tobuild Log Message: request build of rpms/most/devel most-4_10_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1734 retrieving revision 1.1735 diff -u -r1.1734 -r1.1735 --- tobuild 4 Jul 2005 08:43:16 -0000 1.1734 +++ tobuild 4 Jul 2005 08:48:43 -0000 1.1735 @@ -18,3 +18,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel +adrian rpms/most/devel most-4_10_1-1_fc5 devel From bugs.michael at gmx.net Mon Jul 4 09:26:49 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Mon, 4 Jul 2005 11:26:49 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C8F265.5040607@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> Message-ID: <20050704112649.3fb76c84.bugs.michael@gmx.net> On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: > Ralf Corsepius wrote: > > > "cvs tag -F" would be a work-around. It would allow shifting existing > > "tags" to where they you actually want them to be. > > What about the case when there is no tag to move? :) > > darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " > For more information on using the Fedora CVS repositories, please visit > http://fedoraproject.org/wiki/UsingCvs > cvs status: Examining . > darcs/FC-4% When there is no tag, "make tag" doesn't fail. But when you cannot tag, because the tag is occupied already, you can move it. Easy as that. Just be careful with option -F. -- Michael Schwendt Fedora Core release 5 (Development) - Linux 2.6.12-1.1411_FC5 loadavg: 1.37 1.18 1.07 From petersen at redhat.com Mon Jul 4 10:21:48 2005 From: petersen at redhat.com (Jens Petersen) Date: Mon, 04 Jul 2005 19:21:48 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <20050704112649.3fb76c84.bugs.michael@gmx.net> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> Message-ID: <42C90DBC.9070103@redhat.com> Michael Schwendt wrote: > On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: > >>Ralf Corsepius wrote: >> >>>"cvs tag -F" would be a work-around. It would allow shifting existing >>>"tags" to where they you actually want them to be. >> >>What about the case when there is no tag to move? :) >> >> darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " >> For more information on using the Fedora CVS repositories, please visit >>http://fedoraproject.org/wiki/UsingCvs >> cvs status: Examining . >> darcs/FC-4% > > When there is no tag, "make tag" doesn't fail. Errm, this is the whole point that "make tag" failed because the pre-tag checking script (or whatever it is on the server side) I assume thought that darcs-1_0_3-2_fc4 was already in use... Perhaps I was unlucky, but I suspect it is reproducible: import new package, modify spec say, run "make tag" (complains about modifications), try to "make tag" (complains tag already used, but it isn't in cvs)... Jens From bugs.michael at gmx.net Mon Jul 4 10:35:50 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Mon, 4 Jul 2005 12:35:50 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C90DBC.9070103@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> <42C90DBC.9070103@redhat.com> Message-ID: <20050704123550.1cb8ef39.bugs.michael@gmx.net> On Mon, 04 Jul 2005 19:21:48 +0900, Jens Petersen wrote: > Michael Schwendt wrote: > > On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: > > > >>Ralf Corsepius wrote: > >> > >>>"cvs tag -F" would be a work-around. It would allow shifting existing > >>>"tags" to where they you actually want them to be. > >> > >>What about the case when there is no tag to move? :) > >> > >> darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " > >> For more information on using the Fedora CVS repositories, please visit > >>http://fedoraproject.org/wiki/UsingCvs > >> cvs status: Examining . > >> darcs/FC-4% > > > > When there is no tag, "make tag" doesn't fail. > > Errm, this is the whole point that "make tag" failed because > the pre-tag checking script (or whatever it is on the server side) I assume > thought that darcs-1_0_3-2_fc4 was already in use... Errm, and then you can move it, because it is "in use", even if you don't see the tag on your checked out files. -- Michael Schwendt Fedora Core release 5 (Development) - Linux 2.6.12-1.1411_FC5 loadavg: 1.21 1.51 1.49 From fedora-extras-commits at redhat.com Mon Jul 4 10:58:34 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 4 Jul 2005 06:58:34 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.18,1.19 Message-ID: <200507041058.j64AwYeg018325@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18308 Modified Files: bittorrent.spec Log Message: * Mon Jul 04 2005 Paul Howarth 4.1.2-2 - add Provides/Obsoletes for python-khashmir for clean upgrades from split bittorrent packages Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bittorrent.spec 13 Jun 2005 13:01:12 -0000 1.18 +++ bittorrent.spec 4 Jul 2005 10:58:32 -0000 1.19 @@ -23,6 +23,9 @@ Requires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Provides: python-khashmir +Obsoletes: python-khashmir < %{version} + Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -202,15 +205,19 @@ %{_datadir}/pixmaps/bittorrent.png %changelog -* Mon Jun 13 2005 Paul Howarth 4.1.2-1%{?dist} +* Mon Jul 4 2005 Paul Howarth 4.1.2-2 +- add Provides/Obsoletes for python-khashmir for clean upgrades from split + bittorrent packages + +* Mon Jun 13 2005 Paul Howarth 4.1.2-1 - update to 4.1.2 - add gettext build requirement for translations -* Mon Jun 6 2005 Paul Howarth 4.1.1-3%{?dist} +* Mon Jun 6 2005 Paul Howarth 4.1.1-3 - don't delete user/group torrent on uninstall (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) -* Thu Jun 2 2005 Paul Howarth 4.1.1-2%{?dist} +* Thu Jun 2 2005 Paul Howarth 4.1.1-2 - tidy up description text - improved initscripts (#158273) - for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather @@ -221,23 +228,23 @@ using python's dist tools and hence doesn't include all dependencies, provide initscripts etc.; this provides a clean upgrade path to Extras -* Tue May 31 2005 Paul Howarth 4.1.1-1%{?dist} +* Tue May 31 2005 Paul Howarth 4.1.1-1 - update to 4.1.1 - add "khashmir" python library - add TRACKERLESS.txt as %%doc - add translations -* Tue May 24 2005 Paul Howarth 4.0.2-1%{?dist} +* 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 From rc040203 at freenet.de Mon Jul 4 11:06:01 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Mon, 04 Jul 2005 13:06:01 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C90DBC.9070103@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> <42C90DBC.9070103@redhat.com> Message-ID: <1120475161.6657.49.camel@mccallum.corsepiu.local> On Mon, 2005-07-04 at 19:21 +0900, Jens Petersen wrote: > > Perhaps I was unlucky, but I suspect it is reproducible: import new package, > modify spec say, run "make tag" (complains about modifications), try to > "make tag" (complains tag already used, but it isn't in cvs)... I think, I've been there - I resorted to increase the release tag and to bite the bullet of an "unnecessary" updates :( Ralf From fedora-extras-commits at redhat.com Mon Jul 4 12:40:47 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Mon, 4 Jul 2005 08:40:47 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.8,1.9 Message-ID: <200507041240.j64CelZq020720@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20703 Modified Files: galeon.spec Log Message: galeon: last rebuild failed Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- galeon.spec 30 Jun 2005 20:44:34 -0000 1.8 +++ galeon.spec 4 Jul 2005 12:40:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -98,6 +98,9 @@ %changelog +* Sat Jul 2 2005 Dams - 1.3.21 +- Rebuild + * Thu Jun 30 2005 Dams - 1.3.21 - Disabled nautilus view for FC4 - Fixed x86_64 build From fedora-extras-commits at redhat.com Mon Jul 4 12:49:04 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Mon, 4 Jul 2005 08:49:04 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.9,1.10 Message-ID: <200507041249.j64Cn411020831@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20814 Modified Files: galeon.spec Log Message: galeon: Im too stupid to make buildsys rebuild galeon Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- galeon.spec 4 Jul 2005 12:40:45 -0000 1.9 +++ galeon.spec 4 Jul 2005 12:49:02 -0000 1.10 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ From fedora-extras-commits at redhat.com Mon Jul 4 14:34:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:34:40 -0400 Subject: rpms/gambas/devel gambas.spec,1.3,1.4 Message-ID: <200507041434.j64EYeiC023790@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23773/devel Modified Files: gambas.spec Log Message: Post-approval cleanups. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 +++ gambas.spec 4 Jul 2005 14:34:38 -0000 1.4 @@ -1,15 +1,14 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf -BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel -BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel +BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -94,7 +93,7 @@ %files %defattr(-, root, root, 0755) -%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO +%doc AUTHORS COPYING INSTALL README README.REDHAT TODO # Normally the .so file should be in the -devel package # However, gambas can't run without it. :P %{_libdir}/gambas @@ -122,6 +121,10 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 +- clean up BuildRequires +- remove doubling of README in %doc + * Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 - added ExcludeArch for x86_64 and ppc From fedora-extras-commits at redhat.com Mon Jul 4 14:35:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:35:32 -0400 Subject: rpms/gambas/FC-3 gambas.spec,1.3,1.4 Message-ID: <200507041435.j64EZWsl023830@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23801/FC-3 Modified Files: gambas.spec Log Message: Update spec for new branches. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 +++ gambas.spec 4 Jul 2005 14:35:30 -0000 1.4 @@ -1,15 +1,14 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf -BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel -BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel +BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -94,7 +93,7 @@ %files %defattr(-, root, root, 0755) -%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO +%doc AUTHORS COPYING INSTALL README README.REDHAT TODO # Normally the .so file should be in the -devel package # However, gambas can't run without it. :P %{_libdir}/gambas @@ -122,6 +121,10 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 +- clean up BuildRequires +- remove doubling of README in %doc + * Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 - added ExcludeArch for x86_64 and ppc From fedora-extras-commits at redhat.com Mon Jul 4 14:35:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:35:33 -0400 Subject: rpms/gambas/FC-4 gambas.spec,1.3,1.4 Message-ID: <200507041435.j64EZXl7023836@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23801/FC-4 Modified Files: gambas.spec Log Message: Update spec for new branches. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 +++ gambas.spec 4 Jul 2005 14:35:31 -0000 1.4 @@ -1,15 +1,14 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf -BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel -BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel +BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -94,7 +93,7 @@ %files %defattr(-, root, root, 0755) -%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO +%doc AUTHORS COPYING INSTALL README README.REDHAT TODO # Normally the .so file should be in the -devel package # However, gambas can't run without it. :P %{_libdir}/gambas @@ -122,6 +121,10 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 +- clean up BuildRequires +- remove doubling of README in %doc + * Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 - added ExcludeArch for x86_64 and ppc From tcallawa at redhat.com Mon Jul 4 14:40:40 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 09:40:40 -0500 Subject: APPROVED: gambas Message-ID: <1120488040.27103.84.camel@localhost.localdomain> Name: gambas Summary: IDE based on a basic interpreter with object extensions Description: Gambas is a free development environment based on a Basic interpreter with object extensions, like Visual Basic (but it is NOT a clone !). With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL databases, pilot KDE applications with DCOP, translate your program into many languages, create network applications easily, and so on... Reviewed by: Christian Iseli Maintained by: Tom 'spot' Callaway ~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 Mon Jul 4 14:40:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:40:04 -0400 Subject: common tobuild,1.1735,1.1736 Message-ID: <200507041440.j64Ee41V023903@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23886 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-3 gambas-1_0_6-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1735 retrieving revision 1.1736 diff -u -r1.1735 -r1.1736 --- tobuild 4 Jul 2005 08:48:43 -0000 1.1735 +++ tobuild 4 Jul 2005 14:40:01 -0000 1.1736 @@ -19,3 +19,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/most/devel most-4_10_1-1_fc5 devel +spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 14:47:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:47:53 -0400 Subject: common tobuild,1.1736,1.1737 Message-ID: <200507041447.j64ElrrY024046@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24022 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-4 gambas-1_0_6-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1736 retrieving revision 1.1737 diff -u -r1.1736 -r1.1737 --- tobuild 4 Jul 2005 14:40:01 -0000 1.1736 +++ tobuild 4 Jul 2005 14:47:51 -0000 1.1737 @@ -20,3 +20,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/most/devel most-4_10_1-1_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 +spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 14:52:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:52:50 -0400 Subject: rpms/xbase - New directory Message-ID: <200507041452.j64Eqo5j024414@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24390/xbase Log Message: Directory /cvs/extras/rpms/xbase added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 14:52:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:52:51 -0400 Subject: rpms/xbase/devel - New directory Message-ID: <200507041452.j64EqpV0024419@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24390/xbase/devel Log Message: Directory /cvs/extras/rpms/xbase/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 14:53:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:53:12 -0400 Subject: rpms/xbase Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507041453.j64ErClr024466@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24435 Added Files: Makefile import.log Log Message: Setup of module xbase --- NEW FILE Makefile --- # Top level Makefile for module xbase all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 4 14:53:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:53:12 -0400 Subject: rpms/xbase/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507041453.j64ErCSB024471@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24435/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xbase --- NEW 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 Jul 4 14:54:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:54:34 -0400 Subject: rpms/xbase import.log,1.1,1.2 Message-ID: <200507041454.j64EsYCZ024533@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24502 Modified Files: import.log Log Message: auto-import xbase-2.0.0-2 on branch devel from xbase-2.0.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xbase/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2005 14:53:09 -0000 1.1 +++ import.log 4 Jul 2005 14:54:32 -0000 1.2 @@ -0,0 +1 @@ +xbase-2_0_0-2:HEAD:xbase-2.0.0-2.src.rpm:1120488924 From fedora-extras-commits at redhat.com Mon Jul 4 14:54:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:54:34 -0400 Subject: rpms/xbase/devel xbase.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507041454.j64EsYA2024540@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24502/devel Modified Files: .cvsignore sources Added Files: xbase.spec Log Message: auto-import xbase-2.0.0-2 on branch devel from xbase-2.0.0-2.src.rpm --- NEW FILE xbase.spec --- Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 Release: 2%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen %description XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library originally by Gary Kunkel and others (see the AUTHORS file). XBase is useful for accessing data in legacy dBase 3 and 4 database files as well as a general light-weight database engine. It includes support for DBF (dBase version 3 and 4) data files, NDX and NTX indexes, and DBT (dBase version 3 and 4). It supports file and record locking under *nix OS's. %package devel Summary: XBase development libraries and headers Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Headers and libraries for compiling programs that use the XBase library. %prep %setup -q %build %configure --enable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc NEWS README TODO AUTHORS COPYING ChangeLog %{_bindir}/checkndx %{_bindir}/copydbf %{_bindir}/dbfxtrct %{_bindir}/deletall %{_bindir}/dumphdr %{_bindir}/dumprecs %{_bindir}/packdbf %{_bindir}/reindex %{_bindir}/undelall %{_bindir}/zap %{_bindir}/dbfutil1 %{_libdir}/*.so.* %files devel %defattr(-, root, root, 0755) %doc docs/html %dir %{_includedir}/xbase %{_includedir}/xbase/* %{_bindir}/xbase-config %{_libdir}/libxbase.a %{_libdir}/libxbase.so %changelog * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) * Thu Jun 16 2005 Tom "spot" Callaway 2.0.0-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2005 14:53:10 -0000 1.1 +++ .cvsignore 4 Jul 2005 14:54:32 -0000 1.2 @@ -0,0 +1 @@ +xbase-2.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2005 14:53:10 -0000 1.1 +++ sources 4 Jul 2005 14:54:32 -0000 1.2 @@ -0,0 +1 @@ +9b29362031716a12491beb9f8cc882f2 xbase-2.0.0.tar.gz From tcallawa at redhat.com Mon Jul 4 15:01:32 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 10:01:32 -0500 Subject: APPROVED: xbase Message-ID: <1120489292.27103.96.camel@localhost.localdomain> Name: xbase Summary: XBase compatible database library and tools Description: XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library originally by Gary Kunkel and others (see the AUTHORS file). XBase is useful for accessing data in legacy dBase 3 and 4 database files as well as a general light-weight database engine. It includes support for DBF (dBase version 3 and 4) data files, NDX and NTX indexes, and DBT (dBase version 3 and 4). It supports file and record locking under *nix OS's. Reviewer: Adrian Reber Maintainer: Tom 'spot' Callaway ~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 Mon Jul 4 15:09:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:09:47 -0400 Subject: rpms/ebtables/FC-4 ebtables.spec,1.2,1.3 Message-ID: <200507041510.j64FAHHQ025871@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822/FC-4 Modified Files: ebtables.spec Log Message: Fix ghosted files. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 +++ ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -38,6 +38,9 @@ install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 +- actually touch ghosted files + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 - fix sysv file From fedora-extras-commits at redhat.com Mon Jul 4 15:09:46 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:09:46 -0400 Subject: rpms/ebtables/FC-3 ebtables.spec,1.2,1.3 Message-ID: <200507041510.j64FAHIW025870@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822/FC-3 Modified Files: ebtables.spec Log Message: Fix ghosted files. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebtables.spec 1 Jul 2005 16:27:10 -0000 1.2 +++ ebtables.spec 4 Jul 2005 15:09:44 -0000 1.3 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -38,6 +38,9 @@ install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 +- actually touch ghosted files + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 - fix sysv file From fedora-extras-commits at redhat.com Mon Jul 4 15:09:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:09:47 -0400 Subject: rpms/ebtables/devel ebtables.spec,1.2,1.3 Message-ID: <200507041510.j64FAIHa025872@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822/devel Modified Files: ebtables.spec Log Message: Fix ghosted files. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 +++ ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -38,6 +38,9 @@ install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 +- actually touch ghosted files + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 - fix sysv file From fedora-extras-commits at redhat.com Mon Jul 4 15:15:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:15:42 -0400 Subject: common tobuild,1.1737,1.1738 Message-ID: <200507041515.j64FFgCi025946@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25929 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1737 retrieving revision 1.1738 diff -u -r1.1737 -r1.1738 --- tobuild 4 Jul 2005 14:47:51 -0000 1.1737 +++ tobuild 4 Jul 2005 15:15:40 -0000 1.1738 @@ -21,3 +21,4 @@ adrian rpms/most/devel most-4_10_1-1_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 +spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 15:16:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:16:24 -0400 Subject: common tobuild,1.1738,1.1739 Message-ID: <200507041516.j64FGOhj026008@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25991 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1738 retrieving revision 1.1739 diff -u -r1.1738 -r1.1739 --- tobuild 4 Jul 2005 15:15:40 -0000 1.1738 +++ tobuild 4 Jul 2005 15:16:22 -0000 1.1739 @@ -22,3 +22,4 @@ spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 +spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 15:18:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:18:32 -0400 Subject: common tobuild,1.1739,1.1740 Message-ID: <200507041518.j64FIW1d026090@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26073 Modified Files: tobuild Log Message: request build of rpms/xbase/FC-3 xbase-2_0_0-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1739 retrieving revision 1.1740 diff -u -r1.1739 -r1.1740 --- tobuild 4 Jul 2005 15:16:22 -0000 1.1739 +++ tobuild 4 Jul 2005 15:18:30 -0000 1.1740 @@ -23,3 +23,4 @@ spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 +spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 15:19:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:19:04 -0400 Subject: common tobuild,1.1740,1.1741 Message-ID: <200507041519.j64FJ4To026154@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26137 Modified Files: tobuild Log Message: request build of rpms/xbase/FC-4 xbase-2_0_0-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1740 retrieving revision 1.1741 diff -u -r1.1740 -r1.1741 --- tobuild 4 Jul 2005 15:18:30 -0000 1.1740 +++ tobuild 4 Jul 2005 15:19:02 -0000 1.1741 @@ -24,3 +24,4 @@ spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 +spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 15:36:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:36:25 -0400 Subject: rpms/R/FC-3 R.spec,1.7,1.8 Message-ID: <200507041536.j64FatY8026347@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300/FC-3 Modified Files: R.spec Log Message: Fix version numbers on supplemental provides, fix postun for FC-3 spec. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- R.spec 20 Jun 2005 14:13:17 -0000 1.7 +++ R.spec 4 Jul 2005 15:36:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: R Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -19,31 +19,31 @@ # depend on one of these submodules rather than just R. These are # provided for packager convenience. Provides: R-base = %{version} -Provides: R-boot = %{version} +Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = %{version} +Provides: R-cluster = 1.10.0 Provides: R-datasets = %{version} -Provides: R-foreign = %{version} +Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = %{version} -Provides: R-lattice = %{version} +Provides: R-KernSmooth = 2.22 +Provides: R-lattice = 0.11 Provides: R-MASS = %{version} Provides: R-methods = %{version} -Provides: R-mgcv = %{version} -Provides: R-nlme = %{version} +Provides: R-mgcv = 1.3 +Provides: R-nlme = 3.1 Provides: R-nnet = %{version} -Provides: R-rpart = %{version} +Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = %{version} +Provides: R-survival = 2.18 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = %{version} +Provides: R-VR = 7.2 # Temporary fix to avoid the SNAFU of the 0.fdr.2.* release Conflicts: R-devel < %{version}-%{release} @@ -187,9 +187,6 @@ done /sbin/ldconfig -%postun -/sbin/ldconfig - # Update package indices %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null %__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null @@ -209,6 +206,9 @@ %__rm -f %{_libdir}/R/doc/html/search/index.txt fi +%postun +/sbin/ldconfig + %post -n libRmath /sbin/ldconfig @@ -216,6 +216,9 @@ /sbin/ldconfig %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.1.1-2 +- fix version numbers on supplemental package provides + * Mon Jun 20 2005 Tom "spot" Callaway 2.1.1-1 - bugfix update From fedora-extras-commits at redhat.com Mon Jul 4 15:36:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:36:26 -0400 Subject: rpms/R/devel R.spec,1.6,1.7 Message-ID: <200507041536.j64FauRL026351@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300/devel Modified Files: R.spec Log Message: Fix version numbers on supplemental provides, fix postun for FC-3 spec. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/devel/R.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- R.spec 20 Jun 2005 14:13:21 -0000 1.6 +++ R.spec 4 Jul 2005 15:36:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: R Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -19,31 +19,31 @@ # depend on one of these submodules rather than just R. These are # provided for packager convenience. Provides: R-base = %{version} -Provides: R-boot = %{version} +Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = %{version} +Provides: R-cluster = 1.10.0 Provides: R-datasets = %{version} -Provides: R-foreign = %{version} +Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = %{version} -Provides: R-lattice = %{version} +Provides: R-KernSmooth = 2.22 +Provides: R-lattice = 0.11 Provides: R-MASS = %{version} Provides: R-methods = %{version} -Provides: R-mgcv = %{version} -Provides: R-nlme = %{version} +Provides: R-mgcv = 1.3 +Provides: R-nlme = 3.1 Provides: R-nnet = %{version} -Provides: R-rpart = %{version} +Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = %{version} +Provides: R-survival = 2.18 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = %{version} +Provides: R-VR = 7.2 # Temporary fix to avoid the SNAFU of the 0.fdr.2.* release Conflicts: R-devel < %{version}-%{release} @@ -216,6 +216,9 @@ /sbin/ldconfig %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.1.1-2 +- fix version numbers on supplemental package provides + * Mon Jun 20 2005 Tom "spot" Callaway 2.1.1-1 - bugfix update From fedora-extras-commits at redhat.com Mon Jul 4 15:36:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:36:26 -0400 Subject: rpms/R/FC-4 R.spec,1.6,1.7 Message-ID: <200507041537.j64FauXV026350@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300/FC-4 Modified Files: R.spec Log Message: Fix version numbers on supplemental provides, fix postun for FC-3 spec. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- R.spec 20 Jun 2005 14:13:21 -0000 1.6 +++ R.spec 4 Jul 2005 15:36:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: R Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -19,31 +19,31 @@ # depend on one of these submodules rather than just R. These are # provided for packager convenience. Provides: R-base = %{version} -Provides: R-boot = %{version} +Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = %{version} +Provides: R-cluster = 1.10.0 Provides: R-datasets = %{version} -Provides: R-foreign = %{version} +Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = %{version} -Provides: R-lattice = %{version} +Provides: R-KernSmooth = 2.22 +Provides: R-lattice = 0.11 Provides: R-MASS = %{version} Provides: R-methods = %{version} -Provides: R-mgcv = %{version} -Provides: R-nlme = %{version} +Provides: R-mgcv = 1.3 +Provides: R-nlme = 3.1 Provides: R-nnet = %{version} -Provides: R-rpart = %{version} +Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = %{version} +Provides: R-survival = 2.18 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = %{version} +Provides: R-VR = 7.2 # Temporary fix to avoid the SNAFU of the 0.fdr.2.* release Conflicts: R-devel < %{version}-%{release} @@ -216,6 +216,9 @@ /sbin/ldconfig %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.1.1-2 +- fix version numbers on supplemental package provides + * Mon Jun 20 2005 Tom "spot" Callaway 2.1.1-1 - bugfix update From fedora-extras-commits at redhat.com Mon Jul 4 15:38:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:38:54 -0400 Subject: common tobuild,1.1741,1.1742 Message-ID: <200507041538.j64FcsrA026428@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26411 Modified Files: tobuild Log Message: request build of rpms/R/FC-3 R-2_1_1-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1741 retrieving revision 1.1742 diff -u -r1.1741 -r1.1742 --- tobuild 4 Jul 2005 15:19:02 -0000 1.1741 +++ tobuild 4 Jul 2005 15:38:52 -0000 1.1742 @@ -25,3 +25,4 @@ spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 +spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 15:39:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:39:10 -0400 Subject: common tobuild,1.1742,1.1743 Message-ID: <200507041539.j64FdAX2026510@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26493 Modified Files: tobuild Log Message: request build of rpms/R/FC-4 R-2_1_1-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1742 retrieving revision 1.1743 diff -u -r1.1742 -r1.1743 --- tobuild 4 Jul 2005 15:38:52 -0000 1.1742 +++ tobuild 4 Jul 2005 15:39:08 -0000 1.1743 @@ -26,3 +26,4 @@ spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 +spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 15:39:29 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:39:29 -0400 Subject: rpms/libevent/devel - New directory Message-ID: <200507041539.j64FdT8F026547@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26518/libevent/devel Log Message: Directory /cvs/extras/rpms/libevent/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 15:39:28 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:39:28 -0400 Subject: rpms/libevent - New directory Message-ID: <200507041539.j64FdSQ6026542@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26518/libevent Log Message: Directory /cvs/extras/rpms/libevent added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 15:40:03 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:40:03 -0400 Subject: rpms/libevent Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507041540.j64Fe3Hg026590@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563 Added Files: Makefile import.log Log Message: Setup of module libevent --- NEW FILE Makefile --- # Top level Makefile for module libevent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 4 15:40:04 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:40:04 -0400 Subject: rpms/libevent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507041540.j64Fe4rB026595@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libevent --- NEW 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 Jul 4 15:41:27 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:41:27 -0400 Subject: rpms/libevent import.log,1.1,1.2 Message-ID: <200507041541.j64FfRIP026659@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26628 Modified Files: import.log Log Message: auto-import libevent-1.1a-1 on branch devel from libevent-1.1a-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libevent/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2005 15:40:01 -0000 1.1 +++ import.log 4 Jul 2005 15:41:24 -0000 1.2 @@ -0,0 +1 @@ +libevent-1_1a-1:HEAD:libevent-1.1a-1.src.rpm:1120491656 From fedora-extras-commits at redhat.com Mon Jul 4 15:41:27 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:41:27 -0400 Subject: rpms/libevent/devel libevent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507041541.j64FfRwj026666@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26628/devel Modified Files: .cvsignore sources Added Files: libevent.spec Log Message: auto-import libevent-1.1a-1 on branch devel from libevent-1.1a-1.src.rpm --- NEW FILE libevent.spec --- Name: libevent Version: 1.1a Release: 1%{?dist} Summary: Abstract asynchronous event notification library Group: System Environment/Libraries License: BSD URL: http://monkey.org/~provos/libevent/ Source0: http://monkey.org/~provos/libevent-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. libevent is meant to replace the asynchronous event loop found in event driven network servers. An application just needs to call event_dispatch() and can then add or remove events dynamically without having to change the event loop. %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q %build %configure \ --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %check make verify %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,0755) %doc README %{_libdir}/libevent-%{version}.so.* %files devel %defattr(-,root,root,0755) %doc sample/*.c %{_includedir}/event.h %{_libdir}/libevent.so %{_libdir}/libevent.a %{_mandir}/man3/* %changelog * Fri Jun 17 2005 Ralf Ertzinger - 1.1a-1%{?dist} - Upstream update * Wed Jun 08 2005 Ralf Ertzinger - 1.1-2%{?dist} - Added some docs - Moved "make verify" into %%check * Mon Jun 06 2005 Ralf Ertzinger - 1.1-1%{?dist} - Initial build for Fedora Extras, based on the package by Dag Wieers Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libevent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2005 15:40:02 -0000 1.1 +++ .cvsignore 4 Jul 2005 15:41:25 -0000 1.2 @@ -0,0 +1 @@ +libevent-1.1a.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libevent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2005 15:40:02 -0000 1.1 +++ sources 4 Jul 2005 15:41:25 -0000 1.2 @@ -0,0 +1 @@ +6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz From fedora-extras-commits at redhat.com Mon Jul 4 15:45:13 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:45:13 -0400 Subject: rpms/libevent/devel libevent.spec,1.1,1.2 Message-ID: <200507041545.j64FjDWG026723@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26704 Modified Files: libevent.spec Log Message: Removed unnecessady -r from rm Index: libevent.spec =================================================================== RCS file: /cvs/extras/rpms/libevent/devel/libevent.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libevent.spec 4 Jul 2005 15:41:25 -0000 1.1 +++ libevent.spec 4 Jul 2005 15:45:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: libevent Version: 1.1a -Release: 1%{?dist} +Release: 2%{?dist} Summary: Abstract asynchronous event notification library Group: System Environment/Libraries @@ -42,7 +42,7 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %check make verify @@ -72,6 +72,9 @@ %changelog +* Mon Jul 04 2005 Ralf Ertzinger - 1.1a-2%{?dist} +- Removed unnecessary -r from rm + * Fri Jun 17 2005 Ralf Ertzinger - 1.1a-1%{?dist} - Upstream update From fedora-extras-commits at redhat.com Mon Jul 4 16:00:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 12:00:58 -0400 Subject: common tobuild,1.1743,1.1744 Message-ID: <200507041600.j64G0wC7026782@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1743 retrieving revision 1.1744 diff -u -r1.1743 -r1.1744 --- tobuild 4 Jul 2005 15:39:08 -0000 1.1743 +++ tobuild 4 Jul 2005 16:00:56 -0000 1.1744 @@ -27,3 +27,4 @@ spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 +spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 From ed at eh3.com Mon Jul 4 16:52:46 2005 From: ed at eh3.com (Ed Hill) Date: Mon, 04 Jul 2005 12:52:46 -0400 Subject: APPROVED: hdf5 Message-ID: <1120495966.10305.61.camel@ernie> hdf5: A general purpose library and file format for storing scientific data HDF5 is a general purpose library and file format for storing scientific data. HDF5 can store two primary objects: datasets and groups. A dataset is essentially a multidimensional array of data elements, and a group is a structure for organizing objects in an HDF5 file. Using these two basic objects, one can create and store almost any kind of scientific data structure, such as images, arrays of vectors, and structured and unstructured grids. You can also mix and match them in HDF5 files according to your needs. Maintainer: Orion Poplawski Reviewers: Tom 'spot' Callaway, Ed Hill [ And yes, Tom wrote part of the spec and perhaps ought to be listed as a co-author rather than reviewer. Whatever. ;-) ] -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From ed at eh3.com Mon Jul 4 16:55:52 2005 From: ed at eh3.com (Ed Hill) Date: Mon, 04 Jul 2005 12:55:52 -0400 Subject: APPROVED: R-hdf5 Message-ID: <1120496152.10305.66.camel@ernie> R-hdf5 provides an interface to the NCSA HDF5 library for R. Maintainer: Tom 'spot' Callaway Reviewer: Ed Hill -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Mon Jul 4 17:03:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:03:40 -0400 Subject: rpms/R-hdf5 - New directory Message-ID: <200507041703.j64H3eMf029227@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29217/R-hdf5 Log Message: Directory /cvs/extras/rpms/R-hdf5 added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 17:04:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:04:00 -0400 Subject: rpms/R-hdf5/devel - New directory Message-ID: <200507041704.j64H40PL029239@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29217/R-hdf5/devel Log Message: Directory /cvs/extras/rpms/R-hdf5/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 17:04:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:04:40 -0400 Subject: rpms/R-hdf5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507041704.j64H4e6T029289@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-hdf5 --- NEW 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 Jul 4 17:04:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:04:36 -0400 Subject: rpms/R-hdf5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507041704.j64H4apR029276@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262 Added Files: Makefile import.log Log Message: Setup of module R-hdf5 --- NEW FILE Makefile --- # Top level Makefile for module R-hdf5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 4 17:06:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:06:29 -0400 Subject: rpms/R-hdf5 import.log,1.1,1.2 Message-ID: <200507041706.j64H6TTQ029366@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329 Modified Files: import.log Log Message: auto-import R-hdf5-1.6.0-1 on branch devel from R-hdf5-1.6.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/R-hdf5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2005 17:04:34 -0000 1.1 +++ import.log 4 Jul 2005 17:06:14 -0000 1.2 @@ -0,0 +1 @@ +R-hdf5-1_6_0-1:HEAD:R-hdf5-1.6.0-1.src.rpm:1120496820 From fedora-extras-commits at redhat.com Mon Jul 4 17:06:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:06:29 -0400 Subject: rpms/R-hdf5/devel R-hdf5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507041706.j64H6TcW029364@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329/devel Modified Files: .cvsignore sources Added Files: R-hdf5.spec Log Message: auto-import R-hdf5-1.6.0-1 on branch devel from R-hdf5-1.6.0-1.src.rpm --- NEW FILE R-hdf5.spec --- %define packrel 0 %define packname hdf5 Name: R-%{packname} Version: 1.6.0 Release: 1%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: GPL version 2 or later URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: Interface to the NCSA HDF5 library BuildRequires: R-devel, tetex-latex, hdf5-devel, zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description R package: Interface to the NCSA HDF5 library %prep %setup -T -c -a 0 %build cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library %{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css %clean rm -rf $RPM_BUILD_ROOT %post %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %doc DESCRIPTION %{_libdir}/R/library/%{packname} %changelog * Mon Jul 4 2005 Tom "spot" Callaway 1.6.0-1 - Initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-hdf5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2005 17:04:38 -0000 1.1 +++ .cvsignore 4 Jul 2005 17:06:14 -0000 1.2 @@ -0,0 +1 @@ +hdf5_1.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-hdf5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2005 17:04:38 -0000 1.1 +++ sources 4 Jul 2005 17:06:14 -0000 1.2 @@ -0,0 +1 @@ +f5d078882fc20f6755c625e12df0a10b hdf5_1.6.0.tar.gz From fedora-extras-commits at redhat.com Mon Jul 4 17:09:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:09:48 -0400 Subject: rpms/ebtables/devel ebtables.spec,1.3,1.4 Message-ID: <200507041709.j64H9mYO029685@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29638/devel Modified Files: ebtables.spec Log Message: Buildsystem error requires release increment. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 +++ ebtables.spec 4 Jul 2005 17:09:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -71,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-7 +- buildsystem error requires artificial release bump + * Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 - actually touch ghosted files From fedora-extras-commits at redhat.com Mon Jul 4 17:09:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:09:43 -0400 Subject: rpms/ebtables/FC-3 ebtables.spec,1.3,1.4 Message-ID: <200507041710.j64HADmm029688@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29638/FC-3 Modified Files: ebtables.spec Log Message: Buildsystem error requires release increment. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ebtables.spec 4 Jul 2005 15:09:44 -0000 1.3 +++ ebtables.spec 4 Jul 2005 17:09:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -71,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-7 +- buildsystem error requires artificial release bump + * Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 - actually touch ghosted files From fedora-extras-commits at redhat.com Mon Jul 4 17:09:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:09:43 -0400 Subject: rpms/ebtables/FC-4 ebtables.spec,1.3,1.4 Message-ID: <200507041710.j64HADAN029691@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29638/FC-4 Modified Files: ebtables.spec Log Message: Buildsystem error requires release increment. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 +++ ebtables.spec 4 Jul 2005 17:09:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -71,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-7 +- buildsystem error requires artificial release bump + * Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 - actually touch ghosted files From fedora-extras-commits at redhat.com Mon Jul 4 17:11:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:11:24 -0400 Subject: common tobuild,1.1744,1.1745 Message-ID: <200507041711.j64HBOX4029754@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29737 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1744 retrieving revision 1.1745 diff -u -r1.1744 -r1.1745 --- tobuild 4 Jul 2005 16:00:56 -0000 1.1744 +++ tobuild 4 Jul 2005 17:11:22 -0000 1.1745 @@ -28,3 +28,4 @@ spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 +spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 17:11:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:11:52 -0400 Subject: common tobuild,1.1745,1.1746 Message-ID: <200507041711.j64HBqiH029816@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29799 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1745 retrieving revision 1.1746 diff -u -r1.1745 -r1.1746 --- tobuild 4 Jul 2005 17:11:22 -0000 1.1745 +++ tobuild 4 Jul 2005 17:11:50 -0000 1.1746 @@ -29,3 +29,4 @@ spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 +spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 17:12:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:12:30 -0400 Subject: common tobuild,1.1746,1.1747 Message-ID: <200507041712.j64HCUZi029844@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29827 Modified Files: tobuild Log Message: cleaning up my trash. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1746 retrieving revision 1.1747 diff -u -r1.1746 -r1.1747 --- tobuild 4 Jul 2005 17:11:50 -0000 1.1746 +++ tobuild 4 Jul 2005 17:12:28 -0000 1.1747 @@ -27,6 +27,5 @@ spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 -spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 17:29:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 4 Jul 2005 13:29:48 -0400 Subject: devel/libassuan libassuan.spec,1.9,1.10 Message-ID: <200507041729.j64HTnS5029925@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/libassuan In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29908 Modified Files: libassuan.spec Log Message: * Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 - Build PIC only for x86_64. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/devel/libassuan/libassuan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 +++ libassuan.spec 4 Jul 2005 17:29:46 -0000 1.10 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ @@ -18,6 +18,7 @@ Group: Development/Libraries Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description devel This is the IPC library used by GnuPG 1.9, GPGME and a few other packages. @@ -30,9 +31,12 @@ %build +%ifarch x86_64 +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%endif %configure -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -78,6 +82,9 @@ %changelog +* Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 +- Build PIC only for x86_64. + * Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 - 0.6.10, macro patch no longer needed (#162262). From fedora-extras-commits at redhat.com Mon Jul 4 17:31:22 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 4 Jul 2005 13:31:22 -0400 Subject: common tobuild,1.1747,1.1748 Message-ID: <200507041731.j64HVMO1029993@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29976 Modified Files: tobuild Log Message: request build of rpms/libassuan/devel libassuan-0_6_10-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1747 retrieving revision 1.1748 diff -u -r1.1747 -r1.1748 --- tobuild 4 Jul 2005 17:12:28 -0000 1.1747 +++ tobuild 4 Jul 2005 17:31:20 -0000 1.1748 @@ -29,3 +29,4 @@ spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 +mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel From ivazquez at ivazquez.net Mon Jul 4 18:34:03 2005 From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams) Date: Mon, 04 Jul 2005 14:34:03 -0400 Subject: common tobuild,1.1704,1.1705 In-Reply-To: <200507020349.j623nisF006644@cvs-int.fedora.redhat.com> References: <200507020349.j623nisF006644@cvs-int.fedora.redhat.com> Message-ID: <1120502043.15363.31.camel@ignacio.ignacio.lan> On Fri, 2005-07-01 at 23:49 -0400, Ralf Cors?pius wrote: > Author: corsepiu > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6625 > > Modified Files: > tobuild > Log Message: > request build of rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 for fc3 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.1704 > retrieving revision 1.1705 > diff -u -r1.1704 -r1.1705 > --- tobuild 2 Jul 2005 03:49:01 -0000 1.1704 > +++ tobuild 2 Jul 2005 03:49:42 -0000 1.1705 > @@ -1,23 +1 @@ > -# this is the build control file. the format is > -# user repo tag target status > -# > - [...] > - [...] > - [...] > - [...] > - [...] Whoops. If anyone was wondering why their packages aren't building, this is why. -- Ignacio Vazquez-Abrams http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Mon Jul 4 18:33:38 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 14:33:38 -0400 Subject: common tobuild,1.1748,1.1749 Message-ID: <200507041833.j64IXcrR031178@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31161 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1748 retrieving revision 1.1749 diff -u -r1.1748 -r1.1749 --- tobuild 4 Jul 2005 17:31:20 -0000 1.1748 +++ tobuild 4 Jul 2005 18:33:36 -0000 1.1749 @@ -30,3 +30,4 @@ spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 21:19:54 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 4 Jul 2005 17:19:54 -0400 Subject: common tobuild,1.1749,1.1750 Message-ID: <200507042119.j64LJsD3002374@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2357 Modified Files: tobuild Log Message: request build of rpms/cln/devel cln-1_1_9-8_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1749 retrieving revision 1.1750 diff -u -r1.1749 -r1.1750 --- tobuild 4 Jul 2005 18:33:36 -0000 1.1749 +++ tobuild 4 Jul 2005 21:19:52 -0000 1.1750 @@ -31,3 +31,4 @@ spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 21:29:02 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 4 Jul 2005 17:29:02 -0400 Subject: common tobuild,1.1750,1.1751 Message-ID: <200507042129.j64LT2PD002462@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2445 Modified Files: tobuild Log Message: request build of rpms/octave/devel octave-2_1_71-11_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1750 retrieving revision 1.1751 diff -u -r1.1750 -r1.1751 --- tobuild 4 Jul 2005 21:19:52 -0000 1.1750 +++ tobuild 4 Jul 2005 21:29:00 -0000 1.1751 @@ -32,3 +32,4 @@ mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel +qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 21:45:53 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 4 Jul 2005 17:45:53 -0400 Subject: common tobuild,1.1751,1.1752 Message-ID: <200507042145.j64LjrTl002506@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2489 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1751 retrieving revision 1.1752 diff -u -r1.1751 -r1.1752 --- tobuild 4 Jul 2005 21:29:00 -0000 1.1751 +++ tobuild 4 Jul 2005 21:45:50 -0000 1.1752 @@ -1,13 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel -jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel -tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 -tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 -tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel -dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 -dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 22:52:48 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 18:52:48 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.1,1.2 Message-ID: <200507042252.j64MqmIa004202@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/devel Modified Files: mod_suphp.spec Log Message: added correct -n target to %setup Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_suphp.spec 30 Jun 2005 20:21:49 -0000 1.1 +++ mod_suphp.spec 4 Jul 2005 22:52:46 -0000 1.2 @@ -25,7 +25,7 @@ process executing the PHP interpreter. %prep -%setup -q +%setup -q -n suphp-%{version} %build %configure \ From fedora-extras-commits at redhat.com Mon Jul 4 22:54:35 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 18:54:35 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.2,1.3 Message-ID: <200507042254.j64MsZo8004257@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4240 Modified Files: mod_suphp.spec Log Message: bumped release. Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_suphp.spec 4 Jul 2005 22:52:46 -0000 1.2 +++ mod_suphp.spec 4 Jul 2005 22:54:33 -0000 1.3 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,6 +66,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 +- Added correct name to %setup macro + * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Mon Jul 4 22:55:07 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 18:55:07 -0400 Subject: common tobuild,1.1752,1.1753 Message-ID: <200507042255.j64Mt7Yb004319@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1752 retrieving revision 1.1753 diff -u -r1.1752 -r1.1753 --- tobuild 4 Jul 2005 21:45:50 -0000 1.1752 +++ tobuild 4 Jul 2005 22:55:05 -0000 1.1753 @@ -26,3 +26,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 23:27:32 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Mon, 4 Jul 2005 19:27:32 -0400 Subject: rpms/balsa/devel .cvsignore, 1.4, 1.5 balsa.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507042327.j64NRWF1005471@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5450 Modified Files: .cvsignore balsa.spec sources Log Message: - update to upstream version 2.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Jun 2005 22:30:17 -0000 1.4 +++ .cvsignore 4 Jul 2005 23:27:30 -0000 1.5 @@ -1,2 +1,2 @@ +balsa-2.3.4.tar.bz2 gmime-2.1.14.tar.bz2 -balsa-2.3.3.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- balsa.spec 14 Jun 2005 17:22:11 -0000 1.7 +++ balsa.spec 4 Jul 2005 23:27:30 -0000 1.8 @@ -2,7 +2,7 @@ %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings --with-ssl --with-gss Name: balsa -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: Mail Client @@ -29,16 +29,20 @@ BuildRequires: desktop-file-utils %description -Balsa is an e-mail reader. This client is part of the GNOME -desktop environment. It supports local mailboxes, POP3 and -IMAP. +Balsa is a GNOME email client which supports mbox, maildir, and mh +local mailboxes, and IMAP4 and POP3 remote mailboxes. Email can be +sent via sendmail or SMTP. Optional multithreading support allows for +non-intrusive retrieval and sending of mail. A finished GUI similar to +that of the Eudora email client supports viewing images inline, saving +message parts, viewing headers, adding attachments, moving messages, +and printing messages. %prep %setup -q -D -a 1 %build -dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-shared && make install; cd $dir +dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-gtk-doc --disable-shared && make install; cd $dir export PKG_CONFIG_PATH="gmime-%{gmimever}:$PKG_CONFIG_PATH" %configure %{config_opts} @@ -89,6 +93,9 @@ %changelog +* Tue Jul 5 2005 Pawel Salek - 2.3.4 +- update to upstream version 2.3.4 + * Tue Jun 14 2005 Pawel Salek - 2.3.3 - directory ownership cleanup (credit to Michael Schwendt). Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Jun 2005 22:30:17 -0000 1.4 +++ sources 4 Jul 2005 23:27:30 -0000 1.5 @@ -1,2 +1,2 @@ +12b1ffb936ac679468adb33b422b72d8 balsa-2.3.4.tar.bz2 ee1c2d0c1f76ae113f0dd70893bbacf4 gmime-2.1.14.tar.bz2 -ac43ab8ca5ccc6782daac21e370b8605 balsa-2.3.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 4 23:32:38 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Mon, 4 Jul 2005 19:32:38 -0400 Subject: common tobuild,1.1753,1.1754 Message-ID: <200507042332.j64NWc3t005528@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5511 Modified Files: tobuild Log Message: request build of rpms/balsa/devel balsa-2_3_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1753 retrieving revision 1.1754 diff -u -r1.1753 -r1.1754 --- tobuild 4 Jul 2005 22:55:05 -0000 1.1753 +++ tobuild 4 Jul 2005 23:32:36 -0000 1.1754 @@ -27,3 +27,4 @@ qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel +pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel From tcallawa at redhat.com Tue Jul 5 00:27:08 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 19:27:08 -0500 Subject: APPROVED: wv2 Message-ID: <1120523228.30349.9.camel@localhost.localdomain> Name: wv2 Summary: A library which allows access to Microsoft? Word files Description: wv is a library which allows access to Microsoft? Word files. It can load and parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known internally as Word 9, 8, 7 and 6.) There is some support for reading earlier formats as well: Word 2 docs are converted to plaintext. Reviewer: Tom 'spot' Callaway Maintainer: Andreas Bierfert ~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 tcallawa at redhat.com Tue Jul 5 00:28:27 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 19:28:27 -0500 Subject: APPROVED: libpqxx Message-ID: <1120523307.30349.12.camel@localhost.localdomain> Name: libpqxx Summary: C++ client API for PostgreSQL Description: C++ client API for PostgreSQL. The standard front-end (in the sense of "language binding") for writing C++ programs that use PostgreSQL. Supersedes older libpq++ interface. Reviewer: Tom 'spot' Callaway Maintainer: Andreas Bierfert ~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 Tue Jul 5 00:33:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 4 Jul 2005 20:33:03 -0400 Subject: devel/gai-temp gai-temp.spec,1.5,1.6 Message-ID: <200507050033.j650X3lH006759@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/gai-temp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6742 Modified Files: gai-temp.spec Log Message: fix typo in changelog - unimportant, but should not make it into a future update Index: gai-temp.spec =================================================================== RCS file: /cvs/extras/devel/gai-temp/gai-temp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gai-temp.spec 28 Jun 2005 16:11:04 -0000 1.5 +++ gai-temp.spec 5 Jul 2005 00:33:01 -0000 1.6 @@ -44,7 +44,7 @@ %changelog * Tue Jun 28 2005 Michael Schwendt -- remove work-around from 1.0.3-5 again, bug has been fixed +- remove work-around from 0.1.1-2 again, bug has been fixed * Mon Jun 27 2005 Michael Schwendt - 0.1.1-2 - temporarily add BR libpng-devel to work around a broken From fedora-extras-commits at redhat.com Tue Jul 5 00:45:49 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 20:45:49 -0400 Subject: rpms/scim/devel .cvsignore, 1.3, 1.4 scim.spec, 1.4, 1.5 sources, 1.3, 1.4 xinput-scim, 1.2, 1.3 Message-ID: <200507050045.j650jn9B006856@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833 Modified Files: .cvsignore scim.spec sources xinput-scim Log Message: - update to 1.3.2 test release - don't set xinput.d script executable - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 May 2005 01:35:21 -0000 1.3 +++ .cvsignore 5 Jul 2005 00:45:47 -0000 1.4 @@ -1 +1 @@ -scim-1.2.3.tar.gz +scim-1.3.2.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim.spec 20 Jun 2005 14:39:21 -0000 1.4 +++ scim.spec 5 Jul 2005 00:45:47 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -10,7 +10,7 @@ Source1: xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: %{_bindir}/update-gtk-immodules +PreReq: %{_bindir}/update-gtk-immodules BuildRequires: gtk2-devel, desktop-file-utils %description @@ -66,7 +66,7 @@ # install xinput config file. mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d -install -pm 755 %{SOURCE1} \ +install -pm 644 %{SOURCE1} \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim @@ -134,6 +134,11 @@ %changelog +* Tue Jul 5 2005 Jens Petersen - 1.3.2-1 +- update to 1.3.2 test release +- don't set xinput.d script executable +- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script + * Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 - Remove one of doubled capplets for setup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 May 2005 01:35:21 -0000 1.3 +++ sources 5 Jul 2005 00:45:47 -0000 1.4 @@ -1 +1 @@ -9031648718cbeb10aea879726f0e9d5b scim-1.2.3.tar.gz +94a808c6a2d952d7842a4e9bfe71a7bc scim-1.3.2.tar.gz Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xinput-scim 20 Jun 2005 14:39:21 -0000 1.2 +++ xinput-scim 5 Jul 2005 00:45:47 -0000 1.3 @@ -1,6 +1,5 @@ -XMODIFIERS=@im=SCIM XIM=SCIM XIM_PROGRAM=scim XIM_ARGS="-d" GTK_IM_MODULE=scim -QT_IM_MODULES=scim +#QT_IM_MODULE=scim From fedora-extras-commits at redhat.com Tue Jul 5 00:46:22 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 20:46:22 -0400 Subject: common tobuild,1.1754,1.1755 Message-ID: <200507050046.j650kMq3006918@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901 Modified Files: tobuild Log Message: request build of rpms/scim/devel scim-1_3_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1754 retrieving revision 1.1755 diff -u -r1.1754 -r1.1755 --- tobuild 4 Jul 2005 23:32:36 -0000 1.1754 +++ tobuild 5 Jul 2005 00:46:20 -0000 1.1755 @@ -28,3 +28,4 @@ qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel +petersen rpms/scim/devel scim-1_3_2-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 03:07:24 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 23:07:24 -0400 Subject: rpms/darcs/devel darcs.spec,1.2,1.3 Message-ID: <200507050307.j6537sT7010311@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253 Modified Files: darcs.spec Log Message: drop superfluous doc buildrequires (Karanbir Singh, #162436) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- darcs.spec 1 Jul 2005 05:26:47 -0000 1.2 +++ darcs.spec 5 Jul 2005 03:07:21 -0000 1.3 @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel -# for documentation -BuildRequires: tetex-latex, tetex-dvips, latex2html # for make check BuildRequires: which @@ -85,6 +83,9 @@ %changelog +* Tue Jul 5 2005 Jens Petersen +- drop superfluous doc buildrequires (Karanbir Singh, #162436) + * Fri Jul 1 2005 Jens Petersen - 1.0.3-2 - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and From fedora-extras-commits at redhat.com Tue Jul 5 03:11:17 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 23:11:17 -0400 Subject: rpms/darcs/FC-4 darcs.spec,1.3,1.4 Message-ID: <200507050311.j653BH0w010340@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10323 Modified Files: darcs.spec Log Message: drop superfluous doc buildrequires (Karanbir Singh, #162436) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 +++ darcs.spec 5 Jul 2005 03:11:15 -0000 1.4 @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel -# for documentation -BuildRequires: tetex-latex, tetex-dvips, latex2html # for make check BuildRequires: which @@ -85,6 +83,9 @@ %changelog +* Tue Jul 5 2005 Jens Petersen +- drop superfluous doc buildrequires (Karanbir Singh, #162436) + * Fri Jul 1 2005 Jens Petersen - 1.0.3-2 - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and From fedora-extras-commits at redhat.com Tue Jul 5 03:12:22 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 23:12:22 -0400 Subject: rpms/darcs/FC-3 darcs.spec,1.2,1.3 Message-ID: <200507050312.j653CMcv010368@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10351 Modified Files: darcs.spec Log Message: drop superfluous doc buildrequires (Karanbir Singh, #162436) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-3/darcs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- darcs.spec 1 Jul 2005 12:19:43 -0000 1.2 +++ darcs.spec 5 Jul 2005 03:12:20 -0000 1.3 @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel -# for documentation -BuildRequires: tetex-latex, tetex-dvips, latex2html # for make check BuildRequires: which @@ -85,6 +83,9 @@ %changelog +* Tue Jul 5 2005 Jens Petersen +- drop superfluous doc buildrequires (Karanbir Singh, #162436) + * Fri Jul 1 2005 Jens Petersen - 1.0.3-2 - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and From petersen at redhat.com Tue Jul 5 03:44:44 2005 From: petersen at redhat.com (Jens Petersen) Date: Tue, 05 Jul 2005 12:44:44 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <20050704123550.1cb8ef39.bugs.michael@gmx.net> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> <42C90DBC.9070103@redhat.com> <20050704123550.1cb8ef39.bugs.michael@gmx.net> Message-ID: <42CA022C.2040808@redhat.com> Michael Schwendt wrote: > On Mon, 04 Jul 2005 19:21:48 +0900, Jens Petersen wrote: > > >>Michael Schwendt wrote: >> >>>On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: >>> >>> >>>>Ralf Corsepius wrote: >>>> >>>> >>>>>"cvs tag -F" would be a work-around. It would allow shifting existing >>>>>"tags" to where they you actually want them to be. >>>> >>>>What about the case when there is no tag to move? :) >>>> >>>>darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " >>>>For more information on using the Fedora CVS repositories, please visit >>>>http://fedoraproject.org/wiki/UsingCvs >>>>cvs status: Examining . >>>>darcs/FC-4% >>> >>>When there is no tag, "make tag" doesn't fail. > > Errm, and then you can move it, because it is "in use", even if > you don't see the tag on your checked out files. Ok, thanks for setting me straight. :) But I'd still really rather not fiddle around with -F. I think this discussion leads to the conclusion that it would be really useful to have a "force-tag" target in Makefile.common, which does the -F invocation for one. (I can say off-the-record that it has proved invaluable under fedora core development.;) Jens Jens From fedora-extras-commits at redhat.com Tue Jul 5 06:26:27 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 02:26:27 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.19,1.20 Message-ID: <200507050626.j656QRkY013781@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13764 Modified Files: bittorrent.spec Log Message: Update release prior to requesting build Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bittorrent.spec 4 Jul 2005 10:58:32 -0000 1.19 +++ bittorrent.spec 5 Jul 2005 06:26:25 -0000 1.20 @@ -5,7 +5,7 @@ Name: bittorrent Version: 4.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet From fedora-extras-commits at redhat.com Tue Jul 5 06:27:05 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 02:27:05 -0400 Subject: common tobuild,1.1755,1.1756 Message-ID: <200507050627.j656R59e013838@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13821 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1755 retrieving revision 1.1756 diff -u -r1.1755 -r1.1756 --- tobuild 5 Jul 2005 00:46:20 -0000 1.1755 +++ tobuild 5 Jul 2005 06:27:03 -0000 1.1756 @@ -29,3 +29,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel petersen rpms/scim/devel scim-1_3_2-1_fc5 devel +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 08:51:31 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 04:51:31 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.20,1.21 Message-ID: <200507050851.j658pV8d016918@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16901 Modified Files: bittorrent.spec Log Message: * Tue Jul 5 2005 Paul Howarth 4.1.2-3 - obsolete python-khashmir based on version-release, not just version Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bittorrent.spec 5 Jul 2005 06:26:25 -0000 1.20 +++ bittorrent.spec 5 Jul 2005 08:51:29 -0000 1.21 @@ -5,7 +5,7 @@ Name: bittorrent Version: 4.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -24,7 +24,7 @@ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Provides: python-khashmir -Obsoletes: python-khashmir < %{version} +Obsoletes: python-khashmir < %{version}-%{release} Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig @@ -205,6 +205,9 @@ %{_datadir}/pixmaps/bittorrent.png %changelog +* Tue Jul 5 2005 Paul Howarth 4.1.2-3 +- obsolete python-khashmir based on version-release, not just version + * Mon Jul 4 2005 Paul Howarth 4.1.2-2 - add Provides/Obsoletes for python-khashmir for clean upgrades from split bittorrent packages From fedora-extras-commits at redhat.com Tue Jul 5 10:20:50 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Tue, 5 Jul 2005 06:20:50 -0400 Subject: common tobuild,1.1756,1.1757 Message-ID: <200507051020.j65AKowQ019260@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1756 retrieving revision 1.1757 diff -u -r1.1756 -r1.1757 --- tobuild 5 Jul 2005 06:27:03 -0000 1.1756 +++ tobuild 5 Jul 2005 10:20:48 -0000 1.1757 @@ -30,3 +30,4 @@ pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel petersen rpms/scim/devel scim-1_3_2-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 10:45:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:45:37 -0400 Subject: rpms/wv2/FC-4 wv2.spec,1.1,1.2 Message-ID: <200507051045.j65Ajbjh019376@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19359 Modified Files: wv2.spec Log Message: - add dist tag Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/FC-4/wv2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wv2.spec 1 Jul 2005 22:40:29 -0000 1.1 +++ wv2.spec 5 Jul 2005 10:45:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 4 +Release: 5{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries @@ -67,6 +67,9 @@ %{_includedir}/wv2 %changelog +* Tue Jul 05 2005 Andreas Bierfert 0.2.2-5 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 - add some Requires for the devel package - changed some files around From fedora-extras-commits at redhat.com Tue Jul 5 10:46:17 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:46:17 -0400 Subject: rpms/wv2/FC-4 wv2.spec,1.2,1.3 Message-ID: <200507051046.j65AkHek019401@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384 Modified Files: wv2.spec Log Message: - fix typo Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/FC-4/wv2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wv2.spec 5 Jul 2005 10:45:35 -0000 1.2 +++ wv2.spec 5 Jul 2005 10:46:15 -0000 1.3 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 5{?dist} +Release: 5%{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Jul 5 10:47:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:47:10 -0400 Subject: common tobuild,1.1757,1.1758 Message-ID: <200507051047.j65AlAWn019463@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19446 Modified Files: tobuild Log Message: request build of rpms/wv2/FC-4 wv2-0_2_2-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1757 retrieving revision 1.1758 diff -u -r1.1757 -r1.1758 --- tobuild 5 Jul 2005 10:20:48 -0000 1.1757 +++ tobuild 5 Jul 2005 10:47:08 -0000 1.1758 @@ -31,3 +31,4 @@ petersen rpms/scim/devel scim-1_3_2-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 10:47:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:47:42 -0400 Subject: rpms/wv2/devel wv2.spec,1.1,1.2 Message-ID: <200507051047.j65Alg1u019488@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19469 Modified Files: wv2.spec Log Message: - add dist tag Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wv2.spec 1 Jul 2005 22:40:29 -0000 1.1 +++ wv2.spec 5 Jul 2005 10:47:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 4 +Release: 5%{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries @@ -67,6 +67,9 @@ %{_includedir}/wv2 %changelog +* Tue Jul 05 2005 Andreas Bierfert 0.2.2-5 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 - add some Requires for the devel package - changed some files around From fedora-extras-commits at redhat.com Tue Jul 5 10:48:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:48:14 -0400 Subject: common tobuild,1.1758,1.1759 Message-ID: <200507051048.j65AmEmk019553@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19535 Modified Files: tobuild Log Message: request build of rpms/wv2/devel wv2-0_2_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1758 retrieving revision 1.1759 diff -u -r1.1758 -r1.1759 --- tobuild 5 Jul 2005 10:47:08 -0000 1.1758 +++ tobuild 5 Jul 2005 10:48:12 -0000 1.1759 @@ -32,3 +32,4 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 +awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 10:49:05 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 06:49:05 -0400 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.1,1.2 Message-ID: <200507051049.j65An5Ri019612@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19595 Modified Files: mod_suphp.spec Log Message: bumped release Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-3/mod_suphp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_suphp.spec 30 Jun 2005 20:21:49 -0000 1.1 +++ mod_suphp.spec 5 Jul 2005 10:49:02 -0000 1.2 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -25,7 +25,7 @@ process executing the PHP interpreter. %prep -%setup -q +%setup -q -n suphp-%{version} %build %configure \ @@ -66,6 +66,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 +- Added correct name to %setup macro + * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 10:49:35 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:49:35 -0400 Subject: rpms/libpqxx/FC-4 libpqxx.spec,1.1,1.2 Message-ID: <200507051049.j65AnZ0A019670@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19653 Modified Files: libpqxx.spec Log Message: - add dist tag Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpqxx.spec 1 Jul 2005 22:34:14 -0000 1.1 +++ libpqxx.spec 5 Jul 2005 10:49:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.4 -Release: 3 +Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 2.5.4-3 - add postgresql-devel to Requires for devel package - get rid of -R option in pqxx-config From fedora-extras-commits at redhat.com Tue Jul 5 10:50:11 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:50:11 -0400 Subject: common tobuild,1.1759,1.1760 Message-ID: <200507051050.j65AoB9o019754@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19735 Modified Files: tobuild Log Message: request build of rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1759 retrieving revision 1.1760 diff -u -r1.1759 -r1.1760 --- tobuild 5 Jul 2005 10:48:12 -0000 1.1759 +++ tobuild 5 Jul 2005 10:50:09 -0000 1.1760 @@ -33,3 +33,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel +awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 10:50:28 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:50:28 -0400 Subject: rpms/libpqxx/devel libpqxx.spec,1.1,1.2 Message-ID: <200507051050.j65AoSb1019779@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762 Modified Files: libpqxx.spec Log Message: - add dist tag Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpqxx.spec 1 Jul 2005 22:34:14 -0000 1.1 +++ libpqxx.spec 5 Jul 2005 10:50:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.4 -Release: 3 +Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 2.5.4-3 - add postgresql-devel to Requires for devel package - get rid of -R option in pqxx-config From fedora-extras-commits at redhat.com Tue Jul 5 10:50:37 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 06:50:37 -0400 Subject: rpms/mod_suphp/FC-4 mod_suphp.spec,1.1,1.2 Message-ID: <200507051050.j65Aob3L019801@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19758 Modified Files: mod_suphp.spec Log Message: bumped release Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-4/mod_suphp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_suphp.spec 30 Jun 2005 20:21:49 -0000 1.1 +++ mod_suphp.spec 5 Jul 2005 10:50:35 -0000 1.2 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -25,7 +25,7 @@ process executing the PHP interpreter. %prep -%setup -q +%setup -q -n suphp-%{version} %build %configure \ @@ -66,6 +66,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 +- Added correct name to %setup macro + * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 10:51:17 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 06:51:17 -0400 Subject: common tobuild,1.1760,1.1761 Message-ID: <200507051051.j65ApH0n019906@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19886 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1760 retrieving revision 1.1761 diff -u -r1.1760 -r1.1761 --- tobuild 5 Jul 2005 10:50:09 -0000 1.1760 +++ tobuild 5 Jul 2005 10:51:15 -0000 1.1761 @@ -34,3 +34,4 @@ awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 From rc040203 at freenet.de Tue Jul 5 10:53:14 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Tue, 05 Jul 2005 12:53:14 +0200 Subject: APPROVED: perl-Tree-DAG_Node Message-ID: <1120560795.30532.13.camel@mccallum.corsepiu.local> %description This class encapsulates/makes/manipulates objects that represent nodes in a tree structure. The tree structure is not an object itself, but is emergent from the linkages you create between nodes. This class provides the methods for making linkages that can be used to build up a tree, while preventing you from ever making any kinds of linkages which are not allowed in a tree (such as having a node be its own mother or ancestor, or having a node have two mothers). Maintainer: Jose Pedro Oliveira Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Tue Jul 5 14:23:52 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 10:23:52 -0400 Subject: common tobuild,1.1761,1.1762 Message-ID: <200507051423.j65ENqRN024933@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24916 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1761 retrieving revision 1.1762 diff -u -r1.1761 -r1.1762 --- tobuild 5 Jul 2005 10:51:15 -0000 1.1761 +++ tobuild 5 Jul 2005 14:23:50 -0000 1.1762 @@ -35,3 +35,4 @@ awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 14:46:24 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Tue, 5 Jul 2005 10:46:24 -0400 Subject: common tobuild,1.1762,1.1763 Message-ID: <200507051446.j65EkOFT025047@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029 Modified Files: tobuild Log Message: request build of rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1762 retrieving revision 1.1763 diff -u -r1.1762 -r1.1763 --- tobuild 5 Jul 2005 14:23:50 -0000 1.1762 +++ tobuild 5 Jul 2005 14:46:22 -0000 1.1763 @@ -36,3 +36,4 @@ awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel +byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 14:53:49 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Tue, 5 Jul 2005 10:53:49 -0400 Subject: common tobuild,1.1763,1.1764 Message-ID: <200507051453.j65ErnE9025146@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25132 Modified Files: tobuild Log Message: request build of rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1763 retrieving revision 1.1764 diff -u -r1.1763 -r1.1764 --- tobuild 5 Jul 2005 14:46:22 -0000 1.1763 +++ tobuild 5 Jul 2005 14:53:47 -0000 1.1764 @@ -37,3 +37,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 +byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 15:05:29 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 5 Jul 2005 11:05:29 -0400 Subject: common tobuild,1.1764,1.1765 Message-ID: <200507051505.j65F5xq5026281@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26261 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1764 retrieving revision 1.1765 diff -u -r1.1764 -r1.1765 --- tobuild 5 Jul 2005 14:53:47 -0000 1.1764 +++ tobuild 5 Jul 2005 15:05:08 -0000 1.1765 @@ -38,3 +38,4 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel From fedora-extras-commits at redhat.com Tue Jul 5 15:30:45 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 5 Jul 2005 11:30:45 -0400 Subject: common tobuild,1.1765,1.1766 Message-ID: <200507051530.j65FUjX6026417@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26400 Modified Files: tobuild Log Message: request build of rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1765 retrieving revision 1.1766 diff -u -r1.1765 -r1.1766 --- tobuild 5 Jul 2005 15:05:08 -0000 1.1765 +++ tobuild 5 Jul 2005 15:30:42 -0000 1.1766 @@ -39,3 +39,4 @@ byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel +qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 15:42:05 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 5 Jul 2005 11:42:05 -0400 Subject: rpms/most/FC-4 .cvsignore, 1.2, 1.3 most.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200507051542.j65Fg5bK026468@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26446 Modified Files: .cvsignore most.spec sources Log Message: updated to 4.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:52:46 -0000 1.2 +++ .cvsignore 5 Jul 2005 15:42:03 -0000 1.3 @@ -1 +1 @@ -most-4.9.5.tar.gz +most-4.10.1.tar.bz2 Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/most.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- most.spec 30 Mar 2005 14:32:43 -0000 1.6 +++ most.spec 5 Jul 2005 15:42:03 -0000 1.7 @@ -1,13 +1,13 @@ -Summary: more, less, most -Name: most -Version: 4.9.5 -Release: 4 -License: GPL -URL: ftp://space.mit.edu/pub/davis/most/ -Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: slang-devel +Summary: more, less, most +Name: most +Version: 4.10.1 +Release: 1%{?dist} +License: GPL +URL: ftp://space.mit.edu/pub/davis/most/ +Group: Applications/Text +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: slang-devel %description most is a paging program that displays, one windowful at a time, the @@ -43,6 +43,9 @@ %changelog +* Fri Jul 01 2005 Adrian Reber - 4.10.1-1 +- updated to 4.10.1 + * Wed Mar 30 2005 Adrian Reber - 4.9.5-4 - fix build on ppc/ppc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:52:46 -0000 1.2 +++ sources 5 Jul 2005 15:42:03 -0000 1.3 @@ -1 +1 @@ -5c0922952485b0a5822ef994603dcc2f most-4.9.5.tar.gz +9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 5 15:46:50 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 5 Jul 2005 11:46:50 -0400 Subject: common tobuild,1.1766,1.1767 Message-ID: <200507051546.j65Fkovt026535@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26518 Modified Files: tobuild Log Message: request build of rpms/most/FC-4 most-4_10_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1766 retrieving revision 1.1767 diff -u -r1.1766 -r1.1767 --- tobuild 5 Jul 2005 15:30:42 -0000 1.1766 +++ tobuild 5 Jul 2005 15:46:48 -0000 1.1767 @@ -40,3 +40,4 @@ byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel +adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 From ville.skytta at iki.fi Tue Jul 5 16:16:46 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Tue, 05 Jul 2005 19:16:46 +0300 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.1,1.2 In-Reply-To: <200507051049.j65An5Ri019612@cvs-int.fedora.redhat.com> References: <200507051049.j65An5Ri019612@cvs-int.fedora.redhat.com> Message-ID: <1120580206.6862.27.camel@localhost.localdomain> On Tue, 2005-07-05 at 06:49 -0400, Andreas Thienemann wrote: > %changelog > +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 > +- Added correct name to %setup macro Careful here, macros are expanded in %changelog too. Use %%setup in this case. From fedora-extras-commits at redhat.com Tue Jul 5 16:39:41 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 12:39:41 -0400 Subject: devel/common tobuild,1.1767,1.1768 Message-ID: <200507051639.j65GdfCK028265@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28248 Modified Files: tobuild Log Message: request build of devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1767 retrieving revision 1.1768 diff -u -r1.1767 -r1.1768 --- tobuild 5 Jul 2005 15:46:48 -0000 1.1767 +++ tobuild 5 Jul 2005 16:39:39 -0000 1.1768 @@ -41,3 +41,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 +kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 16:40:42 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 12:40:42 -0400 Subject: common tobuild,1.1768,1.1769 Message-ID: <200507051640.j65GegJa028332@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28315 Modified Files: tobuild Log Message: request build of rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1768 retrieving revision 1.1769 diff -u -r1.1768 -r1.1769 --- tobuild 5 Jul 2005 16:39:39 -0000 1.1768 +++ tobuild 5 Jul 2005 16:40:40 -0000 1.1769 @@ -42,3 +42,4 @@ qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel +kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 16:41:24 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 12:41:24 -0400 Subject: common tobuild,1.1769,1.1770 Message-ID: <200507051641.j65GfOWj028399@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28382 Modified Files: tobuild Log Message: request build of rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1769 retrieving revision 1.1770 diff -u -r1.1769 -r1.1770 --- tobuild 5 Jul 2005 16:40:40 -0000 1.1769 +++ tobuild 5 Jul 2005 16:41:22 -0000 1.1770 @@ -43,3 +43,4 @@ adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 +kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 16:50:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:50:45 -0400 Subject: rpms/tkcvs/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tkcvs.spec, 1.9, 1.10 Message-ID: <200507051650.j65GojSm028454@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28433 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 7.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Feb 2005 13:23:15 -0000 1.3 +++ .cvsignore 5 Jul 2005 16:50:43 -0000 1.4 @@ -1 +1 @@ -tkcvs_7_2_2.tar.gz +tkcvs_7_2_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Feb 2005 13:23:15 -0000 1.3 +++ sources 5 Jul 2005 16:50:43 -0000 1.4 @@ -1 +1 @@ -8cf12b4e30209228eb8050ac6ee2da80 tkcvs_7_2_2.tar.gz +ef7bf5114a083bd36c2bc793d1ca23c5 tkcvs_7_2_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tkcvs.spec 6 Apr 2005 22:13:34 -0000 1.9 +++ tkcvs.spec 5 Jul 2005 16:50:43 -0000 1.10 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.2 -Release: 3 +Version: 7.2.3 +Release: 1 Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_2.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_2 +%setup -q -n tkcvs_7_2_3 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 +- New Version 2.7.3 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 5 16:51:16 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:51:16 -0400 Subject: common tobuild,1.1770,1.1771 Message-ID: <200507051651.j65GpG9w028519@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28502 Modified Files: tobuild Log Message: request build of rpms/tkcvs/FC-4 tkcvs-7_2_3-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1770 retrieving revision 1.1771 diff -u -r1.1770 -r1.1771 --- tobuild 5 Jul 2005 16:41:22 -0000 1.1770 +++ tobuild 5 Jul 2005 16:51:14 -0000 1.1771 @@ -44,3 +44,4 @@ kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 +gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 16:51:34 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:51:34 -0400 Subject: rpms/tkcvs/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tkcvs.spec, 1.9, 1.10 Message-ID: <200507051651.j65GpYJm028546@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28525 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 7.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Feb 2005 13:23:15 -0000 1.3 +++ .cvsignore 5 Jul 2005 16:51:32 -0000 1.4 @@ -1 +1 @@ -tkcvs_7_2_2.tar.gz +tkcvs_7_2_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Feb 2005 13:23:15 -0000 1.3 +++ sources 5 Jul 2005 16:51:32 -0000 1.4 @@ -1 +1 @@ -8cf12b4e30209228eb8050ac6ee2da80 tkcvs_7_2_2.tar.gz +ef7bf5114a083bd36c2bc793d1ca23c5 tkcvs_7_2_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tkcvs.spec 6 Apr 2005 22:13:34 -0000 1.9 +++ tkcvs.spec 5 Jul 2005 16:51:32 -0000 1.10 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.2 -Release: 3 +Version: 7.2.3 +Release: 2 Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_2.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_2 +%setup -q -n tkcvs_7_2_3 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 +- New Version 2.7.3 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 5 16:52:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:52:05 -0400 Subject: common tobuild,1.1771,1.1772 Message-ID: <200507051652.j65Gq5cl028625@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28608 Modified Files: tobuild Log Message: request build of rpms/tkcvs/devel tkcvs-7_2_3-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1771 retrieving revision 1.1772 diff -u -r1.1771 -r1.1772 --- tobuild 5 Jul 2005 16:51:14 -0000 1.1771 +++ tobuild 5 Jul 2005 16:52:03 -0000 1.1772 @@ -45,3 +45,4 @@ kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 +gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel From fedora-extras-commits at redhat.com Tue Jul 5 16:59:16 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:59:16 -0400 Subject: rpms/global/FC-4 .cvsignore, 1.4, 1.5 global.spec, 1.9, 1.10 sources, 1.4, 1.5 global-4.8.4-gcc4.patch, 1.1, NONE Message-ID: <200507051659.j65GxGHD028688@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/global/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28667 Modified Files: .cvsignore global.spec sources Removed Files: global-4.8.4-gcc4.patch Log Message: new version 4.8.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/global/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Mar 2005 21:36:38 -0000 1.4 +++ .cvsignore 5 Jul 2005 16:59:14 -0000 1.5 @@ -1 +1 @@ -global-4.8.4.tar.gz +global-4.8.6.tar.gz Index: global.spec =================================================================== RCS file: /cvs/extras/rpms/global/FC-4/global.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- global.spec 25 May 2005 22:03:21 -0000 1.9 +++ global.spec 5 Jul 2005 16:59:14 -0000 1.10 @@ -1,14 +1,13 @@ Name: global -Version: 4.8.4 -Release: 4 +Version: 4.8.6 +Release: 1%{?dist} Summary: Source code tag system Group: Development/Tools License: GPL/BSD URL: http://www.gnu.org/software/global -Source: http://tamacom.com/global/global-4.8.4.tar.gz -Patch0: global-4.8.4-gcc4.patch +Source: http://tamacom.com/global/global-4.8.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -18,7 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 %build %configure @@ -50,6 +48,9 @@ %{_datadir}/gtags %changelog +* Tue Jul 5 2005 Gerard Milmeister - 4.8.6-1 +- New Version 4.8.6 + * Wed May 25 2005 Jeremy Katz - 4.8.4-4 - fix build with gcc4 (#156212) Index: sources =================================================================== RCS file: /cvs/extras/rpms/global/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Mar 2005 21:36:38 -0000 1.4 +++ sources 5 Jul 2005 16:59:14 -0000 1.5 @@ -1 +1 @@ -060d43cf74e297c154a5a53ba43c52fb global-4.8.4.tar.gz +99b9020788746942b22741c3b2f59bdc global-4.8.6.tar.gz --- global-4.8.4-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 17:00:06 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:00:06 -0400 Subject: common tobuild,1.1772,1.1773 Message-ID: <200507051700.j65H06Tp028756@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28739 Modified Files: tobuild Log Message: request build of rpms/global/FC-4 global-4_8_6-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1772 retrieving revision 1.1773 diff -u -r1.1772 -r1.1773 --- tobuild 5 Jul 2005 16:52:03 -0000 1.1772 +++ tobuild 5 Jul 2005 17:00:04 -0000 1.1773 @@ -46,3 +46,4 @@ kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel +gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:00:46 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:00:46 -0400 Subject: rpms/global/devel .cvsignore, 1.4, 1.5 global.spec, 1.9, 1.10 sources, 1.4, 1.5 global-4.8.4-gcc4.patch, 1.1, NONE Message-ID: <200507051700.j65H0knq028801@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/global/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28780 Modified Files: .cvsignore global.spec sources Removed Files: global-4.8.4-gcc4.patch Log Message: new version 4.8.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/global/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Mar 2005 21:36:38 -0000 1.4 +++ .cvsignore 5 Jul 2005 17:00:43 -0000 1.5 @@ -1 +1 @@ -global-4.8.4.tar.gz +global-4.8.6.tar.gz Index: global.spec =================================================================== RCS file: /cvs/extras/rpms/global/devel/global.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- global.spec 25 May 2005 22:03:21 -0000 1.9 +++ global.spec 5 Jul 2005 17:00:43 -0000 1.10 @@ -1,14 +1,13 @@ Name: global -Version: 4.8.4 -Release: 4 +Version: 4.8.6 +Release: 1%{?dist} Summary: Source code tag system Group: Development/Tools License: GPL/BSD URL: http://www.gnu.org/software/global -Source: http://tamacom.com/global/global-4.8.4.tar.gz -Patch0: global-4.8.4-gcc4.patch +Source: http://tamacom.com/global/global-4.8.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -18,7 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 %build %configure @@ -50,6 +48,9 @@ %{_datadir}/gtags %changelog +* Tue Jul 5 2005 Gerard Milmeister - 4.8.6-1 +- New Version 4.8.6 + * Wed May 25 2005 Jeremy Katz - 4.8.4-4 - fix build with gcc4 (#156212) Index: sources =================================================================== RCS file: /cvs/extras/rpms/global/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Mar 2005 21:36:38 -0000 1.4 +++ sources 5 Jul 2005 17:00:43 -0000 1.5 @@ -1 +1 @@ -060d43cf74e297c154a5a53ba43c52fb global-4.8.4.tar.gz +99b9020788746942b22741c3b2f59bdc global-4.8.6.tar.gz --- global-4.8.4-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 17:01:55 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:01:55 -0400 Subject: common tobuild,1.1773,1.1774 Message-ID: <200507051701.j65H1tgb029904@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29886 Modified Files: tobuild Log Message: request build of rpms/global/devel global-4_8_6-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1773 retrieving revision 1.1774 diff -u -r1.1773 -r1.1774 --- tobuild 5 Jul 2005 17:00:04 -0000 1.1773 +++ tobuild 5 Jul 2005 17:01:33 -0000 1.1774 @@ -47,3 +47,4 @@ gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 +gemi rpms/global/devel global-4_8_6-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 17:06:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 5 Jul 2005 13:06:18 -0400 Subject: devel/sylpheed .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sylpheed.spec, 1.15, 1.16 sylpheed-0.8.9-ck.patch, 1.1, NONE Message-ID: <200507051706.j65H6IUs029987@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957 Modified Files: .cvsignore sources sylpheed.spec Removed Files: sylpheed-0.8.9-ck.patch Log Message: update to next beta release Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jun 2005 13:50:45 -0000 1.7 +++ .cvsignore 5 Jul 2005 17:05:40 -0000 1.8 @@ -1 +1 @@ -sylpheed-2.0.0beta3.tar.bz2 +sylpheed-2.0.0beta4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jun 2005 13:50:45 -0000 1.7 +++ sources 5 Jul 2005 17:06:03 -0000 1.8 @@ -1 +1 @@ -9c04acc3690af6ceddf1a2b55a1cbb6e sylpheed-2.0.0beta3.tar.bz2 +675b998ac6e4d2d6c0dce1442209de83 sylpheed-2.0.0beta4.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sylpheed.spec 28 Jun 2005 16:11:05 -0000 1.15 +++ sylpheed.spec 5 Jul 2005 17:06:03 -0000 1.16 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.2.beta3 +Release: 0.2.beta4 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -17,10 +17,9 @@ %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} BuildRequires: autoconf -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta3.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta4.tar.bz2 Source1: sylpheed.1 -Patch0: %{name}-0.8.9-ck.patch Patch2: sylpheed-default-browser.patch Patch3: sylpheed-1.9.10-desktop.patch @@ -40,8 +39,7 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta3 -#%patch0 -p1 -b .ck +%setup -q -n %{name}-2.0.0beta4 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop @@ -85,8 +83,11 @@ %{_mandir}/man1 %changelog +* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.2.beta4 +- Update to 2.0.0beta4. + * Tue Jun 28 2005 Michael Schwendt -- remove work-around from 1.0.3-5 again, bug has been fixed +- remove work-around from previous entry again, bug has been fixed * Sun Jun 26 2005 Michael Schwendt - 2.0.0-0.2.beta3 - temporarily add BR libpng-devel to work around a broken cairo-devel --- sylpheed-0.8.9-ck.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 17:16:17 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 13:16:17 -0400 Subject: devel/common tobuild,1.1774,1.1775 Message-ID: <200507051716.j65HGHir030143@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30126 Modified Files: tobuild Log Message: clean up built stuff Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1774 retrieving revision 1.1775 diff -u -r1.1774 -r1.1775 --- tobuild 5 Jul 2005 17:01:33 -0000 1.1774 +++ tobuild 5 Jul 2005 17:16:15 -0000 1.1775 @@ -1,49 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 -ausil rpms/konversation/devel konversation-0_18-4_fc5 devel -ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 -petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel -adrian rpms/most/devel most-4_10_1-1_fc5 devel -spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 -spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 -spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 -spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 -spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 -spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 -spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 -spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 -spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 -spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 -mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel -qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel -pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel -petersen rpms/scim/devel scim-1_3_2-1_fc5 devel -pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 -awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel -awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 -pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel -byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 -byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel -qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel -adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 -kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel -kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 -kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:42:46 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:42:46 -0400 Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.10, 1.11 TeXmacs.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200507051742.j65HgkAJ030237@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30215 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Jun 2005 17:12:02 -0000 1.10 +++ .cvsignore 5 Jul 2005 17:42:44 -0000 1.11 @@ -1 +1 @@ -TeXmacs-1.0.5.4-src.tar.gz +TeXmacs-1.0.5.5-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- TeXmacs.spec 21 Jun 2005 17:12:02 -0000 1.15 +++ TeXmacs.spec 5 Jul 2005 17:42:44 -0000 1.16 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.4 +Version: 1.0.5.5 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.4-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.5-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 @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 5 2005 Gerard Milmeister - 1.0.5.5 +- New Version 1.0.5.5 + * Tue Jun 21 2005 Gerard Milmeister - 1.0.5.4 - New Version 1.0.5.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Jun 2005 17:12:02 -0000 1.10 +++ sources 5 Jul 2005 17:42:44 -0000 1.11 @@ -1 +1 @@ -e589b4ae5ec04906e6f346b6de0db69c TeXmacs-1.0.5.4-src.tar.gz +492bf5f75791c80d64a727767fedb8bc TeXmacs-1.0.5.5-src.tar.gz From fedora-extras-commits at redhat.com Tue Jul 5 17:43:15 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:43:15 -0400 Subject: common tobuild,1.1775,1.1776 Message-ID: <200507051743.j65HhFRv030299@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30282 Modified Files: tobuild Log Message: request build of rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1775 retrieving revision 1.1776 diff -u -r1.1775 -r1.1776 --- tobuild 5 Jul 2005 17:16:15 -0000 1.1775 +++ tobuild 5 Jul 2005 17:43:12 -0000 1.1776 @@ -5,3 +5,4 @@ gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 gemi rpms/global/devel global-4_8_6-1_fc5 devel +gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:44:00 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 13:44:00 -0400 Subject: common tobuild,1.1776,1.1777 Message-ID: <200507051744.j65Hi0uT030346@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30329 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1776 retrieving revision 1.1777 diff -u -r1.1776 -r1.1777 --- tobuild 5 Jul 2005 17:43:12 -0000 1.1776 +++ tobuild 5 Jul 2005 17:43:58 -0000 1.1777 @@ -6,3 +6,4 @@ gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 gemi rpms/global/devel global-4_8_6-1_fc5 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 +dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:44:12 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:44:12 -0400 Subject: rpms/TeXmacs/devel .cvsignore, 1.10, 1.11 TeXmacs.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200507051744.j65HiCbp030374@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30352 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Jun 2005 17:15:55 -0000 1.10 +++ .cvsignore 5 Jul 2005 17:44:10 -0000 1.11 @@ -1 +1 @@ -TeXmacs-1.0.5.4-src.tar.gz +TeXmacs-1.0.5.5-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- TeXmacs.spec 21 Jun 2005 17:15:55 -0000 1.15 +++ TeXmacs.spec 5 Jul 2005 17:44:10 -0000 1.16 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.4 +Version: 1.0.5.5 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.4-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.5-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 @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 5 2005 Gerard Milmeister - 1.0.5.5 +- New Version 1.0.5.5 + * Tue Jun 21 2005 Gerard Milmeister - 1.0.5.4 - New Version 1.0.5.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Jun 2005 17:15:55 -0000 1.10 +++ sources 5 Jul 2005 17:44:10 -0000 1.11 @@ -1 +1 @@ -e589b4ae5ec04906e6f346b6de0db69c TeXmacs-1.0.5.4-src.tar.gz +492bf5f75791c80d64a727767fedb8bc TeXmacs-1.0.5.5-src.tar.gz From fedora-extras-commits at redhat.com Tue Jul 5 17:44:52 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:44:52 -0400 Subject: common tobuild,1.1777,1.1778 Message-ID: <200507051745.j65HjMKp030440@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30420 Modified Files: tobuild Log Message: request build of rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1777 retrieving revision 1.1778 diff -u -r1.1777 -r1.1778 --- tobuild 5 Jul 2005 17:43:58 -0000 1.1777 +++ tobuild 5 Jul 2005 17:44:50 -0000 1.1778 @@ -7,3 +7,4 @@ gemi rpms/global/devel global-4_8_6-1_fc5 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 +gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 17:48:40 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Tue, 5 Jul 2005 13:48:40 -0400 Subject: common tobuild,1.1778,1.1779 Message-ID: <200507051748.j65HmeJ3030510@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30490 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1778 retrieving revision 1.1779 diff -u -r1.1778 -r1.1779 --- tobuild 5 Jul 2005 17:44:50 -0000 1.1778 +++ tobuild 5 Jul 2005 17:48:38 -0000 1.1779 @@ -8,3 +8,4 @@ gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 18:07:39 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:07:39 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.3,1.4 Message-ID: <200507051807.j65I7dFu031806@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/devel Modified Files: mod_suphp.spec Log Message: bumped up releasever Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_suphp.spec 4 Jul 2005 22:54:33 -0000 1.3 +++ mod_suphp.spec 5 Jul 2005 18:07:37 -0000 1.4 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,8 +66,11 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 +- Bumped up the releasever + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 -- Added correct name to %setup macro +- Added correct name to %%setup macro * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 18:07:33 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:07:33 -0400 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.2,1.3 Message-ID: <200507051808.j65I83ev031809@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/FC-3 Modified Files: mod_suphp.spec Log Message: bumped up releasever Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-3/mod_suphp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_suphp.spec 5 Jul 2005 10:49:02 -0000 1.2 +++ mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,8 +66,11 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 +- Bumped up the releasever + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 -- Added correct name to %setup macro +- Added correct name to %%setup macro * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 18:07:33 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:07:33 -0400 Subject: rpms/mod_suphp/FC-4 mod_suphp.spec,1.2,1.3 Message-ID: <200507051808.j65I84ft031812@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/FC-4 Modified Files: mod_suphp.spec Log Message: bumped up releasever Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-4/mod_suphp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_suphp.spec 5 Jul 2005 10:50:35 -0000 1.2 +++ mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,8 +66,11 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 +- Bumped up the releasever + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 -- Added correct name to %setup macro +- Added correct name to %%setup macro * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 18:09:26 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:09:26 -0400 Subject: common tobuild,1.1779,1.1780 Message-ID: <200507051809.j65I9QHv031881@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1779 retrieving revision 1.1780 diff -u -r1.1779 -r1.1780 --- tobuild 5 Jul 2005 17:48:38 -0000 1.1779 +++ tobuild 5 Jul 2005 18:09:24 -0000 1.1780 @@ -9,3 +9,4 @@ dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 18:10:06 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:10:06 -0400 Subject: common tobuild,1.1780,1.1781 Message-ID: <200507051810.j65IA6I0031948@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31931 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1780 retrieving revision 1.1781 diff -u -r1.1780 -r1.1781 --- tobuild 5 Jul 2005 18:09:24 -0000 1.1780 +++ tobuild 5 Jul 2005 18:10:04 -0000 1.1781 @@ -10,3 +10,4 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 18:10:46 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:10:46 -0400 Subject: common tobuild,1.1781,1.1782 Message-ID: <200507051810.j65IAktL032010@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31993 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1781 retrieving revision 1.1782 diff -u -r1.1781 -r1.1782 --- tobuild 5 Jul 2005 18:10:04 -0000 1.1781 +++ tobuild 5 Jul 2005 18:10:44 -0000 1.1782 @@ -11,3 +11,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 19:33:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 5 Jul 2005 15:33:09 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.11, 1.12 Message-ID: <200507051933.j65JX9dZ000766@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv747 Modified Files: kernel-module-thinkpad.spec Log Message: Another approach: - local rebuilders get to --define kver - the one who requests the rebuild in FE needs to tune the default value of kver in the specfile explicitly and separately for each {,smp,xen0,xenU} - we ship many kind-of-duplicate source rpms for these builds, do we care? - only buildsys change needed would be to be able to specify the target arch(s) Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kernel-module-thinkpad.spec 3 Jul 2005 18:23:58 -0000 1.11 +++ kernel-module-thinkpad.spec 5 Jul 2005 19:33:06 -0000 1.12 @@ -1,12 +1,11 @@ -%{?kver: %define mkver .%(echo %{kver} | tr - _)} -%{!?kver: %define kver %(uname -r)} +%{!?kver: %define kver 2.6.11-1.1369_FC4} %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} %define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 2%{?mkver} +Release: 2.%(echo %{kver} | tr - _) Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL From fedora-extras-commits at redhat.com Tue Jul 5 20:19:09 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:09 -0400 Subject: rpms/hdf5 - New directory Message-ID: <200507052019.j65KJ9g3002024@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/hdf5 Log Message: Directory /cvs/extras/rpms/hdf5 added to the repository From fedora-extras-commits at redhat.com Tue Jul 5 20:19:10 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:10 -0400 Subject: rpms/hdf5/devel - New directory Message-ID: <200507052019.j65KJAa1002029@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/hdf5/devel Log Message: Directory /cvs/extras/rpms/hdf5/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 5 20:19:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:18 -0400 Subject: rpms/hdf5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507052019.j65KJICv002072@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045 Added Files: Makefile import.log Log Message: Setup of module hdf5 --- NEW FILE Makefile --- # Top level Makefile for module hdf5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 5 20:19:19 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:19 -0400 Subject: rpms/hdf5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507052019.j65KJJ4D002077@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hdf5 --- NEW 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 Jul 5 20:20:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:20:18 -0400 Subject: rpms/hdf5 import.log,1.1,1.2 Message-ID: <200507052020.j65KKI1Z002176@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2139 Modified Files: import.log Log Message: auto-import hdf5-1.6.4-4 on branch devel from hdf5-1.6.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hdf5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jul 2005 20:19:16 -0000 1.1 +++ import.log 5 Jul 2005 20:20:16 -0000 1.2 @@ -0,0 +1 @@ +hdf5-1_6_4-4:HEAD:hdf5-1.6.4-4.src.rpm:1120594813 From fedora-extras-commits at redhat.com Tue Jul 5 20:20:19 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:20:19 -0400 Subject: rpms/hdf5/devel hdf5-1.6.4-destdir.patch, NONE, 1.1 hdf5-1.6.4-gcc4.patch, NONE, 1.1 hdf5-1.6.4-h5diff_attr.patch, NONE, 1.1 hdf5-1.6.4-norpath.patch, NONE, 1.1 hdf5-1.6.4-testh5repack.patch, NONE, 1.1 hdf5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507052020.j65KKJsl002188@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2139/devel Modified Files: .cvsignore sources Added Files: hdf5-1.6.4-destdir.patch hdf5-1.6.4-gcc4.patch hdf5-1.6.4-h5diff_attr.patch hdf5-1.6.4-norpath.patch hdf5-1.6.4-testh5repack.patch hdf5.spec Log Message: auto-import hdf5-1.6.4-4 on branch devel from hdf5-1.6.4-4.src.rpm hdf5-1.6.4-destdir.patch: --- NEW FILE hdf5-1.6.4-destdir.patch --- --- hdf5-1.6.4/config/commence.in.BAD 2005-04-03 13:52:00.000000000 -0500 +++ hdf5-1.6.4/config/commence.in 2005-04-03 13:52:53.000000000 -0500 @@ -35,11 +35,11 @@ TRACE=: ## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -docdir=@exec_prefix@/doc +prefix=$(DESTDIR)@prefix@ +exec_prefix=$(DESTDIR)@exec_prefix@ +bindir=$(DESTDIR)@bindir@ +libdir=$(DESTDIR)@libdir@ +includedir=$(DESTDIR)@includedir@ +docdir=$(DESTDIR)@exec_prefix@/doc PUB_LIB=$(LIB) --- hdf5-1.6.4/fortran/config/commence.in.BAD 2005-04-03 14:08:27.000000000 -0500 +++ hdf5-1.6.4/fortran/config/commence.in 2005-04-03 14:08:48.000000000 -0500 @@ -40,11 +40,11 @@ TRACE=: ## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -docdir=@exec_prefix@/doc +prefix=$(DESTDIR)@prefix@ +exec_prefix=$(DESTDIR)@exec_prefix@ +bindir=$(DESTDIR)@bindir@ +libdir=$(DESTDIR)@libdir@ +includedir=$(DESTDIR)@includedir@ +docdir=$(DESTDIR)@exec_prefix@/doc PUB_LIB=$(LIB) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 14:07:10.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 14:07:35.000000000 -0500 @@ -32,11 +32,11 @@ TRACE=: ## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -docdir=@exec_prefix@/doc +prefix=$(DESTDIR)@prefix@ +exec_prefix=$(DESTDIR)@exec_prefix@ +bindir=$(DESTDIR)@bindir@ +libdir=$(DESTDIR)@libdir@ +includedir=$(DESTDIR)@includedir@ +docdir=$(DESTDIR)@exec_prefix@/doc PUB_LIB=$(LIB) hdf5-1.6.4-gcc4.patch: --- NEW FILE hdf5-1.6.4-gcc4.patch --- --- hdf5-1.6.4/fortran/config/linux-gnulibc1.BAD 2005-04-03 12:55:55.000000000 -0500 +++ hdf5-1.6.4/fortran/config/linux-gnulibc1 2005-04-03 12:56:50.000000000 -0500 @@ -25,7 +25,11 @@ # The default Fortran 90 compiler if test "X-" = "X-$F9X"; then case $CC_BASENAME in - gcc*|pgcc*) + gcc*) + F9X=gfortran + F9X_BASENAME=gfortran + ;; + pgcc*) F9X=pgf90 F9X_BASENAME=pgf90 ;; hdf5-1.6.4-h5diff_attr.patch: --- NEW FILE hdf5-1.6.4-h5diff_attr.patch --- --- hdf5-1.6.4/tools/lib/h5diff_attr.c.orig 2005-07-01 08:47:12.000000000 -0600 +++ hdf5-1.6.4/tools/lib/h5diff_attr.c 2005-07-01 09:01:59.000000000 -0600 @@ -61,8 +61,8 @@ int rank2; /* rank of dataset */ hsize_t dims1[H5S_MAX_RANK];/* dimensions of dataset */ hsize_t dims2[H5S_MAX_RANK];/* dimensions of dataset */ - char name1[255]; - char name2[255]; + char name1[255],np1[512]; + char name2[255],np2[512]; int n1, n2, i, j; int ret=0; hsize_t nfound; @@ -191,21 +191,21 @@ * array compare *------------------------------------------------------------------------- */ - sprintf(name1,"%s of <%s>",name1,path1); - sprintf(name2,"%s of <%s>",name2,path2); + snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1); + snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2); /* always print name */ if (options->m_verbose) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -225,8 +225,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -234,15 +234,15 @@ options->m_quiet=0; if (nfound) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -258,8 +258,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); hdf5-1.6.4-norpath.patch: --- NEW FILE hdf5-1.6.4-norpath.patch --- --- hdf5-1.6.4/config/commence.in.BAD 2005-04-03 18:55:35.000000000 -0500 +++ hdf5-1.6.4/config/commence.in 2005-04-03 18:55:54.000000000 -0500 @@ -48,8 +48,8 @@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ LT=$(top_builddir)/libtool LT_COMPILE=$(LT) --mode=compile $(CC) LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS) -LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS) +LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) --- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 +++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 @@ -1383,7 +1383,7 @@ if test "$ld_shlibs" = yes; then runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + hardcode_libdir_flag_spec='' export_dynamic_flag_spec='${wl}--export-dynamic' case $host_os in cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ LT=$(top_builddir)/libtool LT_COMPILE=$(LT) --mode=compile $(CXX) LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS) -LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) +LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) --- hdf5-1.6.4/fortran/config/commence.in.BAD 2005-04-03 20:05:38.000000000 -0500 +++ hdf5-1.6.4/fortran/config/commence.in 2005-04-03 20:05:48.000000000 -0500 @@ -54,7 +54,7 @@ LT=$(top_builddir)/libtool LT_CCOMPILE=$(LT) --mode=compile $(CC) LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir) -LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir) +LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) hdf5-1.6.4-testh5repack.patch: --- NEW FILE hdf5-1.6.4-testh5repack.patch --- --- hdf5-1.6.4/tools/h5repack/testh5repack_make.c.bad 2005-06-30 14:50:32.000000000 -0600 +++ hdf5-1.6.4/tools/h5repack/testh5repack_make.c 2005-06-30 14:45:48.000000000 -0600 @@ -896,7 +896,7 @@ hsize_t chunk_dims[RANK]={CDIM1,CDIM2}; int buf[DIM1][DIM2]; int i, j, n; - char name[5]; + char name[6]; for (i=n=0; i 1.6.4-4 - Make example scripts executable * Wed Jul 01 2005 Orion Poplawski 1.6.4-3 - Add --enable-threads --with-pthreads to configure - Add %check - Add some %docs - Use %makeinstall - Add patch to fix test for h5repack - Add patch to fix h5diff_attr.c * Mon Jun 27 2005 Tom "spot" Callaway 1.6.4-2 - remove szip from spec, since szip license doesn't meet Fedora standards * Sun Apr 3 2005 Tom "spot" Callaway 1.6.4-1 - inital package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2005 20:19:17 -0000 1.1 +++ .cvsignore 5 Jul 2005 20:20:17 -0000 1.2 @@ -0,0 +1 @@ +hdf5-1.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2005 20:19:17 -0000 1.1 +++ sources 5 Jul 2005 20:20:17 -0000 1.2 @@ -0,0 +1 @@ +a837391b633fc4c6681905d89047c032 hdf5-1.6.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 5 20:23:34 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:23:34 -0400 Subject: common tobuild,1.1782,1.1783 Message-ID: <200507052023.j65KNYY4002300@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283 Modified Files: tobuild Log Message: request build of rpms/hdf5/devel hdf5-1_6_4-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1782 retrieving revision 1.1783 diff -u -r1.1782 -r1.1783 --- tobuild 5 Jul 2005 18:10:44 -0000 1.1782 +++ tobuild 5 Jul 2005 20:23:32 -0000 1.1783 @@ -12,3 +12,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 +orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 20:33:41 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 5 Jul 2005 16:33:41 -0400 Subject: web/html/download mirrors.php,1.17,1.18 Message-ID: <200507052033.j65KXfhY002355@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321 Modified Files: mirrors.php Log Message: Added rsync for jaist mirror fixed link for muohio ftp mirror and added three new mirrors. (3ccc Taiwan, inode Austria, optus Australia) Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mirrors.php 30 Jun 2005 21:15:20 -0000 1.17 +++ mirrors.php 5 Jul 2005 20:33:39 -0000 1.18 @@ -36,7 +36,7 @@
  • rsync://distro.ibiblio.org/fedora-linux-core/
  • ftp://ftp.cse.buffalo.edu/pub/fedora/linux/core/
  • http://mirror.eas.muohio.edu/fedora/linux/core/
    • -
  • ftp://mirror.eas.muohio.edu/pub/fedora/linux/core/
    • +
  • ftp://mirror.eas.muohio.edu/fedora/linux/core/
  • http://mirror.hiwaay.net/redhat/fedora/linux/core/
  • ftp://mirror.hiwaay.net/redhat/fedora/linux/core/
  • rsync://mirror.hiwaay.net/fedora-linux-core/
    • @@ -174,6 +174,8 @@
  • rsync://ftp.univie.ac.at/fedora/
  • ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core/
  • ftp://ftp.uni-klu.ac.at/linux/fedora/linux/core/
    • +
  • http://fedora.inode.at/
    • +
  • ftp://fedora.inode.at/
  • Belgium @@ -484,6 +486,8 @@
  • ftp://ftp.netcraft.com.au/pub/fedora/linux/core/
  • http://mirror.pacific.net.au/linux/redhat/fedora/
  • ftp://mirror.pacific.net.au/linux/redhat/fedora/
    • +
  • http://mirror.optus.net/fedora/core/
    • +
  • ftp://mirror.optus.net/fedora/core/
  • Hong Kong @@ -506,6 +510,7 @@
  • rsync://ftp.riken.jp/fedora/
  • http://ftp.jaist.ac.jp/pub/Linux/Fedora/core/
  • ftp://ftp.jaist.ac.jp/pub/Linux/Fedora/core/
    • +
  • rsync://ftp.jaist.ac.jp/pub/Linux/Fedora/core/
  • ftp://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
  • http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
  • rsync://ftp.nara.wide.ad.jp/fedora/
    • @@ -542,6 +547,8 @@ From fedora-extras-commits at redhat.com Tue Jul 5 20:52:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 5 Jul 2005 16:52:08 -0400 Subject: common tobuild,1.1783,1.1784 Message-ID: <200507052052.j65Kq8XF002534@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2516 Modified Files: tobuild Log Message: request build of rpms/scrub/FC-4 scrub-1_6-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1783 retrieving revision 1.1784 diff -u -r1.1783 -r1.1784 --- tobuild 5 Jul 2005 20:23:32 -0000 1.1783 +++ tobuild 5 Jul 2005 20:52:05 -0000 1.1784 @@ -13,3 +13,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel +spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 20:55:29 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Tue, 5 Jul 2005 16:55:29 -0400 Subject: web/html/participate/communicate index.php,1.2,1.3 Message-ID: <200507052055.j65KtT8m002592@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/participate/communicate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2575 Modified Files: index.php Log Message: Add fedora-perl-devel-list Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/participate/communicate/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 4 May 2005 11:25:19 -0000 1.2 +++ index.php 5 Jul 2005 20:55:27 -0000 1.3 @@ -104,6 +104,8 @@ - For discussions about desktop issues such as user interfaces, artwork, and usability
  • fedora-config-list - For discussions about the development of configuration tools
    • +
  • fedora-perl-devel-list +- For discussions about packages relating to the perl programming language
  • fedora-tools-list - For discussions about the toolchain (gcc, gdb, etc...) within Fedora
  • fedora-devel-java-list From fedora-extras-commits at redhat.com Tue Jul 5 21:00:55 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 17:00:55 -0400 Subject: common tobuild,1.1784,1.1785 Message-ID: <200507052100.j65L0tN8002637@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2620 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1784 retrieving revision 1.1785 diff -u -r1.1784 -r1.1785 --- tobuild 5 Jul 2005 20:52:05 -0000 1.1784 +++ tobuild 5 Jul 2005 21:00:53 -0000 1.1785 @@ -14,3 +14,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 +dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 21:08:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:08:05 -0400 Subject: extras-buildsys/server ArchJob.py, NONE, 1.1 Builder.py, NONE, 1.1 BuilderManager.py, NONE, 1.1 PackageJob.py, NONE, 1.1 main.py, NONE, 1.1 BuildMaster.py, 1.9, 1.10 CONFIG.py, 1.14, 1.15 Makefile, 1.4, 1.5 Repo.py, 1.4, 1.5 UserInterface.py, 1.14, 1.15 BuildJob.py, 1.15, NONE buildserver.py, 1.12, NONE client_manager.py, 1.27, NONE Message-ID: <200507052108.j65L85U7003868@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/server Modified Files: BuildMaster.py CONFIG.py Makefile Repo.py UserInterface.py Added Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py main.py Removed Files: BuildJob.py buildserver.py client_manager.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. --- NEW FILE ArchJob.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import time import string import xmlrpclib import sys import socket import os import threading import urllib from plague import FileDownloader from plague import CommonErrors from M2Crypto import SSL # Load in the config execfile("/etc/plague/server/CONFIG.py") # SSL certificate and key filenames certs = {} certs['key_and_cert'] = config_opts['server_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] class ArchJob: """ Tracks a single build instance for a single arch on a builder """ def __init__(self, builder, server, par_job, jobid, target, arch): self.par_job = par_job self.builder = builder self._server = server self.jobid = jobid self.status = 'running' self.builder_status = '' self.target = target self.arch = arch self._builder_gone = False self.downloads = {} self.starttime = time.time() def _builder_finished(self): if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed': return True return False def builder_failed(self): if self.builder_status == 'killed' or self.builder_status == 'failed': return True return False def builder_prepping(self): if self.builder_status == 'prepping': return True return False def set_builder_status(self, status): if status != 'idle': self.builder_status = status if status == 'killed' or status == 'failed': self.par_job.wake() def _send_repo_unlocked(self): try: self._server.repo_unlocked(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, self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass def _dl_files(self): files = [] try: 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, self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass return files def process(self): if self.status == 'done': return elif self.status == 'running': # Clients pause before they enter the 'prep' state (which accesses # the repo for this target), and wait for the server to allow them # to proceed when the repo is unlocked. if self.builder_status == 'downloaded': if not self.par_job.repo.locked(): self._send_repo_unlocked() # if the builder is done, grab list of files to download if self._builder_finished(): self.status = 'downloading' for f in self._dl_files(): uf = urllib.unquote(f) self.downloads[uf] = 0 elif self.status == 'downloading': # Start grabbing the next undownloaded file, but only # if we aren't already pulling one down # # Download states: # 0: waiting # 1: in progress # 2: error # 3: done undownloaded = False for url in self.downloads.keys(): dl_status = self.downloads[url] if dl_status == 0: # spawn the download target_dir = os.path.join(self.par_job.get_stage_dir(), self.arch) if not os.path.exists(target_dir): os.makedirs(target_dir) if config_opts['ssl_builders']: dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url, target_dir, ['.rpm', '.log'], 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 break elif dl_status == 1: # in progress undownloaded = True break elif dl_status == 2: # error continue elif dl_status == 3: # this one is done continue # All done downloading? if not undownloaded: self._print_downloaded_files() self.status = 'done' self.par_job.wake() def _print_downloaded_files(self): file_string = "" ndownloads = len(self.downloads.keys()) for url in self.downloads.keys(): filename = os.path.basename(url) string = "'" + filename + "'" if self.downloads[url] == 2: string = string + " (failed)" file_string = file_string + string if url != self.downloads.keys()[ndownloads - 1]: file_string = file_string + ", " print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, self.par_job.package, self.arch, file_string) def dl_callback(self, status, cb_data): url = cb_data if status == 'done': self.downloads[url] = 3 elif status == 'failed': self.downloads[url] = 2 def get_status(self): return self.status def get_files(self): files = [] for url in self.downloads.keys(): fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) if fname and self.downloads[url] == 3: files.append(fname) return files def set_download_status(self, url, status): if self.downloads.has_key(url): self.downloads[url] = status def builder_gone(self): if self.status != 'done': self._par_job.remove_arch_job(self) def die(self): if self.status == 'initialize' or self.status == 'running': self._server.die(self.jobid) self.status = 'done' --- NEW FILE Builder.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import time import string import xmlrpclib import sys import socket import os import threading from plague import XMLRPCServerProxy from plague import CommonErrors from M2Crypto import SSL import ArchJob # Load in the config execfile("/etc/plague/server/CONFIG.py") # SSL certificate and key filenames certs = {} certs['key_and_cert'] = config_opts['server_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] class Builder(threading.Thread): """ Tracks all jobs on a builder instance """ def __init__(self, manager, address): self._cur_jobid = None self._manager = manager self._jobs = {} self._address = address if config_opts['ssl_builders']: self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, certs) else: self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, None) self._unavail_count = 0 self._arches = [] try: self._arches = self._server.supported_arches() except (socket.error, SSL.SSLError): raise RuntimeError self._alive = True self._arches.append('noarch') self._server_lock = threading.Lock() self._stop = False self._prepping_jobs = False threading.Thread.__init__(self) def arches(self): return self._arches def can_build_arch(self, arch): if arch in self._arches: return True return False def address(self): return self._address def alive(self): """ Is the builder responding to requests? """ return self._alive def start_job(self, par_job, target, arch, srpm_url): if not arch in self._arches or not self.available(): raise RuntimeError self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() if jobid == 0: raise RuntimeError job = ArchJob.ArchJob(self, self._server, par_job, jobid, target, arch) self._jobs[jobid] = job self._update_cur_job() return job def _update_cur_job(self): cur_jobid = None self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 self._server_lock.release() # Update the current job's status if self._unavail_count == 0: try: job = self._jobs[jobid] job.set_builder_status(status) except KeyError: pass self._cur_jobid = jobid if status == 'prepping': self._prepping_jobs = True else: self._prepping_jobs = False def stop(self): self._stop = True def run(self): while not self._stop: self._update_cur_job() # Kill all jobs on the client if it went away if self._unavail_count > 2: for jobid in self._jobs.keys(): job = self._jobs[jobid] job.builder_gone() del self._jobs[jobid] self._alive = False self._stop = True self._manager.builder_gone() continue # Update status of all jobs for j in self._jobs.values(): j.process() time.sleep(3) def available(self): """ Can the builder start a new job right now? """ if self._unavail_count > 2 or not self._alive: return False if self._cur_jobid: return False return True def any_prepping_jobs(self): return self._prepping_jobs def to_dict(self): client_dict = {} client_dict['address'] = self._address client_dict['arches'] = self._arches if self._cur_jobid: client_dict['status'] = 'building' else: client_dict['status'] = 'idle' return client_dict --- NEW FILE BuilderManager.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import time import string import xmlrpclib import sys import socket import os import threading import Builder # Load in the config execfile("/etc/plague/server/CONFIG.py") class BuilderManager: """ Tracks individual builder instances. """ def __init__(self): self._builders_lock = threading.Lock() # List of addresses of possible builders self.possible_builders = config_opts['builders'] self.running_builders = [] builder_list = self.update_builders() # Print out builder list when starting up print "\nBuilders:" print "-" * 60 for builder in builder_list: string = " " + builder['address'] string = string + " " * (40 - len(builder['address'])) for arch in builder['arches']: string = string + arch + " " print string print "" self._queue_lock = threading.Lock() self._queue = [] self._have_work = False def __del__(self): for builder in self.running_builders: builder.stop() time.sleep(2) for builder in self.running_builders: del builder def set_build_master(self, build_master): self._build_master = build_master def update_builders(self): self._builders_lock.acquire() builder_list = [] for address in self.possible_builders: # If the address is "https" but we aren't set up for SSL, exit if address.startswith('https') and not config_opts['ssl_builders']: print "Builder address (%s) starts with 'https', but the 'ssl_builders' option is set to False." % address os._exit(1) # If the address is already in our running_builders list, skip it skip = False for builder in self.running_builders: if address == builder.address(): skip = True if skip == True: continue # Try to connect to builder and add it to our builder # list if we can try: builder = Builder.Builder(self, address) except RuntimeError: pass else: builder_list.append(builder.to_dict()) builder.start() self.running_builders.append(builder) self._builders_lock.release() return builder_list def list_builders(self): builder_list = [] for builder in self.running_builders: builder_list.append(builder.to_dict()) return builder_list def have_work(self): avail = False for builder in self.running_builders: if builder.available(): avail = True if len(self._queue) > 0 and avail: return True return self._have_work def builder_gone(self): self._have_work = True def process(self): self._have_work = False # Deal with dead/unreachable builders for builder in self.running_builders: if not builder.alive(): print "Removing builder '%s' because it timed out." % builder.address() builder.stop() self.running_builders.remove(builder) # Deal with new arch jobs self._queue_lock.acquire() new_jobs = {} for req in self._queue: parent = req['parent'] stage = parent.get_cur_stage() if (stage != 'prep') and (stage != 'building'): self._queue.remove(req) continue # Find a free builder for this request for builder in self.running_builders: if builder.available() and builder.can_build_arch(req['arch']): try: job = builder.start_job(parent, req['target'], req['arch'], req['srpm_url']) except RuntimeError: pass else: if not new_jobs.has_key(parent): new_jobs[parent] = [] new_jobs[parent].append(job) self._queue.remove(req) break self._queue_lock.release() # Notify the parent jobs of their new archjobs. Have to do this outside _queue_lock # for locking reasons for parent in new_jobs.keys(): for job in new_jobs[parent]: parent.add_arch_job(job) if len(self._queue) > 0: time.sleep(0.25) def request_arch_job(self, par_job, target, arch, srpm_url): req = {} req['parent'] = par_job req['target'] = target req['arch'] = arch req['srpm_url'] = srpm_url self._queue_lock.acquire() self._queue.append(req) self._queue_lock.release() def any_prepping_builders(self): # query each build builder for any jobs that are in the 'prepping' state for builder in self.running_builders: if builder.alive() and builder.any_prepping_jobs(): return True return False --- NEW FILE PackageJob.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import os import os.path import sys import commands import threading import time import popen2 import rpmUtils import exceptions import shutil import tempfile import smtplib from email.MIMEText import MIMEText import string import SimpleXMLRPCServer import xmlrpclib import socket import BuilderManager import ArchJob # Load in the config execfile("/etc/plague/server/CONFIG.py") os.environ['CVSROOT'] = config_opts['pkg_cvs_root'] if len(config_opts['pkg_cvs_rsh']) > 0: os.environ['CVS_RSH'] = config_opts['pkg_cvs_rsh'] DEBUG = False def debugprint(stuff=''): if DEBUG: print stuff def log(stuff=''): print stuff class PrepError(exceptions.Exception): def __init__(self, errno=0, args=None): exceptions.Exception.__init__(self) self.args = args self.errno = errno def __str__(self): return self.args class BuildError(exceptions.Exception): def __init__(self, errno=0, args=None): exceptions.Exception.__init__(self) self.args = args self.errno = errno def __str__(self): return self.args http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") def is_build_job_stage_valid(stage): """ Validate a job stage. """ stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'cleanup', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] if stage in stages: return True return False class PackageJob(threading.Thread): """ Controller object for building 1 SRPM on multiple arches """ def __init__(self, uid, username, package, cvs_tag, repo, buildmaster, hostname): self.curstage = 'initialize' self.bm = buildmaster self.hostname = hostname self.uid = uid self.username = username self.starttime = time.time() self.endtime = None self.package = package self.name = None self.target = repo.target() self.repo = repo self.failed = False self.no_cvs = config_opts['use_srpm_not_cvs'] self.cvs_tag = cvs_tag self.stage_dir = None self.srpm_path = None self.srpm_http_path = None # Deal with straight SRPM builds if self.no_cvs and self.curstage is 'initialize': self._set_cur_stage('make_srpm') self.repofiles = {} self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() threading.Thread.__init__(self) def get_cur_stage(self): return self.curstage def _set_cur_stage(self, stage): """ Update our internal job stage, and notify the BuildMaster that we've changed as well. """ oldstage = self.curstage self.curstage = stage if oldstage != stage: self.bm.queue_job_status_update(self.uid, stage) def get_uid(self): return self.uid def arch_handling(self, hdr): # Associate sub-architectures with their "master" architecture. # This is only used to determine which arches to build on by default, # so that if we have an Additional Package Arches file that specifies # 'sparcv9' for a package that we don't try to build sparcv9 for that # package unless 'sparc' is listed in our 'targets' config option. sub_arches = { 'athlon' : 'i386', 'i686' : 'i386', 'i586' : 'i386', 'i486' : 'i386', 'amd64' : 'x86_64', 'ia32e' : 'x86_64', 'ppc32' : 'ppc', 'sparcv8' : 'sparc', 'sparcv9' : 'sparc' } # Grab additional build arches out of the Additional Package # Arches file apa_file_name = self.target + "addl-arches" apa_file = os.path.join(config_opts['addl_package_arches_dir'], apa_file_name) addl_arches = [] try: f = open(apa_file, "r") except IOError, e: pass else: for line in f.readlines(): line = line.strip() tmp_split = line.split(':') if len(tmp_split) == 2: package = tmp_split[0] if package == self.name: tmp_arches = tmp_split[1] tmp_arches = tmp_arches.strip() addl_arches = tmp_arches.split(' ') break targets = config_opts['targets'] buildable_arches = targets[self.target] target_opt_arches = config_opts['target_optional_arches'] opt_arches = [] if target_opt_arches.has_key(self.target): opt_arches = target_opt_arches[self.target] # Remove arches we don't support from addl_arches for arch in addl_arches: if sub_arches.has_key(arch): master_addl_arch = sub_arches[arch] if master_addl_arch not in buildable_arches: if master_addl_arch not in opt_arches: addl_arches.remove(arch) ba = hdr['buildarchs'] exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] arches = {} if ba == ['noarch']: arches['noarch'] = None return arches # default to building all base arches the 'target' # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target tmparchs = [] allowed_arches = [] for arch in buildable_arches: tmparchs.append(arch) allowed_arches.append(arch) for arch in addl_arches: tmparchs.append(arch) allowed_arches.append(arch) # Optional arches don't get built by default but are "allowed" for arch in opt_arches: allowed_arches.append(arch) if ba: tmparchs = ba else: if exclusive: tmparchs = exclusive if exclude: for arch in exclude: if arch in tmparchs: tmparchs.remove(arch) # we probably need to check the archs, and make sure they are what # we can build for for thisarch in tmparchs: if thisarch in allowed_arches: arches[thisarch] = None return arches def _make_stage_dir(self, rootdir): # The dir will look like this: # /devel/95-foo-1.1.0-23 pkgsubdir = '%d-%s-%s-%s' % (self.uid, self.name, self.ver, self.release) stage_dir = os.path.join(rootdir, self.target, pkgsubdir) if os.path.exists(stage_dir): shutil.rmtree(stage_dir, ignore_errors=True) os.makedirs(stage_dir) return stage_dir def _checkout(self): self._set_cur_stage('checkout') dir_prefix = self.cvs_tag + "-" self.checkout_tmpdir = tempfile.mkdtemp(prefix=dir_prefix, dir=config_opts['tmpdir']) os.chdir(self.checkout_tmpdir) # Checkout the module cmd = '%s co -r %s %s' % (config_opts['cvs_cmd'], self.cvs_tag, self.package) debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return # Just in case the 'common' directory didn't come along for the ride, # get it from CVS pkg_path = os.path.join(self.checkout_tmpdir, self.package) if not os.path.exists(os.path.join(pkg_path, "common")): os.chdir(pkg_path) cmd = '%s co common' % config_opts['cvs_cmd'] debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) os.chdir(self.checkout_tmpdir) if s != 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return def _make_srpm(self): self._set_cur_stage('make_srpm') self.srpm_path = None srpm_dir = os.path.join(self.checkout_tmpdir, self.package, self.target) if not os.path.exists(srpm_dir): subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return os.chdir(srpm_dir) cmd = '%s srpm' % config_opts['make_cmd'] debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir)) s, o = commands.getstatusoutput(cmd) if s != 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not make srpm for %s - output was:\n %s" % (self.cvs_tag, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return srpmpath = None for line in o.split("\n"): if line.startswith("Wrote:"): line.replace("\n", "") (garbage, path) = line.split(':') srpmpath = path.strip() break if not srpmpath: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find srpm for %s - output was:\n %s" % (self.cvs_tag, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return self.srpm_path = srpmpath def _prep(self): self._set_cur_stage('prep') # In SRPM-only mode, cvs_tag is path to the SRPM to build if self.no_cvs: self.srpm_path = self.cvs_tag ts = rpmUtils.transaction.initReadOnlyTransaction() hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.srpm_path) self.name = hdr['name'] self.ver = hdr['version'] self.release = hdr['release'] self.archjobs = self.arch_handling(hdr) del hdr del ts if len(self.archjobs) == 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find any architectures to build for %s - output was:\n" % (self.cvs_tag) self.email_result(resultstring=msg, subject=subj) self.failed = True self._set_cur_stage('finished') return self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) for arch in self.archjobs.keys(): thisdir = os.path.join(self.stage_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) # Copy the SRPM to the final package product dir srpm = os.path.basename(self.srpm_path) srpm_in_dir = os.path.join(self.stage_dir, srpm) if os.path.exists(srpm_in_dir): os.unlink(srpm_in_dir) shutil.copy(self.srpm_path, self.stage_dir) # Must also copy SRPM to where the build client can get it over HTTP http_pkg_path = self._make_stage_dir(http_dir) self.srpm_http_path = os.path.join(http_pkg_path, srpm) shutil.copy(self.srpm_path, self.srpm_http_path) self.srpm_path = srpm_in_dir # Remove CVS checkout and make_srpm dirs if not self.no_cvs: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) self._request_arch_jobs() def _request_one_arch_job(self, arch): # Construct SPRM URL srpm_http_base = self.srpm_http_path[len(http_dir):] if config_opts['ssl_builders'] == True: method = "https://" else: method = "http://" srpm_url = method + self.hostname + ":8886/" + srpm_http_base self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url) def _request_arch_jobs(self): # Queue requests for build jobs self._archjobs_lock.acquire() for arch in self.archjobs.keys(): if self.archjobs[arch]: continue self._request_one_arch_job(arch) self._archjobs_lock.release() def add_arch_job(self, job): """ Called by the BuilderManager when it's started a new arch job for us """ self._archjobs_lock.acquire() if self.archjobs[job.arch] != None: log("%s (%s/%s): Already have archjob for this arch (%s). New job UID is %s." % (self.uid, self.package, job.arch, self.archjobs[job.arch].jobid, job.jobid)) self.archjobs[job.arch] = job self._archjobs_lock.release() log("%s (%s/%s): Builder UID is %s" % (self.uid, self.package, job.arch, job.jobid)) def remove_arch_job(self, job): """ Removes an arch job when its builder is no longer responding """ self._archjobs_lock.acquire() print "%s (%s/%s): Builder disappeared. Requeuing arch..." % (self.uid, self.package, job.arch) self.archjobs[job.arch] = None self._request_one_arch_job(job.arch) self._archjobs_lock.release() def is_done(self): if self.curstage == 'needsign' or self.curstage == 'failed' or self.curstage == 'killed': return True return False def die(self, username): # Kill any building jobs self._set_cur_stage('killed') self._archjobs_lock.acquire() for job in self.archjobs.values(): if job: job.die() self.archjobs = {} self._archjobs_lock.release() resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username) self.email_result(resultstring) self.bm.notify_job_done(self) def wake(self): self._event.set() def run(self): while not self.is_done(): # Advance to next stage based on current stage wait = False if self.curstage == 'initialize': self._checkout() elif self.curstage == 'checkout': self._make_srpm() elif self.curstage == 'make_srpm': self._prep() elif self.curstage == 'prep' or self.curstage == 'building': wait = self._monitor() elif self.curstage == 'finished': self._cleanup() elif self.curstage == 'cleanup': if self.failed: self._failed() else: self._add_to_repo() elif self.curstage == 'addtorepo': wait = True elif self.curstage == 'repodone': self._succeeded() if wait: while not self._event.isSet(): self._event.wait() self._event.clear() def _monitor(self): self._set_cur_stage('building') # Count failed and completed jobs completed_jobs = 0 for job in self.archjobs.values(): if not job: continue if job.get_status() is 'done': if job.builder_failed(): self.failed = True else: completed_jobs = completed_jobs + 1 # If any jobs have failed, or if all jobs have completed successfully, advance if self.failed or (completed_jobs == len(self.archjobs)): self._set_cur_stage('finished') return False # Don't want to wait return True def _cleanup(self): self._set_cur_stage('cleanup') if self.failed: # Kill remaining jobs on other arches for job in self.archjobs.values(): if job: job.die() def get_stage_dir(self): return self.stage_dir def _failed(self): self._set_cur_stage('failed') resultstring = """ %s (%s): %s on %s failed to complete on one or more archs. """ % (self.uid, self.package, self.cvs_tag, self.target) resultstring = resultstring + "\n" # Add each arch job and its result: for job in self.archjobs.values(): if job and job.builder_status != 'killed': resultstring = resultstring + " " + "%s - %s: %s" % (job.arch, job.jobid, job.builder_status) + "\n" resultstring = resultstring + "\n" self.email_result(resultstring) self.bm.notify_job_done(self) def _add_to_repo(self): self._set_cur_stage('addtorepo') # Create a list of files that the repo should copy to # the repo dir for job in self.archjobs.values(): if not job: continue file_list = job.get_files() for f in file_list: if not f.endswith(".rpm"): continue src_file = os.path.join(self.stage_dir, job.arch, f) verrel = "%s-%s" % (self.ver, self.release) if f.endswith(".src.rpm"): dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, "SRPM") else: dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, job.arch) self.repofiles[src_file] = dst_path self._event.clear() # Request the repo copy our files. It will get the file # list from this object directly when the copy operation # happens if len(self.repofiles): self.repo.request_copy(self) def repo_add_callback(self): self._set_cur_stage('repodone') self.wake() def _succeeded(self): self._set_cur_stage('needsign') resultstring = "%s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target) self.email_result(resultstring) self.bm.notify_job_done(self) def email_result(self, resultstring, subject=None): """send 'resultstring' to self.email from self.email_from""" msg = MIMEText(resultstring) if not subject: name = self.name if not name: name = self.package subject = 'Build Result: %d - %s on %s' % (self.uid, name, self.target) msg['Subject'] = subject msg['From'] = config_opts['email_from'] msg['To'] = self.username s = smtplib.SMTP() s.connect() s.sendmail(config_opts['email_from'], [self.username], msg.as_string()) s.close() --- NEW FILE main.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 Duke University # written by Seth Vidal import sys import os from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer import SimpleXMLRPCServer from M2Crypto import threading as m2thread sys.path.append('/usr/share/plague/server') import User import BuildMaster import BuilderManager from UserInterface import UserInterfaceSSLAuth from UserInterface import UserInterfaceNoAuth # Load in the config execfile("/etc/plague/server/CONFIG.py") use_lighttpd = True class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer): """ SSL XMLRPC server that authenticates clients based on their certificate. """ def __init__(self, address, certs): AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs) self.authenticator = User.Authenticator() def auth_cb(self, request, client_address): """ Authenticate the user and determine user's privs. TODO: pull user privs from a DB """ peer_cert = request.get_peer_cert() # m2crypto 0.9 only supports 'Email' so fall through # to that if emailAddress doesn't work try: email = peer_cert.get_subject().emailAddress except AttributeError: email = peer_cert.get_subject().Email user = None try: user = self.authenticator.new_authed_user(email, client_address) except Exception: pass return user ################################################################# if __name__ == '__main__': if len(sys.argv) < 2: print "Usage:\n" print " %s \n" % sys.argv[0] sys.exit(1) hostname = sys.argv[1] m2thread.init() builder_manager = BuilderManager.BuilderManager() # Create the BuildMaster thread bm = BuildMaster.BuildMaster(hostname, builder_manager) bm.start() # Create the BuildMaster XMLRPC server UI_PORT = 8887 ui = None if config_opts['ssl_frontend'] == True: ui_certs = {} ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] ui_certs['ca_cert'] = config_opts['ca_cert'] ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] ui = UserInterfaceSSLAuth(builder_manager, bm) bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) else: ui = UserInterfaceNoAuth(builder_manager, bm) bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) bm_server.register_instance(ui) # SRPM fileserver SRPM_SERVER_PORT = 8886 http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") if use_lighttpd: http_cnf_file = "/var/tmp/plague-server.conf" if config_opts['ssl_builders']: key_and_cert = config_opts['server_key_and_cert'] else: key_and_cert = None srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, SRPM_SERVER_PORT, http_dir, False, key_and_cert) else: if config_opts['ssl_builders']: srpm_server_certs = {} srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] srpm_server_certs['ca_cert'] = config_opts['ca_cert'] srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) else: srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) srpm_server.start() print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) try: bm_server.serve_forever() except KeyboardInterrupt: # Make sure the BuildMaster thread shuts down print "Shutting down..." bm.stop() srpm_server.stop() del bm print "Done." m2thread.cleanup() os._exit(0) Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BuildMaster.py 29 Jun 2005 05:23:00 -0000 1.9 +++ BuildMaster.py 5 Jul 2005 21:08:03 -0000 1.10 @@ -1,4 +1,3 @@ -#!/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 @@ -13,15 +12,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # copyright 2005 Duke University -# written by Seth Vidal +# +# Copyright 2005 Dan Williams and Red Hat, Inc. import time -import BuildJob +import PackageJob import sqlite import threading import os import Repo +import copy # Load in the config @@ -69,13 +70,13 @@ class BuildMaster(threading.Thread): - def __init__(self, hostname, client_manager): - self.bcm = client_manager + def __init__(self, hostname, builder_manager): + self.builder_manager = builder_manager self.hostname = hostname self.should_stop = False self.repos = {} for target in config_opts['targets'].keys(): - repo = Repo.Repo(target, client_manager) + repo = Repo.Repo(target, builder_manager) self.repos[target] = repo repo.start() @@ -106,7 +107,6 @@ def __del__(self): self.dbcx.close() - del self.bcm def stop(self): self.should_stop = True @@ -142,7 +142,9 @@ def queue_job_status_update(self, uid, status): self._status_updates_lock.acquire() - self._status_updates[uid] = status + lcl_uid = copy.copy(uid) + lcl_status = copy.copy(status) + self._status_updates[lcl_uid] = lcl_status self._status_updates_lock.release() def notify_job_done(self, job): @@ -164,9 +166,6 @@ self._done_queue = [] self._done_queue_lock.release() - def getClientManager(self): - return self.bcm - def _write_status_to_db(self, uid, status): try: self.curs.execute('UPDATE jobs SET status="%s" WHERE uid=%d' \ @@ -218,7 +217,7 @@ # to make sure we pick the last result to get the correct one row = data[len(data) - 1] repo = self.repos[item['target']] - job = BuildJob.BuildJob(row['uid'], item['email'], item['package'], + job = PackageJob.PackageJob(row['uid'], item['email'], item['package'], locator, repo, self, self.hostname) print "%s (%s): Starting tag '%s' on target '%s'" % (row['uid'], \ @@ -278,6 +277,9 @@ if have_work: return True + if self.builder_manager.have_work(): + return True + return False def get_job(self, jobid): @@ -295,8 +297,8 @@ # Write update status for jobs to the database self._save_job_status() - # Update all build clients and known jobs - self.bcm.process() + if self.builder_manager.have_work(): + self.builder_manager.process() # Clean up jobs that have finished self._process_finished_jobs() Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- CONFIG.py 1 Jul 2005 11:51:33 -0000 1.14 +++ CONFIG.py 5 Jul 2005 21:08:03 -0000 1.15 @@ -16,7 +16,7 @@ config_opts['ssl_frontend'] = True # ssl_buildclients: True = all communication between server & build client # be over an SSL connecction -config_opts['ssl_buildclients'] = True +config_opts['ssl_builders'] = False SERVER_BASE_DIR = "/etc/plague/server" @@ -87,6 +87,6 @@ # Builder Clients -config_opts['builders'] = [ 'https://127.0.0.1:8888' ] +config_opts['builders'] = [ 'http://127.0.0.1:8888' ] Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 28 Jun 2005 16:46:13 -0000 1.4 +++ Makefile 5 Jul 2005 21:08:03 -0000 1.5 @@ -10,9 +10,11 @@ rm -f *.pyc *.pyo *~ *.bak FILES = \ - BuildJob.py \ + ArchJob.py \ + BuilderManager.py \ + Builder.py \ BuildMaster.py \ - client_manager.py \ + PackageJob.py \ Repo.py \ UserInterface.py \ User.py @@ -22,7 +24,7 @@ install: $(MKDIR) -p $(DESTDIR)/$(BINDIR) - $(INSTALL) -m 755 buildserver.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-server + $(INSTALL) -m 755 main.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-server $(MKDIR) -p $(OTHERINSTDIR) for file in $(FILES); do $(INSTALL) -m 644 $$file $(OTHERINSTDIR)/$$file; done $(MKDIR) -p $(CONFIGDIR) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Repo.py 29 Jun 2005 18:06:12 -0000 1.4 +++ Repo.py 5 Jul 2005 21:08:03 -0000 1.5 @@ -28,8 +28,8 @@ class Repo(threading.Thread): """ Represents an on-disk repository of RPMs and manages updates to the repo. """ - def __init__(self, target, client_manager): - self._bcm = client_manager + def __init__(self, target, builder_manager): + self._builder_manager = builder_manager self._target = target self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): @@ -79,7 +79,7 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() - s, o = commands.getstatusoutput('/usr/bin/createrepo -q %s' % self._repodir) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q %s' % self._repodir) if s != 0: print "createrepo failed with exit status %d!" % s @@ -92,7 +92,7 @@ # 2 until all clients have finished their 'prep' state. Only then do we # copy RPMs to the repo and run createrepo on it. - prepping_clients = self._bcm.any_prepping_clients() + prepping_builders = self._builder_manager.any_prepping_builders() self._lock.acquire() @@ -105,7 +105,7 @@ # Enter lock level 2 if there are no build clients in the # 'prep' state and we are already at lock level 1 - if not prepping_clients and self._lock_count == 1: + if not prepping_builders and self._lock_count == 1: self._lock_count = 2 self._lock.release() Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- UserInterface.py 29 Jun 2005 21:32:33 -0000 1.14 +++ UserInterface.py 5 Jul 2005 21:08:03 -0000 1.15 @@ -23,7 +23,7 @@ import os import copy import BuildMaster -import BuildJob +import PackageJob # Load in the config execfile("/etc/plague/server/CONFIG.py") @@ -50,8 +50,8 @@ Base UserInterface class. NO AUTHENTICATION. Subclass this to provide some. """ - def __init__(self, client_manager, build_master): - self._cm = client_manager + def __init__(self, builder_manager, build_master): + self._builder_manager = builder_manager self._bm = build_master @@ -92,6 +92,12 @@ "%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target)) return (-1, "Pathname to SRPM is limited to 255 characters.") + srpm_file = os.path.abspath(srpm_file) + if not srpm_file or not os.access(srpm_file, os.R_OK): + email_result(email, srpm_file, "Error setting up build for %s on "\ + "%s: The SRPM does not exist, or is not accessible. Remember to use absolute paths." % (srpm_file, target)) + return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.") + print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" \ % (package, srpm_file, target, email) targets = config_opts['targets'] @@ -131,7 +137,7 @@ if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] - if BuildJob.is_build_job_stage_valid(status): + if PackageJob.is_build_job_stage_valid(status): if first: search = search + " WHERE " first = False @@ -164,16 +170,16 @@ return (ret, msg, job_list) - def update_clients(self): + def update_builders(self): execfile("/etc/plague/server/CONFIG.py") - client_list = self._cm.update_clients() - return (0, "Success.", client_list) + builder_list = self._builder_manager.update_builders() + return (0, "Success.", builder_list) - def list_clients(self): + def list_builders(self): execfile("/etc/plague/server/CONFIG.py") - client_list = self._cm.list_clients() - return (0, "Success.", client_list) + builder_list = self._builder_manager.list_builders() + return (0, "Success.", builder_list) class UserInterfaceSSLAuth(UserInterface): @@ -209,15 +215,15 @@ return UserInterface.list_jobs(self, args_dict) - def update_clients(self, user): + def update_builders(self, user): if not user.server_admin: return (-1, "Insufficient privileges.") - return UserInterface.update_clients(self) + return UserInterface.update_builders(self) - def list_clients(self, user): + def list_builders(self, user): if not user.server_admin: return (-1, "Insufficient privileges.") - return UserInterface.list_clients(self) + return UserInterface.list_builders(self) class UserInterfaceNoAuth(UserInterface): --- BuildJob.py DELETED --- --- buildserver.py DELETED --- --- client_manager.py DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 21:07:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:07:53 -0400 Subject: extras-buildsys ChangeLog,1.42,1.43 Message-ID: <200507052108.j65L8NIb003876@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768 Modified Files: ChangeLog Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ChangeLog 1 Jul 2005 11:51:26 -0000 1.42 +++ ChangeLog 5 Jul 2005 21:07:51 -0000 1.43 @@ -1,3 +1,15 @@ +2005-07-05 Dan Williams + + * Rework a bunch of stuff so the build server doesn't use quite as much CPU, + also split out stuff from server/client_manager.py + + * Generalize the common/ classes to provide both SSL and non-SSL facilities, + renaming a lot of those files in the process + + * Fix non-SSL builder/server and client/server communication + + Note: At this time, SSL may be broken. + 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's From fedora-extras-commits at redhat.com Tue Jul 5 21:07:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:07:59 -0400 Subject: extras-buildsys/client client.py,1.5,1.6 Message-ID: <200507052108.j65L8TVg003883@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/client Modified Files: client.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- client.py 1 Jul 2005 11:51:27 -0000 1.5 +++ client.py 5 Jul 2005 21:07:57 -0000 1.6 @@ -17,7 +17,7 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import sys, os -from plague import SSLXMLRPCServerProxy +from plague import XMLRPCServerProxy import ConfigParser import M2Crypto import M2Crypto.m2xmlrpclib @@ -39,7 +39,7 @@ config.set('User', 'email', 'foo at it.com') -config_file_path = os.path.expanduser('~/.plague-builder.cfg') +config_file_path = os.path.expanduser('~/.plague-client.cfg') config.read([config_file_path]) @@ -128,46 +128,46 @@ print msg -def print_clients(banner, client_list): +def print_builders(banner, builder_list): print "\n%s:" % banner print "-" * 70 - for client in client_list: - string = " " + client['address'] - string = string + " " * (40 - len(client['address'])) - for arch in client['arches']: + for builder in builder_list: + string = " " + builder['address'] + string = string + " " * (40 - len(builder['address'])) + for arch in builder['arches']: string = string + arch + " " - string = string + " " + client['status'] + string = string + " " + builder['status'] print string print "" -def update_clients(server, email): +def update_builders(server, email): """ - Tell the build server to requery its build client list and re-add dropped - clients that are now alive. + Tell the build server to requery its builder list and re-add dropped + builders that are now alive. """ try: - (e, msg, client_list) = server.update_clients() - if len(client_list) > 0: - print_clients("New Build Clients", client_list) + (e, msg, builder_list) = server.update_builders() + if len(builder_list) > 0: + print_builders("New Builders", builder_list) else: - print "No new build clients found." + print "No new builders found." except (M2Crypto.SSL.SSLError, socket.error), e: print "Error connecting to build server: '%s'" % e -def list_clients(server, email): +def list_builders(server, email): """ - Get a list of currently active build clients. + Get a list of currently active builders. """ try: - (e, msg, client_list) = server.list_clients() - if len(client_list) > 0: - print_clients("Active Build Clients", client_list) + (e, msg, builder_list) = server.list_builders() + if len(builder_list) > 0: + print_builders("Active Builders", builder_list) else: - print "No active build clients found." + print "No active builders found." except (M2Crypto.SSL.SSLError, socket.error), e: print "Error connecting to build server: '%s'" % e @@ -189,7 +189,7 @@ certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert')) certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert')) - server = SSLXMLRPCServerProxy.SSLXMLRPCServerProxy(certs, config.get('Server', 'address')) + server = XMLRPCServerProxy.XMLRPCServerProxy(addr, certs) elif use_ssl == 'false': if addr.startswith("https:"): raise ServerException("Error: '%s' is an SSL server, but the use_ssl config option set to False. See %s" % (addr, config_file_path)) @@ -236,8 +236,8 @@ print " list " print " list " print " kill " - print " update_clients" - print " list_clients" + print " update_builders" + print " list_builders" print "" sys.exit(1) @@ -284,10 +284,10 @@ sys.exit(1) jobid = sys.argv[2] kill(server, email, jobid) - elif cmd == 'update_clients': - update_clients(server, email) - elif cmd == 'list_clients': - list_clients(server, email) + elif cmd == 'update_builders': + update_builders(server, email) + elif cmd == 'list_builders': + list_builders(server, email) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Tue Jul 5 21:07:54 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:07:54 -0400 Subject: extras-buildsys/builder CONFIG.py,1.3,1.4 builder.py,1.4,1.5 Message-ID: <200507052108.j65L8OwE003878@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CONFIG.py 1 Jul 2005 11:51:27 -0000 1.3 +++ CONFIG.py 5 Jul 2005 21:07:52 -0000 1.4 @@ -18,6 +18,7 @@ config_opts['distro_name'] = "fedora" config_opts['repo_name'] = "core" +config_opts['ssl_buildserver'] = False config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 @@ -34,3 +35,6 @@ # WARNING: this directory is world-readable via HTTP! config_opts['builder_work_dir'] = "/tmp/builder_work" +# User to drop privilege level to since we can't run mock as root, +# but we have to run the HTTP server as root so it can chroot +config_opts['builder_user'] = "builder" Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- builder.py 1 Jul 2005 11:51:27 -0000 1.4 +++ builder.py 5 Jul 2005 21:07:52 -0000 1.5 @@ -31,9 +31,9 @@ import urllib import errno from plague import FileDownloader -from plague import SimpleSSLXMLRPCServer +from plague import AuthedXMLRPCServer from plague import lighttpdManager -from plague import SimpleHTTPSServer +from plague import HTTPServer from M2Crypto import threading as m2thread @@ -57,11 +57,15 @@ return None file_part = file_path[len(config_opts["builder_work_dir"]) + 1:] port = "%s" % config_opts['fileserver_port'] - full_url = "https://" + g_our_hostname + ":" + port + "/" + file_part + if config_opts['ssl_buildserver']: + method = "https://" + else: + method = "http://" + full_url = method + g_our_hostname + ":" + port + "/" + file_part return urllib.quote(full_url) -class BuildClientMock: +class BuilderMock: """puts things together for an arch - baseclass for handling builds for other arches""" @@ -372,47 +376,47 @@ return False -class i386Arch(BuildClientMock): +class i386Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-i386-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '/usr/bin/setarch i686' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class x86_64Arch(BuildClientMock): +class x86_64Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-x86_64-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class PPCArch(BuildClientMock): +class PPCArch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-ppc-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class PPC64Arch(BuildClientMock): +class PPC64Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-ppc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class SparcArch(BuildClientMock): +class SparcArch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-sparc-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '/usr/bin/sparc32' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class Sparc64Arch(BuildClientMock): +class Sparc64Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-sparc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '/usr/bin/sparc64' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) # Keep this global scope, used in __main__ builder_dict = {'i386': i386Arch, @@ -432,7 +436,7 @@ 'sparc64': Sparc64Arch } -def getBuildClient(uniqid, target, buildarch, srpm_url, localarches): +def getArchBuilder(uniqid, target, buildarch, srpm_url, localarches): """hand it an arch it hands you back the builder instance you need""" if not builder_dict.has_key(buildarch): @@ -454,7 +458,7 @@ if config_opts['debug']: print string -class XMLRPCBuildClientServer: +class XMLRPCBuilderServer: def __init__(self, localarches): self.ids = {} # unique id => awclass instance self.localarches = localarches @@ -462,75 +466,122 @@ def process(self): # Give jobs some time to update their status and do their thing - job = 0 - for (uniqid, bcp) in self.ids.iteritems(): - if not bcp.is_done_status(): - bcp.process() - job = uniqid - self.cur_job = job # Update current job + jobid = 0 + for (uniqid, job) in self.ids.iteritems(): + if not job.is_done_status(): + job.process() + jobid = uniqid + self.cur_job = jobid # Update current job - def start(self, target, buildarch, srpm_url): + def start(self, target, arch, srpm_url): if self.cur_job != 0: log("Tried to build '%s' when already buiding something" % srpm_url) return 0 cur_time = time.time() - check = '%d %s %s %s' % (cur_time, target, buildarch, srpm_url) + check = '%d %s %s %s' % (cur_time, target, arch, srpm_url) sum = sha.new() sum.update(check) uniqid = sum.hexdigest() if target == 'devel': target = 'development' - bcp = getBuildClient(uniqid, target, buildarch, srpm_url, self.localarches) - if bcp != None: - self.ids[uniqid] = bcp - bcp.start() + job = getArchBuilder(uniqid, target, arch, srpm_url, self.localarches) + if job != None: + self.ids[uniqid] = job + job.start() filename = os.path.basename(srpm_url) log("%s: started %s on %s arch %s at time %d" % (uniqid, filename, - target, buildarch, cur_time)) + target, arch, cur_time)) else: log("%s: Failed request for %s on %s UNSUPPORTED arch %s at time %d" % - (uniqid, srpm_url, target, buildarch, cur_time)) + (uniqid, srpm_url, target, arch, cur_time)) uniqid = 0 self.cur_job = uniqid return uniqid - def status(self, uniqid=None): - if not uniqid: - uniqid = self.cur_job - if not uniqid: - return 'idle' - try: - bcp = self.ids[uniqid] - except KeyError, e: - bcp = None - if not bcp: - return 'idle' - return bcp.status() - def die(self, uniqid): - bcp = self.ids[uniqid] - return bcp.die() + job = self.ids[uniqid] + return job.die() def files(self, uniqid): - bcp = self.ids[uniqid] - return bcp.files() + job = self.ids[uniqid] + return job.files() def repo_unlocked(self, uniqid): - bcp = self.ids[uniqid] - return bcp.repo_unlocked() + job = self.ids[uniqid] + return job.repo_unlocked() def listjobs(self): return self.ids.keys() def get_cur_job(self): """ Are we currently building something? """ - return self.cur_job + status = 'idle' + try: + job = self.ids[self.cur_job] + status = job.status() + except KeyError: + status = 'idle' + return (self.cur_job, status) def supported_arches(self): return self.localarches +def drop_privs(): + """ + We can't and shouldn't run mock as root, so we drop privs. + We have to run the HTTP server as root though so it can chroot + to the fileserver directory. + """ + + if os.getuid() != 0: + return + + import pwd + import grp + + eu = config_opts['builder_user'] + try: + uid = int(eu) + except ValueError: + try: + pwrec = pwd.getpwnam(eu) + except KeyError: + print "Username '%s' does not exist." % eu + return -1 + uid = pwrec[2] + else: + try: + pwrec = pwd.getpwuid(uid) + except KeyError: + print "User ID %d doesn't exist." % uid + return -1 + gid = pwrec[3] + + if uid == 0: + print "You cannot use the superuser as the 'builder_user' option." + return -1 + + # Make ourself members of the mock group build_user's group + try: + mock_req = grp.getgrnam('mock') + except KeyError: + print "Mock group doesn't exist." + return -1 + groups = [mock_req[2], gid] + os.setgroups(groups) + + try: + os.setgid(gid) + except OSError: + print "Could drop group privileges. Error: '%s'" % sys.exc_info() + return -1 + + os.setuid(uid) + return 0 + + if __name__ == '__main__': if len(sys.argv) < 3: print "Usage:\n" @@ -552,26 +603,46 @@ g_our_hostname = sys.argv[1] localarches = sys.argv[2:] - print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + work_dir = config_opts['builder_work_dir'] + if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): + print "%s does not exist or is not readable." % work_dir + os._exit(1) m2thread.init() - xmlrpc_port = config_opts['xmlrpc_port'] - xmlserver = SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer(certs, (g_our_hostname, xmlrpc_port)) - bcs = XMLRPCBuildClientServer(localarches) - xmlserver.register_instance(bcs) - # Start up the HTTP server thread which the build server # pulls completed RPMs from - work_dir = config_opts['builder_work_dir'] port = config_opts['fileserver_port'] if use_lighttpd: http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid() - http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, config_opts['builder_key_and_cert']) + if config_opts['ssl_buildserver']: + key_and_cert = config_opts['builder_key_and_cert'] + else: + key_and_cert = None + http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: - http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, port), work_dir) + if config_opts['ssl_buildserver']: + http_server = HTTPServer.HTTPServer(certs, (g_our_hostname, port), work_dir, certs) + else: + http_server = HTTPServer.HTTPServer((g_our_hostname, port), work_dir, None) http_server.start() + # Stop running as root + if drop_privs() == -1: + http_server.stop() + time.sleep(1) + m2thread.cleanup() + os._exit(1) + + print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + xmlrpc_port = config_opts['xmlrpc_port'] + if config_opts['ssl_buildserver']: + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), certs) + else: + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port)) + bcs = XMLRPCBuilderServer(localarches) + xmlserver.register_instance(bcs) + last_time = time.time() while True: try: From fedora-extras-commits at redhat.com Tue Jul 5 21:08:00 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:08:00 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, NONE, 1.1 HTTPServer.py, NONE, 1.1 XMLRPCServerProxy.py, NONE, 1.1 FileDownloader.py, 1.9, 1.10 Makefile, 1.3, 1.4 SSLCommon.py, 1.7, 1.8 lighttpdManager.py, 1.1, 1.2 SSLXMLRPCServerProxy.py, 1.3, NONE SimpleHTTPSServer.py, 1.6, NONE SimpleSSLXMLRPCServer.py, 1.7, NONE Message-ID: <200507052108.j65L80FM003840@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/common Modified Files: FileDownloader.py Makefile SSLCommon.py lighttpdManager.py Added Files: AuthedXMLRPCServer.py HTTPServer.py XMLRPCServerProxy.py Removed Files: SSLXMLRPCServerProxy.py SimpleHTTPSServer.py SimpleSSLXMLRPCServer.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. --- NEW FILE AuthedXMLRPCServer.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 Konstantin Ryabitsev # Modified by Dan Williams import os, sys import socket import time import SocketServer from M2Crypto import SSL import xmlrpclib import SimpleXMLRPCServer import SSLCommon class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): def do_POST(self): """ See documentation on SimpleXMLRPCRequestHandler. Modifications include the ability to pass through local request-specific data, and removal of code to deal with historical _dispatch methods. """ if 0: # ONLY FOR DEBUGGING, so we can see exceptions on the console # get arguments data = self.rfile.read(int(self.headers["content-length"])) authinfo = self.server.get_authinfo(self.request, self.client_address) response = self.server._marshaled_dispatch(data, authinfo) # got a valid XML RPC response self.send_response(200) self.send_header("Content-type", "text/xml") self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) # shut down the connection self.wfile.flush() self.connection.shutdown(1) else: try: # get arguments data = self.rfile.read(int(self.headers["content-length"])) authinfo = self.server.get_authinfo(self.request, self.client_address) response = self.server._marshaled_dispatch(data, authinfo) except: # This should only happen if the module is buggy # internal error, report as HTTP server error self.send_response(500) self.end_headers() else: # got a valid XML RPC response self.send_response(200) self.send_header("Content-type", "text/xml") self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) # shut down the connection self.wfile.flush() self.connection.shutdown(1) class BaseAuthedXMLRPCServer: def __init__(self, address, authinfo_callback=None): self.allow_reuse_address = 1 self.logRequests = 0 self.authinfo_callback = authinfo_callback if sys.version_info[:3] > (2, 2, 3): SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) def get_authinfo(self, request, client_address): if self.authinfo_callback: return self.authinfo_callback(request, client_address) return None def verify_request(self, request, client_address): """ Allow ourselves a chance to verify the client """ if self.authinfo_callback: authinfo = self.get_authinfo(request, client_address) if authinfo: return True return False # Allow all requests if there's no authinfo_callback return True def _marshaled_dispatch(self, data, authinfo): """ Allow the ability to pass request-dependent objects into the handler instance. """ params, method = xmlrpclib.loads(data) # generate response try: response = self._dispatch(authinfo, method, params) # wrap response in a singleton tuple response = (response,) response = xmlrpclib.dumps(response, methodresponse=1) except xmlrpclib.Fault, fault: response = xmlrpclib.dumps(fault) except: # report exception back to server response = xmlrpclib.dumps( xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)) ) return response def _dispatch(self, authinfo, method, params): """ Allow the ability to pass request-dependent objects into the handler instance. """ func = None try: # check to see if a matching function has been registered func = self.funcs[method] except KeyError: if self.instance is not None: # call instance method directly try: func = self.lcl_resolve_dotted_attribute(method) except AttributeError: pass if func is not None: # Only pass authinfo into Instance if we have are set # up to get authinfo if self.authinfo_callback is not None: return func(authinfo, *params) else: return func(*params) else: raise Exception('method "%s" is not supported' % method) # Sigh. Different versions of M2Crypto have this in different places def lcl_resolve_dotted_attribute(self, method): pyver = sys.version_info[:3] if pyver <= (2, 3, 4): return SimpleXMLRPCServer.resolve_dotted_attribute( self.instance, method) elif pyver > (2, 3, 4): return SimpleXMLRPCServer.resolve_dotted_attribute( self.instance, method, self.allow_dotted_names) def serve_forever(self): while True: try: self.handle_request() except KeyboardInterrupt, e: print "Shutting down..." break except socket.error, e: if e[0] == 11: #Resource temporarily unavailable try: time.sleep(0.1) except KeyboardInterrupt, e: print "Shutting down..." break class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.QuietSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): """ Extension to allow more fine-tuned SSL handling """ def __init__(self, address, authinfo_callback=None, certs=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) ctx = SSLCommon.getSSLContext(certs) SSLCommon.QuietSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, ctx) class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SocketServer.ThreadingTCPServer, SimpleXMLRPCServer.SimpleXMLRPCServer): def __init__(self, address, authinfo_callback=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) SocketServer.ThreadingTCPServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) --- NEW FILE HTTPServer.py --- #!/usr/bin/python -t # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. # import SimpleHTTPServer import SocketServer import threading import urllib import posixpath import os, sys from SimpleHTTPServer import SimpleHTTPRequestHandler from M2Crypto import Rand, SSL from M2Crypto.SSL.SSLServer import ThreadingSSLServer import SSLCommon import socket import time from M2Crypto import threading as m2thread class HttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): def __init__(self, request, client_address, server): self._server = server SimpleHTTPServer.SimpleHTTPRequestHandler.__init__(self, request, client_address, server) def list_directory(self, path): self.send_error(404, "No permission to list directory") def log_request(self, code='-', size='-'): # Don't log requests pass def translate_path(self, path): """Translate a /-separated PATH to the local filename syntax. Components that mean special things to the local file system (e.g. drive or directory names) are ignored. (XXX They should probably be diagnosed.) This code is lifted from SimpleHTTPRequestHandler so that we can make sure the request is always based in our download directory, not the current directory. """ path = posixpath.normpath(urllib.unquote(path)) words = path.split('/') words = filter(None, words) path = self._server.http_dir for word in words: drive, word = os.path.splitdrive(word) head, word = os.path.split(word) if word in (os.curdir, os.pardir): continue path = os.path.join(path, word) return path def do_GET(self): SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) # try: # SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) # except Exception, e: # # We get an exception if the client drops the transfer # pass class ThreadingHTTPSServer(ThreadingSSLServer): """ SSL-enabled variant """ def __init__(self, server_addr, http_dir, certs): self.allow_reuse_address = 1 self.http_dir = http_dir self.ctx = SSLCommon.getSSLContext(certs) ThreadingSSLServer.__init__(self, server_addr, HttpRequestHandler, self.ctx) self.server_name = server_addr[0] self.server_port = server_addr[1] # About the last thing we want is a client blocking the server # because it hung or tracebacked timeout = SSL.timeout(10) self.socket.set_socket_read_timeout(timeout) self.socket.set_socket_write_timeout(timeout) def finish(self): if self.request: self.request.set_shutdown(SSL.SSL_RECEIVED_SHUTDOWN | SSL.SSL_SENT_SHUTDOWN) self.request.close() def serve_forever(self): while True: try: self.handle_request() except KeyboardInterrupt, e: print "Shutting down..." break except socket.error, e: if e[0] == 11: # Resource temporarily unavailable try: time.sleep(0.1) except KeyboardInterrupt, e: print "Shutting down..." break class ThreadingHTTPServer(SocketServer.ThreadingTCPServer): """ Non-SSL variant """ def __init__(self, certs, server_addr, http_dir): self.allow_reuse_address = 1 self.http_dir = http_dir ThreadingTCPServer.__init__(self, server_addr, HttpRequestHandler) def serve_forever(self): while True: try: self.handle_request() except KeyboardInterrupt, e: print "Shutting down..." break except socket.error, e: if e[0] == 11: # Resource temporarily unavailable try: time.sleep(0.1) except KeyboardInterrupt, e: print "Shutting down..." break class HTTPServer(threading.Thread): def __init__(self, addr, http_dir, certs): if certs and len(certs) > 0: self._server = ThreadingHTTPSServer(addr, http_dir, certs) else: self._server = ThreadingHTTPServer(addr, http_dir) self._stop = False threading.Thread.__init__(self) def run(self): while not self._stop: self._server.handle_request() def stop(self): self._stop = True ########################################################### # Testing stuff ########################################################### if __name__ == '__main__': if len(sys.argv) < 4: print "Usage: python SimpleHTTPSServer.py key_and_cert ca_cert peer_ca_cert" sys.exit(1) certs = {} certs['key_and_cert'] = sys.argv[1] certs['ca_cert'] = sys.argv[2] certs['peer_ca_cert'] = sys.argv[3] print "Starting..." srcdir = os.path.join("/tmp", "server_dir") if not os.path.exists(srcdir): os.makedirs(srcdir) print "Creating random test data..." f = open(os.path.join(srcdir, "testfile.dat"), "w") x = 1 while x < 10000: f.write(os.urandom(50)) x = x + 1 f.close() m2thread.init() print "Starting the server." server = SimpleHTTPSServer(certs, ('localhost', 8886), srcdir) server.start() while True: try: time.sleep(1) except KeyboardInterrupt: print "Quitting..." m2thread.cleanup() os._exit(0) --- NEW FILE XMLRPCServerProxy.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. # # Modified by Dan Williams import os, sys from M2Crypto import SSL from M2Crypto.m2xmlrpclib import SSL_Transport, ServerProxy import SSLCommon class XMLRPCServerProxy(ServerProxy): def __init__(self, uri, certs): if certs and len(certs) > 0: self.ctx = SSLCommon.getSSLContext(certs) ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) else: ServerProxy.__init__(self, uri) Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- FileDownloader.py 1 Jul 2005 11:51:33 -0000 1.9 +++ FileDownloader.py 5 Jul 2005 21:07:57 -0000 1.10 @@ -83,7 +83,10 @@ self._filename = get_base_filename_from_url(self._url, legal_exts) if not self._filename: print "Couldn't get base filename from url!! target_dir=%s, url=%s" % (target_dir, url) - self._opener = HTTPSURLopener.HTTPSURLopener(certs) + if certs and len(certs) > 0: + self._opener = HTTPSURLopener.HTTPSURLopener(certs) + else: + self._opener = urllib.URLopener() threading.Thread.__init__(self) def run(self): Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 1 Jul 2005 11:51:33 -0000 1.3 +++ Makefile 5 Jul 2005 21:07:57 -0000 1.4 @@ -11,10 +11,10 @@ CommonErrors.py \ FileDownloader.py \ HTTPSURLopener.py \ - SimpleHTTPSServer.py \ - SimpleSSLXMLRPCServer.py \ + HTTPServer.py \ + AuthedXMLRPCServer.py \ SSLCommon.py \ - SSLXMLRPCServerProxy.py \ + XMLRPCServerProxy.py \ lighttpdManager.py \ __init__.py Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SSLCommon.py 1 Jul 2005 11:51:33 -0000 1.7 +++ SSLCommon.py 5 Jul 2005 21:07:57 -0000 1.8 @@ -51,7 +51,11 @@ class QuietSSLServer(SSL.ThreadingSSLServer): def __init__(self, server_address, RequestHandlerClass, ssl_context): - SSL.SSLServer.__init__(self, server_address, RequestHandlerClass, ssl_context) + try: + SSL.SSLServer.__init__(self, server_address, RequestHandlerClass, ssl_context) + except socket.error, e: + if e[0] == 49: # Cannot assign requested address + print "Error: requested address '%s' couldn't be used." % server_address # About the last thing we want is a client blocking the server # because it hung or tracebacked Index: lighttpdManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/lighttpdManager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lighttpdManager.py 1 Jul 2005 11:51:33 -0000 1.1 +++ lighttpdManager.py 5 Jul 2005 21:07:58 -0000 1.2 @@ -25,7 +25,7 @@ class lighttpdManager(threading.Thread): - def __init__(self, conffile, hostname, port, basedir, key_and_cert): + def __init__(self, conffile, hostname, port, basedir, exit_if_dead, key_and_cert): self._stop = False self._pobj = None self._conffile = conffile @@ -33,6 +33,7 @@ self._hostname = hostname self._basedir = basedir self._key_and_cert = key_and_cert + self._exit_if_dead = exit_if_dead threading.Thread.__init__(self) if not self._setup(): os._exit(1) @@ -41,7 +42,7 @@ def _setup(self): if not os.path.exists(self._basedir): os.makedirs(self._basedir) - if not os.access(self._key_and_cert, os.R_OK): + if self._key_and_cert and not os.access(self._key_and_cert, os.R_OK): print "%s does not exist or is not readable." % self._key_and_cert return False if not os.path.exists(os.path.dirname(self._conffile)): @@ -59,9 +60,13 @@ server.username = "lighttpd" server.groupname = "lighttpd" server.dir-listing = "disable" +''' % (self._basedir, self._port, self._hostname) + + if self._key_and_cert: + cnf = cnf + ''' ssl.engine = "enable" ssl.pemfile = "%s" -''' % (self._basedir, self._port, self._hostname, self._key_and_cert) +''' % (self._key_and_cert) f = open(self._conffile, "w") f.write(cnf) @@ -79,21 +84,27 @@ st = self._pobj.poll() # Restart it if it fails if st >= 0: - print "HTTP server failed, trying to restart..." - print "----------------------------------------" - for line in self._pobj.fromchild.readlines(): - print line - print "----------------------------------------\n" - del self._pobj - if not self._setup(): + if self._exit_if_dead: + print "HTTP server failed! exiting..." os._exit(1) - self._start_server() + else: + print "HTTP server failed, trying to restart..." + print "----------------------------------------" + for line in self._pobj.fromchild.readlines(): + print line + print "----------------------------------------\n" + del self._pobj + if not self._setup(): + os._exit(1) + self._start_server() time.sleep(5) if self._pobj: - os.kill(self._pobj.pid, 15) - os.remove(self._conffile) - + try: + os.kill(self._pobj.pid, 15) + os.remove(self._conffile) + except: + pass def stop(self): self._stop = True --- SSLXMLRPCServerProxy.py DELETED --- --- SimpleHTTPSServer.py DELETED --- --- SimpleSSLXMLRPCServer.py DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 21:15:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 17:15:05 -0400 Subject: common tobuild,1.1785,1.1786 Message-ID: <200507052115.j65LF5Ma003946@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3927 Modified Files: tobuild Log Message: request build of rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1785 retrieving revision 1.1786 diff -u -r1.1785 -r1.1786 --- tobuild 5 Jul 2005 21:00:53 -0000 1.1785 +++ tobuild 5 Jul 2005 21:15:03 -0000 1.1786 @@ -15,3 +15,4 @@ orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel +awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 21:51:04 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 17:51:04 -0400 Subject: common tobuild,1.1786,1.1787 Message-ID: <200507052151.j65Lp5qR004514@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4497 Modified Files: tobuild Log Message: request build of rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1786 retrieving revision 1.1787 diff -u -r1.1786 -r1.1787 --- tobuild 5 Jul 2005 21:15:03 -0000 1.1786 +++ tobuild 5 Jul 2005 21:51:02 -0000 1.1787 @@ -16,3 +16,4 @@ spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 +orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 21:51:22 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 17:51:22 -0400 Subject: common tobuild,1.1787,1.1788 Message-ID: <200507052151.j65LpMJ0004576@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4559 Modified Files: tobuild Log Message: request build of rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1787 retrieving revision 1.1788 diff -u -r1.1787 -r1.1788 --- tobuild 5 Jul 2005 21:51:02 -0000 1.1787 +++ tobuild 5 Jul 2005 21:51:19 -0000 1.1788 @@ -17,3 +17,4 @@ dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 +orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 22:04:27 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Tue, 5 Jul 2005 18:04:27 -0400 Subject: CVSROOT avail,1.7,1.8 Message-ID: <200507052205.j65M5F8K005669@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5650 Modified Files: avail Log Message: Add acls for fedora-security module Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- avail 14 Jun 2005 19:11:19 -0000 1.7 +++ avail 5 Jul 2005 22:04:21 -0000 1.8 @@ -42,3 +42,6 @@ avail | riel | web/html/projects/virtualisation avail | ezannoni | web/html/projects/systemtap avail | harald | web/html/docs/udev + +unavail | | fedora-security +avail | mjc,bressers,jorton,notting,gafton,sopwith,katzj | fedora-security From fedora-extras-commits at redhat.com Tue Jul 5 22:09:24 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 5 Jul 2005 18:09:24 -0400 Subject: rpms/octave/devel octave.spec,1.10,1.11 Message-ID: <200507052209.j65M9OPM005737@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5720 Modified Files: octave.spec Log Message: Build with HDF5 support. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- octave.spec 22 Jun 2005 20:24:50 -0000 1.10 +++ octave.spec 5 Jul 2005 22:09:22 -0000 1.11 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -14,7 +14,7 @@ Requires: gnuplot less info texinfo Requires: /sbin/install-info BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas -BuildPrereq: ncurses-devel zlib-devel libtermcap-devel +BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +128,9 @@ %changelog +* Tue Jul 05 2005 Quentin Spencer 2.1.71-12 +- Require hdf5-devel for build. + * Wed Jun 22 2005 Quentin Spencer 2.1.71-11 - Force octave-devel to require readline-devel. - Add _libdir to configure command (fixes broken mkoctfile on x86_64). From fedora-extras-commits at redhat.com Tue Jul 5 22:10:35 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 5 Jul 2005 18:10:35 -0400 Subject: common tobuild,1.1788,1.1789 Message-ID: <200507052210.j65MAZgl005803@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5785 Modified Files: tobuild Log Message: request build of rpms/octave/devel octave-2_1_71-12_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1788 retrieving revision 1.1789 diff -u -r1.1788 -r1.1789 --- tobuild 5 Jul 2005 21:51:19 -0000 1.1788 +++ tobuild 5 Jul 2005 22:10:33 -0000 1.1789 @@ -18,3 +18,4 @@ awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 +qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 23:04:29 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 19:04:29 -0400 Subject: rpms/gnome-applet-sensors/devel gnome-applet-sensors.spec,1.2,1.3 Message-ID: <200507052304.j65N4xTd006972@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-serv6955 Modified Files: gnome-applet-sensors.spec Log Message: * Tue Jul 05 2005 Aaron Kurtz - 1.0-2 - rawhide Cairo dependencies Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/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:37:00 -0000 1.2 +++ gnome-applet-sensors.spec 5 Jul 2005 23:04:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: gnome-applet-sensors Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops @@ -12,7 +12,8 @@ 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 @@ -59,6 +60,9 @@ %changelog +* Tue Jul 05 2005 Aaron Kurtz - 1.0-2 +- rawhide Cairo dependencies + * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Jul 5 23:07:47 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 19:07:47 -0400 Subject: common tobuild,1.1789,1.1790 Message-ID: <200507052307.j65N7lDj007068@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7051 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1789 retrieving revision 1.1790 diff -u -r1.1789 -r1.1790 --- tobuild 5 Jul 2005 22:10:33 -0000 1.1789 +++ tobuild 5 Jul 2005 23:07:45 -0000 1.1790 @@ -19,3 +19,4 @@ orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel +dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 00:46:11 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Tue, 5 Jul 2005 20:46:11 -0400 Subject: common tobuild,1.1790,1.1791 Message-ID: <200507060046.j660kBD3008368@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8351 Modified Files: tobuild Log Message: request build of rpms/konversation/FC-3 konversation-0_18-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1790 retrieving revision 1.1791 diff -u -r1.1790 -r1.1791 --- tobuild 5 Jul 2005 23:07:45 -0000 1.1790 +++ tobuild 6 Jul 2005 00:46:09 -0000 1.1791 @@ -20,3 +20,4 @@ orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel +ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 6 01:45:33 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 21:45:33 -0400 Subject: devel/qgo .cvsignore,1.2,1.3 qgo.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200507060145.j661jXVP009537@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/qgo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9516 Modified Files: .cvsignore qgo.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/qgo/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2005 04:10:28 -0000 1.2 +++ .cvsignore 6 Jul 2005 01:45:31 -0000 1.3 @@ -1 +1 @@ -qgo-1.0.1.tar.gz +qgo-1.0.2.tar.gz Index: qgo.spec =================================================================== RCS file: /cvs/extras/devel/qgo/qgo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qgo.spec 25 Jun 2005 19:11:43 -0000 1.6 +++ qgo.spec 6 Jul 2005 01:45:31 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Graphical Go client and SGF editor Name: qgo -Version: 1.0.1 -Release: 6%{?dist} +Version: 1.0.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://qgo.sourceforge.net/ @@ -55,6 +55,9 @@ %{_datadir}/mimelnk/text/sgf.desktop %changelog +* Tue Jul 05 2005 Chris Ricker 1.0.2-1 +- New upstream release + * Sat Jun 25 2005 Chris Ricker 1.0.1-6 - *really* fix desktop file (BZ#160007) - fix dist tagging Index: sources =================================================================== RCS file: /cvs/extras/devel/qgo/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 May 2005 04:10:28 -0000 1.2 +++ sources 6 Jul 2005 01:45:31 -0000 1.3 @@ -1 +1 @@ -6bc17460c17cc0e19af01c991bfbd128 qgo-1.0.1.tar.gz +c202a232d1902a902683c421f0177b8c qgo-1.0.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 01:46:02 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 21:46:02 -0400 Subject: devel/common tobuild,1.1791,1.1792 Message-ID: <200507060146.j661k2o4009601@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9584 Modified Files: tobuild Log Message: request build of devel/qgo qgo-1_0_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1791 retrieving revision 1.1792 diff -u -r1.1791 -r1.1792 --- tobuild 6 Jul 2005 00:46:09 -0000 1.1791 +++ tobuild 6 Jul 2005 01:46:00 -0000 1.1792 @@ -21,3 +21,4 @@ qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 +kaboom devel/qgo qgo-1_0_2-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 01:54:57 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 21:54:57 -0400 Subject: rpms/qgo/FC-4 .cvsignore,1.2,1.3 qgo.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200507060154.j661sv2i009649@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/qgo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628 Modified Files: .cvsignore qgo.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgo/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2005 04:10:28 -0000 1.2 +++ .cvsignore 6 Jul 2005 01:54:54 -0000 1.3 @@ -1 +1 @@ -qgo-1.0.1.tar.gz +qgo-1.0.2.tar.gz Index: qgo.spec =================================================================== RCS file: /cvs/extras/rpms/qgo/FC-4/qgo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qgo.spec 25 Jun 2005 19:04:49 -0000 1.6 +++ qgo.spec 6 Jul 2005 01:54:54 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Graphical Go client and SGF editor Name: qgo -Version: 1.0.1 -Release: 6%{?dist} +Version: 1.0.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://qgo.sourceforge.net/ @@ -55,6 +55,9 @@ %{_datadir}/mimelnk/text/sgf.desktop %changelog +* Tue Jul 05 2005 Chris Ricker 1.0.2-1 +- New upstream release + * Sat Jun 25 2005 Chris Ricker 1.0.1-6 - *really* fix desktop file (BZ#160007) - fix dist tagging Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgo/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 May 2005 04:10:28 -0000 1.2 +++ sources 6 Jul 2005 01:54:54 -0000 1.3 @@ -1 +1 @@ -6bc17460c17cc0e19af01c991bfbd128 qgo-1.0.1.tar.gz +c202a232d1902a902683c421f0177b8c qgo-1.0.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 04:12:42 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 00:12:42 -0400 Subject: rpms/octave/FC-4 octave.spec,1.15,1.16 Message-ID: <200507060412.j664CgBr013193@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13171 Modified Files: octave.spec Log Message: Add HDF5 support. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- octave.spec 22 Jun 2005 18:21:58 -0000 1.15 +++ octave.spec 6 Jul 2005 04:12:39 -0000 1.16 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -14,7 +14,7 @@ Requires: gnuplot less info texinfo Requires: /sbin/install-info BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas -BuildPrereq: ncurses-devel zlib-devel libtermcap-devel +BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +128,9 @@ %changelog +* Tue Jul 05 2005 Quentin Spencer 2.1.71-13 +- Require hdf5-devel for build. + * Wed Jun 22 2005 Quentin Spencer 2.1.71-12 - Add _libdir to configure command (fixes broken mkoctfile on x86_64). From fedora-extras-commits at redhat.com Wed Jul 6 04:13:26 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 00:13:26 -0400 Subject: common tobuild,1.1792,1.1793 Message-ID: <200507060413.j664DQDf013255@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13238 Modified Files: tobuild Log Message: request build of rpms/octave/FC-4 octave-2_1_71-13_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1792 retrieving revision 1.1793 diff -u -r1.1792 -r1.1793 --- tobuild 6 Jul 2005 01:46:00 -0000 1.1792 +++ tobuild 6 Jul 2005 04:13:24 -0000 1.1793 @@ -22,3 +22,4 @@ dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 kaboom devel/qgo qgo-1_0_2-1_fc5 devel +qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 05:36:20 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:36:20 -0400 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.7, 1.8 perl-Module-Build.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200507060536.j665aKwG014443@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-serv14422 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: * Wed Jul 06 2005 Steven Pritchard - 0.2611-1 - Update to 0.2611 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Apr 2005 12:31:28 -0000 1.7 +++ .cvsignore 6 Jul 2005 05:36:18 -0000 1.8 @@ -1 +1 @@ -Module-Build-0.2610.tar.gz +Module-Build-0.2611.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Module-Build.spec 7 May 2005 19:06:22 -0000 1.11 +++ perl-Module-Build.spec 6 Jul 2005 05:36:18 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Module-Build -Version: 0.2610 -Release: 3 +Version: 0.2611 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Wed Jul 06 2005 Steven Pritchard - 0.2611-1 +- Update to 0.2611 + * Sat May 7 2005 Ville Skytt?? - 0.2610-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Apr 2005 12:31:28 -0000 1.7 +++ sources 6 Jul 2005 05:36:18 -0000 1.8 @@ -1 +1 @@ -a21addf2dbd1725b6b035fbfe65cb30f Module-Build-0.2610.tar.gz +d0fa9a7917ed43d1c1f8b707e86b6061 Module-Build-0.2611.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 05:36:33 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:36:33 -0400 Subject: common tobuild,1.1793,1.1794 Message-ID: <200507060536.j665aXeK014505@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14488 Modified Files: tobuild Log Message: request build of rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1793 retrieving revision 1.1794 diff -u -r1.1793 -r1.1794 --- tobuild 6 Jul 2005 04:13:24 -0000 1.1793 +++ tobuild 6 Jul 2005 05:36:31 -0000 1.1794 @@ -23,3 +23,4 @@ ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 kaboom devel/qgo qgo-1_0_2-1_fc5 devel qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 +steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 05:58:43 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:58:43 -0400 Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.6,1.7 Message-ID: <200507060558.j665whtp014593@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-serv14576 Modified Files: perl-IPC-ShareLite.spec Log Message: Add %{?dist} to differentiate devel branch. Index: perl-IPC-ShareLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-IPC-ShareLite.spec 6 Apr 2005 22:12:46 -0000 1.6 +++ perl-IPC-ShareLite.spec 6 Jul 2005 05:58:41 -0000 1.7 @@ -2,7 +2,7 @@ Name: perl-IPC-ShareLite Version: 0.09 -Release: 5 +Release: 5%{?dist} Summary: Light-weight Perl interface to shared memory From fedora-extras-commits at redhat.com Wed Jul 6 05:59:40 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:59:40 -0400 Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.6,1.7 Message-ID: <200507060559.j665xeFp014621@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-serv14604 Modified Files: perl-Text-Reform.spec Log Message: Add %{?dist} to differentiate devel branch. Index: perl-Text-Reform.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Text-Reform.spec 6 Apr 2005 22:13:09 -0000 1.6 +++ perl-Text-Reform.spec 6 Jul 2005 05:59:38 -0000 1.7 @@ -2,7 +2,7 @@ Name: perl-Text-Reform Version: 1.11 -Release: 4 +Release: 4%{?dist} Summary: Manual text wrapping and reformatting From fedora-extras-commits at redhat.com Wed Jul 6 06:08:05 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 6 Jul 2005 02:08:05 -0400 Subject: rpms/most/FC-3 .cvsignore, 1.2, 1.3 most.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507060608.j66685nF015741@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15720 Modified Files: .cvsignore most.spec sources Log Message: updated to 4.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:52:46 -0000 1.2 +++ .cvsignore 6 Jul 2005 06:08:02 -0000 1.3 @@ -1 +1 @@ -most-4.9.5.tar.gz +most-4.10.1.tar.bz2 Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/most.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- most.spec 12 Feb 2005 14:00:37 -0000 1.4 +++ most.spec 6 Jul 2005 06:08:02 -0000 1.5 @@ -1,16 +1,13 @@ -# $Id$ - -Summary: more, less, most -Name: most -Version: 4.9.5 -Release: 3 -Epoch: 0 -License: GPL -URL: ftp://space.mit.edu/pub/davis/most/ -Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: slang-devel +Summary: more, less, most +Name: most +Version: 4.10.1 +Release: 1%{?dist} +License: GPL +URL: ftp://space.mit.edu/pub/davis/most/ +Group: Applications/Text +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: slang-devel %description most is a paging program that displays, one windowful at a time, the @@ -23,7 +20,7 @@ %build sed -i 's!s\%@RPATH@\%.*!s\%@RPATH@\%\%g!' configure -%ifarch x86_64 +%ifarch x86_64 ppc ppc64 sed -i 's|/usr/lib|%{_libdir}|g' configure %endif chmod +x configure @@ -46,8 +43,14 @@ %changelog +* Fri Jul 01 2005 Adrian Reber - 4.10.1-1 +- updated to 4.10.1 + +* Wed Mar 30 2005 Adrian Reber - 4.9.5-4 +- fix build on ppc/ppc64 + * Sat Feb 12 2005 Thorsten Leemhuis - 4.9.5-3 -- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build; +- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build; * Mon Jul 19 2004 Adrian Reber - 0:4.9.5-0.fdr.2 - removed chrpath dependency Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:52:46 -0000 1.2 +++ sources 6 Jul 2005 06:08:02 -0000 1.3 @@ -1 +1 @@ -5c0922952485b0a5822ef994603dcc2f most-4.9.5.tar.gz +9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 6 06:08:31 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 6 Jul 2005 02:08:31 -0400 Subject: common tobuild,1.1794,1.1795 Message-ID: <200507060608.j6668Vtx015801@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15782 Modified Files: tobuild Log Message: request build of rpms/most/FC-3 most-4_10_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1794 retrieving revision 1.1795 diff -u -r1.1794 -r1.1795 --- tobuild 6 Jul 2005 05:36:31 -0000 1.1794 +++ tobuild 6 Jul 2005 06:08:28 -0000 1.1795 @@ -24,3 +24,4 @@ kaboom devel/qgo qgo-1_0_2-1_fc5 devel qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel +adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 6 07:37:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 03:37:30 -0400 Subject: common tobuild,1.1795,1.1796 Message-ID: <200507060737.j667bUpL017204@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_2_beta4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1795 retrieving revision 1.1796 diff -u -r1.1795 -r1.1796 --- tobuild 6 Jul 2005 06:08:28 -0000 1.1795 +++ tobuild 6 Jul 2005 07:37:28 -0000 1.1796 @@ -25,3 +25,4 @@ qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 +mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel From fedora-extras-commits at redhat.com Wed Jul 6 07:41:48 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 6 Jul 2005 03:41:48 -0400 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 sylpheed-claws.spec, 1.14, 1.15 Message-ID: <200507060741.j667fmMj017257@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-serv17236 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade - add dist tag Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 May 2005 07:17:22 -0000 1.6 +++ .cvsignore 6 Jul 2005 07:41:46 -0000 1.7 @@ -1 +1 @@ -sylpheed-claws-1.9.11.tar.bz2 +sylpheed-claws-1.9.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 May 2005 07:17:22 -0000 1.7 +++ sources 6 Jul 2005 07:41:46 -0000 1.8 @@ -1 +1 @@ -20e5d1796c45ef93520fb3b6defbf857 sylpheed-claws-1.9.11.tar.bz2 +c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sylpheed-claws.spec 29 May 2005 21:35:32 -0000 1.14 +++ sylpheed-claws.spec 6 Jul 2005 07:41:46 -0000 1.15 @@ -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.11 -Release: 1 +Version: 1.9.12 +Release: 1%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.9.11.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.12.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -109,6 +109,10 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Wed Jul 06 2005 Andreas Bierfert +1.9.12-1 +- version upgrade +- add dist tag * Thu May 26 2005 Andreas Bierfert 1.9.11-1 From fedora-extras-commits at redhat.com Wed Jul 6 07:42:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 6 Jul 2005 03:42:44 -0400 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 sylpheed-claws.spec, 1.14, 1.15 Message-ID: <200507060742.j667gicw017290@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17269 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade - add dist tag Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 May 2005 07:17:22 -0000 1.6 +++ .cvsignore 6 Jul 2005 07:42:42 -0000 1.7 @@ -1 +1 @@ -sylpheed-claws-1.9.11.tar.bz2 +sylpheed-claws-1.9.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 May 2005 07:17:22 -0000 1.7 +++ sources 6 Jul 2005 07:42:42 -0000 1.8 @@ -1 +1 @@ -20e5d1796c45ef93520fb3b6defbf857 sylpheed-claws-1.9.11.tar.bz2 +c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sylpheed-claws.spec 29 May 2005 21:35:32 -0000 1.14 +++ sylpheed-claws.spec 6 Jul 2005 07:42:42 -0000 1.15 @@ -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.11 -Release: 1 +Version: 1.9.12 +Release: 1%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.9.11.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.12.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -109,6 +109,10 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Wed Jul 06 2005 Andreas Bierfert +1.9.12-1 +- version upgrade +- add dist tag * Thu May 26 2005 Andreas Bierfert 1.9.11-1 From fedora-extras-commits at redhat.com Wed Jul 6 08:13:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 04:13:39 -0400 Subject: devel/sylpheed sylpheed.spec,1.16,1.17 Message-ID: <200507060813.j668DdvU018954@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18937 Modified Files: sylpheed.spec Log Message: just a test Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sylpheed.spec 5 Jul 2005 17:06:03 -0000 1.16 +++ sylpheed.spec 6 Jul 2005 08:13:37 -0000 1.17 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.2.beta4 +Release: 0.3.beta4 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -42,6 +42,7 @@ %setup -q -n %{name}-2.0.0beta4 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop +rpm --query cairo-devel %build autoconf @@ -83,7 +84,7 @@ %{_mandir}/man1 %changelog -* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.2.beta4 +* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.3.beta4 - Update to 2.0.0beta4. * Tue Jun 28 2005 Michael Schwendt From fedora-extras-commits at redhat.com Wed Jul 6 08:14:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 04:14:12 -0400 Subject: common tobuild,1.1796,1.1797 Message-ID: <200507060814.j668ECtk019015@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18998 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_3_beta4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1796 retrieving revision 1.1797 diff -u -r1.1796 -r1.1797 --- tobuild 6 Jul 2005 07:37:28 -0000 1.1796 +++ tobuild 6 Jul 2005 08:14:10 -0000 1.1797 @@ -26,3 +26,4 @@ steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel +mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel From fedora-extras-commits at redhat.com Wed Jul 6 11:54:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 6 Jul 2005 07:54:44 -0400 Subject: common tobuild,1.1797,1.1798 Message-ID: <200507061154.j66BsiLw022976@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22959 Modified Files: tobuild Log Message: request build of rpms/fish/FC-3 fish-1_11_1-10_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1797 retrieving revision 1.1798 diff -u -r1.1797 -r1.1798 --- tobuild 6 Jul 2005 08:14:10 -0000 1.1797 +++ tobuild 6 Jul 2005 11:54:42 -0000 1.1798 @@ -27,3 +27,4 @@ adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel +oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 6 11:55:29 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 6 Jul 2005 07:55:29 -0400 Subject: common tobuild,1.1798,1.1799 Message-ID: <200507061155.j66BtT3g023038@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23021 Modified Files: tobuild Log Message: request build of rpms/fish/FC-4 fish-1_11_1-10_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1798 retrieving revision 1.1799 diff -u -r1.1798 -r1.1799 --- tobuild 6 Jul 2005 11:54:42 -0000 1.1798 +++ tobuild 6 Jul 2005 11:55:27 -0000 1.1799 @@ -28,3 +28,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 +oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 12:21:25 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:21:25 -0400 Subject: rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc.spec,1.5,1.6 Message-ID: <200507061221.j66CLS8J024208@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174/tetex-font-cm-lgc/devel Modified Files: tetex-font-cm-lgc.spec Log Message: Run updmap-sys in %post only when installing, not when updating. Index: tetex-font-cm-lgc.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/devel/tetex-font-cm-lgc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tetex-font-cm-lgc.spec 17 Jun 2005 02:26:32 -0000 1.5 +++ tetex-font-cm-lgc.spec 6 Jul 2005 12:21:23 -0000 1.6 @@ -4,7 +4,7 @@ Name: tetex-font-cm-lgc Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CM-LGC Type1 fonts for LaTeX Group: Applications/Publishing @@ -64,7 +64,9 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +if [ "$1" = "1" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +fi %postun if [ "$1" = "0" ]; then @@ -88,6 +90,9 @@ %changelog +* Wed Jul 6 2005 Sarantis Paskalis - 0.5-2 +- Run updmap-sys only when installing, not when updating + * Wed Jun 15 2005 Sarantis Paskalis - 0.5-1 - update to 0.5 (#160464) - make the package tetex-3 compliant (use updmap-sys instead of updmap, From fedora-extras-commits at redhat.com Wed Jul 6 12:21:25 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:21:25 -0400 Subject: rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc.spec,1.6,1.7 Message-ID: <200507061221.j66CLS8n024209@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/tetex-font-cm-lgc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174/tetex-font-cm-lgc/FC-4 Modified Files: tetex-font-cm-lgc.spec Log Message: Run updmap-sys in %post only when installing, not when updating. Index: tetex-font-cm-lgc.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/FC-4/tetex-font-cm-lgc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tetex-font-cm-lgc.spec 17 Jun 2005 02:25:33 -0000 1.6 +++ tetex-font-cm-lgc.spec 6 Jul 2005 12:21:22 -0000 1.7 @@ -4,7 +4,7 @@ Name: tetex-font-cm-lgc Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CM-LGC Type1 fonts for LaTeX Group: Applications/Publishing @@ -64,7 +64,9 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +if [ "$1" = "1" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +fi %postun if [ "$1" = "0" ]; then @@ -88,6 +90,9 @@ %changelog +* Wed Jul 6 2005 Sarantis Paskalis - 0.5-2 +- Run updmap-sys only when installing, not when updating + * Wed Jun 15 2005 Sarantis Paskalis - 0.5-1 - update to 0.5 (#160464) - make the package tetex-3 compliant (use updmap-sys instead of updmap, From fedora-extras-commits at redhat.com Wed Jul 6 12:23:14 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:23:14 -0400 Subject: common tobuild,1.1799,1.1800 Message-ID: <200507061223.j66CNEoe024274@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24257 Modified Files: tobuild Log Message: request build of rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1799 retrieving revision 1.1800 diff -u -r1.1799 -r1.1800 --- tobuild 6 Jul 2005 11:55:27 -0000 1.1799 +++ tobuild 6 Jul 2005 12:23:11 -0000 1.1800 @@ -29,3 +29,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 +sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 12:25:08 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:25:08 -0400 Subject: common tobuild,1.1800,1.1801 Message-ID: <200507061225.j66CP8g2024341@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24324 Modified Files: tobuild Log Message: request build of rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1800 retrieving revision 1.1801 diff -u -r1.1800 -r1.1801 --- tobuild 6 Jul 2005 12:23:11 -0000 1.1800 +++ tobuild 6 Jul 2005 12:25:06 -0000 1.1801 @@ -30,3 +30,4 @@ oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 +sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 13:42:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 09:42:18 -0400 Subject: devel/sylpheed sylpheed.spec,1.17,1.18 Message-ID: <200507061342.j66DgI4l025603@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25586 Modified Files: sylpheed.spec Log Message: remove the test again and give another build a try -- buildsys should access an up-to-date rawhide tree now according to bug 162551 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed.spec 6 Jul 2005 08:13:37 -0000 1.17 +++ sylpheed.spec 6 Jul 2005 13:42:16 -0000 1.18 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.3.beta4 +Release: 0.4.beta4 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -42,7 +42,6 @@ %setup -q -n %{name}-2.0.0beta4 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop -rpm --query cairo-devel %build autoconf @@ -84,7 +83,7 @@ %{_mandir}/man1 %changelog -* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.3.beta4 +* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.4.beta4 - Update to 2.0.0beta4. * Tue Jun 28 2005 Michael Schwendt From fedora-extras-commits at redhat.com Wed Jul 6 13:42:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 09:42:51 -0400 Subject: common tobuild,1.1801,1.1802 Message-ID: <200507061342.j66DgpTb025662@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25645 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_4_beta4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1801 retrieving revision 1.1802 diff -u -r1.1801 -r1.1802 --- tobuild 6 Jul 2005 12:25:06 -0000 1.1801 +++ tobuild 6 Jul 2005 13:42:49 -0000 1.1802 @@ -31,3 +31,4 @@ oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel +mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel From fedora-extras-commits at redhat.com Wed Jul 6 13:43:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 09:43:28 -0400 Subject: common tobuild,1.1802,1.1803 Message-ID: <200507061343.j66DhSoN025685@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25668 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1802 retrieving revision 1.1803 diff -u -r1.1802 -r1.1803 --- tobuild 6 Jul 2005 13:42:49 -0000 1.1802 +++ tobuild 6 Jul 2005 13:43:26 -0000 1.1803 @@ -1,32 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 -gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel -gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 -gemi rpms/global/devel global-4_8_6-1_fc5 devel -gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 -dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 -gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 -orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel -spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 -dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel -awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 -orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 -orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 -qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel -dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel -ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 -kaboom devel/qgo qgo-1_0_2-1_fc5 devel -qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 -steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel -adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 -mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel -mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 14:33:36 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:36 -0400 Subject: rpms/glabels - New directory Message-ID: <200507061433.j66EXaWf026944@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/glabels Log Message: Directory /cvs/extras/rpms/glabels added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 14:33:37 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:37 -0400 Subject: rpms/glabels/devel - New directory Message-ID: <200507061433.j66EXbkc026949@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/glabels/devel Log Message: Directory /cvs/extras/rpms/glabels/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 14:33:56 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:56 -0400 Subject: rpms/glabels Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507061433.j66EXuqW027001@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26967 Added Files: Makefile import.log Log Message: Setup of module glabels --- NEW FILE Makefile --- # Top level Makefile for module glabels all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 6 14:33:56 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:56 -0400 Subject: rpms/glabels/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507061434.j66EXupl027006@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26967/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module glabels --- NEW 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 Jul 6 14:35:22 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:35:22 -0400 Subject: rpms/glabels import.log,1.1,1.2 Message-ID: <200507061435.j66EZMsZ027079@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27048 Modified Files: import.log Log Message: auto-import glabels-2.0.3-1 on branch devel from glabels-2.0.3-1.src.rpm Initial import of glabels Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glabels/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Jul 2005 14:33:54 -0000 1.1 +++ import.log 6 Jul 2005 14:35:20 -0000 1.2 @@ -0,0 +1 @@ +glabels-2_0_3-1:HEAD:glabels-2.0.3-1.src.rpm:1120660509 From fedora-extras-commits at redhat.com Wed Jul 6 14:35:22 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:35:22 -0400 Subject: rpms/glabels/devel glabels.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507061435.j66EZMpP027086@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27048/devel Modified Files: .cvsignore sources Added Files: glabels.spec Log Message: auto-import glabels-2.0.3-1 on branch devel from glabels-2.0.3-1.src.rpm Initial import of glabels --- NEW FILE glabels.spec --- Name: glabels Version: 2.0.3 Release: 1%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 BuildRequires: libgnomeprintui22-devel BuildRequires: desktop-file-utils, scrollkeeper Requires(post): /sbin/ldconfig Requires(post): scrollkeeper Requires(post): shared-mime-info Requires(post): desktop-file-utils Requires(postun): /sbin/ldconfig Requires(postun): scrollkeeper Requires(postun): shared-mime-info Requires(postun): desktop-file-utils %description gLabels is a lightweight program for creating labels and business cards for the GNOME desktop environment. It is designed to work with various laser/ink-jet peel-off label and business card sheets that you'll find at most office supply stores. %package devel Summary: Development files and documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for %{name}. %prep %setup %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT \ UPDATE_DESKTOP_DATABASE="true" UPDATE_MIME_DATABASE="true" 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} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : /sbin/ldconfig %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_datadir}/gnome/help/glabels/ %doc %{_mandir}/man1/glabels.1* %{_bindir}/glabels* %{_libdir}/libglabels.so.* %{_datadir}/application-registry/glabels.applications %{_datadir}/applications/fedora-glabels.desktop %{_datadir}/glabels/ %{_datadir}/mime/packages/glabels.xml %{_datadir}/mime-info/glabels.* %{_datadir}/pixmaps/glabels/ %{_datadir}/pixmaps/glabels.png %{_datadir}/pixmaps/glabels-application-x-glabels.png %{_datadir}/omf/glabels/ %files devel %defattr(-, root, root, 0755) %{_includedir}/libglabels/ %{_libdir}/libglabels.a %{_libdir}/libglabels.so %exclude %{_libdir}/libglabels.la %changelog * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Jul 2005 14:33:54 -0000 1.1 +++ .cvsignore 6 Jul 2005 14:35:20 -0000 1.2 @@ -0,0 +1 @@ +glabels-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Jul 2005 14:33:54 -0000 1.1 +++ sources 6 Jul 2005 14:35:20 -0000 1.2 @@ -0,0 +1 @@ +c077afdeac5ba0c685e404eea1d794e8 glabels-2.0.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 14:46:19 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 10:46:19 -0400 Subject: rpms/octave/devel octave.spec,1.11,1.12 Message-ID: <200507061446.j66EkJjB027203@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27186 Modified Files: octave.spec Log Message: Rebuild. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- octave.spec 5 Jul 2005 22:09:22 -0000 1.11 +++ octave.spec 6 Jul 2005 14:46:17 -0000 1.12 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -128,6 +128,9 @@ %changelog +* Wed Jul 06 2005 Quentin Spencer 2.1.71-13 +- Rebuild + * Tue Jul 05 2005 Quentin Spencer 2.1.71-12 - Require hdf5-devel for build. From fedora-extras-commits at redhat.com Wed Jul 6 14:49:29 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 10:49:29 -0400 Subject: common tobuild,1.1803,1.1804 Message-ID: <200507061449.j66EnTcA027293@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27276 Modified Files: tobuild Log Message: request build of rpms/octave/devel octave-2_1_71-13_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1803 retrieving revision 1.1804 diff -u -r1.1803 -r1.1804 --- tobuild 6 Jul 2005 13:43:26 -0000 1.1803 +++ tobuild 6 Jul 2005 14:49:27 -0000 1.1804 @@ -6,3 +6,4 @@ sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel +qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 14:50:15 2005 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 6 Jul 2005 10:50:15 -0400 Subject: common tobuild,1.1804,1.1805 Message-ID: <200507061450.j66EoFZi027326@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27309 Modified Files: tobuild Log Message: request build of rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1804 retrieving revision 1.1805 diff -u -r1.1804 -r1.1805 --- tobuild 6 Jul 2005 14:49:27 -0000 1.1804 +++ tobuild 6 Jul 2005 14:50:13 -0000 1.1805 @@ -7,3 +7,4 @@ sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel +caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel From fedora-extras-commits at redhat.com Wed Jul 6 16:45:37 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 6 Jul 2005 12:45:37 -0400 Subject: common tobuild,1.1805,1.1806 Message-ID: <200507061645.j66Gjbpd029781@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29764 Modified Files: tobuild Log Message: request build of rpms/qgo/FC-4 qgo-1_0_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1805 retrieving revision 1.1806 diff -u -r1.1805 -r1.1806 --- tobuild 6 Jul 2005 14:50:13 -0000 1.1805 +++ tobuild 6 Jul 2005 16:45:35 -0000 1.1806 @@ -8,3 +8,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel +kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 From qspencer at ieee.org Wed Jul 6 16:57:22 2005 From: qspencer at ieee.org (Quentin Spencer) Date: Wed, 06 Jul 2005 11:57:22 -0500 Subject: APPROVED: ncview Message-ID: <42CC0D72.1080708@ieee.org> Author: Ed Hill Reviewers: Quentin Spencer, Orion Poplawski Package Summary: Ncview is a visual browser for netCDF format files. Typically you would use ncview to get a quick and easy, push-button look at your netCDF files. You can view simple movies of the data, view along various dimensions, take a look at the actual data values, change color maps, invert the data, etc. From fedora-extras-commits at redhat.com Wed Jul 6 17:06:38 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Wed, 6 Jul 2005 13:06:38 -0400 Subject: web/html/download mirrors.php,1.18,1.19 Message-ID: <200507061707.j66H7J50030892@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30868 Modified Files: mirrors.php Log Message: Added url for new mirror falkor.skane.se Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mirrors.php 5 Jul 2005 20:33:39 -0000 1.18 +++ mirrors.php 6 Jul 2005 17:06:24 -0000 1.19 @@ -414,6 +414,7 @@
  • Sweden
  • Switzerland
      From bugs.michael at gmx.net Wed Jul 6 17:52:34 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Wed, 6 Jul 2005 19:52:34 +0200 Subject: APPROVED: mgopen-fonts Message-ID: <20050706195234.43a98d84.bugs.michael@gmx.net> Package: mgopen-fonts The MgOpen fonts are a font family that includes Latin and Greek glyphs. The fonts have been released under a liberal license, similar to the license covering the Bitstream Vera fonts. Reviewer: Michael Schwendt Maintainer: Sarantis Paskalis -------------- 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 Wed Jul 6 17:56:09 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 6 Jul 2005 13:56:09 -0400 Subject: common tobuild,1.1806,1.1807 Message-ID: <200507061756.j66Hu9bf031073@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31056 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1806 retrieving revision 1.1807 diff -u -r1.1806 -r1.1807 --- tobuild 6 Jul 2005 16:45:35 -0000 1.1806 +++ tobuild 6 Jul 2005 17:56:07 -0000 1.1807 @@ -9,3 +9,4 @@ qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 +skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 19:19:20 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Wed, 6 Jul 2005 15:19:20 -0400 Subject: web/html/download mirrors.php,1.19,1.20 Message-ID: <200507061919.j66JJKOg000974@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv957 Modified Files: mirrors.php Log Message: Added new mirror applios.net Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mirrors.php 6 Jul 2005 17:06:24 -0000 1.19 +++ mirrors.php 6 Jul 2005 19:19:18 -0000 1.20 @@ -119,6 +119,7 @@
    • rsync://mirrors.usc.edu/fedora/
    • ftp://mirror.colorado.edu/pub/fedora/linux/core/
    • ftp://mirrors.csumb.edu/fedora/updates/ (Updates only)
      • +
    • ftp://ftp.applios.net/pub/fedora/linux/core
  • Canada From fedora-extras-commits at redhat.com Wed Jul 6 20:08:07 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:07 -0400 Subject: rpms/perl-Tree-DAG_Node - New directory Message-ID: <200507062008.j66K87ov002242@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2222/perl-Tree-DAG_Node Log Message: Directory /cvs/extras/rpms/perl-Tree-DAG_Node added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 20:08:07 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:07 -0400 Subject: rpms/perl-Tree-DAG_Node/devel - New directory Message-ID: <200507062008.j66K873P002247@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2222/perl-Tree-DAG_Node/devel Log Message: Directory /cvs/extras/rpms/perl-Tree-DAG_Node/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 20:08:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:27 -0400 Subject: rpms/perl-Tree-DAG_Node/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507062008.j66K8R4U002299@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2267/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Tree-DAG_Node --- NEW 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 Jul 6 20:08:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:27 -0400 Subject: rpms/perl-Tree-DAG_Node Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507062008.j66K8Rkn002294@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2267 Added Files: Makefile import.log Log Message: Setup of module perl-Tree-DAG_Node --- NEW FILE Makefile --- # Top level Makefile for module perl-Tree-DAG_Node all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 6 20:09:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:09:00 -0400 Subject: rpms/perl-Tree-DAG_Node import.log,1.1,1.2 Message-ID: <200507062009.j66K9VMw002365@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331 Modified Files: import.log Log Message: auto-import perl-Tree-DAG_Node-1.05-2 on branch devel from perl-Tree-DAG_Node-1.05-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-DAG_Node/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Jul 2005 20:08:24 -0000 1.1 +++ import.log 6 Jul 2005 20:08:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Tree-DAG_Node-1_05-2:HEAD:perl-Tree-DAG_Node-1.05-2.src.rpm:1120680529 From fedora-extras-commits at redhat.com Wed Jul 6 20:09:01 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:09:01 -0400 Subject: rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507062009.j66K9VGm002369@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331/devel Modified Files: .cvsignore sources Added Files: perl-Tree-DAG_Node.spec Log Message: auto-import perl-Tree-DAG_Node-1.05-2 on branch devel from perl-Tree-DAG_Node-1.05-2.src.rpm --- NEW FILE perl-Tree-DAG_Node.spec --- Name: perl-Tree-DAG_Node Version: 1.05 Release: 2%{?dist} Summary: Class for representing nodes in a tree Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Tree-DAG_Node/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/Tree-DAG_Node-1.05.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class encapsulates/makes/manipulates objects that represent nodes in a tree structure. The tree structure is not an object itself, but is emergent from the linkages you create between nodes. This class provides the methods for making linkages that can be used to build up a tree, while preventing you from ever making any kinds of linkages which are not allowed in a tree (such as having a node be its own mother or ancestor, or having a node have two mothers). %prep %setup -q -n Tree-DAG_Node-%{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}/Tree/ %{_mandir}/man3/*.3* %changelog * Fri Jul 1 2005 Jose Pedro Oliveira - 1.05-2 - Dist tag. * Thu Dec 30 2004 Jose Pedro Oliveira - 0:1.05-0.fdr.1 - Update to 1.05. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:1.04-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-DAG_Node/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Jul 2005 20:08:25 -0000 1.1 +++ .cvsignore 6 Jul 2005 20:08:59 -0000 1.2 @@ -0,0 +1 @@ +Tree-DAG_Node-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-DAG_Node/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Jul 2005 20:08:25 -0000 1.1 +++ sources 6 Jul 2005 20:08:59 -0000 1.2 @@ -0,0 +1 @@ +6956aa477dae75fbb5e7caab83c43d0a Tree-DAG_Node-1.05.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 20:11:31 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:11:31 -0400 Subject: common tobuild,1.1807,1.1808 Message-ID: <200507062011.j66KBVpV002475@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2458 Modified Files: tobuild Log Message: request build of rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1807 retrieving revision 1.1808 diff -u -r1.1807 -r1.1808 --- tobuild 6 Jul 2005 17:56:07 -0000 1.1807 +++ tobuild 6 Jul 2005 20:11:28 -0000 1.1808 @@ -10,3 +10,4 @@ caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 +jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 20:38:27 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 6 Jul 2005 16:38:27 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.10,1.11 Message-ID: <200507062038.j66KcR7w002750@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2733 Modified Files: galeon.spec Log Message: 1.3.21-6: fixed buildrequires Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- galeon.spec 4 Jul 2005 12:49:02 -0000 1.10 +++ galeon.spec 6 Jul 2005 20:38:25 -0000 1.11 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -10,11 +10,13 @@ Requires: scrollkeeper Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) BuildRequires: gettext mozilla-nspr-devel desktop-file-utils -BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel BuildRequires: mozilla-devel >= 37:1.7.2 BuildRequires: libxml2-devel >= 2.6.6 BuildRequires: libgnomeui-devel >= 2.5.2 -BuildRequires: autoconf +%ifarch x86_64 +BuildRequires: autoconf automake libtool +%endif %description Galeon is a web browser built around Gecko (Mozilla's rendering @@ -98,6 +100,9 @@ %changelog +* Wed Jul 6 2005 Dams - 1.3.21-6 +- Added missing BuildRequires + * Sat Jul 2 2005 Dams - 1.3.21 - Rebuild From fedora-extras-commits at redhat.com Wed Jul 6 20:39:14 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 6 Jul 2005 16:39:14 -0400 Subject: common tobuild,1.1808,1.1809 Message-ID: <200507062039.j66KdEB5002812@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2795 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1808 retrieving revision 1.1809 diff -u -r1.1808 -r1.1809 --- tobuild 6 Jul 2005 20:11:28 -0000 1.1808 +++ tobuild 6 Jul 2005 20:39:12 -0000 1.1809 @@ -11,3 +11,4 @@ kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel +anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 21:21:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:21:03 -0400 Subject: extras-buildsys/server ArchJob.py, 1.1, 1.2 Builder.py, 1.1, 1.2 CONFIG.py, 1.15, 1.16 Repo.py, 1.5, 1.6 main.py, 1.1, 1.2 Message-ID: <200507062121.j66LL3bL004095@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/server Modified Files: ArchJob.py Builder.py CONFIG.py Repo.py main.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ArchJob.py 5 Jul 2005 21:08:03 -0000 1.1 +++ ArchJob.py 6 Jul 2005 21:21:00 -0000 1.2 @@ -24,7 +24,6 @@ import urllib from plague import FileDownloader from plague import CommonErrors -from M2Crypto import SSL # Load in the config execfile("/etc/plague/server/CONFIG.py") Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Builder.py 5 Jul 2005 21:08:03 -0000 1.1 +++ Builder.py 6 Jul 2005 21:21:00 -0000 1.2 @@ -23,7 +23,6 @@ import threading from plague import XMLRPCServerProxy from plague import CommonErrors -from M2Crypto import SSL import ArchJob # Load in the config @@ -53,7 +52,7 @@ self._arches = [] try: self._arches = self._server.supported_arches() - except (socket.error, SSL.SSLError): + except socket.error: raise RuntimeError self._alive = True self._arches.append('noarch') @@ -86,7 +85,7 @@ self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) - except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): + except (socket.error, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() @@ -105,7 +104,7 @@ self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() - except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): + except (socket.error, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- CONFIG.py 5 Jul 2005 21:08:03 -0000 1.15 +++ CONFIG.py 6 Jul 2005 21:21:00 -0000 1.16 @@ -16,7 +16,7 @@ config_opts['ssl_frontend'] = True # ssl_buildclients: True = all communication between server & build client # be over an SSL connecction -config_opts['ssl_builders'] = False +config_opts['ssl_builders'] = True SERVER_BASE_DIR = "/etc/plague/server" Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Repo.py 5 Jul 2005 21:08:03 -0000 1.5 +++ Repo.py 6 Jul 2005 21:21:00 -0000 1.6 @@ -31,6 +31,9 @@ def __init__(self, target, builder_manager): self._builder_manager = builder_manager self._target = target + if not os.path.exists(config_opts['repo_dir']): + print "Error: Repository directory '%s' does not exist." % config_opts['repodir'] + os._exit(1) self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): os.makedirs(self._repodir) Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main.py 5 Jul 2005 21:08:03 -0000 1.1 +++ main.py 6 Jul 2005 21:21:01 -0000 1.2 @@ -22,7 +22,6 @@ from plague import lighttpdManager from plague import HTTPServer import SimpleXMLRPCServer -from M2Crypto import threading as m2thread sys.path.append('/usr/share/plague/server') @@ -49,24 +48,12 @@ self.authenticator = User.Authenticator() def auth_cb(self, request, client_address): - """ - Authenticate the user and determine user's privs. - TODO: pull user privs from a DB - """ - peer_cert = request.get_peer_cert() - - # m2crypto 0.9 only supports 'Email' so fall through - # to that if emailAddress doesn't work - try: - email = peer_cert.get_subject().emailAddress - except AttributeError: - email = peer_cert.get_subject().Email - - user = None + peer_cert = request.get_peer_certificate() + email = peer_cert.get_subject().emailAddress try: user = self.authenticator.new_authed_user(email, client_address) except Exception: - pass + user = None return user @@ -80,8 +67,6 @@ hostname = sys.argv[1] - m2thread.init() - builder_manager = BuilderManager.BuilderManager() # Create the BuildMaster thread @@ -119,9 +104,9 @@ srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] srpm_server_certs['ca_cert'] = config_opts['ca_cert'] srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] - srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) + srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) else: - srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) + srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) srpm_server.start() print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) @@ -135,7 +120,6 @@ del bm print "Done." - m2thread.cleanup() os._exit(0) From fedora-extras-commits at redhat.com Wed Jul 6 21:20:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:51 -0400 Subject: extras-buildsys ChangeLog,1.43,1.44 plague.spec,1.7,1.8 Message-ID: <200507062121.j66LLLFc004099@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996 Modified Files: ChangeLog plague.spec Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- ChangeLog 5 Jul 2005 21:07:51 -0000 1.43 +++ ChangeLog 6 Jul 2005 21:20:49 -0000 1.44 @@ -1,3 +1,7 @@ +2005-07-06 Dan Williams + + * Convert M2Crypto code to pyOpenSSL so that stuff actually works + 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plague.spec 1 Jul 2005 11:51:26 -0000 1.7 +++ plague.spec 6 Jul 2005 21:20:49 -0000 1.8 @@ -9,7 +9,7 @@ Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 URL: http://people.redhat.com/dcbw/plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: python-sqlite, m2crypto, createrepo +Requires: python-sqlite, pyOpenSSL, createrepo Requires: %{name}-common = %{version}-%{release} Requires: lighttpd @@ -21,7 +21,7 @@ %package common Summary: Common resources for the Plague build system Group: Development/Tools -Requires: m2crypto +Requires: pyOpenSSL %description common This package includes the common Python module that all Plague services require. @@ -32,7 +32,7 @@ Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1 -Requires: mock >= 0.3, m2crypto +Requires: mock >= 0.3, pyOpenSSL %description builder The Plague build client does the actual RPM package building on slave @@ -42,7 +42,7 @@ Summary: Package queueing client for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: m2crypto +Requires: pyOpenSSL Requires: lighttpd %description client @@ -53,7 +53,7 @@ Summary: Utility programs for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: m2crypto +Requires: pyOpenSSL %description utils This package includes user utilities for the Plague build system, including From fedora-extras-commits at redhat.com Wed Jul 6 21:20:57 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:57 -0400 Subject: extras-buildsys/client client.py,1.6,1.7 Message-ID: <200507062121.j66LLR9x004106@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/client Modified Files: client.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- client.py 5 Jul 2005 21:07:57 -0000 1.6 +++ client.py 6 Jul 2005 21:20:55 -0000 1.7 @@ -19,10 +19,9 @@ import sys, os from plague import XMLRPCServerProxy import ConfigParser -import M2Crypto -import M2Crypto.m2xmlrpclib -import M2Crypto.X509 import socket +import xmlrpclib +import OpenSSL config = ConfigParser.ConfigParser() @@ -101,7 +100,7 @@ if status: args['status'] = status (e, msg, jobs) = server.list_jobs(args) - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -121,7 +120,7 @@ try: (err, msg) = server.kill_job(email, jobid) - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -153,7 +152,7 @@ print_builders("New Builders", builder_list) else: print "No new builders found." - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e @@ -168,7 +167,7 @@ print_builders("Active Builders", builder_list) else: print "No active builders found." - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e @@ -194,7 +193,7 @@ if addr.startswith("https:"): raise ServerException("Error: '%s' is an SSL server, but the use_ssl config option set to False. See %s" % (addr, config_file_path)) else: - server = M2Crypto.m2xmlrpclib.ServerProxy(addr) + server = xmlrpclib.ServerProxy(addr) else: raise ServerException("Unrecognized value for config '%s' option use_ssl. See %s" % (use_ssl, config_file_path)) @@ -212,13 +211,11 @@ if not os.access(certfile, os.R_OK): print "%s does not exist or is not readable." % certfile sys.exit(1) - cert = M2Crypto.X509.load_cert(certfile) - # m2crypto 0.9 only has 'Email', so fall through to that - # if 'emailAddress' fails - try: - cert_email = cert.get_subject().emailAddress - except AttributeError: - cert_email = cert.get_subject().Email + f = open(certfile, "r") + buf = f.read(8192) + f.close() + cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, buf) + cert_email = cert.get_subject().emailAddress if cert_email != config_email: print "Error: certificate's email address does not match the email address in the config file." sys.exit(1) From fedora-extras-commits at redhat.com Wed Jul 6 21:20:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:51 -0400 Subject: extras-buildsys/builder CONFIG.py,1.4,1.5 builder.py,1.5,1.6 Message-ID: <200507062121.j66LLMmi004103@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CONFIG.py 5 Jul 2005 21:07:52 -0000 1.4 +++ CONFIG.py 6 Jul 2005 21:20:49 -0000 1.5 @@ -18,7 +18,7 @@ config_opts['distro_name'] = "fedora" config_opts['repo_name'] = "core" -config_opts['ssl_buildserver'] = False +config_opts['ssl_buildserver'] = True config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- builder.py 5 Jul 2005 21:07:52 -0000 1.5 +++ builder.py 6 Jul 2005 21:20:49 -0000 1.6 @@ -34,7 +34,6 @@ from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer -from M2Crypto import threading as m2thread # Load in the config @@ -608,8 +607,6 @@ print "%s does not exist or is not readable." % work_dir os._exit(1) - m2thread.init() - # Start up the HTTP server thread which the build server # pulls completed RPMs from port = config_opts['fileserver_port'] @@ -622,24 +619,23 @@ http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.HTTPServer(certs, (g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServer(certs, (g_our_hostname, port), work_dir, certs) else: - http_server = HTTPServer.HTTPServer((g_our_hostname, port), work_dir, None) + http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None) http_server.start() # Stop running as root if drop_privs() == -1: http_server.stop() time.sleep(1) - m2thread.cleanup() os._exit(1) print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) xmlrpc_port = config_opts['xmlrpc_port'] if config_opts['ssl_buildserver']: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), certs) + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port)) + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None) bcs = XMLRPCBuilderServer(localarches) xmlserver.register_instance(bcs) @@ -650,13 +646,6 @@ except KeyboardInterrupt, e: print "Shutting down..." break - except socket.error, e: - if e[0] == 11: # Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break cur_time = time.time() if cur_time >= last_time + 3: @@ -666,5 +655,4 @@ http_server.stop() time.sleep(2) - m2thread.cleanup() os._exit(0) From fedora-extras-commits at redhat.com Wed Jul 6 21:20:57 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:57 -0400 Subject: extras-buildsys/common SSLConnection.py, NONE, 1.1 AuthedXMLRPCServer.py, 1.1, 1.2 FileDownloader.py, 1.10, 1.11 HTTPSURLopener.py, 1.3, 1.4 HTTPServer.py, 1.1, 1.2 Makefile, 1.4, 1.5 SSLCommon.py, 1.8, 1.9 XMLRPCServerProxy.py, 1.1, 1.2 Message-ID: <200507062121.j66LLRAd004110@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/common Modified Files: AuthedXMLRPCServer.py FileDownloader.py HTTPSURLopener.py HTTPServer.py Makefile SSLCommon.py XMLRPCServerProxy.py Added Files: SSLConnection.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works ***** Error reading new file: [Errno 2] No such file or directory: 'SSLConnection.py' Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AuthedXMLRPCServer.py 5 Jul 2005 21:07:57 -0000 1.1 +++ AuthedXMLRPCServer.py 6 Jul 2005 21:20:55 -0000 1.2 @@ -19,13 +19,18 @@ import socket import time import SocketServer -from M2Crypto import SSL import xmlrpclib import SimpleXMLRPCServer import SSLCommon class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): + + # For some reason, httplib closes the connection right after headers + # have been sent if the connection is _not_ HTTP/1.1, which results in + # a "Bad file descriptor" error when the client tries to read from the socket + protocol_version = "HTTP/1.1" + def do_POST(self): """ See documentation on SimpleXMLRPCRequestHandler. Modifications @@ -88,16 +93,6 @@ return None def verify_request(self, request, client_address): - """ - Allow ourselves a chance to verify the client - """ - if self.authinfo_callback: - authinfo = self.get_authinfo(request, client_address) - if authinfo: - return True - return False - - # Allow all requests if there's no authinfo_callback return True def _marshaled_dispatch(self, data, authinfo): @@ -150,7 +145,6 @@ else: raise Exception('method "%s" is not supported' % method) - # Sigh. Different versions of M2Crypto have this in different places def lcl_resolve_dotted_attribute(self, method): pyver = sys.version_info[:3] if pyver <= (2, 3, 4): @@ -160,34 +154,44 @@ return SimpleXMLRPCServer.resolve_dotted_attribute( self.instance, method, self.allow_dotted_names) - def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break - except socket.error, e: - if e[0] == 11: #Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break - -class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.QuietSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): +class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.PlgBaseSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): """ Extension to allow more fine-tuned SSL handling """ def __init__(self, address, authinfo_callback=None, certs=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) - ctx = SSLCommon.getSSLContext(certs) - SSLCommon.QuietSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, ctx) + SSLCommon.PlgBaseSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, certs) -class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SocketServer.ThreadingTCPServer, SimpleXMLRPCServer.SimpleXMLRPCServer): +class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.PlgBaseServer, SimpleXMLRPCServer.SimpleXMLRPCServer): def __init__(self, address, authinfo_callback=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) - SocketServer.ThreadingTCPServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) + SSLCommon.PlgBaseServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) + + +########################################################### +# Testing stuff +########################################################### + +class ReqHandler: + def ping(self): + return "pong" + + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python AuthdXMLRPCServer.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + print "Starting the server." + server = AuthedSSLXMLRPCServer(('localhost', 8886), None, certs) + h = ReqHandler() + server.register_instance(h) + server.serve_forever() Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- FileDownloader.py 5 Jul 2005 21:07:57 -0000 1.10 +++ FileDownloader.py 6 Jul 2005 21:20:55 -0000 1.11 @@ -1,4 +1,3 @@ -#!/usr/bin/python -t # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -13,8 +12,7 @@ # 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. -# +# Copyright 2005 Dan Williams and Red Hat, Inc. import threading import urllib @@ -22,7 +20,7 @@ import os import socket import HTTPSURLopener -from M2Crypto import SSL +import OpenSSL import CommonErrors @@ -98,10 +96,10 @@ target_file = os.path.join(self._target_dir, self._filename) try: result = self._opener.retrieve(self._url, target_file) - except SSL.SSLError, e: - # Don't traceback on dropped connections or timeouts - if CommonErrors.canIgnoreSSLError(e): - pass +# except SSL.SSLError, e: +# # Don't traceback on dropped connections or timeouts +# if CommonErrors.canIgnoreSSLError(e): +# pass except socket.error, e: if CommonErrors.canIgnoreSocketError(e): pass @@ -121,7 +119,6 @@ ########################################################### import sys, time -from M2Crypto import threading as m2thread class dlwr: def __init__(self, x, t): @@ -165,7 +162,6 @@ print "Starting..." dlt = dl_tracker() - m2thread.init() x = 0 while x < 100: wr = dlwr(x, dlt) @@ -183,5 +179,4 @@ time.sleep(1) except KeyboardInterrupt: print "Quitting..." - m2thread.cleanup() os._exit(0) Index: HTTPSURLopener.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPSURLopener.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HTTPSURLopener.py 14 Jun 2005 01:16:30 -0000 1.3 +++ HTTPSURLopener.py 6 Jul 2005 21:20:55 -0000 1.4 @@ -15,43 +15,50 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. -import string, sys, urllib -import os, sys -from urllib import * - -from M2Crypto import SSL, httpslib +import string +import urllib +import os +import sys import SSLCommon +from OpenSSL import SSL + class HTTPSURLopener(urllib.URLopener): def __init__(self, certs): - self.ctx = SSLCommon.getSSLContext(certs) + self.ctx = SSLCommon.CreateSSLContext(certs) urllib.URLopener.__init__(self) def open_https(self, url, data=None): """ - Inspired by M2Crypto.m2urllib. The problem here with - M2Crypto.m2urlllib is that there wasn't a way to get an SSL context - into open_https as far as I could tell. - + Need to override this because there was no visible + way to get the SSL Context into open_https() """ - # Attempt to isolate host and request parts from URI host = None if type(url) is type(""): - host, selector = splithost(url) + host, selector = urllib.splithost(url) if host: - user_passwd, host = splituser(host) - host = unquote(host) + user_passwd, host = urllib.splituser(host) + host = urllib.unquote(host) if not host: raise IOError, ('http error', 'no host given') - h = httpslib.HTTPSConnection(host=host, ssl_context=self.ctx) + h = SSLCommon.PlgHTTPS(host=host, ssl_context=self.ctx) h.putrequest('GET', selector) for args in self.addheaders: apply(h.putheader, args) - h.endheaders() - resp = h.getresponse() - fp = resp.fp - return urllib.addinfourl(fp, {}, "https:" + url) + try: + h.endheaders() + except SSL.Error, e: + # Convert the SSL error into an IOError so the call fails + raise IOError, e + + errcode, errmsg, headers = h.getreply() + fp = h.getfile() + if errcode == 200: + return urllib.addinfourl(fp, headers, "https:" + url) + else: + return self.http_error(url, fp, errcode, errmsg, headers) + Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HTTPServer.py 5 Jul 2005 21:07:57 -0000 1.1 +++ HTTPServer.py 6 Jul 2005 21:20:55 -0000 1.2 @@ -17,21 +17,22 @@ # import SimpleHTTPServer -import SocketServer import threading import urllib import posixpath -import os, sys -from SimpleHTTPServer import SimpleHTTPRequestHandler -from M2Crypto import Rand, SSL -from M2Crypto.SSL.SSLServer import ThreadingSSLServer +import os +import sys import SSLCommon -import socket import time -from M2Crypto import threading as m2thread +from OpenSSL import SSL -class HttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): +class PlgHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): + + # For some reason, httplib closes the connection right after headers + # have been sent if the connection is _not_ HTTP/1.1, which results in + # a "Bad file descriptor" error when the client tries to read from the socket + protocol_version = "HTTP/1.1" def __init__(self, request, client_address, server): self._server = server @@ -66,84 +67,33 @@ path = os.path.join(path, word) return path - def do_GET(self): - SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) -# try: -# SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) -# except Exception, e: -# # We get an exception if the client drops the transfer -# pass - -class ThreadingHTTPSServer(ThreadingSSLServer): - """ SSL-enabled variant """ - - def __init__(self, server_addr, http_dir, certs): - self.allow_reuse_address = 1 - self.http_dir = http_dir - - self.ctx = SSLCommon.getSSLContext(certs) - ThreadingSSLServer.__init__(self, server_addr, HttpRequestHandler, self.ctx) + def handle(self): + """ Always close the connection when done """ + self.close_connection = 1 - self.server_name = server_addr[0] - self.server_port = server_addr[1] - - # About the last thing we want is a client blocking the server - # because it hung or tracebacked - timeout = SSL.timeout(10) - self.socket.set_socket_read_timeout(timeout) - self.socket.set_socket_write_timeout(timeout) - - def finish(self): - if self.request: - self.request.set_shutdown(SSL.SSL_RECEIVED_SHUTDOWN | SSL.SSL_SENT_SHUTDOWN) - self.request.close() - - def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break - except socket.error, e: - if e[0] == 11: # Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break + try: + self.handle_one_request() + except SSL.Error, e: + print e[0] -class ThreadingHTTPServer(SocketServer.ThreadingTCPServer): - """ Non-SSL variant """ - def __init__(self, certs, server_addr, http_dir): - self.allow_reuse_address = 1 +class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer): + def __init__(self, server_address, http_dir, certs): self.http_dir = http_dir + SSLCommon.PlgBaseSSLServer.__init__(self, server_address, PlgHTTPRequestHandler, certs) - ThreadingTCPServer.__init__(self, server_addr, HttpRequestHandler) - - def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break - except socket.error, e: - if e[0] == 11: # Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break +class PlgHTTPServer(SSLCommon.PlgBaseServer): + def __init__(self, server_address, http_dir): + self.http_dir = http_dir + SSLCommon.PlgBaseServer.__init__(self, server_address, PlgHTTPRequestHandler) -class HTTPServer(threading.Thread): +class PlgHTTPServer(threading.Thread): def __init__(self, addr, http_dir, certs): if certs and len(certs) > 0: - self._server = ThreadingHTTPSServer(addr, http_dir, certs) + self._server = PlgHTTPSServer(addr, http_dir, certs) else: - self._server = ThreadingHTTPServer(addr, http_dir) + self._server = PlgHTTPServer(addr, http_dir) self._stop = False threading.Thread.__init__(self) @@ -161,7 +111,7 @@ if __name__ == '__main__': if len(sys.argv) < 4: - print "Usage: python SimpleHTTPSServer.py key_and_cert ca_cert peer_ca_cert" + print "Usage: python HTTPServer.py key_and_cert ca_cert peer_ca_cert" sys.exit(1) certs = {} @@ -183,10 +133,8 @@ x = x + 1 f.close() - m2thread.init() - print "Starting the server." - server = SimpleHTTPSServer(certs, ('localhost', 8886), srcdir) + server = PlgHTTPServer(('localhost', 8886), srcdir, certs) server.start() while True: @@ -194,5 +142,4 @@ time.sleep(1) except KeyboardInterrupt: print "Quitting..." - m2thread.cleanup() os._exit(0) Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 5 Jul 2005 21:07:57 -0000 1.4 +++ Makefile 6 Jul 2005 21:20:55 -0000 1.5 @@ -14,6 +14,7 @@ HTTPServer.py \ AuthedXMLRPCServer.py \ SSLCommon.py \ + SSLConnection.py \ XMLRPCServerProxy.py \ lighttpdManager.py \ __init__.py Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SSLCommon.py 5 Jul 2005 21:07:57 -0000 1.8 +++ SSLCommon.py 6 Jul 2005 21:20:55 -0000 1.9 @@ -14,21 +14,23 @@ # # Copyright 2005 Dan Williams and Red Hat, Inc. -from M2Crypto import SSL import os import CommonErrors +from OpenSSL import SSL +import SSLConnection +import httplib +import socket +import SocketServer +def our_verify(connection, x509, errNum, errDepth, preverifyOK): + # print "Verify: errNum = %s, errDepth = %s, preverifyOK = %s" % (errNum, errDepth, preverifyOK) -def quietCallback(self, *args): - """ - This prevents SSL printing out stuff to stderr/stdout. - """ - return + # preverifyOK should tell us whether or not the client's certificate + # correctly authenticates against the CA chain + return preverifyOK -def getSSLContext(certs, session_id='ssl_session'): - """ - Helper method for m2crypto's SSL libraries. - """ + +def CreateSSLContext(certs): key_and_cert = certs['key_and_cert'] ca_cert = certs['ca_cert'] peer_ca_cert = certs['peer_ca_cert'] @@ -37,53 +39,101 @@ print "%s does not exist or is not readable." % f os._exit(1) - ctx = SSL.Context('sslv3') # SSLv3 only - ctx.load_cert(key_and_cert) + ctx = SSL.Context(SSL.SSLv3_METHOD) # SSLv3 only + ctx.use_certificate_file(key_and_cert) + ctx.use_privatekey_file(key_and_cert) ctx.load_client_ca(ca_cert) - ctx.load_verify_info(peer_ca_cert) - ctx.set_allow_unknown_ca(False) - verify = SSL.verify_peer | SSL.verify_fail_if_no_peer_cert - ctx.set_verify(verify, 10) - ctx.set_session_id_ctx(session_id) - ctx.set_info_callback(quietCallback) + ctx.load_verify_locations(peer_ca_cert) + verify = SSL.VERIFY_PEER | SSL.VERIFY_FAIL_IF_NO_PEER_CERT + ctx.set_verify(verify, our_verify) + ctx.set_verify_depth(10) + ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_TLSv1) return ctx - -class QuietSSLServer(SSL.ThreadingSSLServer): - def __init__(self, server_address, RequestHandlerClass, ssl_context): - try: - SSL.SSLServer.__init__(self, server_address, RequestHandlerClass, ssl_context) - except socket.error, e: - if e[0] == 49: # Cannot assign requested address - print "Error: requested address '%s' couldn't be used." % server_address - - # About the last thing we want is a client blocking the server - # because it hung or tracebacked - timeout = SSL.timeout(10) - self.socket.set_socket_read_timeout(timeout) - self.socket.set_socket_write_timeout(timeout) - - def handle_request(self): - request = None - client_address = None - try: - request, client_address = self.get_request() - timeout = SSL.timeout(10) - request.set_socket_read_timeout(timeout) - request.set_socket_write_timeout(timeout) - if self.verify_request(request, client_address): - self.process_request(request, client_address) - except SSL.SSLError, e: - if CommonErrors.canIgnoreSSLError(e): - pass - else: - self.handle_error(request, client_address) - - # Override M2Crypto's SSL.SSLServer handle_error, which - # doesn't accept the same arguments as SocketServer - def handle_error(self, request, client_address): - print '-'*40 - import traceback - traceback.print_exc() - print '-'*40 + + +class PlgBaseServer(SocketServer.ThreadingTCPServer): + allow_reuse_address = 1 + + def __init__(self, server_addr, req_handler): + self.allow_reuse_address = 1 + SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler) + + def serve_forever(self): + while True: + try: + self.handle_request() + except KeyboardInterrupt, e: + print "Shutting down..." + break + + +class PlgBaseSSLServer(PlgBaseServer): + """ SSL-enabled variant """ + + def __init__(self, server_address, req_handler, certs): + + self.ssl_ctx = CreateSSLContext(certs) + + SocketServer.BaseServer.__init__(self, server_address, req_handler) + + sock = socket.socket(self.address_family, self.socket_type) + con = SSL.Connection(self.ssl_ctx, sock) + self.socket = SSLConnection.SSLConnection(con) + self.server_bind() + self.server_activate() + + host, port = self.socket.getsockname()[:2] + self.server_name = socket.getfqdn(host) + self.server_port = port + + +class PlgHTTPSResponse(httplib.HTTPResponse): + def __init__(self, sock, debuglevel=0, strict=0, method=None): + self.fp = socket._fileobject(sock, "rb", 0) + self.debuglevel = debuglevel + self.strict = strict + self._method = method + + self.msg = None + + # from the Status-Line of the response + self.version = httplib._UNKNOWN # HTTP-Version + self.status = httplib._UNKNOWN # Status-Code + self.reason = httplib._UNKNOWN # Reason-Phrase + + self.chunked = httplib._UNKNOWN # is "chunked" being used? + self.chunk_left = httplib._UNKNOWN # bytes left to read in current chunk + self.length = httplib._UNKNOWN # number of bytes left in response + self.will_close = httplib._UNKNOWN # conn will close at end of response + + +class PlgHTTPSConnection(httplib.HTTPConnection): + "This class allows communication via SSL." + + response_class = PlgHTTPSResponse + + def __init__(self, host, port=None, ssl_context=None, strict=None): + httplib.HTTPConnection.__init__(self, host, port, strict) + self.ssl_ctx = ssl_context + + def connect(self): + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + con = SSL.Connection(self.ssl_ctx, sock) + self.sock = SSLConnection.SSLConnection(con) + self.sock.connect((self.host, self.port)) + + +class PlgHTTPS(httplib.HTTP): + """Compatibility with 1.5 httplib interface + + Python 1.5.2 did not have an HTTPS class, but it defined an + interface for sending http requests that is also useful for + https. + """ + + _connection_class = PlgHTTPSConnection + + def __init__(self, host='', port=None, ssl_context=None, strict=None): + self._setup(self._connection_class(host, port, ssl_context, strict)) Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLRPCServerProxy.py 5 Jul 2005 21:07:58 -0000 1.1 +++ XMLRPCServerProxy.py 6 Jul 2005 21:20:55 -0000 1.2 @@ -15,14 +15,84 @@ # Modified by Dan Williams import os, sys -from M2Crypto import SSL -from M2Crypto.m2xmlrpclib import SSL_Transport, ServerProxy import SSLCommon +import urllib +import xmlrpclib -class XMLRPCServerProxy(ServerProxy): +__version__='0.12' + +class SSL_Transport(xmlrpclib.Transport): + + user_agent = "pyOpenSSL_XMLRPC/%s - %s" % (__version__, xmlrpclib.Transport.user_agent) + + def __init__(self, ssl_context): + self.ssl_ctx=ssl_context + + def request(self, host, handler, request_body, verbose=0): + # Handle username and password. + user_passwd, host_port = urllib.splituser(host) + _host, _port = urllib.splitport(host_port) + h = SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) + if verbose: + h.set_debuglevel(1) + + # What follows is as in xmlrpclib.Transport. (Except the authz bit.) + h.putrequest("POST", handler) + + # required by HTTP/1.1 + h.putheader("Host", _host) + + # required by XML-RPC + h.putheader("User-Agent", self.user_agent) + h.putheader("Content-Type", "text/xml") + h.putheader("Content-Length", str(len(request_body))) + + # Authorisation. + if user_passwd is not None: + auth=string.strip(base64.encodestring(user_passwd)) + h.putheader('Authorization', 'Basic %s' % auth) + + h.endheaders() + + if request_body: + h.send(request_body) + + errcode, errmsg, headers = h.getreply() + + if errcode != 200: + raise ProtocolError( + host + handler, + errcode, errmsg, + headers + ) + + self.verbose = verbose + return self.parse_response(h.getfile()) + + +class XMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, uri, certs): if certs and len(certs) > 0: - self.ctx = SSLCommon.getSSLContext(certs) - ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) + self.ctx = SSLCommon.CreateSSLContext(certs) + xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) else: - ServerProxy.__init__(self, uri) + xmlrpclib.ServerProxy.__init__(self, uri) + + + +########################################################### +# Testing stuff +########################################################### + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python XMLRPCServerProxy.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + s = XMLRPCServerProxy("https://127.0.0.1:8886", certs) + print s.ping() From fedora-extras-commits at redhat.com Wed Jul 6 22:30:35 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:30:35 -0400 Subject: rpms/gramps/devel .cvsignore, 1.8, 1.9 gramps.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200507062230.j66MUZDK005595@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5574 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jul 6 2005 Brian Pepple - 2.0.5-1 - Update to 2.0.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Jul 2005 15:26:39 -0000 1.8 +++ .cvsignore 6 Jul 2005 22:30:33 -0000 1.9 @@ -1 +1 @@ -gramps-2.0.4.tar.gz +gramps-2.0.5.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gramps.spec 1 Jul 2005 15:26:39 -0000 1.8 +++ gramps.spec 6 Jul 2005 22:30:33 -0000 1.9 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jul 6 2005 Brian Pepple - 2.0.5-1 +- Update to 2.0.5. + * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Jul 2005 15:26:39 -0000 1.8 +++ sources 6 Jul 2005 22:30:33 -0000 1.9 @@ -1 +1 @@ -7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz +87e6ad11f18a83dcd91fb12b947b2cc0 gramps-2.0.5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 22:31:48 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:31:48 -0400 Subject: common tobuild,1.1809,1.1810 Message-ID: <200507062231.j66MVm4p005657@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5640 Modified Files: tobuild Log Message: request build of rpms/gramps/devel gramps-2_0_5-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1809 retrieving revision 1.1810 diff -u -r1.1809 -r1.1810 --- tobuild 6 Jul 2005 20:39:12 -0000 1.1809 +++ tobuild 6 Jul 2005 22:31:46 -0000 1.1810 @@ -12,3 +12,4 @@ skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 +bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 22:33:02 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:33:02 -0400 Subject: rpms/gramps/FC-4 .cvsignore, 1.8, 1.9 gramps.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200507062233.j66MX2K6005710@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jul 6 2005 Brian Pepple - 2.0.5-1 - Update to 2.0.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Jul 2005 15:29:19 -0000 1.8 +++ .cvsignore 6 Jul 2005 22:33:00 -0000 1.9 @@ -1 +1 @@ -gramps-2.0.4.tar.gz +gramps-2.0.5.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gramps.spec 1 Jul 2005 15:29:19 -0000 1.8 +++ gramps.spec 6 Jul 2005 22:33:00 -0000 1.9 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jul 6 2005 Brian Pepple - 2.0.5-1 +- Update to 2.0.5. + * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Jul 2005 15:29:19 -0000 1.8 +++ sources 6 Jul 2005 22:33:00 -0000 1.9 @@ -1 +1 @@ -7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz +87e6ad11f18a83dcd91fb12b947b2cc0 gramps-2.0.5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 22:33:24 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:33:24 -0400 Subject: common tobuild,1.1810,1.1811 Message-ID: <200507062233.j66MXONW005772@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5755 Modified Files: tobuild Log Message: request build of rpms/gramps/FC-4 gramps-2_0_5-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1810 retrieving revision 1.1811 diff -u -r1.1810 -r1.1811 --- tobuild 6 Jul 2005 22:31:46 -0000 1.1810 +++ tobuild 6 Jul 2005 22:33:22 -0000 1.1811 @@ -13,3 +13,4 @@ jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel +bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 22:41:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 6 Jul 2005 18:41:33 -0400 Subject: rpms/scribus/FC-4 .cvsignore, 1.5, 1.6 scribus.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200507062241.j66MfXfZ005816@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5795/FC-4 Modified Files: .cvsignore scribus.spec sources Log Message: Scribus update for Phil. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jan 2005 19:29:45 -0000 1.5 +++ .cvsignore 6 Jul 2005 22:41:31 -0000 1.6 @@ -1 +1,2 @@ scribus-1.2.1.tar.bz2 +scribus-1.2.2.1.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scribus.spec 22 May 2005 23:16:50 -0000 1.11 +++ scribus.spec 6 Jul 2005 22:41:31 -0000 1.12 @@ -1,15 +1,16 @@ Name: scribus -Version: 1.2.1 -Release: 5 +Version: 1.2.2.1 +Release: 1 Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2 Source1: scribus.xml -Patch0: scribus-x86_64.patch +Source2: scribus.desktop +#Patch0: scribus-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel @@ -22,24 +23,42 @@ BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: openssl-devel -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 2.3 BuildRequires: qt-devel >= 1:3.3 BuildRequires: zlib-devel +BuildRequires: freetype-devel Requires: ghostscript >= 7.07 -Requires: python >= 2.2 +Requires: python >= 2.3 Requires: tkinter Requires(post): shared-mime-info Requires(post): desktop-file-utils Requires(postun): shared-mime-info Requires(postun): desktop-file-utils -Obsoletes: scribus-i18n-en - +Obsoletes: scribus-i18n-en +Obsoletes: scribus-svg +Obsoletes: scribus-scripting +Obsoletes: scribus-short-words +Obsoletes: scribus-vnla +Obsoletes: scribus-i18en +Obsoletes: scribus-i18de +Obsoletes: scribus-i18fr +Obsoletes: scribus-templates + +Provides: scribus-i18n-en +Provides: scribus-svg +Provides: scribus-scripting +Provides: scribus-short-words +Provides: scribus-vnla +Provides: scribus-i18en +Provides: scribus-i18de +Provides: scribus-i18fr +Provides: scribus-templates %description -Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???, -QuarkXPress??? or Adobe?? InDesign???, except that it is published under the -GNU GPL. +Scribus is an desktop open source page layout program with +the aim of producing commercial grade output in PDF and +Postscript, primarily, though not exclusively for Linux. While the goals of the program are for ease of use and simple easy to understand tools, Scribus offers support for professional publishing @@ -58,7 +77,7 @@ %prep %setup -q -%patch -p1 -b .x86_64 +#%patch -p1 -b .x86_64 %build @@ -117,6 +136,20 @@ %changelog +* Tue Jul 5 2005 P Linnell - 1.2.2.1-1 +- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs + +* Sun Jul 3 2005 P Linnell - 1.2.2-0.fc4 +- 1.2.2 final + +* Tue Jun 28 2005 P Linnell - 1.2.2cvs-0 +- test build for 1.2.2cvs +- Add freetype2 explicit build requirement +- Add obsoletes. See PACKAGING in the source tarball +- Change the description per PACKAGING +- Bump required python. 2.2 is no longer supported. + + * Sun May 22 2005 Jeremy Katz - 1.2.1-5 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2005 19:29:45 -0000 1.5 +++ sources 6 Jul 2005 22:41:31 -0000 1.6 @@ -1 +1,2 @@ 002cb629e817722f4123df7a41fc824b scribus-1.2.1.tar.bz2 +8c2eac0a358b04c39252586d9d85ab24 scribus-1.2.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 6 23:35:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 6 Jul 2005 19:35:43 -0400 Subject: rpms/scribus/FC-4 scribus.spec,1.12,1.13 Message-ID: <200507062335.j66NZhcn006996@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6974/FC-4 Modified Files: scribus.spec Log Message: Missed a period. Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scribus.spec 6 Jul 2005 22:41:31 -0000 1.12 +++ scribus.spec 6 Jul 2005 23:35:41 -0000 1.13 @@ -67,7 +67,7 @@ %package devel -Summary: Header files for Scribus. +Summary: Header files for Scribus Group: Development/Libraries Requires: %{name} = %{version}-%{release} From fedora-extras-commits at redhat.com Wed Jul 6 23:36:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 6 Jul 2005 19:36:13 -0400 Subject: common tobuild,1.1811,1.1812 Message-ID: <200507062336.j66NaDQx007058@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7041 Modified Files: tobuild Log Message: request build of rpms/scribus/FC-4 scribus-1_2_2_1-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1811 retrieving revision 1.1812 diff -u -r1.1811 -r1.1812 --- tobuild 6 Jul 2005 22:33:22 -0000 1.1811 +++ tobuild 6 Jul 2005 23:36:11 -0000 1.1812 @@ -14,3 +14,4 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 +spot rpms/scribus/FC-4 scribus-1_2_2_1-1 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 03:48:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 23:48:29 -0400 Subject: extras-buildsys/builder builder.py,1.6,1.7 Message-ID: <200507070348.j673mTHV011901@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11884 Modified Files: builder.py Log Message: Fix small error for Python HTTPS Server Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- builder.py 6 Jul 2005 21:20:49 -0000 1.6 +++ builder.py 7 Jul 2005 03:48:26 -0000 1.7 @@ -39,7 +39,7 @@ # Load in the config execfile("/etc/plague/builder/CONFIG.py") -use_lighttpd = True +use_lighttpd = False g_our_hostname = None certs = {} @@ -619,7 +619,7 @@ http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.PlgHTTPServer(certs, (g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, certs) else: http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None) http_server.start() From fedora-extras-commits at redhat.com Thu Jul 7 04:05:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 00:05:49 -0400 Subject: extras-buildsys README,1.5,1.6 Message-ID: <200507070406.j6746Wei013011@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12990 Modified Files: README Log Message: Update it Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README 28 Jun 2005 16:46:11 -0000 1.5 +++ README 7 Jul 2005 04:05:46 -0000 1.6 @@ -18,12 +18,12 @@ Builder Setup: 1) In the CVS checkout directory on the client, execute: make DESTDIR=/ install -2) Create a user for the builder. The builder _cannot_ run as 'root' (since mock cannot run as 'root') +2) Create a user for the builder. The builder drops root privileges before running the build, but must have root to be able to do initial setup 3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs directory 4) Things to modify in the client's CONFIG.py: - Modify the 'distro' and 'repo' options to match the targets you've configured in /etc/mock/. These targets are usually in the form of "distro-target-arch-repo". 'arch' and 'target' are passed by the build system dynamically, but 'distro' and 'repo' are hardcoded in the config file. Examples are "fedora-development-i386-core" and "fedora-development-i386-extras". 5) Configure the mock target files in /etc/mock. You only need one target file for each major arch you support. For example, you don't need separate 'ia32e' or 'amd64' config files, since these just use the normal 'x86_64' config file -6) Start the client, NOT as 'root'. ex: "sudo -u builder /usr/bin/plague-builder 127.0.0.1 i386 i686" +6) Start the client. ex: "/usr/bin/plague-builder 127.0.0.1 i386 i686" On the Server: From fedora-extras-commits at redhat.com Thu Jul 7 04:52:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Thu, 7 Jul 2005 00:52:37 -0400 Subject: rpms/proj import.log,1.5,1.6 Message-ID: <200507070452.j674qbUv013206@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174 Modified Files: import.log Log Message: auto-import proj-4.4.9-0 on branch devel from proj-4.4.9-0.src.rpm Update to fix bugzilla reports 161726 and 150013 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Mar 2005 16:46:54 -0000 1.5 +++ import.log 7 Jul 2005 04:52:35 -0000 1.6 @@ -2,3 +2,4 @@ proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255 proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681 proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421 +proj-4_4_9-0:HEAD:proj-4.4.9-0.src.rpm:1120711939 From fedora-extras-commits at redhat.com Thu Jul 7 04:52:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Thu, 7 Jul 2005 00:52:37 -0400 Subject: rpms/proj/devel pj_gridinfo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 proj.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507070452.j674qbfH013216@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174/devel Modified Files: .cvsignore proj.spec sources Added Files: pj_gridinfo.patch Log Message: auto-import proj-4.4.9-0 on branch devel from proj-4.4.9-0.src.rpm Update to fix bugzilla reports 161726 and 150013 pj_gridinfo.patch: --- NEW FILE pj_gridinfo.patch --- 493c493 < "failed to find parent %8.8s for %.\n", --- > "failed to find parent %8.8s for %s\n", Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jan 2005 09:45:21 -0000 1.2 +++ .cvsignore 7 Jul 2005 04:52:35 -0000 1.3 @@ -1,2 +1,2 @@ -proj-4.4.8.tar.gz proj-nad27-1.1.tar.gz +proj-4.4.9.tar.gz Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proj.spec 22 May 2005 16:33:49 -0000 1.4 +++ proj.spec 7 Jul 2005 04:52:35 -0000 1.5 @@ -1,16 +1,17 @@ Name: proj -Version: 4.4.8 -Release: 6 +Version: 4.4.9 +Release: 0 Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering License: MIT URL: http://www.remotesensing.org/proj/ -Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz +Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright Patch0: proj.copyright.patch Patch1: proj.test_scripts.patch +Patch2: pj_gridinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel @@ -48,6 +49,10 @@ gzip -dc %{SOURCE1} | tar -xvvf - cd .. +# Patch for Bug 150013 +cp %{PATCH2} ./ +patch src/pj_gridinfo.c pj_gridinfo.patch + %build %configure make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -59,7 +64,7 @@ install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name} %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:45:21 -0000 1.2 +++ sources 7 Jul 2005 04:52:35 -0000 1.3 @@ -1,2 +1,2 @@ -1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz 66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz +3cc5c2407c213aadfd154c8df80efd6c proj-4.4.9.tar.gz From adrian at lisas.de Thu Jul 7 06:00:13 2005 From: adrian at lisas.de (Adrian Reber) Date: Thu, 7 Jul 2005 08:00:13 +0200 Subject: APPROVED: glabels Message-ID: <20050707060013.GA28468@lisas.de> Package: glabels gLabels is a program for creating labels and business cards for the GNOME desktop environment. It is designed to work with various laser/ink-jet peel-off label and business card sheets that you'll find at most office supply stores. gLabels is free software and is distributed under the terms of the GNU General Public License (GPL). Reviewer: Adrian Reber Maintainer: Jeff Spaleta -------------- 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 Thu Jul 7 06:08:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 02:08:33 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.21,1.22 Message-ID: <200507070608.j6768X8p015682@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15665 Modified Files: bittorrent.spec Log Message: bump and rebuild Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bittorrent.spec 5 Jul 2005 08:51:29 -0000 1.21 +++ bittorrent.spec 7 Jul 2005 06:08:31 -0000 1.22 @@ -5,7 +5,7 @@ Name: bittorrent Version: 4.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -205,6 +205,9 @@ %{_datadir}/pixmaps/bittorrent.png %changelog +* Thu Jul 7 2005 Paul Howarth 4.1.2-4 +- bump and rebuild + * Tue Jul 5 2005 Paul Howarth 4.1.2-3 - obsolete python-khashmir based on version-release, not just version From fedora-extras-commits at redhat.com Thu Jul 7 06:09:10 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 02:09:10 -0400 Subject: common tobuild,1.1812,1.1813 Message-ID: <200507070609.j6769Afu015739@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1812 retrieving revision 1.1813 diff -u -r1.1812 -r1.1813 --- tobuild 6 Jul 2005 23:36:11 -0000 1.1812 +++ tobuild 7 Jul 2005 06:09:08 -0000 1.1813 @@ -15,3 +15,4 @@ bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 spot rpms/scribus/FC-4 scribus-1_2_2_1-1 fc4 +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-4_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 06:23:20 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 02:23:20 -0400 Subject: common tobuild,1.1813,1.1814 Message-ID: <200507070623.j676NKI4015833@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15816 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1813 retrieving revision 1.1814 diff -u -r1.1813 -r1.1814 --- tobuild 7 Jul 2005 06:09:08 -0000 1.1813 +++ tobuild 7 Jul 2005 06:23:18 -0000 1.1814 @@ -1,18 +1,3 @@ # this is the build control file. the format is # user repo tag target status # -oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 -oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 -sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 -sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel -mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel -qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel -caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel -kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 -skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 -jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 -bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel -bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 -spot rpms/scribus/FC-4 scribus-1_2_2_1-1 fc4 -pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-4_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 06:41:31 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 7 Jul 2005 02:41:31 -0400 Subject: common tobuild,1.1814,1.1815 Message-ID: <200507070641.j676fV9v015906@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15889 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1814 retrieving revision 1.1815 diff -u -r1.1814 -r1.1815 --- tobuild 7 Jul 2005 06:23:18 -0000 1.1814 +++ tobuild 7 Jul 2005 06:41:29 -0000 1.1815 @@ -1,3 +1,4 @@ # this is the build control file. the format is # user repo tag target status # +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel From fedora-extras-commits at redhat.com Thu Jul 7 08:51:40 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:51:40 -0400 Subject: rpms/grip/devel grip.1,NONE,1.1 Message-ID: <200507070851.j678peKo018859@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18843 Added Files: grip.1 Log Message: added a man page --- NEW FILE grip.1 --- .TH GRIP "1" "July 2005" "grip 3.2.0" "User Commands" .SH NAME Grip \- Grip is a cd-player and cd-ripper for the Gnome desktop. .SH SYNOPSIS .B grip [\fIoptions\fR] .SH DESCRIPTION Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping capabilities of .BR cd-paranoia (1) builtin, but can also use external rippers (such as .BR cdda2wav (1)). It also provides an automated frontend for audio encoders, letting you take a disc and transform it easily straight into compressed audio files. Internet disc lookups are supported for retrieving track information from disc database servers. .SH OPTIONS .TP \-?, \fB\-\-help\fR Show this help message .TP \fB\-\-usage\fR Display brief usage message .TP \fB\-\-geometry\fR=\fIGEOMETRY\fR Specify the geometry of the main window .TP \fB\-\-config\fR=\fICONFIG\fR Specify the config file to use (in your home dir) .TP \fB\-\-device\fR=\fIDEVICE\fR Specify the cdrom device to use .TP \fB\-\-scsi\-device\fR=\fIDEVICE\fR Specify the generic scsi device to use .TP \fB\-\-small\fR Launch in "small" (cd\-only) mode .TP \fB\-\-local\fR "Local" mode \fB\-\-\fR do not look up disc info on the net .TP \fB\-\-no\-redirect\fR Do not do I/O redirection .TP \fB\-\-verbose\fR Run in verbose (debug) mode .TP \fB\-\-version\fR Show version information .SH "SEE ALSO" .BR cd-paranoia (1) .BR cdda2wav (1) .SH AUTHOR .SS "grip" Mike Oliphant .SS "this manual page" Adrian Reber From fedora-extras-commits at redhat.com Thu Jul 7 08:55:01 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:55:01 -0400 Subject: rpms/grip/devel grip.spec,1.4,1.5 Message-ID: <200507070855.j678t1Xg018892@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18875 Modified Files: grip.spec Log Message: added patch to fix cell renderer problem (BZ #162324) Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- grip.spec 5 Mar 2005 21:10:21 -0000 1.4 +++ grip.spec 7 Jul 2005 08:54:59 -0000 1.5 @@ -1,12 +1,14 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 4 +Release: 5%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia -Source: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source1: grip.1 Patch1: grip-3.2.0-default.patch +Patch2: grip-cell-renderer.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -24,6 +26,7 @@ %prep %setup -q %patch1 -p1 -b .rh-default-encoder +%patch2 -p1 -b .cell-renderer %build %configure @@ -35,6 +38,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install-am +install -p %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1 + cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF StartupWMClass=Grip Encoding=UTF-8 @@ -67,8 +72,13 @@ %{_datadir}/pixmaps/gripicon.png %{_datadir}/gnome/help/grip %{_datadir}/applications/* +%{_mandir}/man1/* %changelog +* Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 +- added patch to fix cell renderer problem (BZ #162324) +- wrote and added a man page + * Wed Mar 02 2005 Adrian Reber - 1:3.2.0-4 - s/Copyright/License/ - s/Serial/Epoch/ From fedora-extras-commits at redhat.com Thu Jul 7 08:55:26 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:55:26 -0400 Subject: rpms/grip/devel grip-cell-renderer.patch,NONE,1.1 Message-ID: <200507070855.j678tQb5018921@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18903 Added Files: grip-cell-renderer.patch Log Message: patch to fix cell renderer problem (BZ #162324) grip-cell-renderer.patch: --- NEW FILE grip-cell-renderer.patch --- --- grip-3.2.0/src/cdplay.c 2004-04-23 18:26:40.000000000 +0200 +++ grip-3.2.0-cell-fix/src/cdplay.c 2005-07-07 08:30:04.000000000 +0200 @@ -294,6 +294,8 @@ GtkRequisition sizereq; GtkWidget *scroll; GtkTreeViewColumn *column; + GtkCellRenderer *track_renderer; + GtkCellRenderer *length_renderer; GtkCellRenderer *renderer; GtkTreeSelection *select; @@ -321,9 +323,9 @@ uinfo->track_list= gtk_tree_view_new_with_model(GTK_TREE_MODEL(uinfo->track_list_store)); - renderer=gtk_cell_renderer_text_new(); + track_renderer=gtk_cell_renderer_text_new(); - column=gtk_tree_view_column_new_with_attributes(_("Track"),renderer, + column=gtk_tree_view_column_new_with_attributes(_("Track"),track_renderer, "text",TRACKLIST_TRACK_COL, NULL); @@ -334,7 +336,8 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(uinfo->track_list),column); - column=gtk_tree_view_column_new_with_attributes(_("Length"),renderer, + length_renderer=gtk_cell_renderer_text_new(); + column=gtk_tree_view_column_new_with_attributes(_("Length"),length_renderer, "text",TRACKLIST_LENGTH_COL, NULL); From fedora-extras-commits at redhat.com Thu Jul 7 08:57:37 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:57:37 -0400 Subject: common tobuild,1.1815,1.1816 Message-ID: <200507070857.j678vbHo018983@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18966 Modified Files: tobuild Log Message: request build of rpms/grip/devel grip-3_2_0-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1815 retrieving revision 1.1816 diff -u -r1.1815 -r1.1816 --- tobuild 7 Jul 2005 06:41:29 -0000 1.1815 +++ tobuild 7 Jul 2005 08:57:35 -0000 1.1816 @@ -2,3 +2,4 @@ # user repo tag target status # jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel +adrian rpms/grip/devel grip-3_2_0-5_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 09:36:26 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 05:36:26 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.15,1.16 Message-ID: <200507070936.j679aQsP020203@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-serv20184 Modified Files: sylpheed-claws.spec Log Message: - add missing doc Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sylpheed-claws.spec 6 Jul 2005 07:41:46 -0000 1.15 +++ sylpheed-claws.spec 7 Jul 2005 09:36:24 -0000 1.16 @@ -88,7 +88,7 @@ %files -f sylpheed-claws.lang %defattr(-,root,root,-) -%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING +%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws ChangeLog-gtk2.claws COPYING %doc NEWS README README.claws RELEASE_NOTES.claws %doc TODO %{_bindir}/* From fedora-extras-commits at redhat.com Thu Jul 7 09:40:22 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 05:40:22 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.15,1.16 Message-ID: <200507070940.j679eMZg020260@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20243 Modified Files: sylpheed-claws.spec Log Message: - add missing doc Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sylpheed-claws.spec 6 Jul 2005 07:42:42 -0000 1.15 +++ sylpheed-claws.spec 7 Jul 2005 09:40:20 -0000 1.16 @@ -88,7 +88,7 @@ %files -f sylpheed-claws.lang %defattr(-,root,root,-) -%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING +%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws ChangeLog-gtk2.claws COPYING %doc NEWS README README.claws RELEASE_NOTES.claws %doc TODO %{_bindir}/* From fedora-extras-commits at redhat.com Thu Jul 7 09:42:59 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:42:59 -0400 Subject: rpms/mgopen-fonts - New directory Message-ID: <200507070942.j679gxEi020350@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20326/mgopen-fonts Log Message: Directory /cvs/extras/rpms/mgopen-fonts added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 09:42:59 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:42:59 -0400 Subject: rpms/mgopen-fonts/devel - New directory Message-ID: <200507070943.j679gx2A020355@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20326/mgopen-fonts/devel Log Message: Directory /cvs/extras/rpms/mgopen-fonts/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 09:43:20 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:43:20 -0400 Subject: rpms/mgopen-fonts Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507070943.j679hKwp020407@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378 Added Files: Makefile import.log Log Message: Setup of module mgopen-fonts --- NEW FILE Makefile --- # Top level Makefile for module mgopen-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Jul 7 09:43:21 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:43:21 -0400 Subject: rpms/mgopen-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507070943.j679hLmN020412@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mgopen-fonts --- NEW 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 Jul 7 09:44:06 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:44:06 -0400 Subject: rpms/mgopen-fonts import.log,1.1,1.2 Message-ID: <200507070944.j679i6tY020481@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20448 Modified Files: import.log Log Message: auto-import mgopen-fonts-0.20050515-1 on branch devel from mgopen-fonts-0.20050515-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 09:43:18 -0000 1.1 +++ import.log 7 Jul 2005 09:44:04 -0000 1.2 @@ -0,0 +1 @@ +mgopen-fonts-0_20050515-1:HEAD:mgopen-fonts-0.20050515-1.src.rpm:1120729433 From fedora-extras-commits at redhat.com Thu Jul 7 09:44:06 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:44:06 -0400 Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507070944.j679i6ha020488@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20448/devel Modified Files: .cvsignore sources Added Files: mgopen-fonts.spec Log Message: auto-import mgopen-fonts-0.20050515-1 on branch devel from mgopen-fonts-0.20050515-1.src.rpm --- NEW FILE mgopen-fonts.spec --- %define archivename MgOpen %define fontdir %{_datadir}/fonts/mgopen %define upstream_date 20050515 Name: mgopen-fonts Version: 0.%{upstream_date} Release: 1 Summary: Truetype greek fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://www.ellak.gr/fonts/mgopen/ Source0: %{archivename}-%{upstream_date}.tar.gz # Upstream tarball is not versioned http://www.ellak.gr/fonts/mgopen/files/%{archivename}.tar.gz Source1: %{archivename}-%{upstream_date}-doc.tar.gz # Tarball of the documentation on the site http://www.ellak.gr/fonts/mgopen/ # The LICENCE file is an excerpt from the html page BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch %description The MgOpen fonts are a font family that includes Latin and Greek glyphs. The fonts have been released under a liberal license, similar to the license covering the Bitstream Vera fonts. %prep %setup -q -c -a1 -n %{archivename}-%{version} %build %install /bin/rm -rf $RPM_BUILD_ROOT #fonts install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} # "touch" all files we've got flagged as %ghost but which are not # present in the RPM_BUILD_ROOT when RPM looks for files /bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 %clean /bin/rm -rf $RPM_BUILD_ROOT %post if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/fonts fi %postun if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/fonts fi fi %files %defattr(0644,root,root,0755) %doc LICENCE mgopen.html _files/ %dir %{fontdir} %{fontdir}/*.ttf %ghost %{fontdir}/fonts.cache-1 %changelog * Thu Jul 6 2005 Sarantis Paskalis 0.20050515-1 - Fix spelling in the description. Import it to Fedora Extras. * Tue Jun 14 2005 Sarantis Paskalis - Use date-versioned sources * Wed May 25 2005 Sarantis Paskalis - Initial package spec (based on bitstream-vera-fonts) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 09:43:19 -0000 1.1 +++ .cvsignore 7 Jul 2005 09:44:04 -0000 1.2 @@ -0,0 +1,2 @@ +MgOpen-20050515-doc.tar.gz +MgOpen-20050515.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 09:43:19 -0000 1.1 +++ sources 7 Jul 2005 09:44:04 -0000 1.2 @@ -0,0 +1,2 @@ +eb667a1458a92bc4d4e9a1f5924f6e61 MgOpen-20050515-doc.tar.gz +9ad4bba3d173e92734320286bfff4c8e MgOpen-20050515.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 09:55:43 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 7 Jul 2005 05:55:43 -0400 Subject: common tobuild,1.1816,1.1817 Message-ID: <200507070955.j679thVQ020635@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1816 retrieving revision 1.1817 diff -u -r1.1816 -r1.1817 --- tobuild 7 Jul 2005 08:57:35 -0000 1.1816 +++ tobuild 7 Jul 2005 09:55:41 -0000 1.1817 @@ -3,3 +3,4 @@ # jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/grip/devel grip-3_2_0-5_fc5 devel +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 09:58:59 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 7 Jul 2005 05:58:59 -0400 Subject: common tobuild,1.1817,1.1818 Message-ID: <200507070958.j679wxOH020703@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20686 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1817 retrieving revision 1.1818 diff -u -r1.1817 -r1.1818 --- tobuild 7 Jul 2005 09:55:41 -0000 1.1817 +++ tobuild 7 Jul 2005 09:58:57 -0000 1.1818 @@ -4,3 +4,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/grip/devel grip-3_2_0-5_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 10:00:50 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 06:00:50 -0400 Subject: rpms/grip/FC-4 grip-cell-renderer.patch, NONE, 1.1 grip.1, NONE, 1.1 grip.spec, 1.4, 1.5 Message-ID: <200507071000.j67A0o2C020743@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20722 Modified Files: grip.spec Added Files: grip-cell-renderer.patch grip.1 Log Message: * Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 - added patch to fix cell renderer problem (BZ #162324) - wrote and added a man page grip-cell-renderer.patch: --- NEW FILE grip-cell-renderer.patch --- --- grip-3.2.0/src/cdplay.c 2004-04-23 18:26:40.000000000 +0200 +++ grip-3.2.0-cell-fix/src/cdplay.c 2005-07-07 08:30:04.000000000 +0200 @@ -294,6 +294,8 @@ GtkRequisition sizereq; GtkWidget *scroll; GtkTreeViewColumn *column; + GtkCellRenderer *track_renderer; + GtkCellRenderer *length_renderer; GtkCellRenderer *renderer; GtkTreeSelection *select; @@ -321,9 +323,9 @@ uinfo->track_list= gtk_tree_view_new_with_model(GTK_TREE_MODEL(uinfo->track_list_store)); - renderer=gtk_cell_renderer_text_new(); + track_renderer=gtk_cell_renderer_text_new(); - column=gtk_tree_view_column_new_with_attributes(_("Track"),renderer, + column=gtk_tree_view_column_new_with_attributes(_("Track"),track_renderer, "text",TRACKLIST_TRACK_COL, NULL); @@ -334,7 +336,8 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(uinfo->track_list),column); - column=gtk_tree_view_column_new_with_attributes(_("Length"),renderer, + length_renderer=gtk_cell_renderer_text_new(); + column=gtk_tree_view_column_new_with_attributes(_("Length"),length_renderer, "text",TRACKLIST_LENGTH_COL, NULL); --- NEW FILE grip.1 --- .TH GRIP "1" "July 2005" "grip 3.2.0" "User Commands" .SH NAME Grip \- Grip is a cd-player and cd-ripper for the Gnome desktop. .SH SYNOPSIS .B grip [\fIoptions\fR] .SH DESCRIPTION Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping capabilities of .BR cd-paranoia (1) builtin, but can also use external rippers (such as .BR cdda2wav (1)). It also provides an automated frontend for audio encoders, letting you take a disc and transform it easily straight into compressed audio files. Internet disc lookups are supported for retrieving track information from disc database servers. .SH OPTIONS .TP \-?, \fB\-\-help\fR Show this help message .TP \fB\-\-usage\fR Display brief usage message .TP \fB\-\-geometry\fR=\fIGEOMETRY\fR Specify the geometry of the main window .TP \fB\-\-config\fR=\fICONFIG\fR Specify the config file to use (in your home dir) .TP \fB\-\-device\fR=\fIDEVICE\fR Specify the cdrom device to use .TP \fB\-\-scsi\-device\fR=\fIDEVICE\fR Specify the generic scsi device to use .TP \fB\-\-small\fR Launch in "small" (cd\-only) mode .TP \fB\-\-local\fR "Local" mode \fB\-\-\fR do not look up disc info on the net .TP \fB\-\-no\-redirect\fR Do not do I/O redirection .TP \fB\-\-verbose\fR Run in verbose (debug) mode .TP \fB\-\-version\fR Show version information .SH "SEE ALSO" .BR cd-paranoia (1) .BR cdda2wav (1) .SH AUTHOR .SS "grip" Mike Oliphant .SS "this manual page" Adrian Reber Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- grip.spec 5 Mar 2005 21:10:21 -0000 1.4 +++ grip.spec 7 Jul 2005 10:00:48 -0000 1.5 @@ -1,12 +1,14 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 4 +Release: 5%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia -Source: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source1: grip.1 Patch1: grip-3.2.0-default.patch +Patch2: grip-cell-renderer.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -24,6 +26,7 @@ %prep %setup -q %patch1 -p1 -b .rh-default-encoder +%patch2 -p1 -b .cell-renderer %build %configure @@ -35,6 +38,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install-am +install -p %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1 + cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF StartupWMClass=Grip Encoding=UTF-8 @@ -67,8 +72,13 @@ %{_datadir}/pixmaps/gripicon.png %{_datadir}/gnome/help/grip %{_datadir}/applications/* +%{_mandir}/man1/* %changelog +* Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 +- added patch to fix cell renderer problem (BZ #162324) +- wrote and added a man page + * Wed Mar 02 2005 Adrian Reber - 1:3.2.0-4 - s/Copyright/License/ - s/Serial/Epoch/ From fedora-extras-commits at redhat.com Thu Jul 7 10:03:57 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 06:03:57 -0400 Subject: common tobuild,1.1818,1.1819 Message-ID: <200507071004.j67A4nNS021879@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21862 Modified Files: tobuild Log Message: request build of rpms/grip/FC-4 grip-3_2_0-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1818 retrieving revision 1.1819 diff -u -r1.1818 -r1.1819 --- tobuild 7 Jul 2005 09:58:57 -0000 1.1818 +++ tobuild 7 Jul 2005 10:03:55 -0000 1.1819 @@ -5,3 +5,4 @@ adrian rpms/grip/devel grip-3_2_0-5_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 10:20:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:20:37 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.16,1.17 Message-ID: <200507071020.j67AKbuh021964@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-serv21947 Modified Files: sylpheed-claws.spec Log Message: - modified pixmap stuff Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sylpheed-claws.spec 7 Jul 2005 09:36:24 -0000 1.16 +++ sylpheed-claws.spec 7 Jul 2005 10:20:35 -0000 1.17 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -81,7 +81,12 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png +%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps + +%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png + +%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -97,6 +102,7 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/48x48/apps/sylpheed-claws.png %dir %{_datadir}/sylpheed-claws/ %{_datadir}/sylpheed-claws/* %{_mandir}/man1/* @@ -109,6 +115,11 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Thu Jul 07 2005 Andreas Bierfert +1.9.12-2 +- add some doc +- fix pixmap installation + * Wed Jul 06 2005 Andreas Bierfert 1.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Thu Jul 7 10:21:56 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:21:56 -0400 Subject: common tobuild,1.1819,1.1820 Message-ID: <200507071021.j67ALuvK022027@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22010 Modified Files: tobuild Log Message: request build of rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1819 retrieving revision 1.1820 diff -u -r1.1819 -r1.1820 --- tobuild 7 Jul 2005 10:03:55 -0000 1.1819 +++ tobuild 7 Jul 2005 10:21:54 -0000 1.1820 @@ -6,3 +6,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 +awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 10:22:39 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:22:39 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.16,1.17 Message-ID: <200507071022.j67AMdGt022052@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22033 Modified Files: sylpheed-claws.spec Log Message: - sync with fc4 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sylpheed-claws.spec 7 Jul 2005 09:40:20 -0000 1.16 +++ sylpheed-claws.spec 7 Jul 2005 10:22:37 -0000 1.17 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -81,7 +81,12 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png +%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps + +%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png + +%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -97,6 +102,7 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/48x48/apps/sylpheed-claws.png %dir %{_datadir}/sylpheed-claws/ %{_datadir}/sylpheed-claws/* %{_mandir}/man1/* @@ -109,6 +115,11 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Thu Jul 07 2005 Andreas Bierfert +1.9.12-2 +- add some doc +- fix pixmap installation + * Wed Jul 06 2005 Andreas Bierfert 1.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Thu Jul 7 10:23:36 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:23:36 -0400 Subject: common tobuild,1.1820,1.1821 Message-ID: <200507071023.j67ANa1c022116@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22099 Modified Files: tobuild Log Message: request build of rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1820 retrieving revision 1.1821 diff -u -r1.1820 -r1.1821 --- tobuild 7 Jul 2005 10:21:54 -0000 1.1820 +++ tobuild 7 Jul 2005 10:23:34 -0000 1.1821 @@ -7,3 +7,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 +awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 10:28:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 06:28:30 -0400 Subject: rpms/anjuta/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 anjuta.spec, 1.9, 1.10 Message-ID: <200507071028.j67ASUY8022168@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147 Modified Files: .cvsignore sources anjuta.spec Log Message: * Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 - Update to 1.2.3. - Add gettext-devel dependency (Paul Frields). - Add libtool (+automake, +autoconf) dependency. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:02:58 -0000 1.3 +++ .cvsignore 7 Jul 2005 10:28:28 -0000 1.4 @@ -1 +1 @@ -anjuta-1.2.2.tar.gz +anjuta-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:02:58 -0000 1.3 +++ sources 7 Jul 2005 10:28:28 -0000 1.4 @@ -1 +1 @@ -a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz +a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- anjuta.spec 6 Apr 2005 22:11:10 -0000 1.9 +++ anjuta.spec 7 Jul 2005 10:28:28 -0000 1.10 @@ -1,14 +1,13 @@ Name: anjuta -Version: 1.2.2 -Release: 7 - +Version: 1.2.3 +Release: 1 Epoch: 1 Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ -Source0: http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz +Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0.2 @@ -22,7 +21,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils -Requires: pkgconfig +Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -43,7 +42,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description docs -Anjuta documentations. +Anjuta documentation. @@ -123,10 +122,15 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +- Update to 1.2.3. +- Add gettext-devel dependency (Paul Frields). +- Add libtool (+automake, +autoconf) dependency. + +* Thu Apr 7 2005 Michael Schwendt - 1:1.2.2-7 - rebuilt -* Thu Feb 10 2005 Thorsten Leemhuis - 1.2.2-6 +* Thu Feb 10 2005 Thorsten Leemhuis - 1:1.2.2-6 - configure option --enable-final does not work correctly on x86_64; Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt; Fixes x86_64 crash (#147010) @@ -134,7 +138,7 @@ * Thu Dec 16 2004 Michael Schwendt - 1:1.2.2-5 - Add some sed magic in %%build which assumedly fixes x86_64 install. -* Wed Nov 10 2004 Matthias Saou 1.2.2-4 +* Wed Nov 10 2004 Matthias Saou 1:1.2.2-4 - Bump release to provide Extras upgrade path. - Clean up ugly space/tabs mix. From fedora-extras-commits at redhat.com Thu Jul 7 10:32:09 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:32:09 -0400 Subject: rpms/sylpheed-claws/FC-3 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 sylpheed-claws.spec, 1.6, 1.7 Message-ID: <200507071032.j67AW9Tg022234@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22213 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - Version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 May 2005 21:39:38 -0000 1.5 +++ .cvsignore 7 Jul 2005 10:32:07 -0000 1.6 @@ -1 +1 @@ -sylpheed-claws-1.0.4a.tar.bz2 +sylpheed-claws-1.0.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 May 2005 21:39:38 -0000 1.6 +++ sources 7 Jul 2005 10:32:07 -0000 1.7 @@ -1 +1 @@ -5179d65225d443c89538249d70dca1ab sylpheed-claws-1.0.4a.tar.bz2 +ef4a1a7beb407dc7c31b4799bc48f12e sylpheed-claws-1.0.5.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/sylpheed-claws.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sylpheed-claws.spec 26 May 2005 21:39:38 -0000 1.6 +++ sylpheed-claws.spec 7 Jul 2005 10:32:07 -0000 1.7 @@ -1,14 +1,14 @@ %define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) Name: sylpheed-claws -Version: 1.0.4a +Version: 1.0.5 Release: 1 Epoch: 0 Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.4a.tar.bz2 +Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.5.tar.bz2 Source1: sylpheed.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -108,6 +108,10 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Thu Jul 07 2005 Andreas Bierfert +0:1.0.5-1 +- Version upgrade + * Thu May 26 2005 Andreas Bierfert 0:1.0.4a-1 - Version upgrade From fedora-extras-commits at redhat.com Thu Jul 7 10:32:55 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:32:55 -0400 Subject: common tobuild,1.1821,1.1822 Message-ID: <200507071032.j67AWt33022296@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22279 Modified Files: tobuild Log Message: request build of rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1821 retrieving revision 1.1822 diff -u -r1.1821 -r1.1822 --- tobuild 7 Jul 2005 10:23:34 -0000 1.1821 +++ tobuild 7 Jul 2005 10:32:53 -0000 1.1822 @@ -8,3 +8,4 @@ adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel +awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 10:33:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 06:33:12 -0400 Subject: rpms/anjuta/devel anjuta.spec,1.10,1.11 Message-ID: <200507071033.j67AXCiW022324@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22307 Modified Files: anjuta.spec Log Message: add dist tag Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- anjuta.spec 7 Jul 2005 10:28:28 -0000 1.10 +++ anjuta.spec 7 Jul 2005 10:33:10 -0000 1.11 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.3 -Release: 1 +Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ From fedora-extras-commits at redhat.com Thu Jul 7 10:34:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 7 Jul 2005 06:34:02 -0400 Subject: rpms/Coin2/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 Coin2.spec, 1.11, 1.12 Coin-2.4.1-doxygen.diff, 1.1, NONE Message-ID: <200507071034.j67AY211022380@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359 Modified Files: .cvsignore sources Coin2.spec Removed Files: Coin-2.4.1-doxygen.diff Log Message: Update to 2.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 May 2005 07:36:38 -0000 1.5 +++ .cvsignore 7 Jul 2005 10:34:00 -0000 1.6 @@ -1,3 +1,3 @@ -Coin-2.4.1-libtool.diff.bz2 -Coin-2.4.1-simacros.diff.bz2 -Coin-2.4.1.tar.gz +Coin-2.4.3-libtool.diff.bz2 +Coin-2.4.3-simacros.diff.bz2 +Coin-2.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2005 07:36:38 -0000 1.5 +++ sources 7 Jul 2005 10:34:00 -0000 1.6 @@ -1,3 +1,3 @@ -5f4301006d7568e39cdd641695d0c53d Coin-2.4.1-libtool.diff.bz2 -c0e21c3da25204eb5406196acf9d3587 Coin-2.4.1-simacros.diff.bz2 -9a6757dc9fb9fbeaa1c033ea670b31a1 Coin-2.4.1.tar.gz +e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 +4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 +57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Coin2.spec 19 May 2005 06:35:04 -0000 1.11 +++ Coin2.spec 7 Jul 2005 10:34:00 -0000 1.12 @@ -1,15 +1,19 @@ +# +# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# + %define coin_includedir %{_includedir}/Coin2 %define coin_htmldir %{_datadir}/Coin2 -%define srcvers 2.4.1 - %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: %{srcvers} +Version: 2.4.3 Release: 1%{?dist} License: GPL @@ -21,10 +25,9 @@ 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.1-simacros.diff.bz2 -Patch4: Coin-2.4.1-libtool.diff.bz2 +Patch3: Coin-2.4.3-simacros.diff.bz2 +Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff -Patch6: Coin-2.4.1-doxygen.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU @@ -57,7 +60,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ src/glue/freetype.c @@ -112,6 +114,9 @@ %doc %{coin_htmldir} %changelog +* Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 +- Upstream update. + * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. --- Coin-2.4.1-doxygen.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 7 10:37:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 7 Jul 2005 06:37:16 -0400 Subject: common tobuild,1.1822,1.1823 Message-ID: <200507071037.j67AbGWi022457@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22440 Modified Files: tobuild Log Message: request build of rpms/Coin2/devel Coin2-2_4_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1822 retrieving revision 1.1823 diff -u -r1.1822 -r1.1823 --- tobuild 7 Jul 2005 10:32:53 -0000 1.1822 +++ tobuild 7 Jul 2005 10:37:14 -0000 1.1823 @@ -9,3 +9,4 @@ awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 +corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 12:00:27 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 08:00:27 -0400 Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.9,1.10 Message-ID: <200507071200.j67C0RoZ023707@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-IO-stringy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23690 Modified Files: perl-IO-stringy.spec Log Message: Module is dual-licensed according to COPYING file in tarball Index: perl-IO-stringy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-IO-stringy.spec 6 Apr 2005 22:12:46 -0000 1.9 +++ perl-IO-stringy.spec 7 Jul 2005 12:00:25 -0000 1.10 @@ -7,7 +7,7 @@ Version: 2.110 Release: 2 -License: Artistic +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-stringy/ Source0: http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 13:00:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 09:00:11 -0400 Subject: common tobuild,1.1823,1.1824 Message-ID: <200507071300.j67D0BVS024878@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24861 Modified Files: tobuild Log Message: request build of rpms/anjuta/devel anjuta-1_2_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1823 retrieving revision 1.1824 diff -u -r1.1823 -r1.1824 --- tobuild 7 Jul 2005 10:37:14 -0000 1.1823 +++ tobuild 7 Jul 2005 13:00:08 -0000 1.1824 @@ -10,3 +10,4 @@ awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel +mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 14:07:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 10:07:35 -0400 Subject: rpms/anjuta/FC-4 .cvsignore, 1.3, 1.4 anjuta.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200507071407.j67E7ZZn027171@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27150 Modified Files: .cvsignore anjuta.spec sources Log Message: 'ERROR: Could not get build-minimal' for devel, so giving a build for FC-4 a try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:02:58 -0000 1.3 +++ .cvsignore 7 Jul 2005 14:07:32 -0000 1.4 @@ -1 +1 @@ -anjuta-1.2.2.tar.gz +anjuta-1.2.3.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- anjuta.spec 6 Apr 2005 22:11:10 -0000 1.9 +++ anjuta.spec 7 Jul 2005 14:07:32 -0000 1.10 @@ -1,14 +1,13 @@ Name: anjuta -Version: 1.2.2 -Release: 7 - +Version: 1.2.3 +Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ -Source0: http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz +Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0.2 @@ -22,7 +21,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils -Requires: pkgconfig +Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -43,7 +42,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description docs -Anjuta documentations. +Anjuta documentation. @@ -123,10 +122,15 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +- Update to 1.2.3. +- Add gettext-devel dependency (Paul Frields). +- Add libtool (+automake, +autoconf) dependency. + +* Thu Apr 7 2005 Michael Schwendt - 1:1.2.2-7 - rebuilt -* Thu Feb 10 2005 Thorsten Leemhuis - 1.2.2-6 +* Thu Feb 10 2005 Thorsten Leemhuis - 1:1.2.2-6 - configure option --enable-final does not work correctly on x86_64; Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt; Fixes x86_64 crash (#147010) @@ -134,7 +138,7 @@ * Thu Dec 16 2004 Michael Schwendt - 1:1.2.2-5 - Add some sed magic in %%build which assumedly fixes x86_64 install. -* Wed Nov 10 2004 Matthias Saou 1.2.2-4 +* Wed Nov 10 2004 Matthias Saou 1:1.2.2-4 - Bump release to provide Extras upgrade path. - Clean up ugly space/tabs mix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:02:58 -0000 1.3 +++ sources 7 Jul 2005 14:07:33 -0000 1.4 @@ -1 +1 @@ -a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz +a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 14:09:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 10:09:32 -0400 Subject: common tobuild,1.1824,1.1825 Message-ID: <200507071409.j67E9WVV027280@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263 Modified Files: tobuild Log Message: request build of rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1824 retrieving revision 1.1825 diff -u -r1.1824 -r1.1825 --- tobuild 7 Jul 2005 13:00:08 -0000 1.1824 +++ tobuild 7 Jul 2005 14:09:30 -0000 1.1825 @@ -11,3 +11,4 @@ awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel +mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 15:20:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:01 -0400 Subject: rpms/barcode - New directory Message-ID: <200507071520.j67FK1p2028724@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28700/barcode Log Message: Directory /cvs/extras/rpms/barcode added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 15:20:02 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:02 -0400 Subject: rpms/barcode/devel - New directory Message-ID: <200507071520.j67FK2B6028729@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28700/barcode/devel Log Message: Directory /cvs/extras/rpms/barcode/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 15:20:16 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:16 -0400 Subject: rpms/barcode Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507071520.j67FKGGI028772@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28745 Added Files: Makefile import.log Log Message: Setup of module barcode --- NEW FILE Makefile --- # Top level Makefile for module barcode all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 15:20:16 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:16 -0400 Subject: rpms/barcode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507071520.j67FKGNi028777@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28745/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module barcode --- NEW 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 Jul 7 15:21:03 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:21:03 -0400 Subject: rpms/barcode import.log,1.1,1.2 Message-ID: <200507071521.j67FLY5S028858@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816 Modified Files: import.log Log Message: auto-import barcode-0.98-5 on branch devel from barcode-0.98-5.src.rpm initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/barcode/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 15:20:14 -0000 1.1 +++ import.log 7 Jul 2005 15:21:01 -0000 1.2 @@ -0,0 +1 @@ +barcode-0_98-5:HEAD:barcode-0.98-5.src.rpm:1120749670 From fedora-extras-commits at redhat.com Thu Jul 7 15:21:08 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:21:08 -0400 Subject: rpms/barcode/devel barcode-install-info.patch, NONE, 1.1 barcode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507071521.j67FLcBC028862@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816/devel Modified Files: .cvsignore sources Added Files: barcode-install-info.patch barcode.spec Log Message: auto-import barcode-0.98-5 on branch devel from barcode-0.98-5.src.rpm initial import barcode-install-info.patch: --- NEW FILE barcode-install-info.patch --- --- barcode-0.98/doc/doc.barcode.orig 2005-07-07 16:27:14.632811312 +0200 +++ barcode-0.98/doc/doc.barcode 2005-07-07 16:31:21.607265488 +0200 @@ -23,6 +23,11 @@ @comment %**start of header @setfilename barcode.info + at dircategory Text creation and manipulation + at dircategory GNU libraries + at direntry +* Barcode: (barcode). Barcode generation from text strings. + at end direntry @settitle Barcode @value{version} @iftex @afourpaper --- NEW FILE barcode.spec --- Summary: generates barcodes from text strings Name: barcode Version: 0.98 Release: 5%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz Patch0: barcode-install-info.patch URL: http://www.gnu.org/software/barcode/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info BuildRequires: tetex, texinfo %description Barcode is meant to solve most needs in barcode creation with a conventional printer. It can create printouts for the conventional product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well as a few other formats. Ouput is generated as either Postscript or Encapsulated Postscript. %package devel Summary: Header files and libraries for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains the header files and libraries needed to develop programs that use the %{name} library. %prep %setup -q %patch0 -p1 -b .categories %build %configure make %{?_smp_mflags} # Regenerate documentation make -C doc barcode.info %install rm -rf %{buildroot} %makeinstall # Fix locations according to FHS mkdir -p %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_infodir} mv %{buildroot}/usr/man/* %{buildroot}%{_mandir} mv %{buildroot}/usr/info/* %{buildroot}%{_infodir} %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/barcode.info.gz %{_infodir}/dir %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/barcode.info.gz %{_infodir}/dir fi %files %defattr(-, root, root) %doc COPYING ChangeLog README TODO %{_bindir}/barcode %{_mandir}/man1/barcode.1.gz %{_infodir}/barcode.info.gz %files devel %defattr(-, root, root) %{_includedir}/*.h %{_libdir}/*.a %{_mandir}/man3/barcode.3.gz %changelog * Thu Jul 07 2005 Andreas Thienemann 0.98-5 - Added install-info support to the texinfo file. - Fixed minor spec errors * Thu Jul 01 2005 Andreas Thienemann 0.98-4 - Added info-install in post and pre stage. * Thu Jul 01 2005 Andreas Thienemann 0.98-3 - Added %%{epoch} tag to the -devel requires. * Thu Jun 30 2005 Andreas Thienemann 0.98-2 - spec cleanup. * Wed Jun 29 2005 Andreas Thienemann 0.98-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 15:20:14 -0000 1.1 +++ .cvsignore 7 Jul 2005 15:21:02 -0000 1.2 @@ -0,0 +1 @@ +barcode-0.98.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 15:20:14 -0000 1.1 +++ sources 7 Jul 2005 15:21:02 -0000 1.2 @@ -0,0 +1 @@ +7f10c3307b84a19a4ab2fa4b3f2974da barcode-0.98.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 15:23:11 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:23:11 -0400 Subject: common tobuild,1.1825,1.1826 Message-ID: <200507071523.j67FNBJF028958@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944 Modified Files: tobuild Log Message: request build of rpms/barcode/devel barcode-0_98-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1825 retrieving revision 1.1826 diff -u -r1.1825 -r1.1826 --- tobuild 7 Jul 2005 14:09:30 -0000 1.1825 +++ tobuild 7 Jul 2005 15:23:09 -0000 1.1826 @@ -12,3 +12,4 @@ corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 +ixs rpms/barcode/devel barcode-0_98-5_fc5 devel From Christian.Iseli at licr.org Thu Jul 7 15:33:31 2005 From: Christian.Iseli at licr.org (Christian.Iseli at licr.org) Date: Thu, 07 Jul 2005 17:33:31 +0200 Subject: APPROVED: barcode Message-ID: <200507071533.j67FXV4O020011@ludwig-alpha.unil.ch> Name: barcode Summary: generates barcodes from text strings Description: Barcode is meant to solve most needs in barcode creation with a conventional printer. It can create printouts for the conventional product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well as a few other formats. Ouput is generated as either Postscript or Encapsulated Postscript. Reviewer: Christian Iseli Maintainer: Andreas Thienemann From andreas at bawue.net Thu Jul 7 15:37:00 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 7 Jul 2005 17:37:00 +0200 (CEST) Subject: APPROVED barcode Message-ID: Package: barcode Barcode is meant to solve most needs in barcode creation with a conventional printer. It can create printouts for the conventional product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well as a few other formats. Ouput is generated as either Postscript or Encapsulated Postscript. Reviewer: Christian Iseli Maintainer: Andreas Thienemann From fedora-extras-commits at redhat.com Thu Jul 7 16:20:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 12:20:59 -0400 Subject: extras-buildsys/server main.py,1.2,1.3 Message-ID: <200507071620.j67GKxCZ030311@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30294/server Modified Files: main.py Log Message: Turn of lighttpd since it's not working with the new SSL stuff yet Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.py 6 Jul 2005 21:21:01 -0000 1.2 +++ main.py 7 Jul 2005 16:20:57 -0000 1.3 @@ -35,7 +35,7 @@ # Load in the config execfile("/etc/plague/server/CONFIG.py") -use_lighttpd = True +use_lighttpd = False class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer): From fedora-extras-commits at redhat.com Thu Jul 7 16:21:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 12:21:14 -0400 Subject: extras-buildsys ChangeLog,1.44,1.45 Message-ID: <200507071621.j67GLi2j030358@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317 Modified Files: ChangeLog Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Use Python exceptions for prep and build errors - Clean up a bunch of stuff - Specify dest file when copying files to the repo * server/Repo.py - Ensure that the destination file is actually the file rather than a path, since shutil.copy() just copies the file over top of the directory in some instances, corrupting the repo Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 6 Jul 2005 21:20:49 -0000 1.44 +++ ChangeLog 7 Jul 2005 16:21:12 -0000 1.45 @@ -1,3 +1,15 @@ +2005-07-07 Dan Williams + + * server/PackageJob.py + - Use Python exceptions for prep and build errors + - Clean up a bunch of stuff + - Specify dest file when copying files to the repo + + * server/Repo.py + - Ensure that the destination file is actually the file rather + than a path, since shutil.copy() just copies the file over top + of the directory in some instances, corrupting the repo + 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works From fedora-extras-commits at redhat.com Thu Jul 7 16:21:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 12:21:14 -0400 Subject: extras-buildsys/server ArchJob.py, 1.2, 1.3 Builder.py, 1.2, 1.3 PackageJob.py, 1.1, 1.2 Repo.py, 1.6, 1.7 Message-ID: <200507071621.j67GLiF4030363@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317/server Modified Files: ArchJob.py Builder.py PackageJob.py Repo.py Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Use Python exceptions for prep and build errors - Clean up a bunch of stuff - Specify dest file when copying files to the repo * server/Repo.py - Ensure that the destination file is actually the file rather than a path, since shutil.copy() just copies the file over top of the directory in some instances, corrupting the repo Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ArchJob.py 6 Jul 2005 21:21:00 -0000 1.2 +++ ArchJob.py 7 Jul 2005 16:21:12 -0000 1.3 @@ -182,6 +182,7 @@ return self.status def get_files(self): + """ Return a list of base filenames we got from the builder """ files = [] for url in self.downloads.keys(): fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Builder.py 6 Jul 2005 21:21:00 -0000 1.2 +++ Builder.py 7 Jul 2005 16:21:12 -0000 1.3 @@ -23,6 +23,7 @@ import threading from plague import XMLRPCServerProxy from plague import CommonErrors +import OpenSSL import ArchJob # Load in the config @@ -104,7 +105,7 @@ self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() - except (socket.error, xmlrpclib.ProtocolError): + except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PackageJob.py 5 Jul 2005 21:08:03 -0000 1.1 +++ PackageJob.py 7 Jul 2005 16:21:12 -0000 1.2 @@ -1,4 +1,4 @@ -# This program is free software; you can redistribute it and/or modify + # 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. @@ -51,18 +51,16 @@ print stuff class PrepError(exceptions.Exception): - def __init__(self, errno=0, args=None): + def __init__(self, args=None): exceptions.Exception.__init__(self) self.args = args - self.errno = errno def __str__(self): return self.args class BuildError(exceptions.Exception): - def __init__(self, errno=0, args=None): + def __init__(self, args=None): exceptions.Exception.__init__(self) self.args = args - self.errno = errno def __str__(self): return self.args @@ -77,7 +75,7 @@ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'cleanup', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] + stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] if stage in stages: return True return False @@ -99,7 +97,6 @@ self.name = None self.target = repo.target() self.repo = repo - self.failed = False self.no_cvs = config_opts['use_srpm_not_cvs'] self.cvs_tag = cvs_tag self.stage_dir = None @@ -252,13 +249,8 @@ debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) # Just in case the 'common' directory didn't come along for the ride, # get it from CVS @@ -270,26 +262,16 @@ s, o = commands.getstatusoutput(cmd) os.chdir(self.checkout_tmpdir) if s != 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) def _make_srpm(self): self._set_cur_stage('make_srpm') self.srpm_path = None srpm_dir = os.path.join(self.checkout_tmpdir, self.package, self.target) if not os.path.exists(srpm_dir): - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) os.chdir(srpm_dir) @@ -297,13 +279,8 @@ debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir)) s, o = commands.getstatusoutput(cmd) if s != 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not make srpm for %s - output was:\n %s" % (self.cvs_tag, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) srpmpath = None for line in o.split("\n"): @@ -313,13 +290,9 @@ srpmpath = path.strip() break if not srpmpath: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find srpm for %s - output was:\n %s" % (self.cvs_tag, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) + self.srpm_path = srpmpath def _prep(self): @@ -339,12 +312,8 @@ del ts if len(self.archjobs) == 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) - msg = "could not find any architectures to build for %s - output was:\n" % (self.cvs_tag) - self.email_result(resultstring=msg, subject=subj) - self.failed = True - self._set_cur_stage('finished') - return + msg = "Package %s does not build on any architectures this build system supports.\n" % self.cvs_tag + raise PrepError(msg) self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) for arch in self.archjobs.keys(): @@ -433,79 +402,74 @@ while not self.is_done(): # Advance to next stage based on current stage wait = False - if self.curstage == 'initialize': - self._checkout() - elif self.curstage == 'checkout': - self._make_srpm() - elif self.curstage == 'make_srpm': - self._prep() - elif self.curstage == 'prep' or self.curstage == 'building': - wait = self._monitor() - elif self.curstage == 'finished': - self._cleanup() - elif self.curstage == 'cleanup': - if self.failed: - self._failed() - else: + + try: + if self.curstage == 'initialize': + self._checkout() + elif self.curstage == 'checkout': + self._make_srpm() + elif self.curstage == 'make_srpm': + self._prep() + elif self.curstage == 'prep' or self.curstage == 'building': + wait = self._monitor() + elif self.curstage == 'finished': self._add_to_repo() - elif self.curstage == 'addtorepo': - wait = True - elif self.curstage == 'repodone': - self._succeeded() - - if wait: - while not self._event.isSet(): - self._event.wait() - self._event.clear() + elif self.curstage == 'addtorepo': + wait = True + elif self.curstage == 'repodone': + self._succeeded() + except PrepError, e: + if not self.no_cvs: + shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + self._failed() + except BuildError, e: + subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + # Kill remaining jobs on other arches + self._archjobs_lock.acquire() + for job in self.archjobs.values(): + if job: + job.die() + self._archjobs_lock.release() + self._failed() + else: + # Wait to be woken up when long-running operations complete + if wait: + while not self._event.isSet(): + self._event.wait() + self._event.clear() def _monitor(self): self._set_cur_stage('building') # Count failed and completed jobs completed_jobs = 0 + self._archjobs_lock.acquire() for job in self.archjobs.values(): if not job: continue if job.get_status() is 'done': if job.builder_failed(): - self.failed = True + self._archjobs_lock.release() + msg = "Job failed on arch %s\n" + raise BuildError(msg) else: completed_jobs = completed_jobs + 1 + self._archjobs_lock.release() - # If any jobs have failed, or if all jobs have completed successfully, advance - if self.failed or (completed_jobs == len(self.archjobs)): + if completed_jobs == len(self.archjobs): self._set_cur_stage('finished') return False # Don't want to wait return True - def _cleanup(self): - self._set_cur_stage('cleanup') - if self.failed: - # Kill remaining jobs on other arches - for job in self.archjobs.values(): - if job: - job.die() - def get_stage_dir(self): return self.stage_dir def _failed(self): self._set_cur_stage('failed') - - resultstring = """ - %s (%s): %s on %s failed to complete on one or more archs. -""" % (self.uid, self.package, self.cvs_tag, self.target) - resultstring = resultstring + "\n" - - # Add each arch job and its result: - for job in self.archjobs.values(): - if job and job.builder_status != 'killed': - resultstring = resultstring + " " + "%s - %s: %s" % (job.arch, job.jobid, job.builder_status) + "\n" - - resultstring = resultstring + "\n" - self.email_result(resultstring) - self.bm.notify_job_done(self) def _add_to_repo(self): @@ -516,8 +480,7 @@ for job in self.archjobs.values(): if not job: continue - file_list = job.get_files() - for f in file_list: + for f in job.get_files(): if not f.endswith(".rpm"): continue src_file = os.path.join(self.stage_dir, job.arch, f) @@ -526,7 +489,7 @@ dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, "SRPM") else: dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, job.arch) - self.repofiles[src_file] = dst_path + self.repofiles[src_file] = os.path.join(dst_path, f) self._event.clear() Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Repo.py 6 Jul 2005 21:21:00 -0000 1.6 +++ Repo.py 7 Jul 2005 16:21:12 -0000 1.7 @@ -71,13 +71,13 @@ if not os.path.exists(os.path.dirname(dst)): os.makedirs(os.path.dirname(dst)) - # Only copy SRPMs to the repo dir if there's not already one there + file_in_dst = os.path.join(os.path.dirname(dst), os.path.basename(src)) if src.endswith(".src.rpm"): - file_in_dst = os.path.join(os.path.dirname(dst),os.path.basename(src)) + # Only copy SRPMs to the repo dir if there's not already one there if not os.path.exists(file_in_dst): - shutil.copy(src, dst) + shutil.copy(src, file_in_dst) else: - shutil.copy(src, dst) + shutil.copy(src, file_in_dst) # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() From fedora-extras-commits at redhat.com Thu Jul 7 17:01:57 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:01:57 -0400 Subject: rpms/naim - New directory Message-ID: <200507071701.j67H1vdN031665@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/naim Log Message: Directory /cvs/extras/rpms/naim added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 17:02:01 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:02:01 -0400 Subject: rpms/naim/devel - New directory Message-ID: <200507071702.j67H21cW031676@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/naim/devel Log Message: Directory /cvs/extras/rpms/naim/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 17:03:08 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:03:08 -0400 Subject: rpms/naim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507071703.j67H38HV031742@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31728 Added Files: Makefile import.log Log Message: Setup of module naim --- NEW FILE Makefile --- # Top level Makefile for module naim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 17:03:22 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:03:22 -0400 Subject: rpms/naim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507071703.j67H3MD1031755@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31728/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module naim --- NEW 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 Jul 7 17:02:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 13:02:59 -0400 Subject: rpms/anjuta/FC-3 .cvsignore, 1.3, 1.4 anjuta.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507071703.j67H3kXA031769@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31708 Modified Files: .cvsignore anjuta.spec sources Log Message: sync with FC-4 and devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:02:58 -0000 1.3 +++ .cvsignore 7 Jul 2005 17:02:57 -0000 1.4 @@ -1 +1 @@ -anjuta-1.2.2.tar.gz +anjuta-1.2.3.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-3/anjuta.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- anjuta.spec 10 Feb 2005 20:01:13 -0000 1.6 +++ anjuta.spec 7 Jul 2005 17:02:57 -0000 1.7 @@ -1,35 +1,35 @@ Name: anjuta -Version: 1.2.2 -Release: 6 +Version: 1.2.3 +Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ -Source0: http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz +Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgnomeui-devel >= 0:2.0.2 -BuildRequires: libbonoboui-devel >= 0:2.0.1 +BuildRequires: libgnomeui-devel >= 2.0.2 +BuildRequires: libbonoboui-devel >= 2.0.1 BuildRequires: libgnomeprintui22-devel -BuildRequires: ncurses-devel >= 0:5.0 -BuildRequires: pcre-devel >= 0:3.9 +BuildRequires: ncurses-devel >= 5.0 +BuildRequires: pcre-devel >= 3.9 BuildRequires: vte-devel BuildRequires: scrollkeeper BuildRequires: libtool BuildRequires: gettext BuildRequires: desktop-file-utils -Requires: pkgconfig +Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper %description -Anjuta is a versatile Integrated Development Environment (IDE) for C and C++. -It has been written for GTK/GNOME, and features a number of advanced -programming facilities. It is basically a GUI interface for the collection -of command line programming utilities and tools available for the GNU system. +Anjuta is a versatile Integrated Development Environment (IDE) for C and C++. +It has been written for GTK/GNOME, and features a number of advanced +programming facilities. It is basically a GUI interface for the collection +of command line programming utilities and tools available for the GNU system. These are usually run via a text console, and can be unfriendly to use. This package includes anjuta_create_global_tags.sh, which will allow you to @@ -37,12 +37,12 @@ %package docs -Summary: Anjuta documentations package. +Summary: Anjuta documentation Group: Development/Tools -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description docs -Anjuta documentations. +Anjuta documentation. @@ -52,7 +52,7 @@ %build -# configure option --enable-final does not work corretly on x86_64; Use +# configure option --enable-final does not work corretly on x86_64; Use # -DNDEBUG in CFLAGS export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %configure @@ -122,15 +122,23 @@ %changelog -* Thu Feb 10 2005 Thorsten Leemhuis - 1.2.2-6 -- configure option --enable-final does not work correctly on x86_64; +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +- Update to 1.2.3. +- Add gettext-devel dependency (Paul Frields). +- Add libtool (+automake, +autoconf) dependency. + +* Thu Apr 7 2005 Michael Schwendt - 1:1.2.2-7 +- rebuilt + +* Thu Feb 10 2005 Thorsten Leemhuis - 1:1.2.2-6 +- configure option --enable-final does not work correctly on x86_64; Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt; Fixes x86_64 crash (#147010) * Thu Dec 16 2004 Michael Schwendt - 1:1.2.2-5 - Add some sed magic in %%build which assumedly fixes x86_64 install. -* Wed Nov 10 2004 Matthias Saou 1.2.2-4 +* Wed Nov 10 2004 Matthias Saou 1:1.2.2-4 - Bump release to provide Extras upgrade path. - Clean up ugly space/tabs mix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:02:58 -0000 1.3 +++ sources 7 Jul 2005 17:02:57 -0000 1.4 @@ -1 +1 @@ -a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz +a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 17:05:41 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:05:41 -0400 Subject: rpms/naim import.log,1.1,1.2 Message-ID: <200507071706.j67H6BIs031916@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31876 Modified Files: import.log Log Message: auto-import naim-0.11.7.3.1-1 on branch devel from naim-0.11.7.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/naim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 17:03:06 -0000 1.1 +++ import.log 7 Jul 2005 17:05:38 -0000 1.2 @@ -0,0 +1 @@ +naim-0_11_7_3_1-1:HEAD:naim-0.11.7.3.1-1.src.rpm:1120755922 From fedora-extras-commits at redhat.com Thu Jul 7 17:05:43 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:05:43 -0400 Subject: rpms/naim/devel naim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507071706.j67H6DIl031927@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31876/devel Modified Files: .cvsignore sources Added Files: naim.spec Log Message: auto-import naim-0.11.7.3.1-1 on branch devel from naim-0.11.7.3.1-1.src.rpm --- NEW FILE naim.spec --- Name: naim Version: 0.11.7.3.1 Release: 1 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client Group: Applications/Internet License: GPL URL: http://naim.n.ml.org Source0: http://shell.n.ml.org/n/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel Requires: screen %description naim is a console client for AOL Instant Messenger (AIM), AOL I Seek You (ICQ), Internet Relay Chat (IRC), and The lily CMC. %prep %setup -q %build %configure --enable-detach make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/usr/share/doc/naim rm -fr $RPM_BUILD_ROOT/%{_includedir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp %{_bindir}/* %{_mandir}/*/* %changelog * Tue Jul 05 2005 Luke Macken 0.11.7.3.1-1 - Packaged for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 17:03:09 -0000 1.1 +++ .cvsignore 7 Jul 2005 17:05:41 -0000 1.2 @@ -0,0 +1 @@ +naim-0.11.7.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/naim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 17:03:09 -0000 1.1 +++ sources 7 Jul 2005 17:05:41 -0000 1.2 @@ -0,0 +1 @@ +8efe3f267d9c192abc41885865f12734 naim-0.11.7.3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 7 17:06:14 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 13:06:14 -0400 Subject: common tobuild,1.1826,1.1827 Message-ID: <200507071706.j67H6kX9031971@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31915 Modified Files: tobuild Log Message: request build of rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1826 retrieving revision 1.1827 diff -u -r1.1826 -r1.1827 --- tobuild 7 Jul 2005 15:23:09 -0000 1.1826 +++ tobuild 7 Jul 2005 17:06:12 -0000 1.1827 @@ -13,3 +13,4 @@ mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 ixs rpms/barcode/devel barcode-0_98-5_fc5 devel +mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 17:15:11 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:15:11 -0400 Subject: extras-buildsys/server PackageJob.py,1.2,1.3 Message-ID: <200507071715.j67HFBf5032316@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/server Modified Files: PackageJob.py Log Message: Fix error message to include arch the job failed on Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PackageJob.py 7 Jul 2005 16:21:12 -0000 1.2 +++ PackageJob.py 7 Jul 2005 17:15:09 -0000 1.3 @@ -452,8 +452,8 @@ continue if job.get_status() is 'done': if job.builder_failed(): + msg = "Job failed on arch %s\n" % (job.arch) self._archjobs_lock.release() - msg = "Job failed on arch %s\n" raise BuildError(msg) else: completed_jobs = completed_jobs + 1 From fedora-extras-commits at redhat.com Thu Jul 7 17:24:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:24:10 -0400 Subject: extras-buildsys/utils repoconv.py,1.2,1.3 Message-ID: <200507071724.j67HOAIJ032443@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32424/utils Modified Files: repoconv.py Log Message: Make it work with SRPM packages Index: repoconv.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/repoconv.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoconv.py 17 Jun 2005 15:52:35 -0000 1.2 +++ repoconv.py 7 Jul 2005 17:24:08 -0000 1.3 @@ -81,12 +81,12 @@ dest_file = os.path.join(destdir, os.path.basename(package)) else: (n,a,e,v,r,srpm) = naevr(package) - t = srpm.split('-') - srpm = t[0] if package.endswith('.src.rpm'): sub_path = os.path.join("%s" % n, "%s-%s" % (v, r)) sub_path = os.path.join(sub_path, "SRPM") else: + t = srpm.split('-') + srpm = t[0] sub_path = os.path.join("%s" % srpm, "%s-%s" % (v, r)) sub_path = os.path.join(sub_path, "%s" % a) dest_file = os.path.join(destdir, sub_path, os.path.basename(package)) From fedora-extras-commits at redhat.com Thu Jul 7 17:45:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:45:10 -0400 Subject: extras-buildsys/server main.py,1.3,1.4 Message-ID: <200507071745.j67HjAdb032587@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540/server Modified Files: main.py Log Message: Fix naming clash Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- main.py 7 Jul 2005 16:20:57 -0000 1.3 +++ main.py 7 Jul 2005 17:45:08 -0000 1.4 @@ -104,9 +104,9 @@ srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] srpm_server_certs['ca_cert'] = config_opts['ca_cert'] srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] - srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) + srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) else: - srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) + srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, None) srpm_server.start() print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) From fedora-extras-commits at redhat.com Thu Jul 7 17:45:04 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:45:04 -0400 Subject: extras-buildsys/builder builder.py,1.7,1.8 Message-ID: <200507071745.j67HjYt7032590@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540/builder Modified Files: builder.py Log Message: Fix naming clash Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- builder.py 7 Jul 2005 03:48:26 -0000 1.7 +++ builder.py 7 Jul 2005 17:45:02 -0000 1.8 @@ -619,9 +619,9 @@ http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, certs) else: - http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None) + http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, None) http_server.start() # Stop running as root From fedora-extras-commits at redhat.com Thu Jul 7 17:45:04 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:45:04 -0400 Subject: extras-buildsys/common HTTPServer.py,1.2,1.3 Message-ID: <200507071745.j67HjZ8j032593@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540/common Modified Files: HTTPServer.py Log Message: Fix naming clash Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HTTPServer.py 6 Jul 2005 21:20:55 -0000 1.2 +++ HTTPServer.py 7 Jul 2005 17:45:02 -0000 1.3 @@ -88,7 +88,7 @@ SSLCommon.PlgBaseServer.__init__(self, server_address, PlgHTTPRequestHandler) -class PlgHTTPServer(threading.Thread): +class PlgHTTPServerManager(threading.Thread): def __init__(self, addr, http_dir, certs): if certs and len(certs) > 0: self._server = PlgHTTPSServer(addr, http_dir, certs) From tcallawa at redhat.com Thu Jul 7 18:14:33 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Thu, 07 Jul 2005 13:14:33 -0500 Subject: APPROVED: libstatgrab Message-ID: <1120760073.9303.23.camel@localhost.localdomain> Name: libstatgrab Summary: Make system statistics Description: Libstatgrab is a library that provides cross platform access to statistics about the system on which it's run. It's written in C and presents a selection of useful interfaces which can be used to access key system statistics. The current list of statistics includes CPU usage, memory utilisation, disk usage, process counts, network traffic, disk I/O, and more. The current list of platforms is Solaris 2.x, Linux, and FreeBSD 4.x/5.x. The aim is to extend this to include as many operating systems as possible. The package also includes a couple of useful tools. The first, saidar, provides a curses-based interface to viewing the current state of the system. The second, statgrab, gives a sysctl-style interface to the statistics gathered by libstatgrab. This extends the use of libstatgrab to people writing scripts or anything else that can't easily make C function calls. Included with statgrab is a script to generate an MRTG configuration file to use statgrab. Reviewer: Tom "spot" Callaway Maintainer: Oliver Falk ~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 Thu Jul 7 18:17:52 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 14:17:52 -0400 Subject: extras-buildsys ChangeLog,1.45,1.46 Message-ID: <200507071818.j67IINZC001337@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1305 Modified Files: ChangeLog Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Make some prep error emails more informative Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ChangeLog 7 Jul 2005 16:21:12 -0000 1.45 +++ ChangeLog 7 Jul 2005 18:17:50 -0000 1.46 @@ -1,6 +1,11 @@ 2005-07-07 Dan Williams * server/PackageJob.py + - Make some prep error emails more informative + +2005-07-07 Dan Williams + + * server/PackageJob.py - Use Python exceptions for prep and build errors - Clean up a bunch of stuff - Specify dest file when copying files to the repo From fedora-extras-commits at redhat.com Thu Jul 7 18:17:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 14:17:53 -0400 Subject: extras-buildsys/server PackageJob.py,1.3,1.4 Message-ID: <200507071818.j67IINB1001340@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1305/server Modified Files: PackageJob.py Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Make some prep error emails more informative Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PackageJob.py 7 Jul 2005 17:15:09 -0000 1.3 +++ PackageJob.py 7 Jul 2005 18:17:51 -0000 1.4 @@ -185,46 +185,46 @@ exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] - arches = {} + build_arches = {} if ba == ['noarch']: - arches['noarch'] = None - return arches + build_arches['noarch'] = None + return (build_arches, None, None) # default to building all base arches the 'target' # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target - tmparchs = [] + pkg_arches = [] allowed_arches = [] for arch in buildable_arches: - tmparchs.append(arch) + pkg_arches.append(arch) allowed_arches.append(arch) for arch in addl_arches: - tmparchs.append(arch) + pkg_arches.append(arch) allowed_arches.append(arch) # Optional arches don't get built by default but are "allowed" for arch in opt_arches: allowed_arches.append(arch) if ba: - tmparchs = ba + pkg_arches = ba else: if exclusive: - tmparchs = exclusive + pkg_arches = exclusive if exclude: for arch in exclude: - if arch in tmparchs: - tmparchs.remove(arch) + if arch in pkg_arches: + pkg_arches.remove(arch) # we probably need to check the archs, and make sure they are what # we can build for - for thisarch in tmparchs: + for thisarch in pkg_arches: if thisarch in allowed_arches: - arches[thisarch] = None + build_arches[thisarch] = None - return arches + return (build_arches, pkg_arches, allowed_arches) def _make_stage_dir(self, rootdir): @@ -307,12 +307,15 @@ self.name = hdr['name'] self.ver = hdr['version'] self.release = hdr['release'] - self.archjobs = self.arch_handling(hdr) + (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) del hdr del ts if len(self.archjobs) == 0: - msg = "Package %s does not build on any architectures this build system supports.\n" % self.cvs_tag + msg = """Package %s does not build on any architectures this build system supports. + Package: %s + Build System: %s +""" % (self.cvs_tag, pkg_arches, allowed_arches) raise PrepError(msg) self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) From fedora-extras-commits at redhat.com Thu Jul 7 18:43:41 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 7 Jul 2005 14:43:41 -0400 Subject: common tobuild,1.1827,1.1828 Message-ID: <200507071843.j67IhffD001510@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1493 Modified Files: tobuild Log Message: request build of rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1827 retrieving revision 1.1828 diff -u -r1.1827 -r1.1828 --- tobuild 7 Jul 2005 17:06:12 -0000 1.1827 +++ tobuild 7 Jul 2005 18:43:39 -0000 1.1828 @@ -14,3 +14,4 @@ mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 ixs rpms/barcode/devel barcode-0_98-5_fc5 devel mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 +jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 18:44:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 7 Jul 2005 14:44:37 -0400 Subject: common tobuild,1.1828,1.1829 Message-ID: <200507071844.j67Iibjx001577@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1560 Modified Files: tobuild Log Message: request build of rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1828 retrieving revision 1.1829 diff -u -r1.1828 -r1.1829 --- tobuild 7 Jul 2005 18:43:39 -0000 1.1828 +++ tobuild 7 Jul 2005 18:44:35 -0000 1.1829 @@ -15,3 +15,4 @@ ixs rpms/barcode/devel barcode-0_98-5_fc5 devel mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 +jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 19:10:16 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 15:10:16 -0400 Subject: extras-buildsys/common HTTPServer.py,1.3,1.4 Message-ID: <200507071910.j67JAGoc002744@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2727/common Modified Files: HTTPServer.py Log Message: Fix for python 2.2 Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HTTPServer.py 7 Jul 2005 17:45:02 -0000 1.3 +++ HTTPServer.py 7 Jul 2005 19:10:14 -0000 1.4 @@ -67,14 +67,15 @@ path = os.path.join(path, word) return path - def handle(self): - """ Always close the connection when done """ - self.close_connection = 1 - - try: - self.handle_one_request() - except SSL.Error, e: - print e[0] + if sys.version_info[:3] >= (2, 3, 0): + def handle(self): + """ Always close the connection when done """ + self.close_connection = 1 + + try: + self.handle_one_request() + except SSL.Error, e: + print e[0] class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer): From fedora-extras-commits at redhat.com Thu Jul 7 19:17:20 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 15:17:20 -0400 Subject: common tobuild,1.1829,1.1830 Message-ID: <200507071917.j67JHKk0002808@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2791 Modified Files: tobuild Log Message: clean up -- buildsys seems to be stuck at barcode Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1829 retrieving revision 1.1830 diff -u -r1.1829 -r1.1830 --- tobuild 7 Jul 2005 18:44:35 -0000 1.1829 +++ tobuild 7 Jul 2005 19:17:18 -0000 1.1830 @@ -1,17 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel -adrian rpms/grip/devel grip-3_2_0-5_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 -awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 -awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel -awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 -corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel -mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel -mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 ixs rpms/barcode/devel barcode-0_98-5_fc5 devel mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 From skvidal at phy.duke.edu Thu Jul 7 19:21:46 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Thu, 07 Jul 2005 15:21:46 -0400 Subject: common tobuild,1.1829,1.1830 In-Reply-To: <200507071917.j67JHKk0002808@cvs-int.fedora.redhat.com> References: <200507071917.j67JHKk0002808@cvs-int.fedora.redhat.com> Message-ID: <1120764106.5121.22.camel@cutter> On Thu, 2005-07-07 at 15:17 -0400, Michael Schwendt wrote: > Author: mschwendt > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2791 > > Modified Files: > tobuild > Log Message: > clean up -- buildsys seems to be stuck at barcode > tex barcode.info seemed to be waiting for input. I killed the tex process. -sv From fedora-extras-commits at redhat.com Thu Jul 7 19:52:07 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:52:07 -0400 Subject: rpms/bazaar/devel bazaar.spec,1.8,1.9 Message-ID: <200507071952.j67Jq70m002941@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2924 Modified Files: bazaar.spec Log Message: Remove /usr/bin/annotate to fix bug #162665 Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/devel/bazaar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bazaar.spec 29 Jun 2005 17:06:54 -0000 1.8 +++ bazaar.spec 7 Jul 2005 19:52:04 -0000 1.9 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -59,6 +59,12 @@ install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check +# The stand alone annotate is meant to debug baz interals, not installation +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then + rm $RPM_BUILD_ROOT%{_bindir}/annotate +fi + %find_lang %{name} # install the documentation @@ -72,11 +78,13 @@ %defattr(-, root, root) %doc COPYING doc/* %{_bindir}/baz -%{_bindir}/annotate %{_bindir}/bazaar-gpg-check %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Shahms E. King 1.4.2-2 +- Remove the standalone "annotate" binary to fix bug #162665 + * Wed Jun 29 2005 Shahms E. King 1.4.2-1 - Update to 1.4.2 - Don't explicitly gzip man pages From fedora-extras-commits at redhat.com Thu Jul 7 19:52:25 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:52:25 -0400 Subject: common tobuild,1.1830,1.1831 Message-ID: <200507071952.j67JqP1L003003@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2986 Modified Files: tobuild Log Message: request build of rpms/bazaar/devel bazaar-1_4_2-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1830 retrieving revision 1.1831 diff -u -r1.1830 -r1.1831 --- tobuild 7 Jul 2005 19:17:18 -0000 1.1830 +++ tobuild 7 Jul 2005 19:52:22 -0000 1.1831 @@ -5,3 +5,4 @@ mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 +shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 19:53:19 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:53:19 -0400 Subject: rpms/bazaar/FC-3 bazaar.spec,1.7,1.8 Message-ID: <200507071953.j67JrJh8003036@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3019 Modified Files: bazaar.spec Log Message: Remove /usr/bin/annotate to fix bug #162665 Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/FC-3/bazaar.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bazaar.spec 29 Jun 2005 17:11:08 -0000 1.7 +++ bazaar.spec 7 Jul 2005 19:53:17 -0000 1.8 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -59,6 +59,12 @@ install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check +# The stand alone annotate is meant to debug baz interals, not installation +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then + rm $RPM_BUILD_ROOT%{_bindir}/annotate +fi + %find_lang %{name} # install the documentation @@ -72,11 +78,13 @@ %defattr(-, root, root) %doc COPYING doc/* %{_bindir}/baz -%{_bindir}/annotate %{_bindir}/bazaar-gpg-check %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Shahms E. King 1.4.2-2 +- Remove the standalone "annotate" binary to fix bug #162665 + * Wed Jun 29 2005 Shahms E. King 1.4.2-1 - Update to 1.4.2 - Don't explicitly gzip man pages From fedora-extras-commits at redhat.com Thu Jul 7 19:53:31 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:53:31 -0400 Subject: common tobuild,1.1831,1.1832 Message-ID: <200507071953.j67JrVcF003099@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3081 Modified Files: tobuild Log Message: request build of rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1831 retrieving revision 1.1832 diff -u -r1.1831 -r1.1832 --- tobuild 7 Jul 2005 19:52:22 -0000 1.1831 +++ tobuild 7 Jul 2005 19:53:28 -0000 1.1832 @@ -6,3 +6,4 @@ jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel +shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 19:53:52 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:53:52 -0400 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 Message-ID: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3105 Modified Files: bazaar.spec Log Message: Remove /usr/bin/annotate to fix bug #162665 Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/FC-4/bazaar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bazaar.spec 29 Jun 2005 17:09:59 -0000 1.8 +++ bazaar.spec 7 Jul 2005 19:53:49 -0000 1.9 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -59,6 +59,12 @@ install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check +# The stand alone annotate is meant to debug baz interals, not installation +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then + rm $RPM_BUILD_ROOT%{_bindir}/annotate +fi + %find_lang %{name} # install the documentation @@ -72,11 +78,13 @@ %defattr(-, root, root) %doc COPYING doc/* %{_bindir}/baz -%{_bindir}/annotate %{_bindir}/bazaar-gpg-check %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Shahms E. King 1.4.2-2 +- Remove the standalone "annotate" binary to fix bug #162665 + * Wed Jun 29 2005 Shahms E. King 1.4.2-1 - Update to 1.4.2 - Don't explicitly gzip man pages From fedora-extras-commits at redhat.com Thu Jul 7 19:54:03 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:54:03 -0400 Subject: common tobuild,1.1832,1.1833 Message-ID: <200507071954.j67Js34p003184@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3167 Modified Files: tobuild Log Message: request build of rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1832 retrieving revision 1.1833 diff -u -r1.1832 -r1.1833 --- tobuild 7 Jul 2005 19:53:28 -0000 1.1832 +++ tobuild 7 Jul 2005 19:54:01 -0000 1.1833 @@ -7,3 +7,4 @@ jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 +shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:16:21 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 16:16:21 -0400 Subject: rpms/most/devel most.spec,1.8,1.9 Message-ID: <200507072016.j67KGL8B004360@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4343 Modified Files: most.spec Log Message: * Thu Jul 07 2005 Adrian Reber - 4.10.2-1 - updated to 4.10.2 (fixes search aborting bug) Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- most.spec 4 Jul 2005 08:48:19 -0000 1.8 +++ most.spec 7 Jul 2005 20:16:19 -0000 1.9 @@ -1,11 +1,11 @@ Summary: more, less, most Name: most -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -43,6 +43,9 @@ %changelog +* Thu Jul 07 2005 Adrian Reber - 4.10.2-1 +- updated to 4.10.2 (fixes search aborting bug) + * Fri Jul 01 2005 Adrian Reber - 4.10.1-1 - updated to 4.10.1 From fedora-extras-commits at redhat.com Thu Jul 7 20:22:19 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:22:19 -0400 Subject: rpms/liferea/devel .cvsignore, 1.6, 1.7 liferea.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200507072022.j67KMJ0Y004421@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4400 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu Jul 7 2005 Brian Pepple - 0.9.3-1 - Update to 0.9.3. - Enable dbus. - Add dist tag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 May 2005 17:56:24 -0000 1.6 +++ .cvsignore 7 Jul 2005 20:22:17 -0000 1.7 @@ -1 +1 @@ -liferea-0.9.2.tar.gz +liferea-0.9.3.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liferea.spec 17 May 2005 17:56:24 -0000 1.11 +++ liferea.spec 7 Jul 2005 20:22:17 -0000 1.12 @@ -1,6 +1,8 @@ +%define with_dbus 1 + Name: liferea -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -14,7 +16,11 @@ BuildRequires: GConf2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -Buildrequires: zlib-devel +BuildRequires: zlib-devel + +%if %{with_dbus} +BuildRequires: dbus-devel +%endif Requires(post): GConf2 Requires(preun): GConf2 @@ -33,7 +39,12 @@ %build -%configure --disable-schemas-install --enable-dbus=no +%configure --disable-schemas-install \ +%if %{with_dbus} + --enable-dbus=yes +%else + --enable-dbus=no +%endif make %{?_smp_mflags} @@ -81,6 +92,11 @@ %changelog +* Thu Jul 7 2005 Brian Pepple - 0.9.3-1 +- Update to 0.9.3. +- Enable dbus. +- Add dist tag. + * Thu May 12 2005 Brian Pepple - 0.9.2-1 - Update to 0.9.2 - Don't enable d-bus since old API is used. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 May 2005 17:56:24 -0000 1.7 +++ sources 7 Jul 2005 20:22:17 -0000 1.8 @@ -1 +1 @@ -08a52274b4ef91f7ac9a01cc45fbad13 liferea-0.9.2.tar.gz +8a592a2e73b8d6e1bc78417e91ab82b2 liferea-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:23:45 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:23:45 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.6, 1.7 liferea.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200507072023.j67KNjBD004465@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4444 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu Jul 7 2005 Brian Pepple - 0.9.3-1 - Update to 0.9.3. - Enable dbus. - Add dist tag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 May 2005 17:56:24 -0000 1.6 +++ .cvsignore 7 Jul 2005 20:23:42 -0000 1.7 @@ -1 +1 @@ -liferea-0.9.2.tar.gz +liferea-0.9.3.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liferea.spec 17 May 2005 17:56:24 -0000 1.11 +++ liferea.spec 7 Jul 2005 20:23:43 -0000 1.12 @@ -1,6 +1,8 @@ +%define with_dbus 1 + Name: liferea -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -14,7 +16,11 @@ BuildRequires: GConf2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -Buildrequires: zlib-devel +BuildRequires: zlib-devel + +%if %{with_dbus} +BuildRequires: dbus-devel +%endif Requires(post): GConf2 Requires(preun): GConf2 @@ -33,7 +39,12 @@ %build -%configure --disable-schemas-install --enable-dbus=no +%configure --disable-schemas-install \ +%if %{with_dbus} + --enable-dbus=yes +%else + --enable-dbus=no +%endif make %{?_smp_mflags} @@ -81,6 +92,11 @@ %changelog +* Thu Jul 7 2005 Brian Pepple - 0.9.3-1 +- Update to 0.9.3. +- Enable dbus. +- Add dist tag. + * Thu May 12 2005 Brian Pepple - 0.9.2-1 - Update to 0.9.2 - Don't enable d-bus since old API is used. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 May 2005 17:56:24 -0000 1.7 +++ sources 7 Jul 2005 20:23:43 -0000 1.8 @@ -1 +1 @@ -08a52274b4ef91f7ac9a01cc45fbad13 liferea-0.9.2.tar.gz +8a592a2e73b8d6e1bc78417e91ab82b2 liferea-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:26:18 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:26:18 -0400 Subject: common tobuild,1.1833,1.1834 Message-ID: <200507072026.j67KQI4l004538@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4521 Modified Files: tobuild Log Message: request build of rpms/liferea/devel liferea-0_9_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1833 retrieving revision 1.1834 diff -u -r1.1833 -r1.1834 --- tobuild 7 Jul 2005 19:54:01 -0000 1.1833 +++ tobuild 7 Jul 2005 20:26:16 -0000 1.1834 @@ -8,3 +8,4 @@ shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 +bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 20:26:54 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:26:54 -0400 Subject: common tobuild,1.1834,1.1835 Message-ID: <200507072026.j67KQsux004601@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4584 Modified Files: tobuild Log Message: request build of rpms/liferea/FC-4 liferea-0_9_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1834 retrieving revision 1.1835 diff -u -r1.1834 -r1.1835 --- tobuild 7 Jul 2005 20:26:16 -0000 1.1834 +++ tobuild 7 Jul 2005 20:26:51 -0000 1.1835 @@ -9,3 +9,4 @@ shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel +bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:30:59 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 16:30:59 -0400 Subject: rpms/most/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200507072030.j67KUxP0004646@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627 Modified Files: .cvsignore sources Log Message: updated to 4.10.2 (fixes search aborting bug) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Jul 2005 12:41:26 -0000 1.3 +++ .cvsignore 7 Jul 2005 20:30:57 -0000 1.4 @@ -1 +1 @@ -most-4.10.1.tar.bz2 +most-4.10.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Jul 2005 12:41:26 -0000 1.3 +++ sources 7 Jul 2005 20:30:57 -0000 1.4 @@ -1 +1 @@ -9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 +16f7a67a969e0ce9a941c0e6c1ff0470 most-4.10.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:32:57 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 16:32:57 -0400 Subject: common tobuild,1.1835,1.1836 Message-ID: <200507072032.j67KWvs7004703@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4686 Modified Files: tobuild Log Message: request build of rpms/most/devel most-4_10_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1835 retrieving revision 1.1836 diff -u -r1.1835 -r1.1836 --- tobuild 7 Jul 2005 20:26:51 -0000 1.1835 +++ tobuild 7 Jul 2005 20:32:54 -0000 1.1836 @@ -10,3 +10,4 @@ shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 +adrian rpms/most/devel most-4_10_2-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 20:50:12 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 16:50:12 -0400 Subject: rpms/naim/devel naim.spec,1.1,1.2 Message-ID: <200507072050.j67KoC2o004769@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4748 Modified Files: naim.spec Log Message: Remove --enable-detach %configure flag Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- naim.spec 7 Jul 2005 17:05:41 -0000 1.1 +++ naim.spec 7 Jul 2005 20:50:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: naim Version: 0.11.7.3.1 -Release: 1 +Release: 2 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client Group: Applications/Internet @@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel -Requires: screen %description naim is a console client for AOL Instant Messenger (AIM), AOL I Seek You (ICQ), @@ -20,7 +19,7 @@ %setup -q %build -%configure --enable-detach +%configure make %{?_smp_mflags} %install @@ -39,5 +38,9 @@ %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Luke Macken 0.11.7.3.1-2 +- Disable detach-mode, which seems to break the users shell upon detaching. + Run naim in screen manually if you want this functionality. + * Tue Jul 05 2005 Luke Macken 0.11.7.3.1-1 - Packaged for Fedora Extras From fedora-extras-commits at redhat.com Thu Jul 7 20:52:07 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 7 Jul 2005 16:52:07 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.11,1.12 Message-ID: <200507072052.j67Kq7L3004816@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4799 Modified Files: galeon.spec Log Message: galeon: 1.3.21-8. Fixed buildreqs. Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- galeon.spec 6 Jul 2005 20:38:25 -0000 1.11 +++ galeon.spec 7 Jul 2005 20:52:05 -0000 1.12 @@ -1,11 +1,11 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 6%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ -Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 +Source0: http://download.sourceforge.net/galeon/galeon-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) @@ -14,8 +14,9 @@ BuildRequires: mozilla-devel >= 37:1.7.2 BuildRequires: libxml2-devel >= 2.6.6 BuildRequires: libgnomeui-devel >= 2.5.2 +BuildRequires: perl(XML::Parser) scrollkeeper %ifarch x86_64 -BuildRequires: autoconf automake libtool +BuildRequires: autoconf automake libtool intltool %endif %description @@ -100,6 +101,10 @@ %changelog +* Thu Jul 7 2005 Dams - 1.3.21 +- Hopefully fixed BuildReq. +- replaced name by galeon in Source0 + * Wed Jul 6 2005 Dams - 1.3.21-6 - Added missing BuildRequires From fedora-extras-commits at redhat.com Thu Jul 7 20:52:54 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 7 Jul 2005 16:52:54 -0400 Subject: common tobuild,1.1836,1.1837 Message-ID: <200507072052.j67Kqsws004878@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4861 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-8_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1836 retrieving revision 1.1837 diff -u -r1.1836 -r1.1837 --- tobuild 7 Jul 2005 20:32:54 -0000 1.1836 +++ tobuild 7 Jul 2005 20:52:51 -0000 1.1837 @@ -11,3 +11,4 @@ bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 adrian rpms/most/devel most-4_10_2-1_fc5 devel +anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:55:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 16:55:03 -0400 Subject: rpms/screem/FC-4 .cvsignore, 1.3, 1.4 screem.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507072055.j67Kt3he004913@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/screem/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4892 Modified Files: .cvsignore screem.spec sources Log Message: * Thu Jul 7 2005 Michael Schwendt - 0.14.1-1 - Update to 0.14.1 (also fixes bug #153224). - BR gnome-menus-devel libcroco-devel - Drop --with-libxml2 --disable-gtkhtml-help --with-included-neon, since they are not evaluated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/screem/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 19:20:27 -0000 1.3 +++ .cvsignore 7 Jul 2005 20:55:01 -0000 1.4 @@ -1 +1 @@ -screem-0.12.1.tar.gz +screem-0.14.1.tar.gz Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/FC-4/screem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- screem.spec 22 May 2005 23:11:22 -0000 1.4 +++ screem.spec 7 Jul 2005 20:55:01 -0000 1.5 @@ -1,13 +1,12 @@ Name: screem -Version: 0.12.1 -Release: 3 - -Summary: A website development enviroment +Version: 0.14.1 +Release: 1%{?dist} +Summary: Website development environment Group: Development/Tools License: GPL URL: http://screem.sourceforge.net/ -Source0: http://download.sourceforge.net/screem/screem-0.12.1.tar.gz +Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -17,7 +16,10 @@ BuildRequires: gtksourceview-devel BuildRequires: libgnomeprintui22-devel BuildRequires: libgnomeui-devel +BuildRequires: gnome-menus-devel +BuildRequires: libcroco-devel BuildRequires: scrollkeeper + Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -42,12 +44,10 @@ %build -%configure --disable-gtkhtml-help \ +%configure \ --disable-schemas-install \ --disable-update-mime \ --disable-update-desktop \ - --with-included-neon \ - --with-libxml2 \ --enable-dbus make %{?_smp_mflags} @@ -100,16 +100,22 @@ %{_datadir}/mime/packages/* %{_datadir}/mime-info %{_datadir}/omf -%{_datadir}/pixmaps +%{_datadir}/pixmaps/* %{_libdir}/%{name} %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Jul 7 2005 Michael Schwendt - 0.14.1-1 +- Update to 0.14.1 (also fixes bug #153224). +- BR gnome-menus-devel libcroco-devel +- Drop --with-libxml2 --disable-gtkhtml-help --with-included-neon, + since they are not evaluated. + * Sun May 22 2005 Jeremy Katz - 0.12.1-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - 0.12.1-2 - rebuilt * Thu Nov 25 2004 Phillip Compton - 0.12.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/screem/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 19:20:27 -0000 1.3 +++ sources 7 Jul 2005 20:55:01 -0000 1.4 @@ -1 +1 @@ -4d1f50deee2888f0ac094cb3df61f1ad screem-0.12.1.tar.gz +b23bf53698df79477f83f3d66b6eab0d screem-0.14.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:56:58 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 16:56:58 -0400 Subject: common tobuild,1.1837,1.1838 Message-ID: <200507072056.j67KuwO6004975@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4958 Modified Files: tobuild Log Message: request build of rpms/screem/FC-4 screem-0_14_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1837 retrieving revision 1.1838 diff -u -r1.1837 -r1.1838 --- tobuild 7 Jul 2005 20:52:51 -0000 1.1837 +++ tobuild 7 Jul 2005 20:56:56 -0000 1.1838 @@ -12,3 +12,4 @@ bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 adrian rpms/most/devel most-4_10_2-1_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 +mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:57:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 16:57:36 -0400 Subject: rpms/screem/devel .cvsignore, 1.3, 1.4 screem.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507072057.j67KvaY2005002@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/screem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4981 Modified Files: .cvsignore screem.spec sources Log Message: sync with FC-4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/screem/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 19:20:27 -0000 1.3 +++ .cvsignore 7 Jul 2005 20:57:33 -0000 1.4 @@ -1 +1 @@ -screem-0.12.1.tar.gz +screem-0.14.1.tar.gz Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/devel/screem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- screem.spec 22 May 2005 23:11:22 -0000 1.4 +++ screem.spec 7 Jul 2005 20:57:33 -0000 1.5 @@ -1,13 +1,12 @@ Name: screem -Version: 0.12.1 -Release: 3 - -Summary: A website development enviroment +Version: 0.14.1 +Release: 1%{?dist} +Summary: Website development environment Group: Development/Tools License: GPL URL: http://screem.sourceforge.net/ -Source0: http://download.sourceforge.net/screem/screem-0.12.1.tar.gz +Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -17,7 +16,10 @@ BuildRequires: gtksourceview-devel BuildRequires: libgnomeprintui22-devel BuildRequires: libgnomeui-devel +BuildRequires: gnome-menus-devel +BuildRequires: libcroco-devel BuildRequires: scrollkeeper + Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -42,12 +44,10 @@ %build -%configure --disable-gtkhtml-help \ +%configure \ --disable-schemas-install \ --disable-update-mime \ --disable-update-desktop \ - --with-included-neon \ - --with-libxml2 \ --enable-dbus make %{?_smp_mflags} @@ -100,16 +100,22 @@ %{_datadir}/mime/packages/* %{_datadir}/mime-info %{_datadir}/omf -%{_datadir}/pixmaps +%{_datadir}/pixmaps/* %{_libdir}/%{name} %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Jul 7 2005 Michael Schwendt - 0.14.1-1 +- Update to 0.14.1 (also fixes bug #153224). +- BR gnome-menus-devel libcroco-devel +- Drop --with-libxml2 --disable-gtkhtml-help --with-included-neon, + since they are not evaluated. + * Sun May 22 2005 Jeremy Katz - 0.12.1-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - 0.12.1-2 - rebuilt * Thu Nov 25 2004 Phillip Compton - 0.12.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/screem/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 19:20:27 -0000 1.3 +++ sources 7 Jul 2005 20:57:33 -0000 1.4 @@ -1 +1 @@ -4d1f50deee2888f0ac094cb3df61f1ad screem-0.12.1.tar.gz +b23bf53698df79477f83f3d66b6eab0d screem-0.14.1.tar.gz From tcallawa at redhat.com Thu Jul 7 21:00:10 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Thu, 07 Jul 2005 16:00:10 -0500 Subject: APPROVAL: libifp Message-ID: <1120770010.9303.52.camel@localhost.localdomain> libifp is a general-purpose library-driver for iRiver's iFP (flash-based) portable audio players. The source code is pure C and is fairly portable. Also included is a console app that uses the library. Reviewer: Tom "spot" Callaway Maintainer: Ignacio Vazquez-Abrams ~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 Thu Jul 7 21:12:48 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:12:48 -0400 Subject: rpms/libifp - New directory Message-ID: <200507072112.j67LCmIR006242@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6222/libifp Log Message: Directory /cvs/extras/rpms/libifp added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 21:12:48 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:12:48 -0400 Subject: rpms/libifp/devel - New directory Message-ID: <200507072112.j67LCmps006247@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6222/libifp/devel Log Message: Directory /cvs/extras/rpms/libifp/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 21:13:02 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:02 -0400 Subject: rpms/libifp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507072113.j67LD2LE006294@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6267 Added Files: Makefile import.log Log Message: Setup of module libifp --- NEW FILE Makefile --- # Top level Makefile for module libifp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 21:13:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:03 -0400 Subject: rpms/libifp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507072113.j67LD3O3006299@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6267/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libifp --- NEW 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 Jul 7 21:13:49 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:49 -0400 Subject: rpms/libifp import.log,1.1,1.2 Message-ID: <200507072113.j67LDndC006362@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6331 Modified Files: import.log Log Message: auto-import libifp-1.0.0.1-1 on branch devel from libifp-1.0.0.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libifp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 21:13:00 -0000 1.1 +++ import.log 7 Jul 2005 21:13:47 -0000 1.2 @@ -0,0 +1 @@ +libifp-1_0_0_1-1:HEAD:libifp-1.0.0.1-1.src.rpm:1120770934 From fedora-extras-commits at redhat.com Thu Jul 7 21:13:49 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:49 -0400 Subject: rpms/libifp/devel libifp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507072113.j67LDnjx006369@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6331/devel Modified Files: .cvsignore sources Added Files: libifp.spec Log Message: auto-import libifp-1.0.0.1-1 on branch devel from libifp-1.0.0.1-1.src.rpm --- NEW FILE libifp.spec --- Name: libifp Version: 1.0.0.1 Release: 1 Summary: A general-purpose library-driver for iRiver's iFP portable audio players Group: System Environment/Base License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen %description libifp is a general-purpose library-driver for iRiver's iFP (flash-based) portable audio players. The source code is pure C and is fairly portable. Also included is a console app that uses the library. %package devel Summary: Headers and libraries for developing with libifp Group: Development/Libraries Requires: %{name}=%{version}-%{release} %description devel This package contains headers and libraries for developing apps that use libifp. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.so %{_mandir}/man3/* %changelog * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 21:13:01 -0000 1.1 +++ .cvsignore 7 Jul 2005 21:13:47 -0000 1.2 @@ -0,0 +1 @@ +libifp-1.0.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 21:13:01 -0000 1.1 +++ sources 7 Jul 2005 21:13:47 -0000 1.2 @@ -0,0 +1 @@ +3b692cc224391b5714f5a8fbb8abf85b libifp-1.0.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 21:17:47 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:17:47 -0400 Subject: rpms/libifp/devel libifp.spec,1.1,1.2 Message-ID: <200507072117.j67LHl1c006458@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441/devel Modified Files: libifp.spec Log Message: Fix spacing, add disttag Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libifp.spec 7 Jul 2005 21:13:47 -0000 1.1 +++ libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: libifp Version: 1.0.0.1 -Release: 1 +Release: 1%{?dist} Summary: A general-purpose library-driver for iRiver's iFP portable audio players Group: System Environment/Base @@ -20,7 +20,7 @@ %package devel Summary: Headers and libraries for developing with libifp Group: Development/Libraries -Requires: %{name}=%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel This package contains headers and libraries for developing apps that use From Christian.Iseli at licr.org Thu Jul 7 21:32:28 2005 From: Christian.Iseli at licr.org (Christian.Iseli at licr.org) Date: Thu, 07 Jul 2005 23:32:28 +0200 Subject: common tobuild,1.1829,1.1830 In-Reply-To: Your message of "Thu, 07 Jul 2005 15:21:46 EDT." <1120764106.5121.22.camel@cutter> Message-ID: <200507072132.j67LWaBJ030263@mx1.redhat.com> skvidal at phy.duke.edu said: > On Thu, 2005-07-07 at 15:17 -0400, Michael Schwendt wrote: >> clean up -- buildsys seems to be stuck at barcode > I killed the tex process. Looks like some BuildRequires are missing in barcode.spec: -BuildRequires: tetex, texinfo +BuildRequires: tetex, texinfo, tetex-dvips, ghostscript Sorry it escaped me in the review. With this patch, I got it to compile in mock... It's strange that it'd get stuck in the tex process, though. Another oddity is in my mock's root.log file: Install: libxml2.i386 0:2.6.19-1 -ls: readlink:: No such file or directory ls: file: No such file or directory ls: expected: No such file or directory core Christian From fedora-extras-commits at redhat.com Thu Jul 7 21:38:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 17:38:28 -0400 Subject: rpms/screem/FC-3 .cvsignore, 1.3, 1.4 screem.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507072138.j67LcS0Z006595@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/screem/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6574 Modified Files: .cvsignore screem.spec sources Log Message: * Thu Jul 7 2005 Michael Schwendt - 0.12.2-1 - Update to 0.12.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/screem/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 19:20:27 -0000 1.3 +++ .cvsignore 7 Jul 2005 21:38:26 -0000 1.4 @@ -1 +1 @@ -screem-0.12.1.tar.gz +screem-0.12.2.tar.gz Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/FC-3/screem.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- screem.spec 25 Nov 2004 19:20:27 -0000 1.2 +++ screem.spec 7 Jul 2005 21:38:26 -0000 1.3 @@ -1,12 +1,12 @@ Name: screem -Version: 0.12.1 +Version: 0.12.2 Release: 1 -Summary: A website development enviroment +Summary: Website development environment Group: Development/Tools License: GPL URL: http://screem.sourceforge.net/ -Source0: http://download.sourceforge.net/screem/screem-0.12.1.tar.gz +Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -105,6 +105,9 @@ %changelog +* Thu Jul 7 2005 Michael Schwendt - 0.12.2-1 +- Update to 0.12.2. + * Thu Nov 25 2004 Phillip Compton - 0.12.1-1 - 0.12.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/screem/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 19:20:27 -0000 1.3 +++ sources 7 Jul 2005 21:38:26 -0000 1.4 @@ -1 +1 @@ -4d1f50deee2888f0ac094cb3df61f1ad screem-0.12.1.tar.gz +34368e70de44a3f7fc1687e39dc5156e screem-0.12.2.tar.gz From andreas at bawue.net Thu Jul 7 21:42:14 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 7 Jul 2005 23:42:14 +0200 (CEST) Subject: common tobuild,1.1829,1.1830 In-Reply-To: <200507072132.j67LWaBJ030263@mx1.redhat.com> References: <200507072132.j67LWaBJ030263@mx1.redhat.com> Message-ID: On Thu, 7 Jul 2005 Christian.Iseli at licr.org wrote: > Looks like some BuildRequires are missing in barcode.spec: > > -BuildRequires: tetex, texinfo > +BuildRequires: tetex, texinfo, tetex-dvips, ghostscript > > Sorry it escaped me in the review. With this patch, I got it to compile in > mock... This has been already added to the cvs as release 6. However, it's a bit strange as why it suddenly wants to completely rebuild the docs. > It's strange that it'd get stuck in the tex process, though. Yes. Definitly. Especially as this didn't happen on two different machines. bye, andreas From fedora-extras-commits at redhat.com Thu Jul 7 21:42:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 17:42:48 -0400 Subject: common tobuild,1.1838,1.1839 Message-ID: <200507072142.j67LgmSo006706@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6687 Modified Files: tobuild Log Message: request build of rpms/screem/FC-3 screem-0_12_2-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1838 retrieving revision 1.1839 diff -u -r1.1838 -r1.1839 --- tobuild 7 Jul 2005 20:56:56 -0000 1.1838 +++ tobuild 7 Jul 2005 21:42:46 -0000 1.1839 @@ -13,3 +13,4 @@ adrian rpms/most/devel most-4_10_2-1_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 +mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 21:44:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 17:44:01 -0400 Subject: rpms/barcode/devel barcode-configure.patch, NONE, 1.1 barcode.spec, 1.1, 1.2 Message-ID: <200507072144.j67Li12q006740@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6720 Modified Files: barcode.spec Added Files: barcode-configure.patch Log Message: Fixed missing BuildRequire and a buildproblem on x86_64 barcode-configure.patch: --- NEW FILE barcode-configure.patch --- --- barcode-0.98/Makefile.in.orig 2005-07-07 23:07:48.513990181 +0200 +++ barcode-0.98/Makefile.in 2005-07-07 23:08:53.716905115 +0200 @@ -11,12 +11,12 @@ LDFLAGS = -L. -l$(TARGET) @LIBPAPER@ prefix = @prefix@ -BINDIR = $(prefix)/bin -LIBDIR = $(prefix)/lib -INCDIR = $(prefix)/include -MAN1DIR = $(prefix)/man/man1 -MAN3DIR = $(prefix)/man/man3 -INFODIR = $(prefix)/info +BINDIR = $(bindir) +LIBDIR = $(libdir) +INCDIR = $(includedir) +MAN1DIR = $(mandir)/man1 +MAN3DIR = $(mandir)/man3 +INFODIR = $(infodir) # getopt may be installed or not, if not take our copy GETOPT_O = @GETOPT_O@ Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- barcode.spec 7 Jul 2005 15:21:02 -0000 1.1 +++ barcode.spec 7 Jul 2005 21:43:59 -0000 1.2 @@ -1,16 +1,17 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz -Patch0: barcode-install-info.patch +Patch0: barcode-configure.patch +Patch1: barcode-install-info.patch URL: http://www.gnu.org/software/barcode/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info -BuildRequires: tetex, texinfo +BuildRequires: tetex, tetex-dvips, texinfo, ghostscript %description Barcode is meant to solve most needs in barcode creation with a @@ -30,25 +31,17 @@ %prep %setup -q -%patch0 -p1 -b .categories +%patch0 -p1 -b .directories +%patch1 -p1 -b .categories %build %configure make %{?_smp_mflags} -# Regenerate documentation -make -C doc barcode.info - %install rm -rf %{buildroot} %makeinstall -# Fix locations according to FHS -mkdir -p %{buildroot}%{_mandir} -mkdir -p %{buildroot}%{_infodir} -mv %{buildroot}/usr/man/* %{buildroot}%{_mandir} -mv %{buildroot}/usr/info/* %{buildroot}%{_infodir} - %clean rm -rf %{buildroot} @@ -74,6 +67,9 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 07 2005 Andreas Thienemann 0.98-6 +- Added configure patch to pick up correct libdir for x86_64 + * Thu Jul 07 2005 Andreas Thienemann 0.98-5 - Added install-info support to the texinfo file. - Fixed minor spec errors From fedora-extras-commits at redhat.com Thu Jul 7 21:46:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 17:46:00 -0400 Subject: rpms/barcode/devel barcode.spec,1.2,1.3 Message-ID: <200507072146.j67Lk0Sh006772@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6753 Modified Files: barcode.spec Log Message: updated changelog Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- barcode.spec 7 Jul 2005 21:43:59 -0000 1.2 +++ barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 @@ -69,6 +69,7 @@ %changelog * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 +- Added missing BuildRequires for ghostscript and tetex-dvips * Thu Jul 07 2005 Andreas Thienemann 0.98-5 - Added install-info support to the texinfo file. From Christian.Iseli at licr.org Thu Jul 7 21:47:33 2005 From: Christian.Iseli at licr.org (Christian.Iseli at licr.org) Date: Thu, 07 Jul 2005 23:47:33 +0200 Subject: common tobuild,1.1829,1.1830 In-Reply-To: Your message of "Thu, 07 Jul 2005 23:42:14 +0200." Message-ID: <200507072147.j67LldsD015682@mx3.redhat.com> andreas at bawue.net said: > However, it's a bit strange as why it suddenly wants to completely rebuild > the docs. That's because you patch the doc.barcode file... From fedora-extras-commits at redhat.com Thu Jul 7 22:29:46 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:29:46 -0400 Subject: rpms/ncview - New directory Message-ID: <200507072229.j67MTklb008734@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8714/ncview Log Message: Directory /cvs/extras/rpms/ncview added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 22:29:47 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:29:47 -0400 Subject: rpms/ncview/devel - New directory Message-ID: <200507072229.j67MTlMR008739@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8714/ncview/devel Log Message: Directory /cvs/extras/rpms/ncview/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 22:30:05 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:05 -0400 Subject: rpms/ncview Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507072230.j67MU59M008786@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8759 Added Files: Makefile import.log Log Message: Setup of module ncview --- NEW FILE Makefile --- # Top level Makefile for module ncview all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 22:30:05 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:05 -0400 Subject: rpms/ncview/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507072230.j67MU5dt008791@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8759/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ncview --- NEW 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 Jul 7 22:30:55 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:55 -0400 Subject: rpms/ncview import.log,1.1,1.2 Message-ID: <200507072231.j67MVPiI008885@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8838 Modified Files: import.log Log Message: auto-import ncview-1.92e-4 on branch devel from ncview-1.92e-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ncview/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 22:30:03 -0000 1.1 +++ import.log 7 Jul 2005 22:30:53 -0000 1.2 @@ -0,0 +1 @@ +ncview-1_92e-4:HEAD:ncview-1.92e-4.src.rpm:1120775451 From fedora-extras-commits at redhat.com Thu Jul 7 22:30:55 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:55 -0400 Subject: rpms/ncview/devel ncview-1.92e-Makefile.in.patch, NONE, 1.1 ncview-1.92e-do_print.c.patch, NONE, 1.1 ncview-1.92e-netpbm.patch, NONE, 1.1 ncview.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507072230.j67MUtKV008877@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8838/devel Modified Files: .cvsignore sources Added Files: ncview-1.92e-Makefile.in.patch ncview-1.92e-do_print.c.patch ncview-1.92e-netpbm.patch ncview.spec Log Message: auto-import ncview-1.92e-4 on branch devel from ncview-1.92e-4.src.rpm ncview-1.92e-Makefile.in.patch: --- NEW FILE ncview-1.92e-Makefile.in.patch --- --- ncview-1.92e/Makefile.in.orig 2004-10-12 15:54:42.795409115 -0400 +++ ncview-1.92e/Makefile.in 2004-10-12 15:55:14.503542390 -0400 @@ -43,7 +43,7 @@ ## files will be kept and installed. Comment this line out if ## no such directory will be specified. ##################################################################### -NCVIEW_LIB_DIR = @prefix@/lib/ncview +NCVIEW_LIB_DIR = @datadir@ ###################################################################### ## If needed, *add* here the names of any additional include or library @@ -123,7 +123,7 @@ ncview: $(OBJS) @CC@ $(MYCFLAGS) -o ncview $(OBJS) $(LDOPTIONS) $(OTHERLIBDIRS) \ @X_LIBS@ $(NETCDFLIB) $(UDUNITSLIB) $(XAWLIB) $(XMULIB) \ - $(PPMLIB) \ + $(PPMLIBDIR) $(PPMLIB) \ @X_PRE_LIBS@ $(XTOOLLIB) $(XEXTLIB) $(XLIB) @X_EXTRA_LIBS@ -lm ncview.1: ncview.1.sed ncview-1.92e-do_print.c.patch: --- NEW FILE ncview-1.92e-do_print.c.patch --- --- ncview-1.92e/do_print.c.orig 2005-07-06 13:33:37.000000000 -0400 +++ ncview-1.92e/do_print.c 2005-07-06 14:00:56.000000000 -0400 @@ -75,6 +75,7 @@ size_t x_size, y_size, top_of_image, bot_of_image, center_x, center_y, left_of_image, right_of_image; char outfname[1024], tstr[1500]; + int outfid; FILE *outf; float output_scale; int r, g, b, n_print; @@ -86,20 +87,34 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; - - if( printopts.output_device == DEVICE_PRINTER ) - strcpy( printopts.out_file_name, tmpnam(NULL) ); - if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) + if( printopts.output_device == DEVICE_PRINTER ) { + strcpy( printopts.out_file_name, "/tmp/ncview.XXXXXX" ); + outfid = mkstemp( printopts.out_file_name ); + if (outfid == -1) { + sprintf( tstr, "Error opening temporary file for output!\n" ); + in_error( tstr ); return; - - if( (outf = fopen(printopts.out_file_name, "w" )) == NULL ) { + } + if( (outf = fopen(printopts.out_file_name, "a" )) == NULL ) { sprintf( tstr, "Error opening file %s for output!\n", - outfname ); + printopts.out_file_name ); in_error( tstr ); return; - } - + } + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) + return; + + if( (outf = fopen(printopts.out_file_name, "w" )) == NULL ) { + sprintf( tstr, "Error opening file %s for output!\n", + outfname ); + in_error( tstr ); + return; + } + } + in_set_cursor_busy(); calc_scale( &output_scale, x_size, y_size ); ncview-1.92e-netpbm.patch: --- NEW FILE ncview-1.92e-netpbm.patch --- --- ncview-1.92e/configure.BAD 2005-07-05 16:07:32.000000000 -0500 +++ ncview-1.92e/configure 2005-07-05 16:07:53.000000000 -0500 @@ -2835,7 +2835,7 @@ fi fi -PPM_LIBNAME=libppm.so +PPM_LIBNAME=libnetpbm.so # Check whether --with-ppm_libdir or --without-ppm_libdir was given. if test "${with_ppm_libdir+set}" = set; then withval="$with_ppm_libdir" --- NEW FILE ncview.spec --- Name: ncview Version: 1.92e Release: 4 Summary: A visual browser for netCDF format files Group: Applications/Engineering License: GPL URL: http://meteora.ucsd.edu/~pierce/ncview_home_page.html Source0: ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.92e.tar.gz Patch0: ncview-1.92e-Makefile.in.patch Patch1: ncview-1.92e-netpbm.patch Patch2: ncview-1.92e-do_print.c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel netcdf-devel udunits-devel netpbm-devel Requires: xorg-x11 udunits %description Ncview is a visual browser for netCDF format files. Typically you would use ncview to get a quick and easy, push-button look at your netCDF files. You can view simple movies of the data, view along various dimensions, take a look at the actual data values, change color maps, invert the data, etc. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build %configure --with-netcdf_incdir=%{_includedir}/netcdf-3 \ --with-netcdf_libdir=%{_libdir}/netcdf-3 --with-ppm_libdir=%{_libdir} \ --prefix=/usr --datadir=%{_datadir}/ncview # WARNING! # The parallel build was tested and it does NOT work. # make %{?_smp_mflags} make %install rm -rf $RPM_BUILD_ROOT export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults" mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults" %makeinstall NCVIEW_LIB_DIR=${RPM_BUILD_ROOT}%{_datadir}/ncview BINDIR=${RPM_BUILD_ROOT}%{_bindir} MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man1 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/* chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/* %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/* %{_datadir}/ncview %{_libdir}/X11/app-defaults/* %{_mandir}/man1/* %changelog * Wed Jul 6 2005 Ed Hill - 1.92e-4 - mkstemp() security fix and more cleanups * Wed Jul 6 2005 Ed Hill - 1.92e-3 - move the data files to %{_datadir} and add COPYING - added xorg-x11 Requires and BuildRequires * Tue Jul 5 2005 Ed Hill - 1.92e-2 - fix permissions, remove fortran dependency, and small cleanups * Tue Jul 5 2005 Tom "spot" Callaway - 1.92e-1 - Fedora Extras cleanups * Sun Dec 5 2004 Ed Hill - 0:1.92e-0.fdr.0 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 22:30:03 -0000 1.1 +++ .cvsignore 7 Jul 2005 22:30:53 -0000 1.2 @@ -0,0 +1 @@ +ncview-1.92e.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 22:30:03 -0000 1.1 +++ sources 7 Jul 2005 22:30:53 -0000 1.2 @@ -0,0 +1 @@ +37b9566e6ece132c9e578e69db0cdf7d ncview-1.92e.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 22:36:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:36:09 -0400 Subject: rpms/scribus/FC-4 scribus.spec,1.13,1.14 Message-ID: <200507072236.j67Ma9Nd008970@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-4 Modified Files: scribus.spec Log Message: Bumping release for FC-3 build Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scribus.spec 6 Jul 2005 23:35:41 -0000 1.13 +++ scribus.spec 7 Jul 2005 22:36:07 -0000 1.14 @@ -1,6 +1,6 @@ Name: scribus Version: 1.2.2.1 -Release: 1 +Release: 2%{?dist} Summary: DeskTop Publishing application written in Qt @@ -136,6 +136,9 @@ %changelog +* Thu Jul 7 2005 Tom "spot" Callaway 1.2.2.1-2 +- use dist tag for sanity between branches + * Tue Jul 5 2005 P Linnell - 1.2.2.1-1 - 1.2.2.1 released to fix crash on open with certain 1.2.1 docs From fedora-extras-commits at redhat.com Thu Jul 7 22:36:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:36:09 -0400 Subject: rpms/scribus/FC-3 scribus.spec,1.8,1.9 Message-ID: <200507072236.j67Ma948008964@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-3 Modified Files: scribus.spec Log Message: Bumping release for FC-3 build Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-3/scribus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scribus.spec 9 Feb 2005 01:54:43 -0000 1.8 +++ scribus.spec 7 Jul 2005 22:36:07 -0000 1.9 @@ -1,14 +1,15 @@ Name: scribus -Version: 1.2.1 -Release: 3 +Version: 1.2.2.1 +Release: 2%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2 Source1: scribus.xml -Patch0: scribus-x86_64.patch +Source2: scribus.desktop +#Patch0: scribus-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel @@ -21,24 +22,42 @@ BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: openssl-devel -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 2.3 BuildRequires: qt-devel >= 1:3.3 BuildRequires: zlib-devel +BuildRequires: freetype-devel Requires: ghostscript >= 7.07 -Requires: python >= 2.2 +Requires: python >= 2.3 Requires: tkinter Requires(post): shared-mime-info Requires(post): desktop-file-utils Requires(postun): shared-mime-info Requires(postun): desktop-file-utils -Obsoletes: scribus-i18n-en - +Obsoletes: scribus-i18n-en +Obsoletes: scribus-svg +Obsoletes: scribus-scripting +Obsoletes: scribus-short-words +Obsoletes: scribus-vnla +Obsoletes: scribus-i18en +Obsoletes: scribus-i18de +Obsoletes: scribus-i18fr +Obsoletes: scribus-templates + +Provides: scribus-i18n-en +Provides: scribus-svg +Provides: scribus-scripting +Provides: scribus-short-words +Provides: scribus-vnla +Provides: scribus-i18en +Provides: scribus-i18de +Provides: scribus-i18fr +Provides: scribus-templates %description -Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???, -QuarkXPress??? or Adobe?? InDesign???, except that it is published under the -GNU GPL. +Scribus is an desktop open source page layout program with +the aim of producing commercial grade output in PDF and +Postscript, primarily, though not exclusively for Linux. While the goals of the program are for ease of use and simple easy to understand tools, Scribus offers support for professional publishing @@ -47,17 +66,17 @@ %package devel -Summary: Header files for Scribus. +Summary: Header files for Scribus Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Header files for Scribus. +Header files for Scribus %prep %setup -q -%patch -p1 -b .x86_64 +#%patch -p1 -b .x86_64 %build @@ -116,6 +135,22 @@ %changelog +* Thu Jul 7 2005 Tom "spot" Callaway 1.2.2.1-2 +- use dist tag for sanity between branches + +* Tue Jul 5 2005 P Linnell - 1.2.2.1-1 +- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs + +* Sun Jul 3 2005 P Linnell - 1.2.2-0.fc4 +- 1.2.2 final + +* Tue Jun 28 2005 P Linnell - 1.2.2cvs-0 +- test build for 1.2.2cvs +- Add freetype2 explicit build requirement +- Add obsoletes. See PACKAGING in the source tarball +- Change the description per PACKAGING +- Bump required python. 2.2 is no longer supported. + * Sun Feb 06 2005 Phillip Compton - 1.2.1-3 - Bumped BR on qt-devel to 3.3. From fedora-extras-commits at redhat.com Thu Jul 7 22:36:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:36:51 -0400 Subject: rpms/scribus/FC-3 sources,1.5,1.6 Message-ID: <200507072236.j67MapZT008997@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8976/FC-3 Modified Files: sources Log Message: New sources. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2005 19:29:45 -0000 1.5 +++ sources 7 Jul 2005 22:36:49 -0000 1.6 @@ -1 +1,2 @@ 002cb629e817722f4123df7a41fc824b scribus-1.2.1.tar.bz2 +8c2eac0a358b04c39252586d9d85ab24 scribus-1.2.2.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 7 22:37:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:37:16 -0400 Subject: common tobuild,1.1839,1.1840 Message-ID: <200507072237.j67MbGXx009059@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9042 Modified Files: tobuild Log Message: request build of rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1839 retrieving revision 1.1840 diff -u -r1.1839 -r1.1840 --- tobuild 7 Jul 2005 21:42:46 -0000 1.1839 +++ tobuild 7 Jul 2005 22:37:14 -0000 1.1840 @@ -14,3 +14,4 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 +spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 22:37:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:37:36 -0400 Subject: common tobuild,1.1840,1.1841 Message-ID: <200507072237.j67Mbamu009121@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9104 Modified Files: tobuild Log Message: request build of rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1840 retrieving revision 1.1841 diff -u -r1.1840 -r1.1841 --- tobuild 7 Jul 2005 22:37:14 -0000 1.1840 +++ tobuild 7 Jul 2005 22:37:34 -0000 1.1841 @@ -15,3 +15,4 @@ mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 +spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 23:02:43 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 19:02:43 -0400 Subject: rpms/libifp/devel libifp.hotplug, NONE, 1.1 libifp.usermap, NONE, 1.1 libifp.spec, 1.2, 1.3 Message-ID: <200507072302.j67N2hBN010513@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/devel Modified Files: libifp.spec Added Files: libifp.hotplug libifp.usermap Log Message: Added Per Bjornsson's hotplug files --- NEW FILE libifp.hotplug --- #!/bin/bash # # /etc/hotplug/usb/libifp # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, # but it's ugly to depend on a camera driver in order to talk # to an audio player... # # Sets up newly plugged-in iRiver iFP device so that the user who owns # the console according to pam_console can access it from user space # # Note that for this script to work, you'll need all of the following: # a) a line in the file /etc/hotplug/usb/libifp.usermap that corresponds # to the iFP device you are using. # b) a setup using pam_console creates the respective lock files # containing the name of the respective user. You can check for that # by executing "echo `cat /var/{run,lock}/console.lock`" and # verifying the appropriate user is mentioned somewhere there. # c) a Linux kernel supporting hotplug and usbdevfs # d) the hotplug package (http://linux-hotplug.sourceforge.net/) # # All of the above are expected to be true on recent Red Hat and Fedora # distributions in the default install. # # In the usermap file, the first field "usb module" should be named # "libifp" like this script. # if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # New code, using lock files instead of copying /dev/console permissions # This also works with non-gdm logins (e.g. on a virtual terminal) # Idea and code from Nalin Dahyabhai if [ -f /var/run/console/console.lock ] then CONSOLEOWNER=`cat /var/run/console/console.lock` elif [ -f /var/lock/console.lock ] then CONSOLEOWNER=`cat /var/lock/console.lock` else CONSOLEOWNER= fi if [ -n "$CONSOLEOWNER" ] then chmod 0000 "${DEVICE}" chown "$CONSOLEOWNER" "${DEVICE}" chmod 0600 "${DEVICE}" fi fi --- NEW FILE libifp.usermap --- # This file is shipped with libifp (based on a similar file in # the libsane package as shipped by Red Hat). # # The entries below are used to detect an iRiver iFP portable music # player when it is plugged in and then run the libifp hotplug script to # change the ownership and permissions on the "device node" used by # libusb. # # The 0x0003 match flag means the device is matched by its vendor and # product IDs. # # Sample entry (replace 0xVVVV and 0xPPPP with vendor ID and product ID respectively) : # libifp 0x0003 0xVVVV 0xPPPP 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # # usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info # # # The following list already contains the known iRiver iFP devices, with the # product IDs copied from the header file for libifp. # If it doesn't work for yours, try adding an appropriate entry. # iRiver iFP-1XX libifp 0x0003 0x4102 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-3XX libifp 0x0003 0x4102 0x1003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-5XX libifp 0x0003 0x4102 0x1005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-7XX libifp 0x0003 0x4102 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-8XX libifp 0x0003 0x4102 0x1008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-9XX libifp 0x0003 0x4102 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-10XX libifp 0x0003 0x4102 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver N10 libifp 0x0003 0x4102 0x1011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 +++ libifp.spec 7 Jul 2005 23:02:41 -0000 1.3 @@ -7,6 +7,8 @@ License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz +Source1: libifp.hotplug +Source2: libifp.usermap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -37,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +53,7 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* +%{_sysconfdir}/hotplug/usb/* %files devel %defattr(-,root,root,-) @@ -58,5 +63,8 @@ %{_mandir}/man3/* %changelog +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release From fedora-extras-commits at redhat.com Thu Jul 7 23:02:36 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 19:02:36 -0400 Subject: rpms/libifp/FC-3 libifp.hotplug, NONE, 1.1 libifp.usermap, NONE, 1.1 libifp.spec, 1.2, 1.3 Message-ID: <200507072302.j67N2aE6010478@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/FC-3 Modified Files: libifp.spec Added Files: libifp.hotplug libifp.usermap Log Message: Added Per Bjornsson's hotplug files --- NEW FILE libifp.hotplug --- #!/bin/bash # # /etc/hotplug/usb/libifp # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, # but it's ugly to depend on a camera driver in order to talk # to an audio player... # # Sets up newly plugged-in iRiver iFP device so that the user who owns # the console according to pam_console can access it from user space # # Note that for this script to work, you'll need all of the following: # a) a line in the file /etc/hotplug/usb/libifp.usermap that corresponds # to the iFP device you are using. # b) a setup using pam_console creates the respective lock files # containing the name of the respective user. You can check for that # by executing "echo `cat /var/{run,lock}/console.lock`" and # verifying the appropriate user is mentioned somewhere there. # c) a Linux kernel supporting hotplug and usbdevfs # d) the hotplug package (http://linux-hotplug.sourceforge.net/) # # All of the above are expected to be true on recent Red Hat and Fedora # distributions in the default install. # # In the usermap file, the first field "usb module" should be named # "libifp" like this script. # if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # New code, using lock files instead of copying /dev/console permissions # This also works with non-gdm logins (e.g. on a virtual terminal) # Idea and code from Nalin Dahyabhai if [ -f /var/run/console/console.lock ] then CONSOLEOWNER=`cat /var/run/console/console.lock` elif [ -f /var/lock/console.lock ] then CONSOLEOWNER=`cat /var/lock/console.lock` else CONSOLEOWNER= fi if [ -n "$CONSOLEOWNER" ] then chmod 0000 "${DEVICE}" chown "$CONSOLEOWNER" "${DEVICE}" chmod 0600 "${DEVICE}" fi fi --- NEW FILE libifp.usermap --- # This file is shipped with libifp (based on a similar file in # the libsane package as shipped by Red Hat). # # The entries below are used to detect an iRiver iFP portable music # player when it is plugged in and then run the libifp hotplug script to # change the ownership and permissions on the "device node" used by # libusb. # # The 0x0003 match flag means the device is matched by its vendor and # product IDs. # # Sample entry (replace 0xVVVV and 0xPPPP with vendor ID and product ID respectively) : # libifp 0x0003 0xVVVV 0xPPPP 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # # usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info # # # The following list already contains the known iRiver iFP devices, with the # product IDs copied from the header file for libifp. # If it doesn't work for yours, try adding an appropriate entry. # iRiver iFP-1XX libifp 0x0003 0x4102 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-3XX libifp 0x0003 0x4102 0x1003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-5XX libifp 0x0003 0x4102 0x1005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-7XX libifp 0x0003 0x4102 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-8XX libifp 0x0003 0x4102 0x1008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-9XX libifp 0x0003 0x4102 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-10XX libifp 0x0003 0x4102 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver N10 libifp 0x0003 0x4102 0x1011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/FC-3/libifp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 +++ libifp.spec 7 Jul 2005 23:02:34 -0000 1.3 @@ -7,6 +7,8 @@ License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz +Source1: libifp.hotplug +Source2: libifp.usermap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -37,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +53,7 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* +%{_sysconfdir}/hotplug/usb/* %files devel %defattr(-,root,root,-) @@ -58,5 +63,8 @@ %{_mandir}/man3/* %changelog +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release From fedora-extras-commits at redhat.com Thu Jul 7 23:02:41 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 19:02:41 -0400 Subject: rpms/libifp/FC-4 libifp.hotplug, NONE, 1.1 libifp.usermap, NONE, 1.1 libifp.spec, 1.2, 1.3 Message-ID: <200507072303.j67N2fTa010505@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/FC-4 Modified Files: libifp.spec Added Files: libifp.hotplug libifp.usermap Log Message: Added Per Bjornsson's hotplug files --- NEW FILE libifp.hotplug --- #!/bin/bash # # /etc/hotplug/usb/libifp # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, # but it's ugly to depend on a camera driver in order to talk # to an audio player... # # Sets up newly plugged-in iRiver iFP device so that the user who owns # the console according to pam_console can access it from user space # # Note that for this script to work, you'll need all of the following: # a) a line in the file /etc/hotplug/usb/libifp.usermap that corresponds # to the iFP device you are using. # b) a setup using pam_console creates the respective lock files # containing the name of the respective user. You can check for that # by executing "echo `cat /var/{run,lock}/console.lock`" and # verifying the appropriate user is mentioned somewhere there. # c) a Linux kernel supporting hotplug and usbdevfs # d) the hotplug package (http://linux-hotplug.sourceforge.net/) # # All of the above are expected to be true on recent Red Hat and Fedora # distributions in the default install. # # In the usermap file, the first field "usb module" should be named # "libifp" like this script. # if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # New code, using lock files instead of copying /dev/console permissions # This also works with non-gdm logins (e.g. on a virtual terminal) # Idea and code from Nalin Dahyabhai if [ -f /var/run/console/console.lock ] then CONSOLEOWNER=`cat /var/run/console/console.lock` elif [ -f /var/lock/console.lock ] then CONSOLEOWNER=`cat /var/lock/console.lock` else CONSOLEOWNER= fi if [ -n "$CONSOLEOWNER" ] then chmod 0000 "${DEVICE}" chown "$CONSOLEOWNER" "${DEVICE}" chmod 0600 "${DEVICE}" fi fi --- NEW FILE libifp.usermap --- # This file is shipped with libifp (based on a similar file in # the libsane package as shipped by Red Hat). # # The entries below are used to detect an iRiver iFP portable music # player when it is plugged in and then run the libifp hotplug script to # change the ownership and permissions on the "device node" used by # libusb. # # The 0x0003 match flag means the device is matched by its vendor and # product IDs. # # Sample entry (replace 0xVVVV and 0xPPPP with vendor ID and product ID respectively) : # libifp 0x0003 0xVVVV 0xPPPP 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # # usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info # # # The following list already contains the known iRiver iFP devices, with the # product IDs copied from the header file for libifp. # If it doesn't work for yours, try adding an appropriate entry. # iRiver iFP-1XX libifp 0x0003 0x4102 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-3XX libifp 0x0003 0x4102 0x1003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-5XX libifp 0x0003 0x4102 0x1005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-7XX libifp 0x0003 0x4102 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-8XX libifp 0x0003 0x4102 0x1008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-9XX libifp 0x0003 0x4102 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-10XX libifp 0x0003 0x4102 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver N10 libifp 0x0003 0x4102 0x1011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/FC-4/libifp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 +++ libifp.spec 7 Jul 2005 23:02:39 -0000 1.3 @@ -7,6 +7,8 @@ License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz +Source1: libifp.hotplug +Source2: libifp.usermap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -37,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +53,7 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* +%{_sysconfdir}/hotplug/usb/* %files devel %defattr(-,root,root,-) @@ -58,5 +63,8 @@ %{_mandir}/man3/* %changelog +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release From ed at eh3.com Fri Jul 8 01:40:12 2005 From: ed at eh3.com (Ed Hill) Date: Thu, 07 Jul 2005 21:40:12 -0400 Subject: APPROVED: opendap Message-ID: <1120786813.18460.76.camel@ernie> OPeNDAP is suite of client and server tools and libs generally used for distributing scientific data sets such as satellite observations. Description : OPeNDAP provides software which makes local data accessible to remote locations regardless of local storage format. OPeNDAP also provides tools for transforming existing applications into OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data). OPeNDAP software is freely available. Maintainer: Tom 'Spot' Callaway Reviewers: Ed Hill, Michael Schwendt [1] [1] https://www.redhat.com/archives/fedora-extras-list/2005- April/msg00690.html -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Fri Jul 8 01:50:31 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 7 Jul 2005 21:50:31 -0400 Subject: rpms/mlmmj/devel mlmmj.spec,1.12,1.13 Message-ID: <200507080150.j681oVY8013153@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mlmmj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13136 Modified Files: mlmmj.spec Log Message: - Bump Index: mlmmj.spec =================================================================== RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mlmmj.spec 21 Jun 2005 01:18:32 -0000 1.12 +++ mlmmj.spec 8 Jul 2005 01:50:29 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Mailserver-independent ezmlm-like mailing list manager Name: mlmmj Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/Internet Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2 @@ -48,6 +48,9 @@ %{_mandir}/man1/mlmmj-* %changelog +* Fri Jul 8 2005 Michael Fleming 1.2.8-2 +- Bump & rebuild + * Tue Jun 21 2005 Michael Fleming 1.2.8-1 - New upstream release From fedora-extras-commits at redhat.com Fri Jul 8 01:51:13 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 7 Jul 2005 21:51:13 -0400 Subject: common tobuild,1.1841,1.1842 Message-ID: <200507080151.j681pDhd013217@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13200 Modified Files: tobuild Log Message: request build of rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1841 retrieving revision 1.1842 diff -u -r1.1841 -r1.1842 --- tobuild 7 Jul 2005 22:37:34 -0000 1.1841 +++ tobuild 8 Jul 2005 01:51:09 -0000 1.1842 @@ -16,3 +16,4 @@ mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 +mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 03:28:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 23:28:21 -0400 Subject: extras-buildsys Makefile,1.5,1.6 Message-ID: <200507080328.j683SLJ8015616@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15599 Modified Files: Makefile Log Message: >From ignacio vazquez: Add distclean and rpm targets Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 28 Jun 2005 01:41:21 -0000 1.5 +++ Makefile 8 Jul 2005 03:28:19 -0000 1.6 @@ -11,6 +11,10 @@ clean: for d in $(SUBDIRS); do make -C $$d clean ; done +distclean: clean + rm -rf dist build + rm -f *.tar.bz2 + subdirs: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done @@ -36,3 +40,7 @@ @rm -rf /tmp/${PKGNAME}-$(VERSION) @echo "The archive is in ${PKGNAME}-$(VERSION).tar.bz2" +rpm: archive + rm -rf build dist + mkdir build dist + rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba $(PKGNAME).spec From fedora-extras-commits at redhat.com Fri Jul 8 04:13:34 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:13:34 -0400 Subject: rpms/glabels/devel glabels.spec,1.1,1.2 Message-ID: <200507080413.j684DYcx016804@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16787 Modified Files: glabels.spec Log Message: small spec file change Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/glabels.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glabels.spec 6 Jul 2005 14:35:20 -0000 1.1 +++ glabels.spec 8 Jul 2005 04:13:32 -0000 1.2 @@ -1,12 +1,12 @@ Name: glabels Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net -Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz +Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 @@ -99,5 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 +- use Source0 + * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build + From fedora-extras-commits at redhat.com Fri Jul 8 04:16:34 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:16:34 -0400 Subject: rpms/glabels/FC-4 glabels.spec,1.1,1.2 Message-ID: <200507080416.j684GYRt016830@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16813 Modified Files: glabels.spec Log Message: small spec file change Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/FC-4/glabels.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glabels.spec 6 Jul 2005 14:35:20 -0000 1.1 +++ glabels.spec 8 Jul 2005 04:16:32 -0000 1.2 @@ -1,12 +1,12 @@ Name: glabels Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net -Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz +Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 @@ -99,5 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 +- use Source0 + * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build + From fedora-extras-commits at redhat.com Fri Jul 8 04:17:26 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:17:26 -0400 Subject: rpms/glabels/FC-3 glabels.spec,1.1,1.2 Message-ID: <200507080417.j684HQ4S016858@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16841 Modified Files: glabels.spec Log Message: small spec file change Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/FC-3/glabels.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glabels.spec 6 Jul 2005 14:35:20 -0000 1.1 +++ glabels.spec 8 Jul 2005 04:17:24 -0000 1.2 @@ -1,12 +1,12 @@ Name: glabels Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net -Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz +Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 @@ -99,5 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 +- use Source0 + * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build + From fedora-extras-commits at redhat.com Fri Jul 8 04:20:43 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:20:43 -0400 Subject: common tobuild,1.1842,1.1843 Message-ID: <200507080420.j684KhkK016933@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16916 Modified Files: tobuild Log Message: request build of rpms/glabels/devel glabels-2_0_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1842 retrieving revision 1.1843 diff -u -r1.1842 -r1.1843 --- tobuild 8 Jul 2005 01:51:09 -0000 1.1842 +++ tobuild 8 Jul 2005 04:20:40 -0000 1.1843 @@ -17,3 +17,4 @@ spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel +jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel From rc040203 at freenet.de Fri Jul 8 04:33:11 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 08 Jul 2005 06:33:11 +0200 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 In-Reply-To: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> References: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> Message-ID: <1120797191.30532.313.camel@mccallum.corsepiu.local> On Thu, 2005-07-07 at 15:53 -0400, Shahms King wrote: > Author: shahms > Index: bazaar.spec > +# The stand alone annotate is meant to debug baz interals, not installation > +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html > +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then > + rm $RPM_BUILD_ROOT%{_bindir}/annotate > +fi Why so clumsy? rm -f $RPM_BUILD_ROOT%{_bindir}/annotate Ralf From fedora-extras-commits at redhat.com Fri Jul 8 04:41:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 00:41:15 -0400 Subject: extras-buildsys plague.spec,1.8,1.9 Message-ID: <200507080441.j684fFbY017000@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16983 Modified Files: plague.spec Log Message: Make it noarch Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- plague.spec 6 Jul 2005 21:20:49 -0000 1.8 +++ plague.spec 8 Jul 2005 04:41:13 -0000 1.9 @@ -1,5 +1,7 @@ %define pythonver 2.4 +BuildArch: noarch + Summary: Distributed build system for RPMs Name: plague Version: 0.1 From fedora-extras-commits at redhat.com Fri Jul 8 05:01:31 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 01:01:31 -0400 Subject: common tobuild,1.1843,1.1844 Message-ID: <200507080502.j6852Hkd018150@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18133 Modified Files: tobuild Log Message: request build of rpms/glabels/FC-4 glabels-2_0_3-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1843 retrieving revision 1.1844 diff -u -r1.1843 -r1.1844 --- tobuild 8 Jul 2005 04:20:40 -0000 1.1843 +++ tobuild 8 Jul 2005 05:01:29 -0000 1.1844 @@ -18,3 +18,4 @@ spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel +jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 From rc040203 at freenet.de Fri Jul 8 05:05:41 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 08 Jul 2005 07:05:41 +0200 Subject: APPROVED: perl-Period Message-ID: <1120799142.30532.328.camel@mccallum.corsepiu.local> %description perl-Period provides the Time::Period Perl module. This module can be used to work with periods of time. Maintainer: Chris Ricker Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Fri Jul 8 05:23:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Fri, 8 Jul 2005 01:23:37 -0400 Subject: rpms/proj import.log,1.6,1.7 Message-ID: <200507080524.j685O754018281@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18246 Modified Files: import.log Log Message: auto-import proj-4.4.9-1 on branch devel from proj-4.4.9-1.src.rpm Update to address review comments in bug 150013 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 7 Jul 2005 04:52:35 -0000 1.6 +++ import.log 8 Jul 2005 05:23:35 -0000 1.7 @@ -3,3 +3,4 @@ proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681 proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421 proj-4_4_9-0:HEAD:proj-4.4.9-0.src.rpm:1120711939 +proj-4_4_9-1:HEAD:proj-4.4.9-1.src.rpm:1120800198 From fedora-extras-commits at redhat.com Fri Jul 8 05:23:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Fri, 8 Jul 2005 01:23:37 -0400 Subject: rpms/proj/devel .cvsignore, 1.3, 1.4 pj_gridinfo.patch, 1.1, 1.2 proj.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507080524.j685O7Wb018290@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18246/devel Modified Files: .cvsignore pj_gridinfo.patch proj.spec sources Log Message: auto-import proj-4.4.9-1 on branch devel from proj-4.4.9-1.src.rpm Update to address review comments in bug 150013 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jul 2005 04:52:35 -0000 1.3 +++ .cvsignore 8 Jul 2005 05:23:35 -0000 1.4 @@ -1,2 +1,2 @@ -proj-nad27-1.1.tar.gz proj-4.4.9.tar.gz +proj-nad27-1.1.tar.gz pj_gridinfo.patch: Index: pj_gridinfo.patch =================================================================== RCS file: /cvs/extras/rpms/proj/devel/pj_gridinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pj_gridinfo.patch 7 Jul 2005 04:52:35 -0000 1.1 +++ pj_gridinfo.patch 8 Jul 2005 05:23:35 -0000 1.2 @@ -1,4 +1,19 @@ -493c493 -< "failed to find parent %8.8s for %.\n", ---- -> "failed to find parent %8.8s for %s\n", +*** src/pj_gridinfo.c 2004-10-29 21:03:03.000000000 -0700 +--- src/pj_gridinfo.c.new 2005-07-07 21:48:25.000000000 -0700 +*************** +*** 490,496 **** + { + if( getenv("PROJ_DEBUG") != NULL ) + fprintf( stderr, "pj_gridinfo_init_ntv2(): " +! "failed to find parent %8.8s for %.\n", + (const char *) header+24, gi->ct->id ); + + for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} +--- 490,496 ---- + { + if( getenv("PROJ_DEBUG") != NULL ) + fprintf( stderr, "pj_gridinfo_init_ntv2(): " +! "failed to find parent %8.8s for %s\n", + (const char *) header+24, gi->ct->id ); + + for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- proj.spec 7 Jul 2005 04:52:35 -0000 1.5 +++ proj.spec 8 Jul 2005 05:23:35 -0000 1.6 @@ -1,6 +1,6 @@ Name: proj Version: 4.4.9 -Release: 0 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -51,7 +51,7 @@ # Patch for Bug 150013 cp %{PATCH2} ./ -patch src/pj_gridinfo.c pj_gridinfo.patch +%patch2 -p0 -b .buildroot %build %configure @@ -64,7 +64,7 @@ install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name} %clean -#rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -93,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Thu Jul 7 2005 Shawn McCann - 4.4.9-1 +- Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source. + * Sun May 22 2005 Michael Schwendt - 4.4.8-6 - rebuilt @@ -125,4 +128,3 @@ - to comply with both Fedora and RedHat 9 packaging guidelines. - Split files into proj, proj-devel, and proj-nad (additional grids) - and adjusted the EXE path in the test scripts. - Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2005 04:52:35 -0000 1.3 +++ sources 8 Jul 2005 05:23:35 -0000 1.4 @@ -1,2 +1,2 @@ -66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz 3cc5c2407c213aadfd154c8df80efd6c proj-4.4.9.tar.gz +66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 05:49:54 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 8 Jul 2005 01:49:54 -0400 Subject: mock mock.py,1.20,1.21 Message-ID: <200507080549.j685nsr6018385@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18368 Modified Files: mock.py Log Message: remove references to mach-helper to fix 161828 Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mock.py 25 Jun 2005 19:00:52 -0000 1.20 +++ mock.py 8 Jul 2005 05:49:52 -0000 1.21 @@ -619,13 +619,13 @@ # defaults config_opts = {} - config_opts['basedir'] = '/var/lib/mach/roots/' # root name is automatically added to this - config_opts['chroot'] = '/usr/sbin/mach-helper chroot' - config_opts['mount'] = '/usr/sbin/mach-helper mount' - config_opts['umount'] = '/usr/sbin/mach-helper umount' - config_opts['rm'] = '/usr/sbin/mach-helper rm' - config_opts['mknod'] = '/usr/sbin/mach-helper mknod' - config_opts['yum'] = '/usr/sbin/mach-helper yum' + config_opts['basedir'] = '/var/lib/mock/' # root name is automatically added to this + config_opts['chroot'] = '/usr/sbin/mock-helper chroot' + config_opts['mount'] = '/usr/sbin/mock-helper mount' + config_opts['umount'] = '/usr/sbin/mock-helper umount' + config_opts['rm'] = '/usr/sbin/mock-helper rm' + config_opts['mknod'] = '/usr/sbin/mock-helper mknod' + config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/sbin/runuser' config_opts['buildgroup'] = 'build' config_opts['chrootuser'] = 'mockbuild' From fedora-extras-commits at redhat.com Fri Jul 8 06:39:23 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 8 Jul 2005 02:39:23 -0400 Subject: common tobuild,1.1844,1.1845 Message-ID: <200507080639.j686dN8O020502@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20484 Modified Files: tobuild Log Message: request build of rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1844 retrieving revision 1.1845 diff -u -r1.1844 -r1.1845 --- tobuild 8 Jul 2005 05:01:29 -0000 1.1844 +++ tobuild 8 Jul 2005 06:39:21 -0000 1.1845 @@ -19,3 +19,4 @@ mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 +sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel From fedora-extras-commits at redhat.com Fri Jul 8 06:39:50 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 8 Jul 2005 02:39:50 -0400 Subject: common tobuild,1.1845,1.1846 Message-ID: <200507080639.j686dobw020537@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20520 Modified Files: tobuild Log Message: request build of rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1845 retrieving revision 1.1846 diff -u -r1.1845 -r1.1846 --- tobuild 8 Jul 2005 06:39:21 -0000 1.1845 +++ tobuild 8 Jul 2005 06:39:48 -0000 1.1846 @@ -20,3 +20,4 @@ jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel +sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 06:40:14 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 8 Jul 2005 02:40:14 -0400 Subject: common tobuild,1.1846,1.1847 Message-ID: <200507080640.j686eEra020570@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20553 Modified Files: tobuild Log Message: request build of rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1846 retrieving revision 1.1847 diff -u -r1.1846 -r1.1847 --- tobuild 8 Jul 2005 06:39:48 -0000 1.1846 +++ tobuild 8 Jul 2005 06:40:12 -0000 1.1847 @@ -21,3 +21,4 @@ jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 +sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 From oliver at linux-kernel.at Fri Jul 8 07:01:02 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 09:01:02 +0200 Subject: APPROVED: icmpdn Message-ID: <42CE24AE.7000903@linux-kernel.at> icmpdn: ICMP host name utilities icmpdn is an implementation of the RFC 1788 ICMP domain name facilities for Linux. It includes icmpdnd, a daemon which responds to ICMP domain name requests from other hosts, idnlookup, which requests the domain name of another host, and nss_icmp, which is a nameswitch module for doing reverse hostname lookups via idnlookup. Maintainer: Fredrik Tolf Reviewer: Oliver Falk From fedora-extras-commits at redhat.com Fri Jul 8 07:21:56 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:21:56 -0400 Subject: rpms/libstatgrab - New directory Message-ID: <200507080721.j687Lu5M021859@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835/libstatgrab Log Message: Directory /cvs/extras/rpms/libstatgrab added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 07:21:57 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:21:57 -0400 Subject: rpms/libstatgrab/devel - New directory Message-ID: <200507080721.j687Lvol021864@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835/libstatgrab/devel Log Message: Directory /cvs/extras/rpms/libstatgrab/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 07:22:10 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:10 -0400 Subject: rpms/libstatgrab Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507080722.j687MAnX021911@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21880 Added Files: Makefile import.log Log Message: Setup of module libstatgrab --- NEW FILE Makefile --- # Top level Makefile for module libstatgrab all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 07:22:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:11 -0400 Subject: rpms/libstatgrab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507080722.j687MBWa021916@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21880/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libstatgrab --- NEW 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 Jul 8 07:22:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:43 -0400 Subject: rpms/libstatgrab import.log,1.1,1.2 Message-ID: <200507080722.j687MhFI021986@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21949 Modified Files: import.log Log Message: auto-import libstatgrab-0.11.1-3 on branch devel from libstatgrab-0.11.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 07:22:08 -0000 1.1 +++ import.log 8 Jul 2005 07:22:41 -0000 1.2 @@ -0,0 +1 @@ +libstatgrab-0_11_1-3:HEAD:libstatgrab-0.11.1-3.src.rpm:1120807354 From fedora-extras-commits at redhat.com Fri Jul 8 07:22:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:44 -0400 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21949/devel Modified Files: .cvsignore sources Added Files: libstatgrab.nochmod.patch libstatgrab.spec Log Message: auto-import libstatgrab-0.11.1-3 on branch devel from libstatgrab-0.11.1-3.src.rpm libstatgrab.nochmod.patch: --- NEW FILE libstatgrab.nochmod.patch --- --- src/statgrab/Makefile.am.old 2005-02-04 19:45:16.384407326 +0100 +++ src/statgrab/Makefile.am 2005-02-04 19:45:23.292225787 +0100 @@ -19,12 +19,12 @@ if STATGRAB if SETGIDBINS # Some operating systems need the binary to be setgid kmem - chgrp kmem $(DESTDIR)@bindir@/statgrab - chmod g+s $(DESTDIR)@bindir@/statgrab + chgrp kmem $(DESTDIR)@bindir@/statgrab || true + chmod g+s $(DESTDIR)@bindir@/statgrab || true endif if SETUIDBINS # Some operating systems need the binary to be setuid root - chown root $(DESTDIR)@bindir@/statgrab + chown root $(DESTDIR)@bindir@/statgrab || true chmod u+s $(DESTDIR)@bindir@/statgrab endif endif --- src/statgrab/Makefile.in.old 2005-02-04 19:56:55.352716673 +0100 +++ src/statgrab/Makefile.in 2005-02-04 19:57:31.010601483 +0100 @@ -507,10 +507,10 @@ install-exec-local: # Some operating systems need the binary to be setgid kmem - at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab - at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab + at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab || true + at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab || true # Some operating systems need the binary to be setuid root - at SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab + at SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab || true @SETUIDBINS_TRUE@@STATGRAB_TRUE@ chmod u+s $(DESTDIR)@bindir@/statgrab # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- src/saidar/Makefile.in.old 2005-02-04 20:34:08.108193091 +0100 +++ src/saidar/Makefile.in 2005-02-04 20:34:34.550848428 +0100 @@ -474,11 +474,11 @@ install-exec-local: # Some operating systems need the binary to be setgid kmem - at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar - at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar + at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar || true + at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar || true # Some operating systems need the binary to be setuid root - at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar - at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar + at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar || true + at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar || true # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE libstatgrab.spec --- %define shortname statgrab Summary: Make system statistics Name: libstatgrab Version: 0.11.1 Release: 3%{?dist} Source0: ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}.nochmod.patch License: LGPL Group: System Environment/Libraries URL: http://www.i-scream.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool ncurses-devel %description Libstatgrab is a library that provides cross platform access to statistics about the system on which it's run. It's written in C and presents a selection of useful interfaces which can be used to access key system statistics. The current list of statistics includes CPU usage, memory utilisation, disk usage, process counts, network traffic, disk I/O, and more. The current list of platforms is Solaris 2.x, Linux, and FreeBSD 4.x/5.x. The aim is to extend this to include as many operating systems as possible. The package also includes a couple of useful tools. The first, saidar, provides a curses-based interface to viewing the current state of the system. The second, statgrab, gives a sysctl-style interface to the statistics gathered by libstatgrab. This extends the use of libstatgrab to people writing scripts or anything else that can't easily make C function calls. Included with statgrab is a script to generate an MRTG configuration file to use statgrab. %package -n %{shortname}-tools Summary: Tools from %{name} to monitoring the system Group: Applications/System %description -n %{shortname}-tools This package contains a few tools shiped with libstatgrab. Eg. A tool called saidar, which shows various system information like top, but - of course - OTHER informations. %package devel Summary: The development files from %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains header files and man pages for those use to develop libstatgrab based applications. %package examples Summary: The example files from %{name} Group: Development/Tools Requires: %{name} = %{version}-%{release} %description examples This package contains various examples used to show how to develop libstatgrab based applications. %prep %setup -q %patch0 -p0 %build %configure --with-ncurses make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT cd examples/.libs install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \ network_traffic os_info page_stats process_snapshot \ process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir} chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -n %shortname-tools %defattr(-,root,root) %doc COPYING %{_bindir}/saidar %{_bindir}/statgrab %{_bindir}/statgrab-make-mrtg-config %{_bindir}/statgrab-make-mrtg-index %{_mandir}/*/statgrab* %files %defattr(-,root,root) %doc AUTHORS INSTALL README ChangeLog NEWS COPYING.LGPL examples/*.c %{_libdir}/*.so.* %files devel %defattr(-,root,root) %{_libdir}/*.so %{_libdir}/*.a %{_libdir}/*.la %{_includedir}/*.h %{_libdir}/pkgconfig/%name.pc %{_mandir}/*/sg_* %files examples %defattr(-,root,root) %{_bindir}/cpu_usage %{_bindir}/disk_traffic %{_bindir}/load_stats %{_bindir}/network_iface_stats %{_bindir}/network_traffic %{_bindir}/os_info %{_bindir}/page_stats %{_bindir}/process_snapshot %{_bindir}/process_stats %{_bindir}/user_list %{_bindir}/vm_stats %changelog * Fri Jul 08 2005 Oliver Falk - 0.11.1-3 - Included examples/*.c in doc * Wed Jul 6 2005 Tom "spot" Callaway 0.11.1-2 - a lot of fixes for Fedora Extras * Thu May 19 2005 Oliver Falk - 0.11.1-1.1 - Specfile cleanup * Sun Apr 03 2005 Oliver Falk - 0.11.1-1 - Update * Fri Mar 25 2005 Oliver Falk - 0.11-2.1 - Fix rpmlint warnings * Tue Feb 15 2005 Oliver Falk - 0.11-2 - Don't require coreutils. They are normally installed on Fedora, but not available on RH 8, where the tools are usually also installed. Yes, rebuilding with nodeps would also do it, but it's not fine... * Tue Feb 15 2005 Oliver Falk - 0.11-1 - Initial build for Fedora Core Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 07:22:08 -0000 1.1 +++ .cvsignore 8 Jul 2005 07:22:42 -0000 1.2 @@ -0,0 +1 @@ +libstatgrab-0.11.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 07:22:08 -0000 1.1 +++ sources 8 Jul 2005 07:22:42 -0000 1.2 @@ -0,0 +1 @@ +6d1e6980c39e505082e1c98c9fe81950 libstatgrab-0.11.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 07:24:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:24:11 -0400 Subject: common tobuild,1.1847,1.1848 Message-ID: <200507080724.j687OBVF022088@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22071 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1847 retrieving revision 1.1848 diff -u -r1.1847 -r1.1848 --- tobuild 8 Jul 2005 06:40:12 -0000 1.1847 +++ tobuild 8 Jul 2005 07:24:09 -0000 1.1848 @@ -22,3 +22,4 @@ sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 +oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel From rc040203 at freenet.de Fri Jul 8 07:42:30 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 08 Jul 2005 09:42:30 +0200 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> References: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> Message-ID: <1120808550.30532.348.camel@mccallum.corsepiu.local> On Fri, 2005-07-08 at 03:22 -0400, Oliver Falk wrote: > Author: oliver > cd examples/.libs > install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \ > network_traffic os_info page_stats process_snapshot \ > process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir} > chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config > chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar > chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab > %files examples > %defattr(-,root,root) > %{_bindir}/cpu_usage > %{_bindir}/disk_traffic > %{_bindir}/load_stats > %{_bindir}/network_iface_stats > %{_bindir}/network_traffic > %{_bindir}/os_info > %{_bindir}/page_stats > %{_bindir}/process_snapshot > %{_bindir}/process_stats > %{_bindir}/user_list > %{_bindir}/vm_stats I am not going veto against this package, but please c.f. https://www.redhat.com/archives/fedora-packaging/2005-July/msg00088.html Ralf From fedora-extras-commits at redhat.com Fri Jul 8 07:59:01 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 03:59:01 -0400 Subject: rpms/most/FC-4 .cvsignore, 1.3, 1.4 most.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507080759.j687x1OL022202@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22181 Modified Files: .cvsignore most.spec sources Log Message: * Thu Jul 07 2005 Adrian Reber - 4.10.2-1 - updated to 4.10.2 (fixes search aborting bug) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jul 2005 15:42:03 -0000 1.3 +++ .cvsignore 8 Jul 2005 07:58:59 -0000 1.4 @@ -1 +1 @@ -most-4.10.1.tar.bz2 +most-4.10.2.tar.gz Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/most.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- most.spec 5 Jul 2005 15:42:03 -0000 1.7 +++ most.spec 8 Jul 2005 07:58:59 -0000 1.8 @@ -1,11 +1,11 @@ Summary: more, less, most Name: most -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -43,6 +43,9 @@ %changelog +* Thu Jul 07 2005 Adrian Reber - 4.10.2-1 +- updated to 4.10.2 (fixes search aborting bug) + * Fri Jul 01 2005 Adrian Reber - 4.10.1-1 - updated to 4.10.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jul 2005 15:42:03 -0000 1.3 +++ sources 8 Jul 2005 07:58:59 -0000 1.4 @@ -1 +1 @@ -9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 +16f7a67a969e0ce9a941c0e6c1ff0470 most-4.10.2.tar.gz From oliver at linux-kernel.at Fri Jul 8 08:08:39 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 10:08:39 +0200 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1120808550.30532.348.camel@mccallum.corsepiu.local> References: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> <1120808550.30532.348.camel@mccallum.corsepiu.local> Message-ID: <42CE3487.4030601@linux-kernel.at> On 07/08/2005 09:42 AM, Ralf Corsepius wrote: > On Fri, 2005-07-08 at 03:22 -0400, Oliver Falk wrote: > >>Author: oliver > > >>cd examples/.libs >>install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \ >> network_traffic os_info page_stats process_snapshot \ >> process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir} >>chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config >>chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar >>chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab > > >>%files examples >>%defattr(-,root,root) >>%{_bindir}/cpu_usage >>%{_bindir}/disk_traffic >>%{_bindir}/load_stats >>%{_bindir}/network_iface_stats >>%{_bindir}/network_traffic >>%{_bindir}/os_info >>%{_bindir}/page_stats >>%{_bindir}/process_snapshot >>%{_bindir}/process_stats >>%{_bindir}/user_list >>%{_bindir}/vm_stats > > > I am not going veto against this package, but please c.f. > https://www.redhat.com/archives/fedora-packaging/2005-July/msg00088.html Spot allready move them into the %doc section... Best, Oliver From oliver at linux-kernel.at Fri Jul 8 08:11:01 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 10:11:01 +0200 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <42CE3487.4030601@linux-kernel.at> References: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> <1120808550.30532.348.camel@mccallum.corsepiu.local> <42CE3487.4030601@linux-kernel.at> Message-ID: <42CE3515.2010508@linux-kernel.at> On 07/08/2005 10:08 AM, Oliver Falk wrote: > On 07/08/2005 09:42 AM, Ralf Corsepius wrote: >> On Fri, 2005-07-08 at 03:22 -0400, Oliver Falk wrote: [ ... ] >> I am not going veto against this package, but please c.f. >> https://www.redhat.com/archives/fedora-packaging/2005-July/msg00088.html > > Spot allready move them into the %doc section... Oops, sorry, my mistake. He didn't. But actually the examples-package is a subpackage, that the user can uninstall if he doesn't need it, so it should be OK - I believe. If you have better ideas, feel free to patch it. :-) Best, Oliver From fedora-extras-commits at redhat.com Fri Jul 8 08:16:40 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 04:16:40 -0400 Subject: common tobuild,1.1848,1.1849 Message-ID: <200507080816.j688Gepn023930@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23910 Modified Files: tobuild Log Message: request build of rpms/most/FC-4 most-4_10_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1848 retrieving revision 1.1849 diff -u -r1.1848 -r1.1849 --- tobuild 8 Jul 2005 07:24:09 -0000 1.1848 +++ tobuild 8 Jul 2005 08:16:38 -0000 1.1849 @@ -23,3 +23,4 @@ sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel +adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 08:44:07 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 04:44:07 -0400 Subject: rpms/most/FC-3 .cvsignore, 1.3, 1.4 most.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507080844.j688i7io023994@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23973 Modified Files: .cvsignore most.spec sources Log Message: * Thu Jul 07 2005 Adrian Reber - 4.10.2-1 - updated to 4.10.2 (fixes search aborting bug) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Jul 2005 06:08:02 -0000 1.3 +++ .cvsignore 8 Jul 2005 08:44:05 -0000 1.4 @@ -1 +1 @@ -most-4.10.1.tar.bz2 +most-4.10.2.tar.gz Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/most.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- most.spec 6 Jul 2005 06:08:02 -0000 1.5 +++ most.spec 8 Jul 2005 08:44:05 -0000 1.6 @@ -1,11 +1,11 @@ Summary: more, less, most Name: most -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -43,6 +43,9 @@ %changelog +* Thu Jul 07 2005 Adrian Reber - 4.10.2-1 +- updated to 4.10.2 (fixes search aborting bug) + * Fri Jul 01 2005 Adrian Reber - 4.10.1-1 - updated to 4.10.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Jul 2005 06:08:02 -0000 1.3 +++ sources 8 Jul 2005 08:44:05 -0000 1.4 @@ -1 +1 @@ -9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 +16f7a67a969e0ce9a941c0e6c1ff0470 most-4.10.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 08:44:40 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 04:44:40 -0400 Subject: common tobuild,1.1849,1.1850 Message-ID: <200507080844.j688ievT024056@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24038 Modified Files: tobuild Log Message: request build of rpms/most/FC-3 most-4_10_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1849 retrieving revision 1.1850 diff -u -r1.1849 -r1.1850 --- tobuild 8 Jul 2005 08:16:38 -0000 1.1849 +++ tobuild 8 Jul 2005 08:44:38 -0000 1.1850 @@ -24,3 +24,4 @@ sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 +adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 10:07:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:07:52 -0400 Subject: devel/wesnoth .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wesnoth.spec, 1.11, 1.12 Message-ID: <200507081008.j68A8MmH026436@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/wesnoth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/wesnoth/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Jun 2005 01:17:19 -0000 1.4 +++ .cvsignore 8 Jul 2005 10:07:50 -0000 1.5 @@ -1 +1 @@ -wesnoth-0.9.2.tar.gz +wesnoth-0.9.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/devel/wesnoth/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jun 2005 01:17:19 -0000 1.4 +++ sources 8 Jul 2005 10:07:50 -0000 1.5 @@ -1 +1 @@ -0158b7733373b1a25ed1da6bf1d32899 wesnoth-0.9.2.tar.gz +833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/devel/wesnoth/wesnoth.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- wesnoth.spec 27 Jun 2005 22:24:48 -0000 1.11 +++ wesnoth.spec 8 Jul 2005 10:07:50 -0000 1.12 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -50,8 +50,6 @@ %prep %setup -q cp %{SOURCE3} . -# in 0.9.2: the translations are not built -find po -name stamp-po | xargs rm -f %build @@ -146,6 +144,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 +- update to 0.9.3 + * Mon Jun 13 2005 Michael Schwendt - 0.9.2-1 - update to 0.9.2 - BR libpng-devel is needed From fedora-extras-commits at redhat.com Fri Jul 8 10:13:22 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:13:22 -0400 Subject: common tobuild,1.1850,1.1851 Message-ID: <200507081013.j68ADM6w026517@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26500 Modified Files: tobuild Log Message: request build of devel/wesnoth wesnoth-0_9_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1850 retrieving revision 1.1851 diff -u -r1.1850 -r1.1851 --- tobuild 8 Jul 2005 08:44:38 -0000 1.1850 +++ tobuild 8 Jul 2005 10:13:20 -0000 1.1851 @@ -25,3 +25,4 @@ oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 +mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 10:13:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:13:59 -0400 Subject: common tobuild,1.1851,1.1852 Message-ID: <200507081013.j68ADxdY026550@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26533 Modified Files: tobuild Log Message: request build of devel/screem screem-0_14_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1851 retrieving revision 1.1852 diff -u -r1.1851 -r1.1852 --- tobuild 8 Jul 2005 10:13:20 -0000 1.1851 +++ tobuild 8 Jul 2005 10:13:57 -0000 1.1852 @@ -26,3 +26,4 @@ adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel +mschwendt devel/screem screem-0_14_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 10:15:06 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:15:06 -0400 Subject: devel/anjuta anjuta.spec,1.11,1.12 Message-ID: <200507081015.j68AF637026580@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563 Modified Files: anjuta.spec Log Message: another build attempt Index: anjuta.spec =================================================================== RCS file: /cvs/extras/devel/anjuta/anjuta.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- anjuta.spec 7 Jul 2005 10:33:10 -0000 1.11 +++ anjuta.spec 8 Jul 2005 10:15:04 -0000 1.12 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ @@ -122,7 +122,7 @@ %changelog -* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-2 - Update to 1.2.3. - Add gettext-devel dependency (Paul Frields). - Add libtool (+automake, +autoconf) dependency. From fedora-extras-commits at redhat.com Fri Jul 8 10:15:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:15:33 -0400 Subject: common tobuild,1.1852,1.1853 Message-ID: <200507081015.j68AFXTI026649@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26628 Modified Files: tobuild Log Message: request build of devel/anjuta anjuta-1_2_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1852 retrieving revision 1.1853 diff -u -r1.1852 -r1.1853 --- tobuild 8 Jul 2005 10:13:57 -0000 1.1852 +++ tobuild 8 Jul 2005 10:15:30 -0000 1.1853 @@ -27,3 +27,4 @@ adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel mschwendt devel/screem screem-0_14_1-1_fc5 devel +mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 10:41:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 06:41:41 -0400 Subject: rpms/blender/FC-4 blender.spec,1.12,1.13 Message-ID: <200507081041.j68Affub026772@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blender/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725/FC-4 Modified Files: blender.spec Log Message: Invisible changes :-) (fix trailing spaces and tab vs. spaces). Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blender.spec 6 Jun 2005 03:47:41 -0000 1.12 +++ blender.spec 8 Jul 2005 10:41:39 -0000 1.13 @@ -13,7 +13,7 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch +Patch0: blender-2.37-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -95,17 +95,17 @@ %changelog * Sun Jun 5 2005 Toshio Kuratomi 2.37-2 - Patch to fix compilation errors on x86_64. - + * Sun Jun 5 2005 Toshio Kuratomi 2.37-1 - Update to 2.37. - Drop gcc4 patch. - + * Mon May 16 2005 Toshio Kuratomi 2.36-3 - Bump and rebuild now that scons is available on all platforms. - + * Sat May 14 2005 Toshio Kuratomi 2.36-2 - Fix a gcc4 error. - + * Fri May 13 2005 Toshio Kuratomi 2.36-1 - Update to 2.36. - Rebuild with new gcc4. From fedora-extras-commits at redhat.com Fri Jul 8 10:41:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 06:41:41 -0400 Subject: rpms/blender/FC-3 blender.spec,1.6,1.7 Message-ID: <200507081041.j68AffDI026766@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blender/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725/FC-3 Modified Files: blender.spec Log Message: Invisible changes :-) (fix trailing spaces and tab vs. spaces). Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/FC-3/blender.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blender.spec 7 Jun 2005 00:19:49 -0000 1.6 +++ blender.spec 8 Jul 2005 10:41:38 -0000 1.7 @@ -13,7 +13,7 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch +Patch0: blender-2.37-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Fri Jul 8 10:41:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 06:41:41 -0400 Subject: rpms/blender/devel blender.spec,1.12,1.13 Message-ID: <200507081041.j68AffpP026778@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725/devel Modified Files: blender.spec Log Message: Invisible changes :-) (fix trailing spaces and tab vs. spaces). Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blender.spec 7 Jun 2005 00:22:58 -0000 1.12 +++ blender.spec 8 Jul 2005 10:41:39 -0000 1.13 @@ -13,7 +13,7 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch +Patch0: blender-2.37-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -95,20 +95,20 @@ %changelog * Mon Jun 6 2005 Toshio Kuratomi 2.37-3 - Bump release for development. - + * Sun Jun 5 2005 Toshio Kuratomi 2.37-2 - Patch to fix compilation errors on x86_64. - + * Sun Jun 5 2005 Toshio Kuratomi 2.37-1 - Update to 2.37. - Drop gcc4 patch. - + * Mon May 16 2005 Toshio Kuratomi 2.36-3 - Bump and rebuild now that scons is available on all platforms. - + * Sat May 14 2005 Toshio Kuratomi 2.36-2 - Fix a gcc4 error. - + * Fri May 13 2005 Toshio Kuratomi 2.36-1 - Update to 2.36. - Rebuild with new gcc4. From oliver at linux-kernel.at Fri Jul 8 12:51:24 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 14:51:24 +0200 Subject: Request for review: libdnet Message-ID: <42CE76CC.4040500@linux-kernel.at> Summary: Simple portable interface to lowlevel networking routines Description: libdnet provides a simplified, portable interface to several low-level networking routines, including network address manipulation, kernel arp(4) cache and route(4) table lookup and manipulation, network firewalling (IP filter, ipfw, ipchains, pf, ...), network interface lookup and manipulation, raw IP packet and Ethernet frame, and data transmission. SRPM & SPEC: http://filelister.linux-kernel.at/mod_perl?current=/packages/FC_EXTRAS_APPROVAL/libdnet I'd like to include libdnet as a prerequisite for scanssh. scanssh also uses libevent, but this is allready in FE. Please review/approve. Merci, Oliver From fedora-extras-commits at redhat.com Fri Jul 8 14:20:42 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Fri, 8 Jul 2005 10:20:42 -0400 Subject: common tobuild,1.1853,1.1854 Message-ID: <200507081420.j68EKgMh031678@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31661 Modified Files: tobuild Log Message: request build of rpms/libevent/devel libevent-1_1a-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1853 retrieving revision 1.1854 diff -u -r1.1853 -r1.1854 --- tobuild 8 Jul 2005 10:15:30 -0000 1.1853 +++ tobuild 8 Jul 2005 14:20:40 -0000 1.1854 @@ -28,3 +28,4 @@ mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel mschwendt devel/screem screem-0_14_1-1_fc5 devel mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel +ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel From shahms at shahms.com Fri Jul 8 14:25:55 2005 From: shahms at shahms.com (Shahms King) Date: Fri, 08 Jul 2005 07:25:55 -0700 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 In-Reply-To: <1120797191.30532.313.camel@mccallum.corsepiu.local> References: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> <1120797191.30532.313.camel@mccallum.corsepiu.local> Message-ID: <42CE8CF3.4050904@shahms.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Ralf Corsepius wrote: | On Thu, 2005-07-07 at 15:53 -0400, Shahms King wrote: | |>Author: shahms | | |>Index: bazaar.spec | | |>+# The stand alone annotate is meant to debug baz interals, not installation |>+# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html |>+if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then |>+ rm $RPM_BUILD_ROOT%{_bindir}/annotate |>+fi | | | Why so clumsy? | rm -f $RPM_BUILD_ROOT%{_bindir}/annotate | | Ralf I don't find checking before removing clumsy, myself and I try to avoid "rm -f" where possible simply on principle. - -- Shahms E. King Multnomah ESD Public Key: http://shahms.mesd.k12.or.us/~sking/shahms.asc Fingerprint: 1612 054B CE92 8770 F1EA AB1B FEAB 3636 45B2 D75B -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iD8DBQFCzozz/qs2NkWy11sRAkp0AJ4lkKILuVnVwd15Qqwy0MSUg4FEagCgj328 Sba++FuXgILRJMAMVgdQyFI= =zCk2 -----END PGP SIGNATURE----- From oliver at linux-kernel.at Fri Jul 8 14:25:53 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 16:25:53 +0200 Subject: libevent (WAS: Re: common tobuild,1.1853,1.1854) In-Reply-To: <200507081420.j68EKgMh031678@cvs-int.fedora.redhat.com> References: <200507081420.j68EKgMh031678@cvs-int.fedora.redhat.com> Message-ID: <42CE8CF1.4000604@linux-kernel.at> On 07/08/2005 04:20 PM, Ralf Ertzinger (ertzing) wrote: > Author: ertzing > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31661 > > Modified Files: > tobuild > Log Message: > request build of rpms/libevent/devel libevent-1_1a-2_fc5 for devel > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.1853 > retrieving revision 1.1854 > diff -u -r1.1853 -r1.1854 > --- tobuild 8 Jul 2005 10:15:30 -0000 1.1853 > +++ tobuild 8 Jul 2005 14:20:40 -0000 1.1854 > @@ -28,3 +28,4 @@ > mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel > mschwendt devel/screem screem-0_14_1-1_fc5 devel > mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel > +ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel Ah, here we go... :-) -of From fedora-extras-commits at redhat.com Fri Jul 8 15:12:46 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 11:12:46 -0400 Subject: common tobuild,1.1854,1.1855 Message-ID: <200507081512.j68FCkRq000481@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv464 Modified Files: tobuild Log Message: request build of rpms/glabels/FC-3 glabels-2_0_3-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1854 retrieving revision 1.1855 diff -u -r1.1854 -r1.1855 --- tobuild 8 Jul 2005 14:20:40 -0000 1.1854 +++ tobuild 8 Jul 2005 15:12:44 -0000 1.1855 @@ -29,3 +29,4 @@ mschwendt devel/screem screem-0_14_1-1_fc5 devel mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel +jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 15:51:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 11:51:39 -0400 Subject: common tobuild,1.1855,1.1856 Message-ID: <200507081551.j68FpdcN000632@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv615 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1855 retrieving revision 1.1856 diff -u -r1.1855 -r1.1856 --- tobuild 8 Jul 2005 15:12:44 -0000 1.1855 +++ tobuild 8 Jul 2005 15:51:37 -0000 1.1856 @@ -1,32 +1,5 @@ # this is the build control file. the format is # user repo tag target status # -ixs rpms/barcode/devel barcode-0_98-5_fc5 devel -mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 -jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 -jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 -shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel -shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 -shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 -bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel -bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 -adrian rpms/most/devel most-4_10_2-1_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 -mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 -mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 -spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 -spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 -mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel -jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel -jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 -sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel -sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 -sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 -oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel -adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 -adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 -mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel -mschwendt devel/screem screem-0_14_1-1_fc5 devel -mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 16:17:37 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:17:37 -0400 Subject: common tobuild,1.1856,1.1857 Message-ID: <200507081617.j68GHbds001894@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1877 Modified Files: tobuild Log Message: request build of rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1856 retrieving revision 1.1857 diff -u -r1.1856 -r1.1857 --- tobuild 8 Jul 2005 15:51:37 -0000 1.1856 +++ tobuild 8 Jul 2005 16:17:35 -0000 1.1857 @@ -3,3 +3,4 @@ # ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 +ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 16:18:04 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:18:04 -0400 Subject: common tobuild,1.1857,1.1858 Message-ID: <200507081618.j68GI4Go001961@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1944 Modified Files: tobuild Log Message: request build of rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1857 retrieving revision 1.1858 diff -u -r1.1857 -r1.1858 --- tobuild 8 Jul 2005 16:17:35 -0000 1.1857 +++ tobuild 8 Jul 2005 16:18:02 -0000 1.1858 @@ -4,3 +4,4 @@ ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 +ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 16:18:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:18:29 -0400 Subject: common tobuild,1.1858,1.1859 Message-ID: <200507081619.j68GJ0rG002042@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2015 Modified Files: tobuild Log Message: request build of rpms/libifp/devel libifp-1_0_0_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1858 retrieving revision 1.1859 diff -u -r1.1858 -r1.1859 --- tobuild 8 Jul 2005 16:18:02 -0000 1.1858 +++ tobuild 8 Jul 2005 16:18:27 -0000 1.1859 @@ -5,3 +5,4 @@ jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 +ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 16:44:09 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:44:09 -0400 Subject: rpms/fyre/devel fyre-cluster.init,1.1,1.2 fyre.spec,1.8,1.9 Message-ID: <200507081644.j68Gi9UR002178@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2127/devel Modified Files: fyre-cluster.init fyre.spec Log Message: Added restart definition to initscript (#161008) Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre-cluster.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fyre-cluster.init 18 May 2005 22:41:20 -0000 1.1 +++ fyre-cluster.init 8 Jul 2005 16:44:06 -0000 1.2 @@ -9,11 +9,6 @@ # processname: fyre # config: /etc/sysconfig/fyre # pidfile: /var/run/fyre.pid -# # Source function library. . /etc/init.d/functions @@ -46,6 +41,11 @@ return 0 } +restart() { + stop + start +} + case "$1" in start) start Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fyre.spec 19 May 2005 07:36:23 -0000 1.8 +++ fyre.spec 8 Jul 2005 16:44:06 -0000 1.9 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,13 +75,16 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog -* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8.fc4 +* Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 +- Added restart definition to initscript (#161008) + +* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8 - Marked config file -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7.fc4 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7 - Added initscript for clustering -* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6.fc4 +* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6 - Re-enabled OpenEXR and GNet * Thu Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Fri Jul 8 16:44:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:44:03 -0400 Subject: rpms/fyre/FC-3 fyre-cluster.init,1.1,1.2 fyre.spec,1.7,1.8 Message-ID: <200507081644.j68GiYb6002187@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2127/FC-3 Modified Files: fyre-cluster.init fyre.spec Log Message: Added restart definition to initscript (#161008) Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-3/fyre-cluster.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fyre-cluster.init 18 May 2005 22:41:20 -0000 1.1 +++ fyre-cluster.init 8 Jul 2005 16:44:01 -0000 1.2 @@ -9,11 +9,6 @@ # processname: fyre # config: /etc/sysconfig/fyre # pidfile: /var/run/fyre.pid -# # Source function library. . /etc/init.d/functions @@ -46,6 +41,11 @@ return 0 } +restart() { + stop + start +} + case "$1" in start) start Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-3/fyre.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fyre.spec 19 May 2005 07:36:23 -0000 1.7 +++ fyre.spec 8 Jul 2005 16:44:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 7%{?dist} +Release: 9%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,15 +75,21 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog -* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-7.fc3 +* Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 +- Added restart definition to initscript (#161008) + +* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8 - Marked config file -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-6.fc3 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7 - Added initscript for clustering -* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-5.fc3 +* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6 - Re-enabled OpenEXR and GNet +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Mar 30 2005 Ignacio Vazquez-Abrams 1.0.0-4 - Disabled OpenEXR and GNet in %%configure - Removed gtk2-devel from BuildRequires From fedora-extras-commits at redhat.com Fri Jul 8 16:44:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:44:03 -0400 Subject: rpms/fyre/FC-4 fyre-cluster.init,1.1,1.2 fyre.spec,1.8,1.9 Message-ID: <200507081644.j68GiYHA002188@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2127/FC-4 Modified Files: fyre-cluster.init fyre.spec Log Message: Added restart definition to initscript (#161008) Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-4/fyre-cluster.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fyre-cluster.init 18 May 2005 22:41:20 -0000 1.1 +++ fyre-cluster.init 8 Jul 2005 16:44:01 -0000 1.2 @@ -9,11 +9,6 @@ # processname: fyre # config: /etc/sysconfig/fyre # pidfile: /var/run/fyre.pid -# # Source function library. . /etc/init.d/functions @@ -46,6 +41,11 @@ return 0 } +restart() { + stop + start +} + case "$1" in start) start Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-4/fyre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fyre.spec 19 May 2005 07:36:23 -0000 1.8 +++ fyre.spec 8 Jul 2005 16:44:01 -0000 1.9 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,13 +75,16 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog -* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8.fc4 +* Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 +- Added restart definition to initscript (#161008) + +* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8 - Marked config file -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7.fc4 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7 - Added initscript for clustering -* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6.fc4 +* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6 - Re-enabled OpenEXR and GNet * Thu Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Fri Jul 8 16:46:30 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:46:30 -0400 Subject: common tobuild,1.1859,1.1860 Message-ID: <200507081646.j68GkUDm002259@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2242 Modified Files: tobuild Log Message: request build of rpms/fyre/FC-3 fyre-1_0_0-9_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1859 retrieving revision 1.1860 diff -u -r1.1859 -r1.1860 --- tobuild 8 Jul 2005 16:18:27 -0000 1.1859 +++ tobuild 8 Jul 2005 16:46:27 -0000 1.1860 @@ -6,3 +6,4 @@ ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel +ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 16:47:02 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:47:02 -0400 Subject: common tobuild,1.1860,1.1861 Message-ID: <200507081647.j68Gl2cY002321@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304 Modified Files: tobuild Log Message: request build of rpms/fyre/FC-4 fyre-1_0_0-9_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1860 retrieving revision 1.1861 diff -u -r1.1860 -r1.1861 --- tobuild 8 Jul 2005 16:46:27 -0000 1.1860 +++ tobuild 8 Jul 2005 16:47:00 -0000 1.1861 @@ -7,3 +7,4 @@ ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 +ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 16:47:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:47:29 -0400 Subject: common tobuild,1.1861,1.1862 Message-ID: <200507081647.j68GlTXB002383@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2366 Modified Files: tobuild Log Message: request build of rpms/fyre/devel fyre-1_0_0-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1861 retrieving revision 1.1862 diff -u -r1.1861 -r1.1862 --- tobuild 8 Jul 2005 16:47:00 -0000 1.1861 +++ tobuild 8 Jul 2005 16:47:27 -0000 1.1862 @@ -8,3 +8,4 @@ ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 +ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 17:23:46 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 13:23:46 -0400 Subject: extras-buildsys ChangeLog,1.46,1.47 Message-ID: <200507081723.j68HNkUr003675@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3608 Modified Files: ChangeLog Log Message: 2005-07-07 Dan Williams * builder/builder.py - Clean up the buildroot no matter what * Make archjobs write their status to the database too Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 7 Jul 2005 18:17:50 -0000 1.46 +++ ChangeLog 8 Jul 2005 17:23:44 -0000 1.47 @@ -1,5 +1,12 @@ 2005-07-07 Dan Williams + * builder/builder.py + - Clean up the buildroot no matter what + + * Make archjobs write their status to the database too + +2005-07-07 Dan Williams + * server/PackageJob.py - Make some prep error emails more informative From fedora-extras-commits at redhat.com Fri Jul 8 17:23:46 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 13:23:46 -0400 Subject: extras-buildsys/builder builder.py,1.8,1.9 Message-ID: <200507081723.j68HNkwI003681@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3608/builder Modified Files: builder.py Log Message: 2005-07-07 Dan Williams * builder/builder.py - Clean up the buildroot no matter what * Make archjobs write their status to the database too Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- builder.py 7 Jul 2005 17:45:02 -0000 1.8 +++ builder.py 8 Jul 2005 17:23:44 -0000 1.9 @@ -79,6 +79,7 @@ self._srpm_url = srpm_url self._log_fd = None self._mock_config = None + self._done_status = '' self._result_dir = os.path.join(config_opts['builder_work_dir'], self._uniqid, "result") if not os.path.exists(self._result_dir): @@ -115,7 +116,8 @@ self.log("Couldn't kill process %d: %s\n" % (self._pobj.pid, e)) self.log("Killed.\n"); - self._status = 'killed' + self._done_status = 'killed' + self._cleanup() return True def log(self, string): @@ -179,8 +181,8 @@ self._status = 'failed' break - # Kill mock after 5s if it didn't dump the status file - if time.time() - start_time > 5: + # Kill mock after 7s if it didn't dump the status file + if time.time() - start_time > 7: self.log("Timed out waiting for the mock status file! %s\n" % mockstatusfile) try: self.log("Killing mock...\n") @@ -294,7 +296,7 @@ elif self._status == 'failed': if self._pobj: exit_status = self._pobj.poll() - self.log("Job failed due to mock errors! mock exit status: %d\n" % exit_status) + 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") @@ -329,17 +331,29 @@ # mock completed successfully if self._status != 'building': self.log("Bad job end status %s encountered!" % self._status) + self._done_status = 'done' self._cleanup() elif exit_status > 0: # mock exited with an error - self._status = 'failed' + self._done_status = 'failed' + self._cleanup() + else: + # mock still running + pass elif self._status == 'cleanup': exit_status = self._pobj.poll() if exit_status >= 0: + print "mock clean done" # We ignore mock errors when cleaning the buildroot - self._status = 'done' - if self._mock_config.has_key('rootdir'): + self._status = self._done_status + # FIXME: remove the last dir off the end of 'rootdir' here to get + # the real basedir and kill it. At least what's here removes the + # buildroot which is where most of the space is used + if self._mock_config and self._mock_config.has_key('rootdir'): shutil.rmtree(self._mock_config['rootdir'], ignore_errors=True) + else: + # mock still running + pass self._grab_mock_output() if self.is_done_status(): From fedora-extras-commits at redhat.com Fri Jul 8 17:23:47 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 13:23:47 -0400 Subject: extras-buildsys/server ArchJob.py,1.3,1.4 BuildMaster.py,1.10,1.11 Message-ID: <200507081723.j68HNlhw003688@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3608/server Modified Files: ArchJob.py BuildMaster.py Log Message: 2005-07-07 Dan Williams * builder/builder.py - Clean up the buildroot no matter what * Make archjobs write their status to the database too Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ArchJob.py 7 Jul 2005 16:21:12 -0000 1.3 +++ ArchJob.py 8 Jul 2005 17:23:45 -0000 1.4 @@ -53,7 +53,7 @@ self.starttime = time.time() def _builder_finished(self): - if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed': + if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned': return True return False @@ -67,12 +67,44 @@ return True return False + def _to_dict(self): + attrdict = {} + attrdict['jobid'] = self.jobid + attrdict['parent_uid'] = self.par_job.uid + attrdict['arch'] = self.arch + addr = self.builder.address() + # for some reason, splithost doesn't like the protocol + # method, you have to give it a string starting with "//" + if addr.startswith("http"): + idx = addr.find('//') + addr = addr[idx:] + host_port, path = urllib.splithost(addr) + host, port = urllib.splitport(host_port) + attrdict['builder_addr'] = host + attrdict['status'] = self.status + attrdict['builder_status'] = self.builder_status + return attrdict + def set_builder_status(self, status): if status != 'idle': - self.builder_status = status + oldstatus = self.builder_status + self.builder_status = status + if oldstatus != self.builder_status: + attrdict = self._to_dict() + self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) + del attrdict + if status == 'killed' or status == 'failed': self.par_job.wake() + def _set_status(self, status): + oldstatus = self.status + self.status = status + if oldstatus != self.status: + attrdict = self._to_dict() + self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) + del attrdict + def _send_repo_unlocked(self): try: self._server.repo_unlocked(self.jobid) @@ -108,7 +140,7 @@ # if the builder is done, grab list of files to download if self._builder_finished(): - self.status = 'downloading' + self._set_status('downloading') for f in self._dl_files(): uf = urllib.unquote(f) self.downloads[uf] = 0 @@ -153,7 +185,7 @@ # All done downloading? if not undownloaded: self._print_downloaded_files() - self.status = 'done' + self._set_status('done') self.par_job.wake() def _print_downloaded_files(self): @@ -196,11 +228,13 @@ def builder_gone(self): if self.status != 'done': - self._par_job.remove_arch_job(self) + self.builder_status = 'orphaned' + self._set_status('done') + self.par_job.remove_arch_job(self) def die(self): if self.status == 'initialize' or self.status == 'running': self._server.die(self.jobid) - self.status = 'done' + self._set_status('done') Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BuildMaster.py 5 Jul 2005 21:08:03 -0000 1.10 +++ BuildMaster.py 8 Jul 2005 17:23:45 -0000 1.11 @@ -68,6 +68,28 @@ 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): def __init__(self, hostname, builder_manager): @@ -86,6 +108,8 @@ self._new_queue_lock = threading.Lock() self._status_updates = {} self._status_updates_lock = threading.Lock() + self._archjob_status_updates = {} + self._archjob_status_updates_lock = threading.Lock() self._query_queue = [] self._query_queue_lock = threading.Lock() @@ -147,6 +171,13 @@ self._status_updates[lcl_uid] = lcl_status self._status_updates_lock.release() + def queue_archjob_status_update(self, jobid, attrdict): + self._archjob_status_updates_lock.acquire() + lcl_jobid = copy.copy(jobid) + lcl_attrdict = copy.deepcopy(attrdict) + self._archjob_status_updates[lcl_jobid] = lcl_attrdict + self._archjob_status_updates_lock.release() + def notify_job_done(self, job): self._done_queue_lock.acquire() self._done_queue.append(job) @@ -157,7 +188,7 @@ for job in self._done_queue: curstage = job.get_cur_stage() - self._write_status_to_db(job.get_uid(), curstage) + self._write_job_status_to_db(job.get_uid(), curstage) print "%s (%s): Job finished." % (job.get_uid(), job.package) self._building_jobs_lock.acquire() self._building_jobs.remove(job) @@ -166,7 +197,7 @@ self._done_queue = [] self._done_queue_lock.release() - def _write_status_to_db(self, uid, status): + def _write_job_status_to_db(self, uid, status): try: self.curs.execute('UPDATE jobs SET status="%s" WHERE uid=%d' \ % (status, uid)) @@ -175,16 +206,41 @@ self.dbcx.commit() + def _write_archjob_status_to_db(self, jobid, attrdict): + self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % jobid) + self.dbcx.commit() + if len(self.curs.fetchall()) == 0: + try: + self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, arch, builder_addr, status, builder_status) ' \ + 'VALUES ("%s", %d, %d, "%s", "%s", "%s", "%s")' % (jobid, attrdict['parent_uid'], time.time(), attrdict['arch'], \ + attrdict['builder_addr'], attrdict['status'], attrdict['builder_status'])) + except sqlite.OperationalError, 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" ' \ + 'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], attrdict['builder_status'], jobid, attrdict['parent_uid'])) + except sqlite.OperationalError, e: + print "DB Error: could not access jobs database. Reason: '%s'" % e + + self.dbcx.commit() + def _save_job_status(self): # Write new job status to the database self._status_updates_lock.acquire() for uid in self._status_updates.keys(): - self._write_status_to_db(uid, self._status_updates[uid]) + self._write_job_status_to_db(uid, self._status_updates[uid]) self._status_updates = {} self._status_updates_lock.release() + self._archjob_status_updates_lock.acquire() + for jobid in self._archjob_status_updates.keys(): + self._write_archjob_status_to_db(jobid, self._archjob_status_updates[jobid]) + self._archjob_status_updates = {} + self._archjob_status_updates_lock.release() + def _start_new_jobs(self): self._new_queue_lock.acquire() @@ -277,6 +333,13 @@ if have_work: return True + self._archjob_status_updates_lock.acquire() + if len(self._archjob_status_updates) > 0: + have_work = True + self._archjob_status_updates_lock.release() + if have_work: + return True + if self.builder_manager.have_work(): return True From fedora-extras-commits at redhat.com Fri Jul 8 17:30:07 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 13:30:07 -0400 Subject: rpms/jhead/devel .cvsignore, 1.4, 1.5 jhead.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200507081730.j68HU7E1003939@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3918 Modified Files: .cvsignore jhead.spec sources Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-1 - updated to 2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2005 11:16:18 -0000 1.4 +++ .cvsignore 8 Jul 2005 17:30:05 -0000 1.5 @@ -1 +1 @@ -jhead-2.3.tar.gz +jhead-2.4.tar.gz Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jhead.spec 6 Apr 2005 22:12:02 -0000 1.9 +++ jhead.spec 8 Jul 2005 17:30:05 -0000 1.10 @@ -1,12 +1,11 @@ Name: jhead -Version: 2.3 -Release: 2 - +Version: 2.4 +Release: 1%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain URL: http://www.sentex.net/~mwandel/jhead/ -Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.3.tar.gz +Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.4.tar.gz Patch0: jhead-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +37,9 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-1 +- updated to 2.4 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 11:16:18 -0000 1.4 +++ sources 8 Jul 2005 17:30:05 -0000 1.5 @@ -1 +1 @@ -b27c37f1edd25e5f416914ed46ba11fb jhead-2.3.tar.gz +410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 17:33:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:33:22 -0400 Subject: rpms/fedora-rpmdevtools/FC-3 .cvsignore, 1.7, 1.8 fedora-rpmdevtools.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200507081733.j68HXMnB004027@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3978/FC-3 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: 1.1: more perl spectemplate cleanup, gcc-gfortran is devel, drop fedora.us key. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2005 16:45:41 -0000 1.7 +++ .cvsignore 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.0.tar.bz2 +fedora-rpmdevtools-1.1.tar.bz2 spectool-1.0.4.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/fedora-rpmdevtools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fedora-rpmdevtools.spec 24 Mar 2005 16:45:41 -0000 1.7 +++ fedora-rpmdevtools.spec 8 Jul 2005 17:33:20 -0000 1.8 @@ -3,8 +3,8 @@ %define spectool_version 1.0.4 Name: fedora-rpmdevtools -Version: 1.0 -Release: 1 +Version: 1.1 +Release: 1%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -27,8 +27,8 @@ %description This package contains scripts and (X)Emacs support files to aid in -development of Fedora RPM packages. These tools are designed for Red -Hat Linux 8.0 and higher. +development of Fedora RPM packages. These tools are designed for Fedora +Core 2 and later. fedora-buildrpmtree Create RPM build tree within user's home directory fedora-installdevkeys Install GPG keys in alternate RPM keyring fedora-kmodhelper Helper script for building kernel module RPMs @@ -126,6 +126,11 @@ %changelog +* Fri Jul 8 2005 Ville Skytt?? - 1.1-1 +- Drop more pre-FC2 compat stuff from Perl spec template. +- Treat gcc-gfortran as a devel package in rmdevelrpms. +- Drop fedora.us GPG key. + * Thu Mar 24 2005 Ville Skytt?? - 1.0-1 - Make fedora-diffarchive work better with archives containing dirs without read/execute permissions. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2005 16:45:41 -0000 1.7 +++ sources 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -2f20b353cb5795cf01742f8ca08e8d29 fedora-rpmdevtools-1.0.tar.bz2 +5855a4312c1d2ab5bc8f2d574866e59e fedora-rpmdevtools-1.1.tar.bz2 f88484ff2a2d83f0cc1d37bc71300f7a spectool-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 17:33:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:33:22 -0400 Subject: rpms/fedora-rpmdevtools/FC-4 .cvsignore, 1.7, 1.8 fedora-rpmdevtools.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200507081733.j68HXM7P004035@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3978/FC-4 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: 1.1: more perl spectemplate cleanup, gcc-gfortran is devel, drop fedora.us key. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2005 16:45:41 -0000 1.7 +++ .cvsignore 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.0.tar.bz2 +fedora-rpmdevtools-1.1.tar.bz2 spectool-1.0.4.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/fedora-rpmdevtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fedora-rpmdevtools.spec 6 Apr 2005 22:11:37 -0000 1.10 +++ fedora-rpmdevtools.spec 8 Jul 2005 17:33:20 -0000 1.11 @@ -3,9 +3,8 @@ %define spectool_version 1.0.4 Name: fedora-rpmdevtools -Version: 1.0 -Release: 2 - +Version: 1.1 +Release: 1%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -28,8 +27,8 @@ %description This package contains scripts and (X)Emacs support files to aid in -development of Fedora RPM packages. These tools are designed for Red -Hat Linux 8.0 and higher. +development of Fedora RPM packages. These tools are designed for Fedora +Core 2 and later. fedora-buildrpmtree Create RPM build tree within user's home directory fedora-installdevkeys Install GPG keys in alternate RPM keyring fedora-kmodhelper Helper script for building kernel module RPMs @@ -127,7 +126,12 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 8 2005 Ville Skytt?? - 1.1-1 +- Drop more pre-FC2 compat stuff from Perl spec template. +- Treat gcc-gfortran as a devel package in rmdevelrpms. +- Drop fedora.us GPG key. + +* Fri Apr 7 2005 Michael Schwendt - 1.0-2 - rebuilt * Thu Mar 24 2005 Ville Skytt?? - 1.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2005 16:45:41 -0000 1.7 +++ sources 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -2f20b353cb5795cf01742f8ca08e8d29 fedora-rpmdevtools-1.0.tar.bz2 +5855a4312c1d2ab5bc8f2d574866e59e fedora-rpmdevtools-1.1.tar.bz2 f88484ff2a2d83f0cc1d37bc71300f7a spectool-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 17:33:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:33:23 -0400 Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.7, 1.8 fedora-rpmdevtools.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200507081733.j68HXNC3004043@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3978/devel Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: 1.1: more perl spectemplate cleanup, gcc-gfortran is devel, drop fedora.us key. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2005 16:45:41 -0000 1.7 +++ .cvsignore 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.0.tar.bz2 +fedora-rpmdevtools-1.1.tar.bz2 spectool-1.0.4.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fedora-rpmdevtools.spec 6 Apr 2005 22:11:37 -0000 1.10 +++ fedora-rpmdevtools.spec 8 Jul 2005 17:33:20 -0000 1.11 @@ -3,9 +3,8 @@ %define spectool_version 1.0.4 Name: fedora-rpmdevtools -Version: 1.0 -Release: 2 - +Version: 1.1 +Release: 1%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -28,8 +27,8 @@ %description This package contains scripts and (X)Emacs support files to aid in -development of Fedora RPM packages. These tools are designed for Red -Hat Linux 8.0 and higher. +development of Fedora RPM packages. These tools are designed for Fedora +Core 2 and later. fedora-buildrpmtree Create RPM build tree within user's home directory fedora-installdevkeys Install GPG keys in alternate RPM keyring fedora-kmodhelper Helper script for building kernel module RPMs @@ -127,7 +126,12 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 8 2005 Ville Skytt?? - 1.1-1 +- Drop more pre-FC2 compat stuff from Perl spec template. +- Treat gcc-gfortran as a devel package in rmdevelrpms. +- Drop fedora.us GPG key. + +* Fri Apr 7 2005 Michael Schwendt - 1.0-2 - rebuilt * Thu Mar 24 2005 Ville Skytt?? - 1.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2005 16:45:41 -0000 1.7 +++ sources 8 Jul 2005 17:33:21 -0000 1.8 @@ -1,2 +1,2 @@ -2f20b353cb5795cf01742f8ca08e8d29 fedora-rpmdevtools-1.0.tar.bz2 +5855a4312c1d2ab5bc8f2d574866e59e fedora-rpmdevtools-1.1.tar.bz2 f88484ff2a2d83f0cc1d37bc71300f7a spectool-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 17:35:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:35:30 -0400 Subject: common tobuild,1.1862,1.1863 Message-ID: <200507081735.j68HZU2R004107@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4090 Modified Files: tobuild Log Message: request build of rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1862 retrieving revision 1.1863 diff -u -r1.1862 -r1.1863 --- tobuild 8 Jul 2005 16:47:27 -0000 1.1862 +++ tobuild 8 Jul 2005 17:35:27 -0000 1.1863 @@ -9,3 +9,4 @@ ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel +scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 17:36:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:36:12 -0400 Subject: common tobuild,1.1863,1.1864 Message-ID: <200507081736.j68HaChp004178@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161 Modified Files: tobuild Log Message: request build of rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1863 retrieving revision 1.1864 diff -u -r1.1863 -r1.1864 --- tobuild 8 Jul 2005 17:35:27 -0000 1.1863 +++ tobuild 8 Jul 2005 17:36:10 -0000 1.1864 @@ -10,3 +10,4 @@ ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 +scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 17:36:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:36:46 -0400 Subject: common tobuild,1.1864,1.1865 Message-ID: <200507081736.j68Hakku004240@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4223 Modified Files: tobuild Log Message: request build of rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1864 retrieving revision 1.1865 diff -u -r1.1864 -r1.1865 --- tobuild 8 Jul 2005 17:36:10 -0000 1.1864 +++ tobuild 8 Jul 2005 17:36:44 -0000 1.1865 @@ -11,3 +11,4 @@ ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 +scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 17:51:34 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 13:51:34 -0400 Subject: common tobuild,1.1865,1.1866 Message-ID: <200507081751.j68HpYbS004377@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4360 Modified Files: tobuild Log Message: request build of rpms/jhead/devel jhead-2_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1865 retrieving revision 1.1866 diff -u -r1.1865 -r1.1866 --- tobuild 8 Jul 2005 17:36:44 -0000 1.1865 +++ tobuild 8 Jul 2005 17:51:32 -0000 1.1866 @@ -12,3 +12,4 @@ scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel +adrian rpms/jhead/devel jhead-2_4-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 18:12:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:12:33 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.11, 1.12 UserInterface.py, 1.15, 1.16 Message-ID: <200507081812.j68ICXBS005531@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5482/server Modified Files: BuildMaster.py UserInterface.py Log Message: 2005-07-08 Dan Williams * Pass archjob information along to the client, and move query into UserInterface's thread Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- BuildMaster.py 8 Jul 2005 17:23:45 -0000 1.11 +++ BuildMaster.py 8 Jul 2005 18:12:31 -0000 1.12 @@ -211,8 +211,8 @@ self.dbcx.commit() if len(self.curs.fetchall()) == 0: try: - self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, arch, builder_addr, status, builder_status) ' \ - 'VALUES ("%s", %d, %d, "%s", "%s", "%s", "%s")' % (jobid, attrdict['parent_uid'], time.time(), attrdict['arch'], \ + 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")' % (jobid, attrdict['parent_uid'], time.time(), 0, attrdict['arch'], \ attrdict['builder_addr'], attrdict['status'], attrdict['builder_status'])) except sqlite.OperationalError, e: print "DB Error: could not access jobs database. Reason: '%s'" % e Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- UserInterface.py 5 Jul 2005 21:08:03 -0000 1.15 +++ UserInterface.py 8 Jul 2005 18:12:31 -0000 1.16 @@ -26,7 +26,8 @@ import PackageJob # Load in the config -execfile("/etc/plague/server/CONFIG.py") +CONFIG_LOCATION = "/etc/plague/server/" +execfile(CONFIG_LOCATION + "CONFIG.py") def email_result(email, cvs_tag, resultstring, subject=None): @@ -44,6 +45,12 @@ s.close() +def get_dbcx(): + dbcx = None + dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3) + curs = dbcx.cursor() + return (dbcx, curs) + class UserInterface: """ @@ -145,29 +152,47 @@ search = search + " AND " search = search + 'status = "%s"' % status else: - return (-1, "Error: Invalid query.", []) + return (-1, "Error: Invalid query.", [], []) if len(search): sql = sql + search if not len(sql): - return (-1, "Error: Invalid query.", []) + return (-1, "Error: Invalid query.", [], []) + + try: + dbcx, curs = get_dbcx() + except sqlite.DatabaseError, e: + return (-1, "Unable to access job database.", [], []) + curs.execute(sql) + data = curs.fetchall() + results = [] + for row in data: + tempX = [ item for item in row ] + results.append(tempX) + jobs = copy.deepcopy(results) + + uids = '' + for result in jobs: + if len(uids) == 0: + uids = uids + "parent_uid=%d" % result[0] + else: + uids = uids + " OR parent_uid=%d" % result[0] + + archjobs = [] + if len(uids) > 0: + sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids + curs.execute(sql) + data = curs.fetchall() + aj_results = [] + for row in data: + tempX = [ item for item in row ] + aj_results.append(tempX) + archjobs = copy.deepcopy(aj_results) + + del curs + del dbcx - job_list = [] - query = BuildMaster.JobsQuery(sql) - self._bm.queue_query(query) - start_time = time.time() - - # Wait for query to return from BuildMaster - ret = -1 - msg = "Error: The query timed out, please try again." - while time.time() <= start_time + 5: - if query.done: - job_list = copy.deepcopy(query.result) - del query - ret = 0 - msg = "Success." - break - return (ret, msg, job_list) + return (0, "Success.", jobs, archjobs) def update_builders(self): From fedora-extras-commits at redhat.com Fri Jul 8 18:12:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:12:27 -0400 Subject: extras-buildsys ChangeLog,1.47,1.48 Message-ID: <200507081812.j68ICvxu005534@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5482 Modified Files: ChangeLog Log Message: 2005-07-08 Dan Williams * Pass archjob information along to the client, and move query into UserInterface's thread Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 8 Jul 2005 17:23:44 -0000 1.47 +++ ChangeLog 8 Jul 2005 18:12:25 -0000 1.48 @@ -1,3 +1,8 @@ +2005-07-08 Dan Williams + + * Pass archjob information along to the client, + and move query into UserInterface's thread + 2005-07-07 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Fri Jul 8 18:12:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:12:27 -0400 Subject: extras-buildsys/client client.py,1.7,1.8 Message-ID: <200507081813.j68ICwTY005537@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5482/client Modified Files: client.py Log Message: 2005-07-08 Dan Williams * Pass archjob information along to the client, and move query into UserInterface's thread Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- client.py 6 Jul 2005 21:20:55 -0000 1.7 +++ client.py 8 Jul 2005 18:12:25 -0000 1.8 @@ -99,7 +99,7 @@ args['email'] = email if status: args['status'] = status - (e, msg, jobs) = server.list_jobs(args) + (e, msg, jobs, archjobs) = server.list_jobs(args) except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -111,6 +111,9 @@ else: for job in jobs: print job + for archjob in archjobs: + if archjob[1] == job[0]: + print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) def kill(server, email, jobid): From fedora-extras-commits at redhat.com Fri Jul 8 18:16:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:16:24 -0400 Subject: extras-buildsys/common CommonErrors.py,1.6,1.7 Message-ID: <200507081816.j68IGO8L005567@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5550/common Modified Files: CommonErrors.py Log Message: Don't import m2crypto any more Index: CommonErrors.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/CommonErrors.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CommonErrors.py 24 Jun 2005 17:13:26 -0000 1.6 +++ CommonErrors.py 8 Jul 2005 18:16:22 -0000 1.7 @@ -14,7 +14,6 @@ # # Copyright 2005 Dan Williams and Red Hat, Inc. -from M2Crypto import SSL import socket From fedora-extras-commits at redhat.com Fri Jul 8 18:23:06 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:23:06 -0400 Subject: rpms/inadyn/FC-4 inadyn.spec,1.10,1.11 Message-ID: <200507081823.j68INbjQ005629@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/inadyn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597/inadyn/FC-4 Modified Files: inadyn.spec Log Message: Fix dist being mandatory in FC-4 branch, and devel being older without. Index: inadyn.spec =================================================================== RCS file: /cvs/extras/rpms/inadyn/FC-4/inadyn.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- inadyn.spec 6 Jun 2005 15:08:51 -0000 1.10 +++ inadyn.spec 8 Jul 2005 18:23:04 -0000 1.11 @@ -1,6 +1,6 @@ Name: inadyn Version: 1.90 -Release: 11%{dist} +Release: 11%{?dist} Summary: Dynamic DNS Client @@ -54,7 +54,7 @@ s|/etc/([^ir])|%{_sysconfdir}/$1|g ; \ s|/etc/rc\.d/init\.d/|%{_initrddir}/|g' \ <%{SOURCE2} >$RPM_BUILD_ROOT%{_initrddir}/inadyn - + %clean rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Fri Jul 8 18:23:07 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:23:07 -0400 Subject: rpms/inadyn/devel inadyn.spec,1.9,1.10 Message-ID: <200507081823.j68INbca005630@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/inadyn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597/inadyn/devel Modified Files: inadyn.spec Log Message: Fix dist being mandatory in FC-4 branch, and devel being older without. Index: inadyn.spec =================================================================== RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- inadyn.spec 3 May 2005 19:54:39 -0000 1.9 +++ inadyn.spec 8 Jul 2005 18:23:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: inadyn Version: 1.90 -Release: 11 +Release: 11%{?dist} Summary: Dynamic DNS Client @@ -54,7 +54,7 @@ s|/etc/([^ir])|%{_sysconfdir}/$1|g ; \ s|/etc/rc\.d/init\.d/|%{_initrddir}/|g' \ <%{SOURCE2} >$RPM_BUILD_ROOT%{_initrddir}/inadyn - + %clean rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Fri Jul 8 18:27:00 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 8 Jul 2005 14:27:00 -0400 Subject: rpms/naim/devel naim.spec,1.2,1.3 Message-ID: <200507081827.j68IR0ip005696@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5679 Modified Files: naim.spec Log Message: Add %{?dist} tag to Release Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- naim.spec 7 Jul 2005 20:50:10 -0000 1.2 +++ naim.spec 8 Jul 2005 18:26:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: naim Version: 0.11.7.3.1 -Release: 2 +Release: 2%{?dist} Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client Group: Applications/Internet From fedora-extras-commits at redhat.com Fri Jul 8 18:29:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:29:53 -0400 Subject: rpms/kyum/FC-4 kyum.spec,1.3,1.4 Message-ID: <200507081830.j68IUNSJ005751@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kyum/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5719/kyum/FC-4 Modified Files: kyum.spec Log Message: Change dist to not be mandatory in FC-4 branch, and remove trailing spaces. Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/kyum.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kyum.spec 16 Jun 2005 15:38:16 -0000 1.3 +++ kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 @@ -1,16 +1,16 @@ Name: kyum Version: 0.7.1 -Release: 2%{dist} +Release: 2%{?dist} Summary: Graphical User Frontend (GUI) for yum License: GPL Group: Applications/System URL: http://kde-apps.org/content/show.php?content=22185 -Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz +Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum >= 2.2.0 Requires: kdebase >= 6:3.3 @@ -31,15 +31,15 @@ %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh - + make -f Makefile.cvs -%configure --disable-rpath +%configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ @@ -50,7 +50,7 @@ --add-category Application \ --add-category SystemSetup \ $RPM_BUILD_ROOT%{_datadir}/app*/*/%{name}.desktop - + %clean rm -rf $RPM_BUILD_ROOT @@ -113,7 +113,7 @@ - release version 0.5.3 - Fix: "Remove" operation was accidently disabled in the source. - + - Added support for the yum command "generate-rss" (although this yum command is probably rather useful in a nightly batch mode). @@ -122,7 +122,7 @@ - release version 0.5.2 - When an old-format yum.conf, that contains repository definitions, is loaded, kyum offers to move them to a *.repo file (kyum.repo). - + - The "Import GPG Key" dialog now uses the value "gpgkey" from the repository definition, if present. @@ -139,7 +139,7 @@ - Replaced QFileDialog with KFileDialog. - Output window now uses monospaced font (Courier). - + - When an item is focused in the package list, all columns are selected. * Sat Apr 09 2005 Roland Wolters @@ -147,17 +147,17 @@ - release version 0.4.2: - Fix: Repos loaded from profiles where always put in kyum.repo instead of restoring the *.repo they were originally defined in. - + * Sat Apr 09 2005 Steffen Offermann - release version 0.4.1: - - Added profile support: Different sets of repository/yum.conf configurations - can be saved to and loaded from profiles. - - Reordered tabs in main window. - - Search dialog: Added option "Find and Install". - - Added option "Import GPG Key" to the repository context menu. - - Running actions can now be aborted. - - Support for yum's "clean" command added. + - Added profile support: Different sets of repository/yum.conf configurations + can be saved to and loaded from profiles. + - Reordered tabs in main window. + - Search dialog: Added option "Find and Install". + - Added option "Import GPG Key" to the repository context menu. + - Running actions can now be aborted. + - Support for yum's "clean" command added. * Thu Mar 31 2005 Steffen Offermann From fedora-extras-commits at redhat.com Fri Jul 8 18:29:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:29:53 -0400 Subject: rpms/kyum/devel kyum.spec,1.3,1.4 Message-ID: <200507081830.j68IUNXH005754@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5719/kyum/devel Modified Files: kyum.spec Log Message: Change dist to not be mandatory in FC-4 branch, and remove trailing spaces. Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kyum.spec 21 Jun 2005 20:20:46 -0000 1.3 +++ kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 @@ -7,10 +7,10 @@ License: GPL Group: Applications/System URL: http://kde-apps.org/content/show.php?content=22185 -Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz +Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum >= 2.2.0 Requires: kdebase >= 6:3.3 @@ -31,15 +31,15 @@ %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh - + make -f Makefile.cvs -%configure --disable-rpath +%configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ @@ -50,7 +50,7 @@ --add-category Application \ --add-category SystemSetup \ $RPM_BUILD_ROOT%{_datadir}/app*/*/%{name}.desktop - + %clean rm -rf $RPM_BUILD_ROOT @@ -116,7 +116,7 @@ - release version 0.5.3 - Fix: "Remove" operation was accidently disabled in the source. - + - Added support for the yum command "generate-rss" (although this yum command is probably rather useful in a nightly batch mode). @@ -125,7 +125,7 @@ - release version 0.5.2 - When an old-format yum.conf, that contains repository definitions, is loaded, kyum offers to move them to a *.repo file (kyum.repo). - + - The "Import GPG Key" dialog now uses the value "gpgkey" from the repository definition, if present. @@ -142,7 +142,7 @@ - Replaced QFileDialog with KFileDialog. - Output window now uses monospaced font (Courier). - + - When an item is focused in the package list, all columns are selected. * Sat Apr 09 2005 Roland Wolters @@ -150,17 +150,17 @@ - release version 0.4.2: - Fix: Repos loaded from profiles where always put in kyum.repo instead of restoring the *.repo they were originally defined in. - + * Sat Apr 09 2005 Steffen Offermann - release version 0.4.1: - - Added profile support: Different sets of repository/yum.conf configurations - can be saved to and loaded from profiles. - - Reordered tabs in main window. - - Search dialog: Added option "Find and Install". - - Added option "Import GPG Key" to the repository context menu. - - Running actions can now be aborted. - - Support for yum's "clean" command added. + - Added profile support: Different sets of repository/yum.conf configurations + can be saved to and loaded from profiles. + - Reordered tabs in main window. + - Search dialog: Added option "Find and Install". + - Added option "Import GPG Key" to the repository context menu. + - Running actions can now be aborted. + - Support for yum's "clean" command added. * Thu Mar 31 2005 Steffen Offermann From tcallawa at redhat.com Fri Jul 8 18:35:01 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 08 Jul 2005 13:35:01 -0500 Subject: APPROVED: libapreq2 Message-ID: <1120847701.9303.129.camel@localhost.localdomain> Name: libapreq2 Summary: Generic Apache Request Library Reviewer: Tom "spot" Callaway Maintainer: Ville Skytt? ~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 Jul 8 18:35:21 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:21 -0400 Subject: rpms/tcllib - New directory Message-ID: <200507081835.j68IZL2v005838@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5818/tcllib Log Message: Directory /cvs/extras/rpms/tcllib added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:35:21 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:21 -0400 Subject: rpms/tcllib/devel - New directory Message-ID: <200507081835.j68IZLVK005843@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5818/tcllib/devel Log Message: Directory /cvs/extras/rpms/tcllib/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:35:44 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:44 -0400 Subject: rpms/tcllib Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507081835.j68IZiBd005900@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Added Files: Makefile import.log Log Message: Setup of module tcllib --- NEW FILE Makefile --- # Top level Makefile for module tcllib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 18:35:44 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:44 -0400 Subject: rpms/tcllib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507081835.j68IZiTm005905@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tcllib --- NEW 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 Jul 8 18:38:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:39 -0400 Subject: rpms/perl-ExtUtils-XSBuilder - New directory Message-ID: <200507081838.j68IcdWr006083@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/perl-ExtUtils-XSBuilder Log Message: Directory /cvs/extras/rpms/perl-ExtUtils-XSBuilder added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:38:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:39 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel - New directory Message-ID: <200507081838.j68Icdc1006088@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/perl-ExtUtils-XSBuilder/devel Log Message: Directory /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:38:15 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:38:15 -0400 Subject: rpms/tcllib import.log,1.1,1.2 Message-ID: <200507081838.j68IcjIx006099@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988 Modified Files: import.log Log Message: auto-import tcllib-1.7-2 on branch devel from tcllib-1.7-2.src.rpm Initial import of tcllib Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tcllib/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 18:35:42 -0000 1.1 +++ import.log 8 Jul 2005 18:38:13 -0000 1.2 @@ -0,0 +1 @@ +tcllib-1_7-2:HEAD:tcllib-1.7-2.src.rpm:1120847884 From fedora-extras-commits at redhat.com Fri Jul 8 18:38:15 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:38:15 -0400 Subject: rpms/tcllib/devel tcllib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507081838.j68Ick1C006104@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988/devel Modified Files: .cvsignore sources Added Files: tcllib.spec Log Message: auto-import tcllib-1.7-2 on branch devel from tcllib-1.7-2.src.rpm Initial import of tcllib --- NEW FILE tcllib.spec --- Summary: The standard Tcl library Name: tcllib Version: 1.7 Release: 2%{?dist} Epoch: 0 License: BSD-like Group: Development/Libraries Source: http://download.sourceforge.net/tcllib/tcllib-1.7.tar.bz2 URL: http://tcllib.sourceforge.net/ BuildArchitectures: noarch Requires: tcl >= 0:8.3.1 BuildRequires: tcl >= 0:8.3.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Tcllib, the Tcl Standard Library is a collection of Tcl packages that provide utility functions useful to a large collection of Tcl programmers. The home web site for this code is http://tcllib.sourceforge.net/. At this web site, you will find mailing lists, web forums, databases for bug reports and feature requests, the CVS repository (browsable on the web, or read-only accessible via CVS ), and more. Note: also grab source tarball for more documentation, examples, ... %prep %setup -q %install rm -rf $RPM_BUILD_ROOT files #echo 'not available' > modules/calendar/calendar.n # excluded in distribution echo 'not available' > modules/imap4/imap4.n %_bindir/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\ -pkg-path $RPM_BUILD_ROOT/$(echo 'puts $tcl_library' | %_bindir/tclsh)/%name-%version\ -nroff-path $RPM_BUILD_ROOT%_mandir/mann # install HTML documentation into specific modules sub-directories: cd modules mkdir ../ftp; mv ftp/docs/*.html ../ftp/ for module in exif mime snit stooop struct textutil; do mkdir ../$module && mv $module/*.html ../$module/; done cd .. # generate list of files in the package (man pages are compressed): find $RPM_BUILD_ROOT ! -type d |\ sed -e "s,^$RPM_BUILD_ROOT,,;" -e 's,\.n$,\.n\.gz,;' > files %clean rm -rf $RPM_BUILD_ROOT %files -f files %defattr(-,root,root) %doc PACKAGES README README-1.7.txt ChangeLog license.terms %doc exif/ ftp/ mime/ snit/ stooop/ struct/ textutil/ %changelog * Mon Jul 4 2005 0:1.7-2 - Minor spec file changes in an attempt to conform to Fedora Extras packaging guidelines. * Thu Oct 14 2004 Jean-Luc Fontaine 0:1.7-1 - 1.7 version - new modules: asn, bee, grammar_fa, http, ident, jpeg, ldap, png, rc4, ripemd, tar, tie, treeql, uuid - modules removed: struct1 * Thu Feb 19 2004 Jean-Luc Fontaine 0:1.6-1 - 1.6 version - leaner and cleaner spec file based on Fedora standards - install under tcl_library, not hard-coded /usr/lib Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tcllib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 18:35:42 -0000 1.1 +++ .cvsignore 8 Jul 2005 18:38:13 -0000 1.2 @@ -0,0 +1 @@ +tcllib-1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tcllib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 18:35:42 -0000 1.1 +++ sources 8 Jul 2005 18:38:13 -0000 1.2 @@ -0,0 +1 @@ +db8de0205d0a65b88a4a3e235da6ae10 tcllib-1.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 18:38:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:54 -0400 Subject: rpms/perl-ExtUtils-XSBuilder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507081838.j68Icskc006148@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117 Added Files: Makefile import.log Log Message: Setup of module perl-ExtUtils-XSBuilder --- NEW FILE Makefile --- # Top level Makefile for module perl-ExtUtils-XSBuilder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 18:38:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:54 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507081838.j68IcssU006153@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-ExtUtils-XSBuilder --- NEW 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 Jul 8 18:39:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:39:19 -0400 Subject: rpms/perl-ExtUtils-XSBuilder import.log,1.1,1.2 Message-ID: <200507081839.j68IdnvW006239@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6181 Modified Files: import.log Log Message: auto-import perl-ExtUtils-XSBuilder-0.27-2 on branch devel from perl-ExtUtils-XSBuilder-0.27-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 18:38:52 -0000 1.1 +++ import.log 8 Jul 2005 18:39:16 -0000 1.2 @@ -0,0 +1 @@ +perl-ExtUtils-XSBuilder-0_27-2:HEAD:perl-ExtUtils-XSBuilder-0.27-2.src.rpm:1120848014 From fedora-extras-commits at redhat.com Fri Jul 8 18:39:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:39:19 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507081839.j68IdnBr006243@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6181/devel Modified Files: .cvsignore sources Added Files: perl-ExtUtils-XSBuilder.spec Log Message: auto-import perl-ExtUtils-XSBuilder-0.27-2 on branch devel from perl-ExtUtils-XSBuilder-0.27-2.src.rpm --- NEW FILE perl-ExtUtils-XSBuilder.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-XSBuilder Version: 0.27 Release: 2%{?dist} Summary: Modules that parse C header files and create XS glue code Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-XSBuilder/ Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Tie::IxHash) Requires: perl(Tie::IxHash) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description ExtUtils::XSBuilder is a set of modules to parse C header files and create XS glue code and documentation out of it. Ideally this allows one to "write" an interface to a C library without coding a line. Since no C-API is ideal, some adjuments are necessary most of the time. So to use this module you must still be familiar with C and XS programming, but it removes a lot of stupid work and copy&paste from you. Also when the C API changes, most of the time you only have to rerun XSBuilder to get your new Perl API. %prep %setup -q -n ExtUtils-XSBuilder-%{version} find . -type f | xargs chmod -x %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/ExtUtils %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 0.27-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.27-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 18:38:52 -0000 1.1 +++ .cvsignore 8 Jul 2005 18:39:17 -0000 1.2 @@ -0,0 +1 @@ +ExtUtils-XSBuilder-0.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 18:38:52 -0000 1.1 +++ sources 8 Jul 2005 18:39:17 -0000 1.2 @@ -0,0 +1 @@ +6e1f1c8207b598166dc7a06d633db308 ExtUtils-XSBuilder-0.27.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 18:43:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:43:56 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder.spec, 1.1, 1.2 Message-ID: <200507081843.j68Ihu9O006340@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6323/devel Modified Files: perl-ExtUtils-XSBuilder.spec Log Message: Nuke perl_vendorlib define Index: perl-ExtUtils-XSBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/perl-ExtUtils-XSBuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-ExtUtils-XSBuilder.spec 8 Jul 2005 18:39:17 -0000 1.1 +++ perl-ExtUtils-XSBuilder.spec 8 Jul 2005 18:43:53 -0000 1.2 @@ -1,5 +1,3 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-ExtUtils-XSBuilder Version: 0.27 Release: 2%{?dist} From fedora-extras-commits at redhat.com Fri Jul 8 18:45:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:11 -0400 Subject: rpms/perl-Tie-DBI - New directory Message-ID: <200507081845.j68IjBtg006452@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432/perl-Tie-DBI Log Message: Directory /cvs/extras/rpms/perl-Tie-DBI added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:45:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:12 -0400 Subject: rpms/perl-Tie-DBI/devel - New directory Message-ID: <200507081845.j68IjCAX006457@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432/perl-Tie-DBI/devel Log Message: Directory /cvs/extras/rpms/perl-Tie-DBI/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:45:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:28 -0400 Subject: rpms/perl-Tie-DBI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507081845.j68IjS25006509@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6477 Added Files: Makefile import.log Log Message: Setup of module perl-Tie-DBI --- NEW FILE Makefile --- # Top level Makefile for module perl-Tie-DBI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 18:45:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:29 -0400 Subject: rpms/perl-Tie-DBI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507081845.j68IjTJB006514@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6477/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Tie-DBI --- NEW 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 Jul 8 18:45:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:55 -0400 Subject: rpms/perl-Tie-DBI import.log,1.1,1.2 Message-ID: <200507081845.j68IjtYD006578@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547 Modified Files: import.log Log Message: auto-import perl-Tie-DBI-1.01-2 on branch devel from perl-Tie-DBI-1.01-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Tie-DBI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 18:45:26 -0000 1.1 +++ import.log 8 Jul 2005 18:45:53 -0000 1.2 @@ -0,0 +1 @@ +perl-Tie-DBI-1_01-2:HEAD:perl-Tie-DBI-1.01-2.src.rpm:1120848409 From fedora-extras-commits at redhat.com Fri Jul 8 18:45:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:55 -0400 Subject: rpms/perl-Tie-DBI/devel perl-Tie-DBI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507081845.j68IjtQw006585@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547/devel Modified Files: .cvsignore sources Added Files: perl-Tie-DBI.spec Log Message: auto-import perl-Tie-DBI-1.01-2 on branch devel from perl-Tie-DBI-1.01-2.src.rpm --- NEW FILE perl-Tie-DBI.spec --- Name: perl-Tie-DBI Version: 1.01 Release: 2%{?dist} Summary: Tie hashes to DBI relational databases Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Tie-DBI/ Source0: http://search.cpan.org/CPAN/authors/id/L/LD/LDS/Tie-DBI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This distribution contains Tie::DBI and Tie::RDBM, two modules that allow you to tie associative arrays to relational databases using the DBI library. The hash is tied to a table in a local or networked database. Reading from the hash retrieves values from the datavbase. Storing into the hash updates the database (if you have sufficient privileges). %prep %setup -q -n Tie-DBI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check # needs a running mysql server #make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Tie %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 1.01-2 - cleanups, new description * Wed Jul 6 2005 Tom "spot" Callaway 1.01-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tie-DBI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 18:45:26 -0000 1.1 +++ .cvsignore 8 Jul 2005 18:45:53 -0000 1.2 @@ -0,0 +1 @@ +Tie-DBI-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tie-DBI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 18:45:26 -0000 1.1 +++ sources 8 Jul 2005 18:45:53 -0000 1.2 @@ -0,0 +1 @@ +acdf6ea3c01dc46af8f0c847f8cf40ea Tie-DBI-1.01.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 18:52:24 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 8 Jul 2005 14:52:24 -0400 Subject: common tobuild,1.1866,1.1867 Message-ID: <200507081852.j68IqOkI006716@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6699 Modified Files: tobuild Log Message: request build of rpms/naim/devel naim-0_11_7_3_1-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1866 retrieving revision 1.1867 diff -u -r1.1866 -r1.1867 --- tobuild 8 Jul 2005 17:51:32 -0000 1.1866 +++ tobuild 8 Jul 2005 18:52:22 -0000 1.1867 @@ -13,3 +13,4 @@ scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel adrian rpms/jhead/devel jhead-2_4-1_fc5 devel +lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 19:37:16 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 15:37:16 -0400 Subject: rpms/jhead/devel jhead-compiler-warnings.patch, NONE, 1.1 jhead.spec, 1.10, 1.11 Message-ID: <200507081937.j68JbGho007916@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7896 Modified Files: jhead.spec Added Files: jhead-compiler-warnings.patch Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy jhead-compiler-warnings.patch: --- NEW FILE jhead-compiler-warnings.patch --- diff -ur jhead-2.4/exif.c jhead-2.4.new/exif.c --- jhead-2.4/exif.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/exif.c 2005-07-08 19:37:52.000000000 +0200 @@ -395,7 +395,7 @@ unsigned char * ValuePtr; int ByteCount; char * DirEntry; - DirEntry = DIR_ENTRY_ADDR(DirStart, de); + DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); Tag = Get16u(DirEntry); Format = Get16u(DirEntry+2); @@ -421,7 +421,7 @@ ValuePtr = OffsetBase+OffsetVal; }else{ // 4 bytes or less and value is in the dir entry itself - ValuePtr = DirEntry+8; + ValuePtr = (unsigned char *)DirEntry+8; } if (LastExifRefd < ValuePtr+ByteCount){ @@ -493,17 +493,17 @@ switch(Tag){ case TAG_MAKE: - strncpy(ImageInfo.CameraMake, ValuePtr, 31); + strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31); break; case TAG_MODEL: - strncpy(ImageInfo.CameraModel, ValuePtr, 39); + strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39); break; case TAG_DATETIME_ORIGINAL: // If we get a DATETIME_ORIGINAL, we use that one. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); // Fallthru... case TAG_DATETIME_DIGITIZED: @@ -511,14 +511,14 @@ if (!isdigit(ImageInfo.DateTime[0])){ // If we don't already have a DATETIME_ORIGINAL, use whatever // time fields we may have. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); } if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){ ErrNonfatal("More than %d date fields! This is nuts", MAX_DATE_COPIES, 0); break; } - ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr; + ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr; break; @@ -540,13 +540,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - strncpy(ImageInfo.Comments, a+ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199); break; } } }else{ - strncpy(ImageInfo.Comments, ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)ValuePtr, 199); } break; @@ -927,7 +927,7 @@ for (de=0;de - 2.4-2 +- added patch to make compiler happy + * Fri Jul 08 2005 Adrian Reber - 2.4-1 - updated to 2.4 From fedora-extras-commits at redhat.com Fri Jul 8 20:18:35 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 8 Jul 2005 16:18:35 -0400 Subject: rpms/aiksaurus/devel aiksaurus.spec,1.5,1.6 Message-ID: <200507082018.j68KIZZ0009176@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/aiksaurus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9159 Modified Files: aiksaurus.spec Log Message: Add URL Index: aiksaurus.spec =================================================================== RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aiksaurus.spec 25 Jun 2005 14:04:23 -0000 1.5 +++ aiksaurus.spec 8 Jul 2005 20:18:33 -0000 1.6 @@ -1,7 +1,7 @@ Summary: An English-language thesaurus library. Name: aiksaurus Version: 1.2.1 -Release: 8 +Release: 9 Epoch: 1 Group: System Environment/Libraries License: GPL @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel, desktop-file-utils >= 0.9 PreReq: desktop-file-utils >= 0.9 +URL: http://aiksaurus.sourceforge.net/ Patch0: aiksaurus-1.2.1-desktop.patch @@ -104,6 +105,9 @@ %{_libdir}/pkgconfig/gaiksaurus-1.0.pc %changelog +* Fri Jul 8 2005 Marc Maurer 1:1.2.1-9 +- Add URL + * Sat Jun 25 2005 Colin Charles 1:1.2.1-8 - Fix download URL From fedora-extras-commits at redhat.com Fri Jul 8 20:19:15 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 8 Jul 2005 16:19:15 -0400 Subject: common tobuild,1.1867,1.1868 Message-ID: <200507082019.j68KJFE2009237@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9220 Modified Files: tobuild Log Message: request build of rpms/aiksaurus/devel aiksaurus-1_2_1-9 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1867 retrieving revision 1.1868 diff -u -r1.1867 -r1.1868 --- tobuild 8 Jul 2005 18:52:22 -0000 1.1867 +++ tobuild 8 Jul 2005 20:19:13 -0000 1.1868 @@ -14,3 +14,4 @@ scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel adrian rpms/jhead/devel jhead-2_4-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel +uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel From fedora-extras-commits at redhat.com Fri Jul 8 21:07:54 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:07:54 -0400 Subject: common tobuild,1.1868,1.1869 Message-ID: <200507082107.j68L7sXE010606@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10589 Modified Files: tobuild Log Message: request build of rpms/jhead/devel jhead-2_4-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1868 retrieving revision 1.1869 diff -u -r1.1868 -r1.1869 --- tobuild 8 Jul 2005 20:19:13 -0000 1.1868 +++ tobuild 8 Jul 2005 21:07:52 -0000 1.1869 @@ -15,3 +15,4 @@ adrian rpms/jhead/devel jhead-2_4-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel +adrian rpms/jhead/devel jhead-2_4-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 21:26:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:26:42 -0400 Subject: rpms/nexuiz-data - New directory Message-ID: <200507082126.j68LQglH010701@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10677/nexuiz-data Log Message: Directory /cvs/extras/rpms/nexuiz-data added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 21:26:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:26:42 -0400 Subject: rpms/nexuiz-data/devel - New directory Message-ID: <200507082126.j68LQgoW010706@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10677/nexuiz-data/devel Log Message: Directory /cvs/extras/rpms/nexuiz-data/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 21:27:08 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:27:08 -0400 Subject: rpms/nexuiz-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507082127.j68LR8XO010751@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10722 Added Files: Makefile import.log Log Message: Setup of module nexuiz-data --- NEW FILE Makefile --- # Top level Makefile for module nexuiz-data all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jul 8 21:27:08 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:27:08 -0400 Subject: rpms/nexuiz-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507082127.j68LR811010756@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10722/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nexuiz-data --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 8 21:38:03 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:38:03 -0400 Subject: rpms/jhead/FC-4 jhead-compiler-warnings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jhead.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200507082138.j68Lc3AB010821@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10794 Modified Files: .cvsignore jhead.spec sources Added Files: jhead-compiler-warnings.patch Log Message: - added patch to make compiler happy - updated to 2.4 jhead-compiler-warnings.patch: --- NEW FILE jhead-compiler-warnings.patch --- diff -ur jhead-2.4/exif.c jhead-2.4.new/exif.c --- jhead-2.4/exif.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/exif.c 2005-07-08 19:37:52.000000000 +0200 @@ -395,7 +395,7 @@ unsigned char * ValuePtr; int ByteCount; char * DirEntry; - DirEntry = DIR_ENTRY_ADDR(DirStart, de); + DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); Tag = Get16u(DirEntry); Format = Get16u(DirEntry+2); @@ -421,7 +421,7 @@ ValuePtr = OffsetBase+OffsetVal; }else{ // 4 bytes or less and value is in the dir entry itself - ValuePtr = DirEntry+8; + ValuePtr = (unsigned char *)DirEntry+8; } if (LastExifRefd < ValuePtr+ByteCount){ @@ -493,17 +493,17 @@ switch(Tag){ case TAG_MAKE: - strncpy(ImageInfo.CameraMake, ValuePtr, 31); + strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31); break; case TAG_MODEL: - strncpy(ImageInfo.CameraModel, ValuePtr, 39); + strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39); break; case TAG_DATETIME_ORIGINAL: // If we get a DATETIME_ORIGINAL, we use that one. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); // Fallthru... case TAG_DATETIME_DIGITIZED: @@ -511,14 +511,14 @@ if (!isdigit(ImageInfo.DateTime[0])){ // If we don't already have a DATETIME_ORIGINAL, use whatever // time fields we may have. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); } if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){ ErrNonfatal("More than %d date fields! This is nuts", MAX_DATE_COPIES, 0); break; } - ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr; + ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr; break; @@ -540,13 +540,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - strncpy(ImageInfo.Comments, a+ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199); break; } } }else{ - strncpy(ImageInfo.Comments, ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)ValuePtr, 199); } break; @@ -927,7 +927,7 @@ for (de=0;de - 2.4-2 +- added patch to make compiler happy + +* Fri Jul 08 2005 Adrian Reber - 2.4-1 +- updated to 2.4 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 11:16:18 -0000 1.4 +++ sources 8 Jul 2005 21:38:01 -0000 1.5 @@ -1 +1 @@ -b27c37f1edd25e5f416914ed46ba11fb jhead-2.3.tar.gz +410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 21:38:34 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:38:34 -0400 Subject: common tobuild,1.1869,1.1870 Message-ID: <200507082138.j68LcYQq010880@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10863 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-4 jhead-2_4-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1869 retrieving revision 1.1870 diff -u -r1.1869 -r1.1870 --- tobuild 8 Jul 2005 21:07:52 -0000 1.1869 +++ tobuild 8 Jul 2005 21:38:32 -0000 1.1870 @@ -16,3 +16,4 @@ lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel adrian rpms/jhead/devel jhead-2_4-2_fc5 devel +adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 21:57:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:57:06 -0400 Subject: rpms/nexuiz-data import.log,1.1,1.2 Message-ID: <200507082157.j68LvbDR010958@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10924 Modified Files: import.log Log Message: auto-import nexuiz-data-1.1-1 on branch devel from nexuiz-data-1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 21:27:06 -0000 1.1 +++ import.log 8 Jul 2005 21:57:04 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-data-1_1-1:HEAD:nexuiz-data-1.1-1.src.rpm:1120859808 From fedora-extras-commits at redhat.com Fri Jul 8 21:57:07 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:57:07 -0400 Subject: rpms/nexuiz-data/devel nexuiz-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507082157.j68LvbbJ010962@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10924/devel Modified Files: .cvsignore sources Added Files: nexuiz-data.spec Log Message: auto-import nexuiz-data-1.1-1 on branch devel from nexuiz-data-1.1-1.src.rpm --- NEW FILE nexuiz-data.spec --- %define datadate 20050703 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data Version: 1.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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, 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 %build %install %{__rm} -rf %{buildroot} %{__install} -D -p data/data%{datadate}.pk3 \ %{buildroot}%{_datadir}/nexuiz/data/data%{datadate}.pk3 %clean %{__rm} -rf %{buildroot} %files %defattr(0644, root, root, 0755) %doc Readme.htm COPYING %{_datadir}/nexuiz/ %changelog * 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 shipping the source full of the already provided binary builds. - Don't gz/bzip2 the source as it saves 252kB of 152MB at best and wastes time (the data is already a huge compressed .pk3). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 21:27:06 -0000 1.1 +++ .cvsignore 8 Jul 2005 21:57:05 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-data-1.1.tar Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 21:27:06 -0000 1.1 +++ sources 8 Jul 2005 21:57:05 -0000 1.2 @@ -0,0 +1 @@ +c177cce8cf6ac9134d1d9b8a08dc3272 nexuiz-data-1.1.tar From bugs.michael at gmx.net Fri Jul 8 22:00:40 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Sat, 9 Jul 2005 00:00:40 +0200 Subject: rpms/jhead/FC-4 jhead-compiler-warnings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jhead.spec, 1.9, 1.10 sources, 1.4, 1.5 In-Reply-To: <200507082138.j68Lc3AB010821@cvs-int.fedora.redhat.com> References: <200507082138.j68Lc3AB010821@cvs-int.fedora.redhat.com> Message-ID: <20050709000040.7902e52c.bugs.michael@gmx.net> On Fri, 8 Jul 2005 17:38:03 -0400, Adrian Reber wrote: > Author: adrian > diff -ur jhead-2.4/makefile jhead-2.4.new/makefile > --- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 > +++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 > @@ -9,7 +9,7 @@ > objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o > > $(OBJ)/%.o:$(SRC)/%.c > - ${CC} ${CFLAGS} -Wall -c $< -o $@ > + ${CC} -O3 -Wall -c $< -o $@ > > jhead: $(objs) jhead.h > ${CC} -o jhead $(objs) -lm This one looks reversed. From fedora-extras-commits at redhat.com Fri Jul 8 22:00:20 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:00:20 -0400 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jhead.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507082200.j68M0Kat011057@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11034 Modified Files: .cvsignore jhead.spec sources Added Files: jhead-compiler-warnings.patch Log Message: - added patch to make compiler happy - updated to 2.4 jhead-compiler-warnings.patch: --- NEW FILE jhead-compiler-warnings.patch --- diff -ur jhead-2.4/exif.c jhead-2.4.new/exif.c --- jhead-2.4/exif.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/exif.c 2005-07-08 19:37:52.000000000 +0200 @@ -395,7 +395,7 @@ unsigned char * ValuePtr; int ByteCount; char * DirEntry; - DirEntry = DIR_ENTRY_ADDR(DirStart, de); + DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); Tag = Get16u(DirEntry); Format = Get16u(DirEntry+2); @@ -421,7 +421,7 @@ ValuePtr = OffsetBase+OffsetVal; }else{ // 4 bytes or less and value is in the dir entry itself - ValuePtr = DirEntry+8; + ValuePtr = (unsigned char *)DirEntry+8; } if (LastExifRefd < ValuePtr+ByteCount){ @@ -493,17 +493,17 @@ switch(Tag){ case TAG_MAKE: - strncpy(ImageInfo.CameraMake, ValuePtr, 31); + strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31); break; case TAG_MODEL: - strncpy(ImageInfo.CameraModel, ValuePtr, 39); + strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39); break; case TAG_DATETIME_ORIGINAL: // If we get a DATETIME_ORIGINAL, we use that one. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); // Fallthru... case TAG_DATETIME_DIGITIZED: @@ -511,14 +511,14 @@ if (!isdigit(ImageInfo.DateTime[0])){ // If we don't already have a DATETIME_ORIGINAL, use whatever // time fields we may have. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); } if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){ ErrNonfatal("More than %d date fields! This is nuts", MAX_DATE_COPIES, 0); break; } - ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr; + ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr; break; @@ -540,13 +540,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - strncpy(ImageInfo.Comments, a+ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199); break; } } }else{ - strncpy(ImageInfo.Comments, ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)ValuePtr, 199); } break; @@ -927,7 +927,7 @@ for (de=0;de - 2.4-2 +- added patch to make compiler happy + +* Fri Jul 08 2005 Adrian Reber - 2.4-1 +- updated to 2.4 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sat Feb 12 2005 Adrian Reber 2.3-1 - updated to 2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 11:16:18 -0000 1.4 +++ sources 8 Jul 2005 22:00:18 -0000 1.5 @@ -1 +1 @@ -b27c37f1edd25e5f416914ed46ba11fb jhead-2.3.tar.gz +410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 22:00:51 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:00:51 -0400 Subject: common tobuild,1.1870,1.1871 Message-ID: <200507082200.j68M0pQK011120@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11103 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-3 jhead-2_4-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1870 retrieving revision 1.1871 diff -u -r1.1870 -r1.1871 --- tobuild 8 Jul 2005 21:38:32 -0000 1.1870 +++ tobuild 8 Jul 2005 22:00:49 -0000 1.1871 @@ -17,3 +17,4 @@ uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel adrian rpms/jhead/devel jhead-2_4-2_fc5 devel adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 +adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 22:03:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:03:28 -0400 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch,1.1,1.2 Message-ID: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12182 Modified Files: jhead-compiler-warnings.patch Log Message: don't reverse the other patch jhead-compiler-warnings.patch: Index: jhead-compiler-warnings.patch =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-3/jhead-compiler-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jhead-compiler-warnings.patch 8 Jul 2005 22:00:18 -0000 1.1 +++ jhead-compiler-warnings.patch 8 Jul 2005 22:03:26 -0000 1.2 @@ -115,18 +115,6 @@ }else{ // Discard this section. free(Sections[--SectionsRead].Data); -diff -ur jhead-2.4/makefile jhead-2.4.new/makefile ---- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 -@@ -9,7 +9,7 @@ - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} ${CFLAGS} -Wall -c $< -o $@ -+ ${CC} -O3 -Wall -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm diff -ur jhead-2.4/makernote.c jhead-2.4.new/makernote.c --- jhead-2.4/makernote.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/makernote.c 2005-07-08 19:41:00.000000000 +0200 From fedora-extras-commits at redhat.com Fri Jul 8 22:08:35 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:08:35 -0400 Subject: rpms/jhead/FC-3 jhead.spec,1.8,1.9 Message-ID: <200507082208.j68M8Z4w012263@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245 Modified Files: jhead.spec Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-3 - undo parts of the compiler warning patch because it disabled the correct optflags Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-3/jhead.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jhead.spec 8 Jul 2005 22:00:18 -0000 1.8 +++ jhead.spec 8 Jul 2005 22:08:33 -0000 1.9 @@ -1,6 +1,6 @@ Name: jhead Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain @@ -39,6 +39,10 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-3 +- undo parts of the compiler warning patch because it + disabled the correct optflags + * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy From fedora-extras-commits at redhat.com Fri Jul 8 22:09:55 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:09:55 -0400 Subject: rpms/jhead/FC-4 jhead-compiler-warnings.patch, 1.1, 1.2 jhead.spec, 1.10, 1.11 Message-ID: <200507082209.j68M9t3W012351@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329 Modified Files: jhead-compiler-warnings.patch jhead.spec Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-3 - undo parts of the compiler warning patch because it disabled the correct optflags jhead-compiler-warnings.patch: Index: jhead-compiler-warnings.patch =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-4/jhead-compiler-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jhead-compiler-warnings.patch 8 Jul 2005 21:38:01 -0000 1.1 +++ jhead-compiler-warnings.patch 8 Jul 2005 22:09:53 -0000 1.2 @@ -115,18 +115,6 @@ }else{ // Discard this section. free(Sections[--SectionsRead].Data); -diff -ur jhead-2.4/makefile jhead-2.4.new/makefile ---- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 -@@ -9,7 +9,7 @@ - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} ${CFLAGS} -Wall -c $< -o $@ -+ ${CC} -O3 -Wall -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm diff -ur jhead-2.4/makernote.c jhead-2.4.new/makernote.c --- jhead-2.4/makernote.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/makernote.c 2005-07-08 19:41:00.000000000 +0200 Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-4/jhead.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jhead.spec 8 Jul 2005 21:38:01 -0000 1.10 +++ jhead.spec 8 Jul 2005 22:09:53 -0000 1.11 @@ -1,6 +1,6 @@ Name: jhead Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain @@ -39,6 +39,10 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-3 +- undo parts of the compiler warning patch because it + disabled the correct optflags + * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy From fedora-extras-commits at redhat.com Fri Jul 8 22:11:04 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:11:04 -0400 Subject: rpms/jhead/devel jhead-compiler-warnings.patch, 1.1, 1.2 jhead.spec, 1.11, 1.12 Message-ID: <200507082211.j68MB4Mn012414@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12392 Modified Files: jhead-compiler-warnings.patch jhead.spec Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-3 - undo parts of the compiler warning patch because it disabled the correct optflags jhead-compiler-warnings.patch: Index: jhead-compiler-warnings.patch =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead-compiler-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jhead-compiler-warnings.patch 8 Jul 2005 19:37:14 -0000 1.1 +++ jhead-compiler-warnings.patch 8 Jul 2005 22:11:02 -0000 1.2 @@ -115,18 +115,6 @@ }else{ // Discard this section. free(Sections[--SectionsRead].Data); -diff -ur jhead-2.4/makefile jhead-2.4.new/makefile ---- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 -@@ -9,7 +9,7 @@ - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} ${CFLAGS} -Wall -c $< -o $@ -+ ${CC} -O3 -Wall -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm diff -ur jhead-2.4/makernote.c jhead-2.4.new/makernote.c --- jhead-2.4/makernote.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/makernote.c 2005-07-08 19:41:00.000000000 +0200 Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jhead.spec 8 Jul 2005 19:37:14 -0000 1.11 +++ jhead.spec 8 Jul 2005 22:11:02 -0000 1.12 @@ -1,6 +1,6 @@ Name: jhead Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain @@ -39,6 +39,10 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-3 +- undo parts of the compiler warning patch because it + disabled the correct optflags + * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy From fedora-extras-commits at redhat.com Fri Jul 8 22:13:53 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:13:53 -0400 Subject: common tobuild,1.1871,1.1872 Message-ID: <200507082213.j68MDrm9012483@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12463 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-3 jhead-2_4-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1871 retrieving revision 1.1872 diff -u -r1.1871 -r1.1872 --- tobuild 8 Jul 2005 22:00:49 -0000 1.1871 +++ tobuild 8 Jul 2005 22:13:51 -0000 1.1872 @@ -18,3 +18,4 @@ adrian rpms/jhead/devel jhead-2_4-2_fc5 devel adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 +adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 22:14:35 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:14:35 -0400 Subject: common tobuild,1.1872,1.1873 Message-ID: <200507082214.j68MEZBo012535@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12518 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-4 jhead-2_4-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1872 retrieving revision 1.1873 diff -u -r1.1872 -r1.1873 --- tobuild 8 Jul 2005 22:13:51 -0000 1.1872 +++ tobuild 8 Jul 2005 22:14:33 -0000 1.1873 @@ -19,3 +19,4 @@ adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 +adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 22:15:58 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:15:58 -0400 Subject: common tobuild,1.1873,1.1874 Message-ID: <200507082215.j68MFwGB012573@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12556 Modified Files: tobuild Log Message: request build of rpms/jhead/devel jhead-2_4-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1873 retrieving revision 1.1874 diff -u -r1.1873 -r1.1874 --- tobuild 8 Jul 2005 22:14:33 -0000 1.1873 +++ tobuild 8 Jul 2005 22:15:56 -0000 1.1874 @@ -20,3 +20,4 @@ adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 +adrian rpms/jhead/devel jhead-2_4-3_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 00:11:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:11:57 -0400 Subject: rpms/opendap - New directory Message-ID: <200507090011.j690BvXI015173@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15153/opendap Log Message: Directory /cvs/extras/rpms/opendap added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 00:11:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:11:57 -0400 Subject: rpms/opendap/devel - New directory Message-ID: <200507090012.j690Bv8e015178@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15153/opendap/devel Log Message: Directory /cvs/extras/rpms/opendap/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 00:12:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:12:13 -0400 Subject: rpms/opendap Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507090012.j690CDPS015229@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15198 Added Files: Makefile import.log Log Message: Setup of module opendap --- NEW FILE Makefile --- # Top level Makefile for module opendap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 9 00:12:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:12:13 -0400 Subject: rpms/opendap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507090012.j690CDaN015234@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15198/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module opendap --- NEW 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 Jul 9 00:14:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:14:59 -0400 Subject: rpms/opendap import.log,1.1,1.2 Message-ID: <200507090015.j690FTkF015376@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15318 Modified Files: import.log Log Message: auto-import opendap-3.4.4-5 on branch devel from opendap-3.4.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/opendap/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jul 2005 00:12:10 -0000 1.1 +++ import.log 9 Jul 2005 00:14:57 -0000 1.2 @@ -0,0 +1 @@ +opendap-3_4_4-5:HEAD:opendap-3.4.4-5.src.rpm:1120868152 From fedora-extras-commits at redhat.com Sat Jul 9 00:14:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:14:59 -0400 Subject: rpms/opendap/devel opendap-3.4.4-dap-gcc4.patch, NONE, 1.1 opendap-3.4.4-gcc4.patch, NONE, 1.1 opendap-3.4.4-includedir.patch, NONE, 1.1 opendap-3.4.4-nc3-dods-f95.patch, NONE, 1.1 opendap-3.4.4-rpmoptflags.patch, NONE, 1.1 opendap-3.4.4-shared.patch, NONE, 1.1 opendap-3.4.4-systemlibs.patch, NONE, 1.1 opendap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507090014.j690ExBf015360@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15318/devel Modified Files: .cvsignore sources Added Files: opendap-3.4.4-dap-gcc4.patch opendap-3.4.4-gcc4.patch opendap-3.4.4-includedir.patch opendap-3.4.4-nc3-dods-f95.patch opendap-3.4.4-rpmoptflags.patch opendap-3.4.4-shared.patch opendap-3.4.4-systemlibs.patch opendap.spec Log Message: auto-import opendap-3.4.4-5 on branch devel from opendap-3.4.4-5.src.rpm opendap-3.4.4-dap-gcc4.patch: --- NEW FILE opendap-3.4.4-dap-gcc4.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/RValue.cc.BAD 2005-04-22 13:43:25.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/RValue.cc 2005-04-22 13:43:33.000000000 -0500 @@ -110,7 +110,7 @@ #ifdef WIN32 BaseType **argv = (new (BaseType*)) + argc + 1; #else - BaseType **argv = new (BaseType*)[argc + 1]; + BaseType **argv = new BaseType* [argc + 1]; #endif int index = 0; --- opendap-3.4.4/DODS/src/dap-3.4.8/Operators.h.BAD 2005-04-22 13:39:30.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/Operators.h 2005-04-22 13:39:45.000000000 -0500 @@ -36,8 +36,12 @@ #ifndef _operators_h #define _operators_h +#include #include // GNU Regex class used for string =~ op. +using std::cerr; +using std::endl; + static unsigned dods_max(int i1, int i2) { opendap-3.4.4-gcc4.patch: --- NEW FILE opendap-3.4.4-gcc4.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-22 13:15:04.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-22 13:15:38.000000000 -0500 @@ -3303,6 +3303,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-22 13:13:54.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-22 13:14:33.000000000 -0500 @@ -4531,6 +4531,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; --- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure.BAD 2005-04-22 13:58:22.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure 2005-04-22 13:58:31.000000000 -0500 @@ -3081,6 +3081,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; --- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure.BAD 2005-04-22 13:58:46.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure 2005-04-22 13:58:56.000000000 -0500 @@ -3199,6 +3199,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; opendap-3.4.4-includedir.patch: --- NEW FILE opendap-3.4.4-includedir.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/opendap-config.in.BAD 2005-07-05 14:39:45.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/opendap-config.in 2005-07-05 14:40:18.000000000 -0500 @@ -2,10 +2,10 @@ # # Borrowed the idea for this script (and some code) from libcurl. # -prefix=@dods_root@ +prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include +includedir=${prefix}/include/opendap usage() { opendap-3.4.4-nc3-dods-f95.patch: --- NEW FILE opendap-3.4.4-nc3-dods-f95.patch --- --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-22 14:00:37.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-22 14:00:57.000000000 -0500 @@ -3159,7 +3159,7 @@ forts='f77 g77 fort77' ;; Linux*) - forts="f77 fort77 g77" + forts="f77 fort77 g77 f95" ;; OSF1*) # The use of f90(1) results in the following for opendap-3.4.4-rpmoptflags.patch: --- NEW FILE opendap-3.4.4-rpmoptflags.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/regex-0.12/Makefile.in.BAD 2005-07-05 16:51:18.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/regex-0.12/Makefile.in 2005-07-05 16:51:51.000000000 -0500 @@ -26,7 +26,7 @@ # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to # the corresponding C procedures). If not -DDEBUG, the macros # are used. -CPPFLAGS = +CPPFLAGS = $(RPM_OPT_FLAGS) -fPIC # Likewise, you can override CFLAGS to optimize, use -Wall, etc. CFLAGS = -g opendap-3.4.4-shared.patch: --- NEW FILE opendap-3.4.4-shared.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in.BAD 2005-07-05 14:46:00.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in 2005-07-05 14:53:01.000000000 -0500 @@ -13,7 +13,7 @@ # a url. In addition it can read and process DAS and DDS objects, displaying # the print representation on the screen. -PROG = libdap++.a geturl usage deflate +PROG = libdap++.a libdap++.so.0.0.0 geturl usage deflate # dods_relative ends in a slash. 5/14/2001 jhrg DODS_ROOT = @dods_relative@ @@ -181,55 +181,59 @@ $(AR) cru $@ $? $(RANLIB) $@ +libdap++.so.0.0.0: $(DASOBJS) $(DDSOBJS) $(TYPEOBJS) $(GNUOBJS) $(ERROROBJS) \ + $(EXPROBJS) $(UTILOBJS) $(CLIENTOBJS) $(AISOBJS) + $(CC) $(CPPFLAGS) -shared -Wl,-soname,libdap++.so.0 -o $@ $? + deflate: deflate.o $(CC) $(LDFLAGS) -o deflate deflate.o -lz # geturl is really a test driver, but it is so useful in other contexts that # I have decided to build it as part of the `all' target. jhrg 7/11/96 -geturl: libdap++.a geturl.o +geturl: libdap++.so.0.0.0 geturl.o $(CXX) $(LDFLAGS) -o geturl geturl.o -ldap++ $(LIBS) # The program named usage is the filter that is run by the CGI dispatch # script as the `usage server'. This filter is the same for all different # server types so it does not need to be specialized for each API. -usage: libdap++.a usage.o - $(CXX) $(LDFLAGS) -o usage usage.o libdap++.a $(LIBS) +usage: libdap++.so.0.0.0 usage.o + $(CXX) $(LDFLAGS) -o usage usage.o -ldap++ $(LIBS) # Build the test drivers -das-test: libdap++.a das-test.o das.tab.h - $(CXX) $(LDFLAGS) -o das-test das-test.o libdap++.a $(LIBS) +das-test: libdap++.so.0.0.0 das-test.o das.tab.h + $(CXX) $(LDFLAGS) -o das-test das-test.o -ldap++ $(LIBS) -dds-test: libdap++.a dds-test.o dds.tab.h - $(CXX) $(LDFLAGS) -o dds-test dds-test.o libdap++.a $(LIBS) +dds-test: libdap++.so.0.0.0 dds-test.o dds.tab.h + $(CXX) $(LDFLAGS) -o dds-test dds-test.o -ldap++ $(LIBS) -gse-test: libdap++.a lex.gse.o gse-test.o \ +gse-test: libdap++.so.0.0.0 lex.gse.o gse-test.o \ gse.tab.o $(CXX) $(LDFLAGS) -o gse-test lex.gse.o gse-test.o gse.tab.o \ - libdap++.a $(LIBS) + -ldap++ $(LIBS) -expr-test: libdap++.a $(TESTOBJS) expr-test.o expr.tab.h +expr-test: libdap++.so.0.0.0 $(TESTOBJS) expr-test.o expr.tab.h $(CXX) $(LDFLAGS) -o expr-test expr-test.o lex.expr.o \ - $(TESTOBJS) libdap++.a $(LIBS) + $(TESTOBJS) -ldap++ $(LIBS) error-test: error-test.o Error.tab.h $(ERROROBJS) $(CXX) $(LDFLAGS) -o error-test error-test.o $(ERROROBJS) \ - libdap++.a $(LIBS) + -ldap++ $(LIBS) # Build a summary test for Dods running in a Multi-threaded mode ThreadTest: ThreadTest.o - $(CXX) $(LDFLAGS) -o ThreadTest ThreadTest.o libdap++.a $(LIBS) + $(CXX) $(LDFLAGS) -o ThreadTest ThreadTest.o -ldap++ $(LIBS) -server_handler: server_handler.o $(TESTOBJS) libdap++.a - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) +server_handler: server_handler.o $(TESTOBJS) + $(CXX) $(LDFLAGS) -o $@ $^ -ldap++ $(LIBS) # *** Remove this when we're done hacking the idl client Pix code. 04/14/03 # *** jhrg -tryme: tryme.o LongIterAdapter.o libdap++.a - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) +tryme: tryme.o LongIterAdapter.o + $(CXX) $(LDFLAGS) -o $@ $^ -ldap++ $(LIBS) # The grammar targets. @@ -320,6 +324,7 @@ install: all install-headers install-geturl install-opendap-config install-usage install-deflate -mkdir -p $(libdir) $(INSTALL_DATA) libdap++.a $(libdir) + $(INSTALL_DATA) libdap++.so* $(libdir) $(RANLIB) $(libdir)/libdap++.a install-headers: @@ -360,7 +365,7 @@ ./configure; \ fi -check: libdap++.a das-check dds-check expr-check +check: libdap++.so.0.0.0 das-check dds-check expr-check test-coverage: clean $(MAKE) $(MFLAGS) CXXFLAGS="$(CXXFLAGS) $(TEST_COV_FLAGS)" check @@ -428,52 +433,52 @@ # Build the unit tests. Requires CppUnit be installed. -RCReaderTest: RCReaderTest.o libdap++.a +RCReaderTest: RCReaderTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -SignalHandlerTest: SignalHandlerTest.o libdap++.a +SignalHandlerTest: SignalHandlerTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -DODSFilterTest: DODSFilterTest.o libdap++.a +DODSFilterTest: DODSFilterTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AISMergeTest: AISMergeTest.o libdap++.a +AISMergeTest: AISMergeTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AISDatabaseParserTest: AISDatabaseParserTest.o libdap++.a +AISDatabaseParserTest: AISDatabaseParserTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AISResourcesTest: AISResourcesTest.o libdap++.a +AISResourcesTest: AISResourcesTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -parserUtilTest: parserUtilTest.o libdap++.a +parserUtilTest: parserUtilTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -generalUtilTest: generalUtilTest.o libdap++.a +generalUtilTest: generalUtilTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -DASTest: DASTest.o libdap++.a +DASTest: DASTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -ByteTest: ByteTest.o libdap++.a +ByteTest: ByteTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -SequenceTest: SequenceTest.o libdap++.a +SequenceTest: SequenceTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AttrTableTest: AttrTableTest.o libdap++.a +AttrTableTest: AttrTableTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -DDSTest: DDSTest.o libdap++.a +DDSTest: DDSTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -cgiUtilTest: cgiUtilTest.o libdap++.a +cgiUtilTest: cgiUtilTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -HTTPCacheTest: HTTPCacheTest.o libdap++.a +HTTPCacheTest: HTTPCacheTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -HTTPConnectTest: HTTPConnectTest.o libdap++.a +HTTPConnectTest: HTTPConnectTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) unit-check: $(UNIT_TEST_PROGS) --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in.BAD 2005-07-05 14:53:39.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in 2005-07-05 14:59:57.000000000 -0500 @@ -7,7 +7,7 @@ # DEFS gets the `-D' defines that describe what a particular system has # or doesn't have. -PROG = libnc-dods.a nc_das nc_dds nc_dods +PROG = libnc-dods.a libnc-doda.so.0.0.0 nc_das nc_dds nc_dods DODS_ROOT = @dods_relative@ INCS = -I./lnetcdf @INCS@ @@ -25,7 +25,7 @@ LDFLAGS = -L. -L./lnetcdf @LDFLAGS@ LFLAGS=-8 YFLAGS=-d -NCDODS = -lnc-dods -ldap++ -lnc-dods -ldap++ +NCDODS = -lnc-dods -ldap++ LIBS = @LIBS@ # Set the instalation directories; prefix can be set on the command line @@ -107,15 +107,15 @@ fortran/fort-geninq.o fortran/fort-var1io.o # Matlab client can be suppressed by a switch to configure. -all: libnc-dods.a nc_das nc_dds nc_dods ncdump +all: libnc-dods.a libnc-dods.so.0.0.0 nc_das nc_dds nc_dods ncdump -nc_das: $(DASOBJS) libnc-dods.a +nc_das: $(DASOBJS) libnc-dods.so.0.0.0 $(CXX) $(LDFLAGS) -o nc_das $(DASOBJS) $(NCDODS) $(LIBS) -nc_dds: $(DDSOBJS) libnc-dods.a +nc_dds: $(DDSOBJS) libnc-dods.so.0.0.0 $(CXX) $(LDFLAGS) -o nc_dds $(DDSOBJS) $(NCDODS) $(LIBS) -nc_dods: $(SRVOBJS) libnc-dods.a +nc_dods: $(SRVOBJS) libnc-dods.so.0.0.0 $(CXX) $(LDFLAGS) -o nc_dods $(SRVOBJS) $(NCDODS) $(LIBS) libnc-dods.a: $(LIBOBJS) $(NCOBJS) @@ -123,6 +123,9 @@ $(AR) -cru $@ $(LIBOBJS) $(NCOBJS) $(RANLIB) $@ +libnc-dods.so.0.0.0: $(LIBOBJS) $(NCOBJS) + $(CC) -shared -Wl,-soname,libnc-dods.so.0 -o $@ $? + .PHONY: fortran fortran: -(cd fortran && $(MAKE) $(MFLAGS) all) @@ -163,8 +166,9 @@ gcov -l -o ../ $$f >> $$cov_dat; \ done) -install: libnc-dods.a nc_das nc_dds nc_dods +install: libnc-dods.a libnc-dods.so.0.0.0 nc_das nc_dds nc_dods $(INSTALL_DATA) libnc-dods.a $(libdir) + $(INSTALL_DATA) libnc-dods.so.0.0.0 $(libdir) $(RANLIB) $(libdir)/libnc-dods.a $(INSTALL_DATA) lnetcdf/netcdf.h $(includedir) $(INSTALL_DATA) fortran/netcdf.inc $(includedir) @@ -179,14 +183,14 @@ clean: -rm -f *.o *.sum *.log *~ core - -rm -f $(PROG) libnc-dods.a + -rm -f $(PROG) libnc-dods.a libnc-dods.so.0.0.0 -(cd ncdump && $(MAKE) $(MFLAGS) clean) -(cd fortran && $(MAKE) $(MFLAGS) clean) -(cd nc_test && $(MAKE) $(MFLAGS) clean) distclean: -rm -f *.o *.sum *.log *~ core - -rm -f $(PROG) libnc-dods.a + -rm -f $(PROG) libnc-dods.a libnc-dods.so.0.0.0 -rm -f config.status config.log config.cache -rm -f site.exp config_nc.h lnetcdf/ncconfig.h -(cd ncdump && $(MAKE) $(MFLAGS) distclean) opendap-3.4.4-systemlibs.patch: --- NEW FILE opendap-3.4.4-systemlibs.patch --- --- opendap-3.4.4/DODS/src/ff-dods-3.4.3/configure.BAD 2005-04-23 16:30:59.000000000 -0500 +++ opendap-3.4.4/DODS/src/ff-dods-3.4.3/configure 2005-04-23 16:31:53.000000000 -0500 @@ -6521,19 +6521,6 @@ - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -6551,13 +6538,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-23 16:22:48.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-23 16:28:34.000000000 -0500 @@ -6597,13 +6597,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -6680,13 +6677,13 @@ echo $ECHO_N "checking for libxml2 and its headers... $ECHO_C" >&6 # 2003/06/13 ERD - chaged to handle libxml2 distrib w/ DODS # libxml2 NOT part of DODS distribution - #if test -n "`which xml2-config`" + if test -n "`which xml2-config`" # libxml2 IS part of DODS distribution - if test -x $dods_root/bin/xml2-config + #if test -x $dods_root/bin/xml2-config then # libxml2 NOT part of DODS distribution - #INCS="`xml2-config --cflags` $INCS" - #LIBS="`xml2-config --libs` $LIBS" + INCS="`xml2-config --cflags` $INCS" + LIBS="`xml2-config --libs` $LIBS" # libxml2 IS part of DODS distribution # INCS="`$dods_root/bin/xml2-config --cflags` $INCS" # @@ -6694,8 +6691,8 @@ # which makes its way into the Makefile. This, in turn, puts an # absolute path in the dependencies (why I don't really know, -MM # should not make dependencies for <> includes). 07/25/03 jhrg - INCS="-I../../include/libxml2 $INCS" - LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" + #INCS="-I../../include/libxml2 $INCS" + #LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-23 16:25:20.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-23 16:28:00.000000000 -0500 @@ -8140,19 +8140,6 @@ - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -8170,13 +8157,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -8253,13 +8237,13 @@ echo $ECHO_N "checking for libxml2 and its headers... $ECHO_C" >&6 # 2003/06/13 ERD - chaged to handle libxml2 distrib w/ DODS # libxml2 NOT part of DODS distribution - #if test -n "`which xml2-config`" + if test -n "`which xml2-config`" # libxml2 IS part of DODS distribution - if test -x $dods_root/bin/xml2-config + #if test -x $dods_root/bin/xml2-config then # libxml2 NOT part of DODS distribution - #INCS="`xml2-config --cflags` $INCS" - #LIBS="`xml2-config --libs` $LIBS" + INCS="`xml2-config --cflags` $INCS" + LIBS="`xml2-config --libs` $LIBS" # libxml2 IS part of DODS distribution # INCS="`$dods_root/bin/xml2-config --cflags` $INCS" # @@ -8267,8 +8251,8 @@ # which makes its way into the Makefile. This, in turn, puts an # absolute path in the dependencies (why I don't really know, -MM # should not make dependencies for <> includes). 07/25/03 jhrg - INCS="-I../../include/libxml2 $INCS" - LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" + #INCS="-I../../include/libxml2 $INCS" + #LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure.BAD 2005-04-23 16:35:27.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure 2005-04-23 16:36:03.000000000 -0500 @@ -6343,19 +6343,6 @@ _ACEOF - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -6436,13 +6423,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure.BAD 2005-04-23 16:34:22.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure 2005-04-23 16:35:17.000000000 -0500 @@ -6404,19 +6404,6 @@ _ACEOF - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -6497,13 +6484,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/jg-dods-3.4.3/configure.BAD 2005-04-23 16:29:06.000000000 -0500 +++ opendap-3.4.4/DODS/src/jg-dods-3.4.3/configure 2005-04-23 16:30:15.000000000 -0500 @@ -7212,19 +7212,6 @@ _ACEOF - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -7305,13 +7292,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/Makefile.in.BAD 2005-04-23 16:18:57.000000000 -0500 +++ opendap-3.4.4/DODS/Makefile.in 2005-04-23 16:19:43.000000000 -0500 @@ -53,9 +53,11 @@ CLIENTS = src/clients/ncview* src/clients/ml-cmdln* \ src/clients/ml-structs* -PACKAGES = src/packages* +# Use system packages +# PACKAGES = src/packages* +PACKAGES = -World: packages configure all +World: configure all # I'm not sure just how to handle the packages yet. For now, users/builders # must cd to DODS_ROOT/packages and build there first. It is as if there are --- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-23 16:40:37.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-23 16:41:15.000000000 -0500 @@ -1332,19 +1332,6 @@ - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg --- opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in.BAD 2005-04-23 16:43:49.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in 2005-04-23 16:47:16.000000000 -0500 @@ -661,9 +661,7 @@ util.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h \ Str.h dods-limits.h Url.h Array.h Vector.h List.h Structure.h \ Constructor.h Sequence.h Grid.h DataDDS.h HTTPConnect.h \ - ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h ObjectType.h HTTPCache.h \ + RCReader.h ObjectType.h HTTPCache.h \ ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \ SignalHandlerRegisteredErr.h HTTPResponse.h Response.h RCReader.o: RCReader.cc config_dap.h debug.h RCReader.h Error.h util.h \ @@ -676,16 +674,13 @@ Clause.h expr.h RValue.h Connect.h DAS.h AttrTable.h util.h Byte.h \ Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \ dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \ - Sequence.h Grid.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + Sequence.h Grid.h HTTPConnect.h \ + RCReader.h \ ObjectType.h HTTPCache.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h escaping.h HTTPConnect.o: HTTPConnect.cc config_dap.h debug.h GNU/Regex.h \ - HTTPConnect.h ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h Error.h util.h BaseType.h \ + HTTPConnect.h RCReader.h Error.h util.h BaseType.h \ InternalErr.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \ Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \ GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \ @@ -886,41 +881,9 @@ ResponseTooBigErr.h Error.h AISResources.o: AISResources.cc config_dap.h AISResources.h GNU/Regex.h \ Resource.h Error.h AISExceptions.h AISDatabaseParser.h \ - ../../include/libxml2/libxml/parserInternals.h \ - ../../include/libxml2/libxml/parser.h \ - ../../include/libxml2/libxml/tree.h \ - ../../include/libxml2/libxml/xmlversion.h \ - ../../include/libxml2/libxml/xmlregexp.h \ - ../../include/libxml2/libxml/valid.h \ - ../../include/libxml2/libxml/list.h \ - ../../include/libxml2/libxml/xmlautomata.h \ - ../../include/libxml2/libxml/entities.h \ - ../../include/libxml2/libxml/encoding.h \ - ../../include/libxml2/libxml/xmlIO.h \ - ../../include/libxml2/libxml/globals.h \ - ../../include/libxml2/libxml/xmlerror.h \ - ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \ - ../../include/libxml2/libxml/xmlmemory.h \ - ../../include/libxml2/libxml/threads.h \ - ../../include/libxml2/libxml/HTMLparser.h InternalErr.h + InternalErr.h AISDatabaseParser.o: AISDatabaseParser.cc config_dap.h \ - AISDatabaseParser.h ../../include/libxml2/libxml/parserInternals.h \ - ../../include/libxml2/libxml/parser.h \ - ../../include/libxml2/libxml/tree.h \ - ../../include/libxml2/libxml/xmlversion.h \ - ../../include/libxml2/libxml/xmlregexp.h \ - ../../include/libxml2/libxml/valid.h \ - ../../include/libxml2/libxml/list.h \ - ../../include/libxml2/libxml/xmlautomata.h \ - ../../include/libxml2/libxml/entities.h \ - ../../include/libxml2/libxml/encoding.h \ - ../../include/libxml2/libxml/xmlIO.h \ - ../../include/libxml2/libxml/globals.h \ - ../../include/libxml2/libxml/xmlerror.h \ - ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \ - ../../include/libxml2/libxml/xmlmemory.h \ - ../../include/libxml2/libxml/threads.h \ - ../../include/libxml2/libxml/HTMLparser.h InternalErr.h Error.h \ + AISDatabaseParser.h InternalErr.h Error.h \ AISExceptions.h AISResources.h GNU/Regex.h Resource.h util.h BaseType.h \ dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h \ Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h GNU/Pix.h \ @@ -928,9 +891,7 @@ Constructor.h Sequence.h Grid.h debug.h AISMerge.o: AISMerge.cc config_dap.h AISMerge.h DAS.h GNU/Pix.h \ IteratorAdapter.h AttrTable.h Error.h HTTPConnect.h \ - ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h util.h BaseType.h InternalErr.h \ + RCReader.h util.h BaseType.h InternalErr.h \ dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h \ Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h Clause.h \ expr.h RValue.h List.h Structure.h Constructor.h Sequence.h Grid.h \ @@ -943,9 +904,7 @@ InternalErr.h dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h \ Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \ dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \ - Sequence.h Grid.h DataDDS.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + Sequence.h Grid.h DataDDS.h HTTPConnect.h RCReader.h \ ObjectType.h HTTPCache.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \ @@ -1005,9 +964,7 @@ InternalErr.h dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h \ Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \ dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \ - Sequence.h Grid.h DataDDS.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + Sequence.h Grid.h DataDDS.h HTTPConnect.h RCReader.h \ ObjectType.h HTTPCache.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \ @@ -1017,9 +974,7 @@ Clause.h expr.h RValue.h util.h Byte.h Int16.h UInt16.h Int32.h \ UInt32.h Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h \ List.h Structure.h Constructor.h Sequence.h Grid.h DataDDS.h \ - HTTPConnect.h ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h ObjectType.h HTTPCache.h \ + HTTPConnect.h RCReader.h ObjectType.h HTTPCache.h \ config_dap.h ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \ SignalHandlerRegisteredErr.h HTTPResponse.h Response.h debug.h server_handler.o: server_handler.cc config_dap.h DODSFilter.h DAS.h \ @@ -1048,18 +1003,14 @@ List.h Structure.h Constructor.h Sequence.h Grid.h HTTPCacheTest.o: HTTPCacheTest.cc HTTPCache.h config_dap.h Error.h \ InternalErr.h ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \ - SignalHandlerRegisteredErr.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h util.h \ + SignalHandlerRegisteredErr.h HTTPConnect.h RCReader.h util.h \ BaseType.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \ Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \ GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \ Constructor.h Sequence.h Grid.h ObjectType.h HTTPResponse.h Response.h \ debug.h SignalHandler.h EventHandler.h cgi_util.h EncodingType.h HTTPConnectTest.o: HTTPConnectTest.cc GNU/Regex.h HTTPConnect.h \ - ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h Error.h util.h BaseType.h \ + RCReader.h Error.h util.h BaseType.h \ InternalErr.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \ Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \ GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \ @@ -1090,23 +1041,7 @@ Vector.h DDS.h GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h \ Grid.h Constructor.h AISDatabaseParserTest.o: AISDatabaseParserTest.cc AISDatabaseParser.h \ - ../../include/libxml2/libxml/parserInternals.h \ - ../../include/libxml2/libxml/parser.h \ - ../../include/libxml2/libxml/tree.h \ - ../../include/libxml2/libxml/xmlversion.h \ - ../../include/libxml2/libxml/xmlregexp.h \ - ../../include/libxml2/libxml/valid.h \ - ../../include/libxml2/libxml/list.h \ - ../../include/libxml2/libxml/xmlautomata.h \ - ../../include/libxml2/libxml/entities.h \ - ../../include/libxml2/libxml/encoding.h \ - ../../include/libxml2/libxml/xmlIO.h \ - ../../include/libxml2/libxml/globals.h \ - ../../include/libxml2/libxml/xmlerror.h \ - ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \ - ../../include/libxml2/libxml/xmlmemory.h \ - ../../include/libxml2/libxml/threads.h \ - ../../include/libxml2/libxml/HTMLparser.h InternalErr.h Error.h \ + InternalErr.h Error.h \ AISExceptions.h AISResources.h GNU/Regex.h Resource.h debug.h AISResourcesTest.o: AISResourcesTest.cc AISResources.h GNU/Regex.h \ Resource.h Error.h AISExceptions.h debug.h @@ -1115,9 +1050,7 @@ dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h Int16.h \ UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h dods-limits.h Url.h \ Array.h Vector.h List.h Structure.h Constructor.h Sequence.h Grid.h \ - DataDDS.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + DataDDS.h HTTPConnect.h RCReader.h \ ObjectType.h HTTPCache.h config_dap.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \ --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in.BAD 2005-04-23 16:49:47.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in 2005-04-23 16:51:49.000000000 -0500 @@ -293,9 +293,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/HTTPCache.h \ ../../include/config_dap.h ../../include/ResponseTooBigErr.h \ ../../include/HTTPCacheDisconnectedMode.h \ @@ -326,9 +324,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -363,9 +359,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -387,9 +381,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -414,9 +406,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -440,9 +430,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -466,9 +454,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -504,9 +490,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -530,9 +514,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -568,9 +550,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -604,9 +584,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -630,9 +608,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -656,9 +632,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ --- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/Makefile.in.BAD 2005-04-23 16:49:18.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/Makefile.in 2005-04-23 16:49:30.000000000 -0500 @@ -337,9 +337,7 @@ ../../../include/List.h ../../../include/Structure.h \ ../../../include/Constructor.h ../../../include/Sequence.h \ ../../../include/Grid.h ../../../include/DataDDS.h \ - ../../../include/HTTPConnect.h ../../../include/curl/curl.h \ - ../../../include/curl/curlver.h ../../../include/curl/easy.h \ - ../../../include/curl/multi.h ../../../include/curl/types.h \ + ../../../include/HTTPConnect.h \ ../../../include/RCReader.h ../../../include/ObjectType.h \ ../../../include/HTTPCache.h ../../../include/config_dap.h \ ../../../include/ResponseTooBigErr.h \ --- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/Makefile.in.BAD 2005-04-23 16:48:57.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/Makefile.in 2005-04-23 16:49:09.000000000 -0500 @@ -314,9 +314,7 @@ ../../../include/List.h ../../../include/Structure.h \ ../../../include/Constructor.h ../../../include/Sequence.h \ ../../../include/Grid.h ../../../include/DataDDS.h \ - ../../../include/HTTPConnect.h ../../../include/curl/curl.h \ - ../../../include/curl/curlver.h ../../../include/curl/easy.h \ - ../../../include/curl/multi.h ../../../include/curl/types.h \ + ../../../include/HTTPConnect.h \ ../../../include/RCReader.h ../../../include/ObjectType.h \ ../../../include/HTTPCache.h ../../../include/config_dap.h \ ../../../include/ResponseTooBigErr.h \ --- NEW FILE opendap.spec --- Name: opendap Version: 3.4.4 Release: 5%{?dist} Summary: Open-source Project for a Network Data Access Protocol Group: Applications/Engineering License: LGPL URL: http://www.opendap.org/ Source0: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-dap-3.4.8.tar.gz Source1: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-nc3-dods-3.4.7.tar.gz Source2: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-jg-dods-3.4.3.tar.gz Source3: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-ff-dods-3.4.3.tar.gz # This thing is really broken. #Source4: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-ncview-3.4.3.tar.gz Source5: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-asciival-3.4.3.tar.gz Source6: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-www-interface-3.4.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: opendap-3.4.4-gcc4.patch Patch1: opendap-3.4.4-dap-gcc4.patch Patch2: opendap-3.4.4-nc3-dods-f95.patch Patch3: opendap-3.4.4-systemlibs.patch Patch4: opendap-3.4.4-includedir.patch Patch5: opendap-3.4.4-shared.patch Patch6: opendap-3.4.4-rpmoptflags.patch BuildRequires: openssl-devel, pkgconfig BuildRequires: curl-devel, krb5-libs, netcdf-devel BuildRequires: libxml2-devel %package devel Summary: Development files for opendap Group: Development/Libraries Requires: %{name} = %{version}-%{release} %package server Summary: Server components for opendap Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: perl-HTML-Parser %description OPeNDAP provides software which makes local data accessible to remote locations regardless of local storage format. OPeNDAP also provides tools for transforming existing applications into OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data). OPeNDAP software is freely available. %description devel This package contains the OPeNDAP header files and libraries. %description server This package contains the OPeNDAP server components. %prep %setup -c -n %{name}-%{version} -q -a 1 -a 2 -a 3 -a 5 -a 6 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build cd DODS/ export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3 export CPPFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make unset NETCDF_INC NETCDF_LIB %install rm -rf ${RPM_BUILD_ROOT} cd DODS/ rm -rf include/netcdf.h include/netcdf.inc include/builtin.h share/ mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_includedir}/opendap install -m644 etc/*.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/ install -m644 etc/jgofs_objects_readme $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m755 bin/* $RPM_BUILD_ROOT/%{_bindir} for i in ff_das ff_dds ff_dods jg_das jg_dds jg_dods nc_das nc_dds nc_dods usage-jg \ usage def www_int nph-dods installServers deflate asciival; do install -m755 etc/$i $RPM_BUILD_ROOT/%{_bindir} done install -m755 lib/*.a $RPM_BUILD_ROOT/%{_libdir} install -m755 lib/libdap++.so* $RPM_BUILD_ROOT/%{_libdir} install -m755 lib/libnc-dods.so* $RPM_BUILD_ROOT/%{_libdir} install -m644 include/* $RPM_BUILD_ROOT/%{_includedir}/opendap cd $RPM_BUILD_ROOT/%{_libdir} chmod +x libdap++.so.0.0.0 libnc-dods.so.0.0.0 ln -s libdap++.so.0.0.0 libdap++.so.0 ln -s libdap++.so.0.0.0 libdap++.so ln -s libnc-dods.so.0.0.0 libnc-dods.so.0 ln -s libnc-dods.so.0.0.0 libnc-dods.so %clean rm -rf ${RPM_BUILD_ROOT} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc DODS/etc/INSTALL-clients DODS/README DODS/etc/INSTALL-matlab-client DODS/etc/COPYING %{_bindir}/geturl %{_bindir}/dncdump %{_bindir}/checkvar %{_libdir}/libdap++.so.* %{_libdir}/libnc-dods.so.* %files devel %defattr(-,root,root,-) %doc DODS/ChangeLog DODS/INSTALL DODS/NEWS DODS/VERSION DODS/etc/COPYRIGHT_URI %{_bindir}/opendap-config %{_libdir}/libdap++.a %{_libdir}/libdap++.so %{_libdir}/libnc-dods.a %{_libdir}/libnc-dods.so %{_includedir}/opendap %files server %defattr(-,root,root,-) %doc DODS/etc/INSTALL-servers DODS/etc/README-security DODS/etc/EXAMPLE_DODS_STATISTICS %{_bindir}/installServers %{_bindir}/nph-dods %{_bindir}/asciival %{_bindir}/www_int %{_bindir}/def %{_bindir}/jg_* %{_bindir}/ff_* %{_bindir}/nc_* %{_bindir}/usage-jg %{_bindir}/chkform %{_bindir}/newform %{_bindir}/bufform %{_bindir}/readfile %{_bindir}/deflate %{_bindir}/usage %dir %{_datadir}/%{name} %{_datadir}/%{name}/jgofs_objects_readme %{perl_vendorlib}/*.pm %changelog * Tue Jul 5 2005 Tom "spot" Callaway 3.4.4-4 - Remove broken client bits * Tue Jul 5 2005 Tom "spot" Callaway 3.4.4-3 - put headers in %{_includedir}/opendap - make shared libraries - fix opendap-config * Sat Apr 23 2005 Tom "spot" Callaway 3.4.4-2 - Use system packages instead of included older versions * Fri Apr 22 2005 Tom "spot" Callaway 3.4.4-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opendap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2005 00:12:11 -0000 1.1 +++ .cvsignore 9 Jul 2005 00:14:57 -0000 1.2 @@ -0,0 +1,6 @@ +DODS-asciival-3.4.3.tar.gz +DODS-dap-3.4.8.tar.gz +DODS-ff-dods-3.4.3.tar.gz +DODS-jg-dods-3.4.3.tar.gz +DODS-nc3-dods-3.4.7.tar.gz +DODS-www-interface-3.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opendap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2005 00:12:11 -0000 1.1 +++ sources 9 Jul 2005 00:14:57 -0000 1.2 @@ -0,0 +1,6 @@ +4fb5b5b1af1e962b7d35302d129071dc DODS-asciival-3.4.3.tar.gz +3a1c6000d8713ded765d987c8d216462 DODS-dap-3.4.8.tar.gz +e341d6ba8ac0ea8ef11679e330a0655c DODS-ff-dods-3.4.3.tar.gz +38a2ef12916f1414d3dbe26d8913e2ae DODS-jg-dods-3.4.3.tar.gz +dfeb77f1eace3b3c64884d21afc8a422 DODS-nc3-dods-3.4.7.tar.gz +3c0f9dc00bba72fec8049ad7352fc5af DODS-www-interface-3.4.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 00:41:25 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 8 Jul 2005 20:41:25 -0400 Subject: rpms/mod_security/devel mod_security.conf, 1.1, 1.2 mod_security.spec, 1.2, 1.3 Message-ID: <200507090041.j690fP4U015480@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15461 Modified Files: mod_security.conf mod_security.spec Log Message: - Spec cleanup (from Oliver Falk) - Updated config with some safe-but-useful rulesets Index: mod_security.conf =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_security.conf 19 May 2005 01:39:17 -0000 1.1 +++ mod_security.conf 9 Jul 2005 00:41:23 -0000 1.2 @@ -1,5 +1,4 @@ # Example configuration file for the mod_security Apache module -# This is a minimal setup. You should add some extra entries here. LoadModule security_module modules/mod_security.so @@ -69,4 +68,40 @@ # (and you don't need it anyway) SecFilterSelective HTTP_Transfer-Encoding "!^$" - + # Some common application-related rules from + # http://modsecrules.monkeydev.org/rules.php?safety=safe + + #Nuke Bookmarks XSS + SecFilterSelective THE_REQUEST "/modules\.php\?name=Bookmarks\&file=(del_cat\&catname|del_mark\&markname|edit_cat\&catname|edit_cat\&catcomment|marks\&catname|uploadbookmarks\&category)=(<[[:space:]]*script|(http|https|ftp)\:/)" + + #Nuke Bookmarks Marks.php SQL Injection Vulnerability + SecFilterSelective THE_REQUEST "modules\.php\?name=Bookmarks\&file=marks\&catname=.*\&category=.*/\*\*/(union|select|delete|insert)" + + #PHPNuke general XSS attempt + #/modules.php?name=News&file=article&sid=1&optionbox= + SecFilterSelective THE_REQUEST "/modules\.php\?*name=<[[:space:]]*script" + + # PHPNuke SQL injection attempt + SecFilterSelective THE_REQUEST "/modules\.php\?*name=Search*instory=" + + #phpnuke sql insertion + SecFilterSelective THE_REQUEST "/modules\.php*name=Forums.*file=viewtopic*/forum=.*\'/" + + # WEB-PHP phpbb quick-reply.php arbitrary command attempt + + SecFilterSelective THE_REQUEST "/quick-reply\.php" chain + SecFilter "phpbb_root_path=" + + #Topic Calendar Mod for phpBB Cross-Site Scripting Attack + SecFilterSelective THE_REQUEST "/calendar_scheduler\.php\?start=(<[[:space:]]*script|(http|https|ftp)\:/)" + + # phpMyAdmin: Safe + + #phpMyAdmin Export.PHP File Disclosure Vulnerability + SecFilterSelective SCRIPT_FILENAME "export\.php$" chain + SecFilterSelective ARG_what "\.\." + + #phpMyAdmin path vln + SecFilterSelective REQUEST_URI "/css/phpmyadmin\.css\.php\?GLOBALS\[cfg\]\[ThemePath\]=/etc" + + Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_security.spec 19 May 2005 06:42:01 -0000 1.2 +++ mod_security.spec 9 Jul 2005 00:41:23 -0000 1.3 @@ -1,20 +1,20 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 1.8.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons -Source: http://www.modsecurity.org/download/modsecurity-1.8.7.tar.gz +Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz Source1: mod_security.conf -BuildRoot: %{_tmppath}/%{name}-root/ -Requires: httpd >= 2.0.38 -BuildRequires: httpd-devel >= 2.0.38 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: httpd +BuildRequires: httpd-devel %description -ModSecurity is an open source intrusion detection and prevention engine for web -applications. It operates embedded into the web server, acting as a powerful -umbrella - shielding web applications from attacks. +ModSecurity is an open source intrusion detection and prevention engine +for web applications. It operates embedded into the web server, acting +as a powerful umbrella - shielding web applications from attacks. %prep @@ -40,6 +40,10 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Sat Jul 9 2005 Michael Fleming 1.8.7-3 +- Correct Buildroot +- Some sensible and safe rules for common apps in mod_security.conf + * Thu May 19 2005 Michael Fleming 1.8.7-2 - Don't strip the module (so we can get a useful debuginfo package) From fedora-extras-commits at redhat.com Sat Jul 9 03:26:53 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:26:53 -0400 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.3, 1.4 scim-anthy.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507090326.j693Qr4o019117@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096 Modified Files: .cvsignore scim-anthy.spec sources Log Message: 0.5.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2005 13:15:35 -0000 1.3 +++ .cvsignore 9 Jul 2005 03:26:51 -0000 1.4 @@ -1 +1 @@ -scim-anthy-0.5.0.tar.gz +scim-anthy-0.5.1.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-anthy.spec 30 Jun 2005 13:15:35 -0000 1.4 +++ scim-anthy.spec 9 Jul 2005 03:26:51 -0000 1.5 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input @@ -45,6 +45,9 @@ %changelog +* Sat Jul 9 2005 Jens Petersen - 0.5.1 +- update to 0.5.1 release + * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 - update to 0.5.0 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2005 13:15:35 -0000 1.3 +++ sources 9 Jul 2005 03:26:51 -0000 1.4 @@ -1 +1 @@ -1e220a07404668f876d727b6e23a9ae0 scim-anthy-0.5.0.tar.gz +155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:27:21 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:27:21 -0400 Subject: common tobuild,1.1874,1.1875 Message-ID: <200507090327.j693RL9C019179@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19162 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1874 retrieving revision 1.1875 diff -u -r1.1874 -r1.1875 --- tobuild 8 Jul 2005 22:15:56 -0000 1.1874 +++ tobuild 9 Jul 2005 03:27:18 -0000 1.1875 @@ -21,3 +21,4 @@ adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 adrian rpms/jhead/devel jhead-2_4-3_fc5 devel +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 03:29:33 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:29:33 -0400 Subject: rpms/scim-anthy/devel .cvsignore, 1.3, 1.4 scim-anthy.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507090329.j693TX3b019226@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19205 Modified Files: .cvsignore scim-anthy.spec sources Log Message: 0.5.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2005 13:15:35 -0000 1.3 +++ .cvsignore 9 Jul 2005 03:29:30 -0000 1.4 @@ -1 +1 @@ -scim-anthy-0.5.0.tar.gz +scim-anthy-0.5.1.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-anthy.spec 30 Jun 2005 13:15:35 -0000 1.4 +++ scim-anthy.spec 9 Jul 2005 03:29:30 -0000 1.5 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input @@ -45,6 +45,9 @@ %changelog +* Sat Jul 9 2005 Jens Petersen - 0.5.1-1 +- update to 0.5.1 release + * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 - update to 0.5.0 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2005 13:15:35 -0000 1.3 +++ sources 9 Jul 2005 03:29:30 -0000 1.4 @@ -1 +1 @@ -1e220a07404668f876d727b6e23a9ae0 scim-anthy-0.5.0.tar.gz +155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:38:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:38:18 -0400 Subject: rpms/scim/devel .cvsignore, 1.4, 1.5 scim.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200507090338.j693cIdd019295@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19274 Modified Files: .cvsignore scim.spec sources Log Message: - update to 1.3.3 release - disable linking with version-scripts for now since they cause some problems - disable building of static libs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jul 2005 00:45:47 -0000 1.4 +++ .cvsignore 9 Jul 2005 03:38:16 -0000 1.5 @@ -1 +1 @@ -scim-1.3.2.tar.gz +scim-1.3.3.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim.spec 5 Jul 2005 00:45:47 -0000 1.5 +++ scim.spec 9 Jul 2005 03:38:16 -0000 1.6 @@ -1,5 +1,5 @@ Name: scim -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Smart Common Input Method platform @@ -36,7 +36,7 @@ %build -%configure +%configure --disable-static --disable-ld-version-script make %{?_smp_mflags} @@ -45,8 +45,8 @@ make DESTDIR=${RPM_BUILD_ROOT} install mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} -# Kill all .a and .la -find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f +# remove .la files +find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel desktop-file-install \ @@ -134,6 +134,11 @@ %changelog +* Sat Jul 9 2005 Jens Petersen - 1.3.3-1 +- update to 1.3.3 release + - disable linking with version-scripts for now since they cause some problems +- disable building of static libs + * Tue Jul 5 2005 Jens Petersen - 1.3.2-1 - update to 1.3.2 test release - don't set xinput.d script executable Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jul 2005 00:45:47 -0000 1.4 +++ sources 9 Jul 2005 03:38:16 -0000 1.5 @@ -1 +1 @@ -94a808c6a2d952d7842a4e9bfe71a7bc scim-1.3.2.tar.gz +6644e6ff3a5c01fbb06ea5809c9396f8 scim-1.3.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:51:02 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:51:02 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200507090351.j693p2wo019409@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19383 Modified Files: scim-anthy.spec sources Log Message: fix the incomplete tarball Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-anthy.spec 9 Jul 2005 03:26:51 -0000 1.5 +++ scim-anthy.spec 9 Jul 2005 03:51:00 -0000 1.6 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,7 +45,7 @@ %changelog -* Sat Jul 9 2005 Jens Petersen - 0.5.1 +* Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2005 03:26:51 -0000 1.4 +++ sources 9 Jul 2005 03:51:00 -0000 1.5 @@ -1 +1 @@ -155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz +53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:53:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:53:18 -0400 Subject: rpms/scim-anthy/devel scim-anthy.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200507090353.j693rIsS019478@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19459 Modified Files: scim-anthy.spec sources Log Message: use the new tarball Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-anthy.spec 9 Jul 2005 03:29:30 -0000 1.5 +++ scim-anthy.spec 9 Jul 2005 03:53:16 -0000 1.6 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,7 +45,7 @@ %changelog -* Sat Jul 9 2005 Jens Petersen - 0.5.1-1 +* Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2005 03:29:30 -0000 1.4 +++ sources 9 Jul 2005 03:53:16 -0000 1.5 @@ -1 +1 @@ -155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz +53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 04:12:38 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sat, 9 Jul 2005 00:12:38 -0400 Subject: common tobuild,1.1875,1.1876 Message-ID: <200507090412.j694Cc5n020649@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1875 retrieving revision 1.1876 diff -u -r1.1875 -r1.1876 --- tobuild 9 Jul 2005 03:27:18 -0000 1.1875 +++ tobuild 9 Jul 2005 04:12:36 -0000 1.1876 @@ -22,3 +22,4 @@ adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 adrian rpms/jhead/devel jhead-2_4-3_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 04:14:22 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sat, 9 Jul 2005 00:14:22 -0400 Subject: common tobuild,1.1876,1.1877 Message-ID: <200507090414.j694EMbW020693@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20676 Modified Files: tobuild Log Message: request build of rpms/scim/devel scim-1_3_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1876 retrieving revision 1.1877 diff -u -r1.1876 -r1.1877 --- tobuild 9 Jul 2005 04:12:36 -0000 1.1876 +++ tobuild 9 Jul 2005 04:14:20 -0000 1.1877 @@ -23,3 +23,4 @@ adrian rpms/jhead/devel jhead-2_4-3_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 +petersen rpms/scim/devel scim-1_3_3-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 08:31:50 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:31:50 -0400 Subject: rpms/ip-sentinel/devel ip-sentinel-0.12-pidfile.patch, NONE, 1.1 ip-sentinel.spec, 1.7, 1.8 Message-ID: <200507090831.j698Vov1025906@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25886 Modified Files: ip-sentinel.spec Added Files: ip-sentinel-0.12-pidfile.patch Log Message: fixed named of pidfile (reported by Razvan Sandu) ip-sentinel-0.12-pidfile.patch: --- NEW FILE ip-sentinel-0.12-pidfile.patch --- Index: src/arguments.c =================================================================== --- src/arguments.c (revision 487) +++ src/arguments.c (working copy) @@ -34,7 +34,7 @@ #endif #ifndef DEFAULT_PIDFILE -# define DEFAULT_PIDFILE "/var/run/ip-sentinel.run" +# define DEFAULT_PIDFILE "/var/run/ip-sentinel.pid" #endif #ifndef DEFAULT_LOGFILE Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ip-sentinel.spec 8 Jun 2005 20:07:23 -0000 1.7 +++ ip-sentinel.spec 9 Jul 2005 08:31:48 -0000 1.8 @@ -54,12 +54,13 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 Source1: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig +Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) BuildRequires: which @@ -121,7 +122,7 @@ %prep %setup -q - +%patch0 -p0 -b .pidfile %build %configure --enable-release \ @@ -199,6 +200,9 @@ %changelog +* Fri Jul 8 2005 Enrico Scholz - 0.12-5 +- fixed named of pidfile (reported by Razvan Sandu) + * Wed Jun 8 2005 Enrico Scholz - 0.12-4 - rebuilt From fedora-extras-commits at redhat.com Sat Jul 9 08:35:27 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:35:27 -0400 Subject: rpms/ip-sentinel/FC-3 ip-sentinel-0.12-pidfile.patch, NONE, 1.1 ip-sentinel.spec, 1.4, 1.5 Message-ID: <200507090835.j698ZRvU026012@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25979/FC-3 Modified Files: ip-sentinel.spec Added Files: ip-sentinel-0.12-pidfile.patch Log Message: synced with devel/ ip-sentinel-0.12-pidfile.patch: --- NEW FILE ip-sentinel-0.12-pidfile.patch --- Index: src/arguments.c =================================================================== --- src/arguments.c (revision 487) +++ src/arguments.c (working copy) @@ -34,7 +34,7 @@ #endif #ifndef DEFAULT_PIDFILE -# define DEFAULT_PIDFILE "/var/run/ip-sentinel.run" +# define DEFAULT_PIDFILE "/var/run/ip-sentinel.pid" #endif #ifndef DEFAULT_LOGFILE Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/FC-3/ip-sentinel.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ip-sentinel.spec 8 Jun 2005 20:07:22 -0000 1.4 +++ ip-sentinel.spec 9 Jul 2005 08:35:25 -0000 1.5 @@ -54,12 +54,13 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 Source1: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig +Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) BuildRequires: which @@ -121,6 +122,7 @@ %prep %setup -q +%patch0 -p0 -b .pidfile %build @@ -199,6 +201,9 @@ %changelog +* Fri Jul 8 2005 Enrico Scholz - 0.12-5 +- fixed named of pidfile (reported by Razvan Sandu) + * Wed Jun 8 2005 Enrico Scholz - 0.12-4 - rebuilt From fedora-extras-commits at redhat.com Sat Jul 9 08:35:27 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:35:27 -0400 Subject: rpms/ip-sentinel/FC-4 ip-sentinel-0.12-pidfile.patch, NONE, 1.1 ip-sentinel.spec, 1.7, 1.8 Message-ID: <200507090835.j698ZRqD026020@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25979/FC-4 Modified Files: ip-sentinel.spec Added Files: ip-sentinel-0.12-pidfile.patch Log Message: synced with devel/ ip-sentinel-0.12-pidfile.patch: --- NEW FILE ip-sentinel-0.12-pidfile.patch --- Index: src/arguments.c =================================================================== --- src/arguments.c (revision 487) +++ src/arguments.c (working copy) @@ -34,7 +34,7 @@ #endif #ifndef DEFAULT_PIDFILE -# define DEFAULT_PIDFILE "/var/run/ip-sentinel.run" +# define DEFAULT_PIDFILE "/var/run/ip-sentinel.pid" #endif #ifndef DEFAULT_LOGFILE Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/FC-4/ip-sentinel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ip-sentinel.spec 8 Jun 2005 20:07:23 -0000 1.7 +++ ip-sentinel.spec 9 Jul 2005 08:35:25 -0000 1.8 @@ -54,12 +54,13 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 Source1: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig +Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) BuildRequires: which @@ -121,6 +122,7 @@ %prep %setup -q +%patch0 -p0 -b .pidfile %build @@ -199,6 +201,9 @@ %changelog +* Fri Jul 8 2005 Enrico Scholz - 0.12-5 +- fixed named of pidfile (reported by Razvan Sandu) + * Wed Jun 8 2005 Enrico Scholz - 0.12-4 - rebuilt From fedora-extras-commits at redhat.com Sat Jul 9 08:36:47 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:36:47 -0400 Subject: common tobuild,1.1877,1.1878 Message-ID: <200507090836.j698al1P026109@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26087 Modified Files: tobuild Log Message: request build of rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1877 retrieving revision 1.1878 diff -u -r1.1877 -r1.1878 --- tobuild 9 Jul 2005 04:14:20 -0000 1.1877 +++ tobuild 9 Jul 2005 08:36:45 -0000 1.1878 @@ -24,3 +24,4 @@ petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 petersen rpms/scim/devel scim-1_3_3-1_fc5 devel +ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 9 08:36:53 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 04:36:53 -0400 Subject: common tobuild,1.1878,1.1879 Message-ID: <200507090836.j698aros026134@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26115 Modified Files: tobuild Log Message: request build of rpms/barcode/devel barcode-0_98-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1878 retrieving revision 1.1879 diff -u -r1.1878 -r1.1879 --- tobuild 9 Jul 2005 08:36:45 -0000 1.1878 +++ tobuild 9 Jul 2005 08:36:51 -0000 1.1879 @@ -25,3 +25,4 @@ petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 petersen rpms/scim/devel scim-1_3_3-1_fc5 devel ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 +ixs rpms/barcode/devel barcode-0_98-6_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 08:37:13 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:37:13 -0400 Subject: common tobuild,1.1879,1.1880 Message-ID: <200507090837.j698bDGP026192@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26175 Modified Files: tobuild Log Message: request build of rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1879 retrieving revision 1.1880 diff -u -r1.1879 -r1.1880 --- tobuild 9 Jul 2005 08:36:51 -0000 1.1879 +++ tobuild 9 Jul 2005 08:37:11 -0000 1.1880 @@ -26,3 +26,4 @@ petersen rpms/scim/devel scim-1_3_3-1_fc5 devel ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-6_fc5 devel +ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 08:37:39 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:37:39 -0400 Subject: common tobuild,1.1880,1.1881 Message-ID: <200507090837.j698bdFF026254@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26237 Modified Files: tobuild Log Message: request build of rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1880 retrieving revision 1.1881 diff -u -r1.1880 -r1.1881 --- tobuild 9 Jul 2005 08:37:11 -0000 1.1880 +++ tobuild 9 Jul 2005 08:37:37 -0000 1.1881 @@ -27,3 +27,4 @@ ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-6_fc5 devel ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 +ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel From ville.skytta at iki.fi Sat Jul 9 11:14:51 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Sat, 09 Jul 2005 14:14:51 +0300 Subject: APPROVED: perl-Tie-DBI Message-ID: <1120907691.2892.80.camel@localhost.localdomain> perl-Tie-DBI contains modules for tying hashes to relational databases. Reviewer: Ville Skytt? Maintainer: Tom Callaway From ville.skytta at iki.fi Sat Jul 9 11:18:38 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Sat, 09 Jul 2005 14:18:38 +0300 Subject: APPROVED: perl-ExtUtils-XSBuilder Message-ID: <1120907918.2892.82.camel@localhost.localdomain> ExtUtils::XSBuilder is a set modules to parse C header files and create XS glue code and documentation out of it. Ideally this allows to "write" an interface to a C library without coding a line. Since no C-API is ideal, some adjuments are necessary most of the time. So to use this module you must still be familar with C and XS programming, but it removes a lot of stupid work and copy&paste burden. Also when the C API changes, most of the time you only have to rerun XSBuilder to get your new Perl API. Reviewer: Ville Skytt? Maintainer: Tom Callaway From fedora-extras-commits at redhat.com Sat Jul 9 11:40:51 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 9 Jul 2005 07:40:51 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.12, 1.13 Message-ID: <200507091140.j69Bepta029834@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29817/devel Modified Files: kernel-module-thinkpad.spec Log Message: Install modules into extra/thinkpad. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kernel-module-thinkpad.spec 5 Jul 2005 19:33:06 -0000 1.12 +++ kernel-module-thinkpad.spec 9 Jul 2005 11:40:49 -0000 1.13 @@ -1,11 +1,11 @@ %{!?kver: %define kver 2.6.11-1.1369_FC4} %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} -%define moddir /lib/modules/%{kver}/updates +%define moddir /lib/modules/%{kver}/extra Name: kernel-module-thinkpad Version: 5.8 -Release: 2.%(echo %{kver} | tr - _) +Release: 3.%(echo %{kver} | tr - _) Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL @@ -82,6 +82,9 @@ %changelog +* Sat Jul 9 2005 Ville Skytt?? - 5.8-3 +- Install modules into extra/thinkpad. + * Sun Jul 3 2005 Ville Skytt?? - 5.8-2 - Change towards new (in-progress) kernel module packaging guidelines. - Automatically load modules at boot time. From fedora-extras-commits at redhat.com Sat Jul 9 11:43:08 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:43:08 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.4,1.5 Message-ID: <200507091143.j69Bh8Ud029892@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29845/devel Modified Files: mod_suphp.spec Log Message: Added specific httpd-mmn dependency Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_suphp.spec 5 Jul 2005 18:07:37 -0000 1.4 +++ mod_suphp.spec 9 Jul 2005 11:43:06 -0000 1.5 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -16,6 +16,7 @@ URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel >= 2.0 %description @@ -66,6 +67,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 +- Added a dependency on a specific httpd-mmn + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 - Bumped up the releasever From fedora-extras-commits at redhat.com Sat Jul 9 11:43:02 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:43:02 -0400 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.3,1.4 Message-ID: <200507091143.j69BhW2b029895@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29845/FC-3 Modified Files: mod_suphp.spec Log Message: Added specific httpd-mmn dependency Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-3/mod_suphp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 +++ mod_suphp.spec 9 Jul 2005 11:43:00 -0000 1.4 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -16,6 +16,7 @@ URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel >= 2.0 %description @@ -66,6 +67,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 +- Added a dependency on a specific httpd-mmn + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 - Bumped up the releasever From fedora-extras-commits at redhat.com Sat Jul 9 11:43:03 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:43:03 -0400 Subject: rpms/mod_suphp/FC-4 mod_suphp.spec,1.3,1.4 Message-ID: <200507091143.j69BhXxs029898@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29845/FC-4 Modified Files: mod_suphp.spec Log Message: Added specific httpd-mmn dependency Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-4/mod_suphp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 +++ mod_suphp.spec 9 Jul 2005 11:43:00 -0000 1.4 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -16,6 +16,7 @@ URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel >= 2.0 %description @@ -66,6 +67,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 +- Added a dependency on a specific httpd-mmn + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 - Bumped up the releasever From fedora-extras-commits at redhat.com Sat Jul 9 11:45:31 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:45:31 -0400 Subject: common tobuild,1.1881,1.1882 Message-ID: <200507091145.j69BjVRf030030@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30013 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1881 retrieving revision 1.1882 diff -u -r1.1881 -r1.1882 --- tobuild 9 Jul 2005 08:37:37 -0000 1.1881 +++ tobuild 9 Jul 2005 11:45:28 -0000 1.1882 @@ -28,3 +28,4 @@ ixs rpms/barcode/devel barcode-0_98-6_fc5 devel ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 11:45:50 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:45:50 -0400 Subject: common tobuild,1.1882,1.1883 Message-ID: <200507091145.j69BjoB3030063@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30046 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1882 retrieving revision 1.1883 diff -u -r1.1882 -r1.1883 --- tobuild 9 Jul 2005 11:45:28 -0000 1.1882 +++ tobuild 9 Jul 2005 11:45:47 -0000 1.1883 @@ -29,3 +29,4 @@ ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 9 11:46:11 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:46:11 -0400 Subject: common tobuild,1.1883,1.1884 Message-ID: <200507091146.j69BkBuJ030096@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30079 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1883 retrieving revision 1.1884 diff -u -r1.1883 -r1.1884 --- tobuild 9 Jul 2005 11:45:47 -0000 1.1883 +++ tobuild 9 Jul 2005 11:46:08 -0000 1.1884 @@ -30,3 +30,4 @@ ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 11:57:41 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:57:41 -0400 Subject: rpms/nexuiz - New directory Message-ID: <200507091157.j69BvfYA030181@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30157/nexuiz Log Message: Directory /cvs/extras/rpms/nexuiz added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 11:57:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:57:42 -0400 Subject: rpms/nexuiz/devel - New directory Message-ID: <200507091157.j69BvgMw030186@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30157/nexuiz/devel Log Message: Directory /cvs/extras/rpms/nexuiz/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 11:58:00 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:58:00 -0400 Subject: rpms/nexuiz Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507091158.j69Bw0Mj030235@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202 Added Files: Makefile import.log Log Message: Setup of module nexuiz --- NEW FILE Makefile --- # Top level Makefile for module nexuiz all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 9 11:58:00 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:58:00 -0400 Subject: rpms/nexuiz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507091158.j69Bw06n030240@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nexuiz --- NEW 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 Jul 9 11:58:46 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 9 Jul 2005 07:58:46 -0400 Subject: rpms/mod_security/devel mod_security.conf, 1.2, 1.3 mod_security.spec, 1.3, 1.4 Message-ID: <200507091158.j69Bwk3v030283@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30155 Modified Files: mod_security.conf mod_security.spec Log Message: - Ruleset improvements - Requires httpd-mmn so we only install w/appropriate httpd versions. Index: mod_security.conf =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_security.conf 9 Jul 2005 00:41:23 -0000 1.2 +++ mod_security.conf 9 Jul 2005 11:58:44 -0000 1.3 @@ -37,18 +37,18 @@ # SecFilter 111 # Prevent path traversal (..) attacks - SecFilter "\.\./" + # SecFilter "\.\./" # Weaker XSS protection but allows common HTML tags - SecFilter "<( |\n)*script" + # SecFilter "<( |\n)*script" # Prevent XSS atacks (HTML/Javascript injection) - SecFilter "<(.|\n)+>" + # SecFilter "<(.|\n)+>" # Very crude filters to prevent SQL injection attacks - SecFilter "delete[[:space:]]+from" - SecFilter "insert[[:space:]]+into" - SecFilter "select.+from" + # SecFilter "delete[[:space:]]+from" + # SecFilter "insert[[:space:]]+into" + # SecFilter "select.+from" # Require HTTP_USER_AGENT and HTTP_HOST headers SecFilterSelective "HTTP_USER_AGENT|HTTP_HOST" "^$" Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_security.spec 9 Jul 2005 00:41:23 -0000 1.3 +++ mod_security.spec 9 Jul 2005 11:58:44 -0000 1.4 @@ -1,14 +1,15 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 1.8.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz Source1: mod_security.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: httpd +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat +%{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel %description @@ -40,6 +41,11 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Sat Jul 9 2005 Michael Fleming 1.8.7-4 +- Add Requires: httpd-mmn to get the appropriate "module magic" version + (thanks Ville Skytt?) +- Disabled an overly-agressive rule or two.. + * Sat Jul 9 2005 Michael Fleming 1.8.7-3 - Correct Buildroot - Some sensible and safe rules for common apps in mod_security.conf From fedora-extras-commits at redhat.com Sat Jul 9 11:59:34 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:59:34 -0400 Subject: rpms/nexuiz import.log,1.1,1.2 Message-ID: <200507091200.j69C04k0030341@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30299 Modified Files: import.log Log Message: auto-import nexuiz-1.1-1 on branch devel from nexuiz-1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nexuiz/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jul 2005 11:57:58 -0000 1.1 +++ import.log 9 Jul 2005 11:59:32 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-1_1-1:HEAD:nexuiz-1.1-1.src.rpm:1120910361 From fedora-extras-commits at redhat.com Sat Jul 9 11:59:35 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:59:35 -0400 Subject: rpms/nexuiz/devel nexuiz-1.0-basedir.patch, NONE, 1.1 nexuiz-1.1-nostrip.patch, NONE, 1.1 nexuiz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507091159.j69BxZCg030335@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30299/devel Modified Files: .cvsignore sources Added Files: nexuiz-1.0-basedir.patch nexuiz-1.1-nostrip.patch nexuiz.spec Log Message: auto-import nexuiz-1.1-1 on branch devel from nexuiz-1.1-1.src.rpm nexuiz-1.0-basedir.patch: --- NEW FILE nexuiz-1.0-basedir.patch --- --- fs.c.orig 2005-07-08 13:00:47.000000000 +0200 +++ fs.c 2005-07-08 13:01:06.000000000 +0200 @@ -902,7 +902,7 @@ void FS_Init (void) fs_mempool = Mem_AllocPool("file management", 0, NULL); - strcpy(fs_basedir, "."); + strcpy(fs_basedir, "/usr/share/nexuiz"); strcpy(fs_gamedir, ""); #ifdef MACOSX nexuiz-1.1-nostrip.patch: --- NEW FILE nexuiz-1.1-nostrip.patch --- --- makefile.inc.orig 2005-06-20 18:35:34.000000000 +0200 +++ makefile.inc 2005-07-08 15:32:57.000000000 +0200 @@ -342,7 +342,6 @@ bin-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" - strip $(EXE) vid_glx.o: vid_glx.c $(DO_CC) -I/usr/X11R6/include --- NEW FILE nexuiz.spec --- Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.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-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 Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # For the .ico extraction BuildRequires: ImageMagick, file BuildRequires: xorg-x11-devel, alsa-lib-devel, desktop-file-utils # 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 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 Requires: desktop-file-utils >= 0.9 Requires: nexuiz-data Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, focused on providing basic, old style deathmatches. %package server Group: Amusements/Games Summary: Dedicated server for the Nexuiz first person shooter Requires: nexuiz-data # 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 %description server Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, focused on providing basic, old style deathmatches. This is the nexuiz dedicated server required to host network games. %prep %setup -q %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip %{__sed} -i 's/\r//' Readme.htm %build %{__make} %{?_smp_mflags} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert nexuiz.ico nexuiz.png %install %{__rm} -rf %{buildroot} # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -m 0755 nexuiz-{glx,dedicated} \ %{buildroot}%{_bindir}/ # Create the desktop file %{__cat} > %{name}.desktop << EOF [Desktop Entry] Name=Nexuiz Comment=Multiplayer, deathmatch oriented first person shooter Encoding=UTF-8 Icon=nexuiz Exec=nexuiz-glx Terminal=false Type=Application EOF # Install the desktop file %{__mkdir_p} %{buildroot}%{_datadir}/applications desktop-file-install \ --vendor=fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Game \ %{name}.desktop # Install all png files previously extracted from the .ico file for file in nexuiz*.png; do res="`file ${file} | tr -d ' ' | cut -d ',' -f 2`" %{__install} -D -m 0644 ${file} \ %{buildroot}%{_datadir}/icons/hicolor/${res}/apps/nexuiz.png done %post update-desktop-database %{_datadir}/applications 2>/dev/null || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %postun update-desktop-database %{_datadir}/applications 2>/dev/null || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc Readme.htm COPYING %{_bindir}/nexuiz-glx %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop %files server %defattr(-,root,root,-) %doc Readme.htm COPYING %{_bindir}/nexuiz-dedicated %changelog * Sat Jul 09 2005 Adrian Reber - 1.1-1 - added gtk-update-icon-cache to %%post and %%postun - added desktop-file-utils as Requires({post,postun}) * Fri Jul 8 2005 Matthias Saou 1.1-0 - Update to 1.1. - Split off the huge data, unfortunately requires using custom sources. - Major spec file changes. * Thu Jun 09 2005 Adrian Reber - 1.0-2 - comments concerning the requires added - better(???) descriptions * Thu Jun 09 2005 Adrian Reber - 1.0-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2005 11:57:58 -0000 1.1 +++ .cvsignore 9 Jul 2005 11:59:33 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2005 11:57:58 -0000 1.1 +++ sources 9 Jul 2005 11:59:33 -0000 1.2 @@ -0,0 +1 @@ +a2177339360d4ad19816c66a7dfd0353 nexuiz-1.1.tar.bz2 From ville.skytta at iki.fi Sat Jul 9 12:17:19 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Sat, 09 Jul 2005 15:17:19 +0300 Subject: rpms/mod_security/devel mod_security.conf, 1.2, 1.3 mod_security.spec, 1.3, 1.4 In-Reply-To: <200507091158.j69Bwk3v030283@cvs-int.fedora.redhat.com> References: <200507091158.j69Bwk3v030283@cvs-int.fedora.redhat.com> Message-ID: <1120911439.2892.99.camel@localhost.localdomain> On Sat, 2005-07-09 at 07:58 -0400, Michael G. Fleming wrote: > -Requires: httpd > +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat > +%{_includedir}/httpd/.mmn || echo missing) That won't work at least on FC4 and earlier; the %(...) construct cannot contain linebreaks. In this case, the build will hang, waiting for input to "cat". Also, httpd-mmn is provided by httpd, see attached suggested patch. -------------- next part -------------- A non-text attachment was scrubbed... Name: ms.patch Type: text/x-patch Size: 777 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Sat Jul 9 12:34:12 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 9 Jul 2005 08:34:12 -0400 Subject: rpms/mod_security/devel mod_security.spec,1.4,1.5 Message-ID: <200507091234.j69CYCkV031582@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31565 Modified Files: mod_security.spec Log Message: Convert spec to UTF-8 Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_security.spec 9 Jul 2005 11:58:44 -0000 1.4 +++ mod_security.spec 9 Jul 2005 12:34:10 -0000 1.5 @@ -43,7 +43,7 @@ %changelog * Sat Jul 9 2005 Michael Fleming 1.8.7-4 - Add Requires: httpd-mmn to get the appropriate "module magic" version - (thanks Ville Skytt?) + (thanks Ville Skytt??) - Disabled an overly-agressive rule or two.. * Sat Jul 9 2005 Michael Fleming 1.8.7-3 From fedora-extras-commits at redhat.com Sat Jul 9 12:57:52 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 9 Jul 2005 08:57:52 -0400 Subject: rpms/mod_security/devel mod_security.spec,1.5,1.6 Message-ID: <200507091257.j69CvqPJ031635@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31618 Modified Files: mod_security.spec Log Message: Join busted Requires line. Sorry. Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_security.spec 9 Jul 2005 12:34:10 -0000 1.5 +++ mod_security.spec 9 Jul 2005 12:57:50 -0000 1.6 @@ -8,8 +8,7 @@ Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz Source1: mod_security.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat -%{_includedir}/httpd/.mmn || echo missing) +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel %description @@ -43,7 +42,7 @@ %changelog * Sat Jul 9 2005 Michael Fleming 1.8.7-4 - Add Requires: httpd-mmn to get the appropriate "module magic" version - (thanks Ville Skytt??) + (thanks Ville Skytt?) - Disabled an overly-agressive rule or two.. * Sat Jul 9 2005 Michael Fleming 1.8.7-3 From fedora-extras-commits at redhat.com Sat Jul 9 21:15:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:15:54 -0400 Subject: rpms/icmpdn - New directory Message-ID: <200507092115.j69LFsDJ011788@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11764/icmpdn Log Message: Directory /cvs/extras/rpms/icmpdn added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 21:15:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:15:54 -0400 Subject: rpms/icmpdn/devel - New directory Message-ID: <200507092115.j69LFsr6011793@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11764/icmpdn/devel Log Message: Directory /cvs/extras/rpms/icmpdn/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 21:16:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:13 -0400 Subject: rpms/icmpdn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507092116.j69LGD02011855@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11824 Added Files: Makefile import.log Log Message: Setup of module icmpdn --- NEW FILE Makefile --- # Top level Makefile for module icmpdn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 9 21:16:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:13 -0400 Subject: rpms/icmpdn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507092116.j69LGDYB011860@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11824/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module icmpdn --- NEW 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 Jul 9 21:16:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:45 -0400 Subject: rpms/icmpdn import.log,1.1,1.2 Message-ID: <200507092117.j69LHFRu011929@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11890 Modified Files: import.log Log Message: auto-import icmpdn-0.3-2 on branch devel from icmpdn-0.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/icmpdn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jul 2005 21:16:11 -0000 1.1 +++ import.log 9 Jul 2005 21:16:43 -0000 1.2 @@ -0,0 +1 @@ +icmpdn-0_3-2:HEAD:icmpdn-0.3-2.src.rpm:1120943796 From fedora-extras-commits at redhat.com Sat Jul 9 21:16:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:45 -0400 Subject: rpms/icmpdn/devel icmpdn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507092117.j69LHGEw011933@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11890/devel Modified Files: .cvsignore sources Added Files: icmpdn.spec Log Message: auto-import icmpdn-0.3-2 on branch devel from icmpdn-0.3-2.src.rpm --- NEW FILE icmpdn.spec --- Name: icmpdn Version: 0.3 Release: 2 License: LGPL for library, GPL for utilities Group: System Environment/Libraries Summary: ICMP host name utilities Source0: http://www.dolda2000.com/~fredrik/icmp-dn/%name-%version.tar.gz URL: http://www.dolda2000.com/~fredrik/icmp-dn/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description icmpdn is an implementation of the RFC 1788 ICMP domain name facilities for Linux. It includes icmpdnd, a daemon which responds to ICMP domain name requests from other hosts, idnlookup, which requests the domain name of another host, and nss_icmp, which is a nameswitch module for doing reverse hostname lookups via idnlookup. %prep %setup %build %configure --libdir=/%{_lib} make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" mkdir $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -m755 admin/icmpdnd "$RPM_BUILD_ROOT%{_initrddir}" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) /%{_lib}/libnss_icmp.so /%{_lib}/libnss_icmp.la /%{_lib}/libnss_icmp.so.2.0.0 /%{_lib}/libnss_icmp.so.2 %config %{_sysconfdir}/nss-icmp.conf %attr(4755,root,root) %{_bindir}/idnlookup %config %{_initrddir}/icmpdnd %{_sbindir}/icmpdnd %doc AUTHORS ChangeLog COPYING COPYING.LIB README %changelog * Thu Jul 07 2005 Fredrik Tolf - Compressed the description. - Added COPYING.LIB, which contains the LGPL. * Thu Jun 30 2005 Fredrik Tolf - Fixed more things as from fedora-extras-list: - Replaced /lib with /%{_lib} - Run ldconfig in %post and %postun. - Install init script in %{_initrdddir} instead of %_{sysconfdir}. * Tue Jun 28 2005 Fredrik Tolf - Fixed a lot of things after a discussion on fedora-extras-list, among other things: - Removed Vendor tag - Fixed Source tag - Replaced en-dashes with ASCII hyphens - Added SMP flags to make - Removed INSTALL and NEWS from %doc - Added this ChangeLog section. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icmpdn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2005 21:16:11 -0000 1.1 +++ .cvsignore 9 Jul 2005 21:16:43 -0000 1.2 @@ -0,0 +1 @@ +icmpdn-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/icmpdn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2005 21:16:11 -0000 1.1 +++ sources 9 Jul 2005 21:16:43 -0000 1.2 @@ -0,0 +1 @@ +1a9e9ce3e229c64be63a1cfba55fa576 icmpdn-0.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 21:18:21 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:18:21 -0400 Subject: common tobuild,1.1884,1.1885 Message-ID: <200507092118.j69LILPd012027@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12010 Modified Files: tobuild Log Message: request build of rpms/icmpdn/devel icmpdn-0_3-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1884 retrieving revision 1.1885 diff -u -r1.1884 -r1.1885 --- tobuild 9 Jul 2005 11:46:08 -0000 1.1884 +++ tobuild 9 Jul 2005 21:18:19 -0000 1.1885 @@ -31,3 +31,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 +oliver rpms/icmpdn/devel icmpdn-0_3-2 devel From fedora-extras-commits at redhat.com Sat Jul 9 21:39:05 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 17:39:05 -0400 Subject: rpms/udunits/devel udunits.spec,1.6,1.7 Message-ID: <200507092139.j69Ld5HF012116@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/udunits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12069/devel Modified Files: udunits.spec Log Message: use -fPIC for all arches and remove redundant man3f entry Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/devel/udunits.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udunits.spec 9 May 2005 19:58:21 -0000 1.6 +++ udunits.spec 9 Jul 2005 21:39:03 -0000 1.7 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -59,10 +59,8 @@ %endif %build -%ifarch x86_64 export CFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC" -%endif cd src/ export LD_MATH=-lm %configure @@ -74,6 +72,7 @@ sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install cp -p COPYRIGHT README RELEASE_NOTES VERSION ../ +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -106,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Sat Jul 9 2005 Ed Hill 1.12.4-9 +- use -fPIC for all arches and remove redundant man3f entry + * Mon May 9 2005 Tom "spot" Callaway 1.12.4-8 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Sat Jul 9 21:38:59 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 17:38:59 -0400 Subject: rpms/udunits/FC-3 udunits.spec,1.6,1.7 Message-ID: <200507092139.j69LdTjE012119@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/udunits/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12069/FC-3 Modified Files: udunits.spec Log Message: use -fPIC for all arches and remove redundant man3f entry Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-3/udunits.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udunits.spec 9 May 2005 19:58:20 -0000 1.6 +++ udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -59,10 +59,8 @@ %endif %build -%ifarch x86_64 export CFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC" -%endif cd src/ export LD_MATH=-lm %configure @@ -74,6 +72,7 @@ sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install cp -p COPYRIGHT README RELEASE_NOTES VERSION ../ +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -106,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Sat Jul 9 2005 Ed Hill 1.12.4-9 +- use -fPIC for all arches and remove redundant man3f entry + * Mon May 9 2005 Tom "spot" Callaway 1.12.4-8 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Sat Jul 9 21:38:59 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 17:38:59 -0400 Subject: rpms/udunits/FC-4 udunits.spec,1.6,1.7 Message-ID: <200507092139.j69LdUGK012122@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/udunits/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12069/FC-4 Modified Files: udunits.spec Log Message: use -fPIC for all arches and remove redundant man3f entry Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-4/udunits.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udunits.spec 9 May 2005 19:58:21 -0000 1.6 +++ udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -59,10 +59,8 @@ %endif %build -%ifarch x86_64 export CFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC" -%endif cd src/ export LD_MATH=-lm %configure @@ -74,6 +72,7 @@ sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install cp -p COPYRIGHT README RELEASE_NOTES VERSION ../ +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -106,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Sat Jul 9 2005 Ed Hill 1.12.4-9 +- use -fPIC for all arches and remove redundant man3f entry + * Mon May 9 2005 Tom "spot" Callaway 1.12.4-8 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Sat Jul 9 21:44:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:44:25 -0400 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.2,1.3 Message-ID: <200507092144.j69LiPUA012154@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12137/common Modified Files: XMLRPCServerProxy.py Log Message: Simplify our SSL_Transport class Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XMLRPCServerProxy.py 6 Jul 2005 21:20:55 -0000 1.2 +++ XMLRPCServerProxy.py 9 Jul 2005 21:44:23 -0000 1.3 @@ -21,60 +21,25 @@ __version__='0.12' -class SSL_Transport(xmlrpclib.Transport): +class PlgSSL_Transport(xmlrpclib.Transport): user_agent = "pyOpenSSL_XMLRPC/%s - %s" % (__version__, xmlrpclib.Transport.user_agent) def __init__(self, ssl_context): self.ssl_ctx=ssl_context - def request(self, host, handler, request_body, verbose=0): + def make_connection(self, host): # Handle username and password. - user_passwd, host_port = urllib.splituser(host) - _host, _port = urllib.splitport(host_port) - h = SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) - if verbose: - h.set_debuglevel(1) + host, extra_headers, x509 = self.get_host_info(host) + _host, _port = urllib.splitport(host) + return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) - # What follows is as in xmlrpclib.Transport. (Except the authz bit.) - h.putrequest("POST", handler) - # required by HTTP/1.1 - h.putheader("Host", _host) - - # required by XML-RPC - h.putheader("User-Agent", self.user_agent) - h.putheader("Content-Type", "text/xml") - h.putheader("Content-Length", str(len(request_body))) - - # Authorisation. - if user_passwd is not None: - auth=string.strip(base64.encodestring(user_passwd)) - h.putheader('Authorization', 'Basic %s' % auth) - - h.endheaders() - - if request_body: - h.send(request_body) - - errcode, errmsg, headers = h.getreply() - - if errcode != 200: - raise ProtocolError( - host + handler, - errcode, errmsg, - headers - ) - - self.verbose = verbose - return self.parse_response(h.getfile()) - - -class XMLRPCServerProxy(xmlrpclib.ServerProxy): +class PlgXMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, uri, certs): if certs and len(certs) > 0: self.ctx = SSLCommon.CreateSSLContext(certs) - xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) + xmlrpclib.ServerProxy.__init__(self, uri, PlgSSL_Transport(ssl_context=self.ctx)) else: xmlrpclib.ServerProxy.__init__(self, uri) From fedora-extras-commits at redhat.com Sat Jul 9 21:53:42 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:53:42 -0400 Subject: extras-buildsys/utils repoconv.py,1.3,1.4 Message-ID: <200507092153.j69LrgTL012185@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12168/utils Modified Files: repoconv.py Log Message: Fix indents Index: repoconv.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/repoconv.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- repoconv.py 7 Jul 2005 17:24:08 -0000 1.3 +++ repoconv.py 9 Jul 2005 21:53:40 -0000 1.4 @@ -96,8 +96,8 @@ os.unlink(dest_file) debugprint('Copying %s to %s' % (os.path.basename(package), dest_file)) - if not os.path.exists(os.path.dirname(dest_file)): - os.makedirs(os.path.dirname(dest_file)) + if not os.path.exists(os.path.dirname(dest_file)): + os.makedirs(os.path.dirname(dest_file)) shutil.copy(package, dest_file) # Create repo metadata From fedora-extras-commits at redhat.com Sat Jul 9 21:54:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:54:10 -0400 Subject: extras-buildsys/server Repo.py,1.7,1.8 Message-ID: <200507092154.j69LsAqr012208@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12191/server Modified Files: Repo.py Log Message: Fix traceback when repo_dir doesn't exist Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Repo.py 7 Jul 2005 16:21:12 -0000 1.7 +++ Repo.py 9 Jul 2005 21:54:08 -0000 1.8 @@ -32,7 +32,7 @@ self._builder_manager = builder_manager self._target = target if not os.path.exists(config_opts['repo_dir']): - print "Error: Repository directory '%s' does not exist." % config_opts['repodir'] + print "Error: Repository directory '%s' does not exist." % config_opts['repo_dir'] os._exit(1) self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): From fedora-extras-commits at redhat.com Sat Jul 9 21:54:36 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:54:36 -0400 Subject: extras-buildsys/client client.py,1.8,1.9 Message-ID: <200507092154.j69Lsacl012231@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12214/client Modified Files: client.py Log Message: Add space after each job Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- client.py 8 Jul 2005 18:12:25 -0000 1.8 +++ client.py 9 Jul 2005 21:54:34 -0000 1.9 @@ -114,6 +114,7 @@ for archjob in archjobs: if archjob[1] == job[0]: print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) + print '' def kill(server, email, jobid): From fedora-extras-commits at redhat.com Sun Jul 10 01:49:48 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 21:49:48 -0400 Subject: rpms/ncview/devel ncview-1.92e-do_print.c.patch,1.1,1.2 Message-ID: <200507100149.j6A1nmBt017002@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946/devel Modified Files: ncview-1.92e-do_print.c.patch Log Message: remember to close the file descriptor from mkstemp() ncview-1.92e-do_print.c.patch: Index: ncview-1.92e-do_print.c.patch =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/ncview-1.92e-do_print.c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview-1.92e-do_print.c.patch 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview-1.92e-do_print.c.patch 10 Jul 2005 01:49:46 -0000 1.2 @@ -8,7 +8,7 @@ FILE *outf; float output_scale; int r, g, b, n_print; -@@ -86,20 +87,34 @@ +@@ -86,20 +87,35 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; @@ -36,6 +36,7 @@ - } - + } ++ close(outfid); + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) From fedora-extras-commits at redhat.com Sun Jul 10 01:49:41 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 21:49:41 -0400 Subject: rpms/ncview/FC-3 ncview-1.92e-do_print.c.patch,1.1,1.2 Message-ID: <200507100150.j6A1oCF3017005@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946/FC-3 Modified Files: ncview-1.92e-do_print.c.patch Log Message: remember to close the file descriptor from mkstemp() ncview-1.92e-do_print.c.patch: Index: ncview-1.92e-do_print.c.patch =================================================================== RCS file: /cvs/extras/rpms/ncview/FC-3/ncview-1.92e-do_print.c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview-1.92e-do_print.c.patch 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview-1.92e-do_print.c.patch 10 Jul 2005 01:49:39 -0000 1.2 @@ -8,7 +8,7 @@ FILE *outf; float output_scale; int r, g, b, n_print; -@@ -86,20 +87,34 @@ +@@ -86,20 +87,35 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; @@ -36,6 +36,7 @@ - } - + } ++ close(outfid); + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) From fedora-extras-commits at redhat.com Sun Jul 10 01:49:42 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 21:49:42 -0400 Subject: rpms/ncview/FC-4 ncview-1.92e-do_print.c.patch,1.1,1.2 Message-ID: <200507100150.j6A1oDsv017008@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946/FC-4 Modified Files: ncview-1.92e-do_print.c.patch Log Message: remember to close the file descriptor from mkstemp() ncview-1.92e-do_print.c.patch: Index: ncview-1.92e-do_print.c.patch =================================================================== RCS file: /cvs/extras/rpms/ncview/FC-4/ncview-1.92e-do_print.c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview-1.92e-do_print.c.patch 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview-1.92e-do_print.c.patch 10 Jul 2005 01:49:40 -0000 1.2 @@ -8,7 +8,7 @@ FILE *outf; float output_scale; int r, g, b, n_print; -@@ -86,20 +87,34 @@ +@@ -86,20 +87,35 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; @@ -36,6 +36,7 @@ - } - + } ++ close(outfid); + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) From fedora-extras-commits at redhat.com Sun Jul 10 03:44:37 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:37 -0400 Subject: extras-buildsys/builder builder.py,1.9,1.10 Message-ID: <200507100344.j6A3ibtu019411@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/builder Modified Files: builder.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- builder.py 8 Jul 2005 17:23:44 -0000 1.9 +++ builder.py 10 Jul 2005 03:44:35 -0000 1.10 @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# copyright 2005 Duke University -# written by Seth Vidal +# +# Copyright 2005 Dan Williams and Red Hat, Inc. import SimpleXMLRPCServer From fedora-extras-commits at redhat.com Sun Jul 10 03:44:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:38 -0400 Subject: extras-buildsys/client client.py,1.9,1.10 Message-ID: <200507100344.j6A3icCe019420@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/client Modified Files: client.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- client.py 9 Jul 2005 21:54:34 -0000 1.9 +++ client.py 10 Jul 2005 03:44:36 -0000 1.10 @@ -192,7 +192,7 @@ certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert')) certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert')) - server = XMLRPCServerProxy.XMLRPCServerProxy(addr, certs) + server = XMLRPCServerProxy.PlgXMLRPCServerProxy(addr, certs) elif use_ssl == 'false': if addr.startswith("https:"): raise ServerException("Error: '%s' is an SSL server, but the use_ssl config option set to False. See %s" % (addr, config_file_path)) From fedora-extras-commits at redhat.com Sun Jul 10 03:44:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:39 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.2, 1.3 XMLRPCServerProxy.py, 1.3, 1.4 Message-ID: <200507100344.j6A3idA9019427@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/common Modified Files: AuthedXMLRPCServer.py XMLRPCServerProxy.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AuthedXMLRPCServer.py 6 Jul 2005 21:20:55 -0000 1.2 +++ AuthedXMLRPCServer.py 10 Jul 2005 03:44:36 -0000 1.3 @@ -12,8 +12,8 @@ # 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 Konstantin Ryabitsev -# Modified by Dan Williams +# Copyright 2005 Dan Williams and Red Hat, Inc. + import os, sys import socket @@ -22,6 +22,44 @@ import xmlrpclib import SimpleXMLRPCServer import SSLCommon +import threading + + + +""" +So we need a way of getting data from the RequestHandler instance, which +is unique to each request, into the actual handler instance that we've registered. + +To do this without overriding a bunch of member functions, we have a global +dict of data that maps authorization info to a particular thread, since each +request is handled in its own thread. Therefore, the handler instance can +access the data that our request handler has set. + +""" + +__authinfos_lock = threading.Lock() +__authinfos = {} + + +def _add_authinfo(authinfo): + __authinfos_lock.acquire() + __authinfos[threading.currentThread()] = authinfo + __authinfos_lock.release() + +def get_authinfo(): + i = None + __authinfos_lock.acquire() + try: + i = __authinfos[threading.currentThread()] + except KeyError: + pass + __authinfos_lock.release() + return i + +def _del_authinfo(): + __authinfos_lock.acquire() + del __authinfos[threading.currentThread()] + __authinfos_lock.release() class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): @@ -32,50 +70,10 @@ protocol_version = "HTTP/1.1" def do_POST(self): - """ - See documentation on SimpleXMLRPCRequestHandler. Modifications - include the ability to pass through local request-specific data, - and removal of code to deal with historical _dispatch methods. - """ - - if 0: - # ONLY FOR DEBUGGING, so we can see exceptions on the console - # get arguments - data = self.rfile.read(int(self.headers["content-length"])) - authinfo = self.server.get_authinfo(self.request, self.client_address) - response = self.server._marshaled_dispatch(data, authinfo) - - # got a valid XML RPC response - self.send_response(200) - self.send_header("Content-type", "text/xml") - self.send_header("Content-length", str(len(response))) - self.end_headers() - self.wfile.write(response) - - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) - else: - try: - # get arguments - data = self.rfile.read(int(self.headers["content-length"])) - authinfo = self.server.get_authinfo(self.request, self.client_address) - response = self.server._marshaled_dispatch(data, authinfo) - except: # This should only happen if the module is buggy - # internal error, report as HTTP server error - self.send_response(500) - self.end_headers() - else: - # got a valid XML RPC response - self.send_response(200) - self.send_header("Content-type", "text/xml") - self.send_header("Content-length", str(len(response))) - self.end_headers() - self.wfile.write(response) - - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) + authinfo = self.server.get_authinfo(self.request, self.client_address) + _add_authinfo(authinfo) + SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.do_POST(self) + _del_authinfo() class BaseAuthedXMLRPCServer: @@ -92,68 +90,6 @@ return self.authinfo_callback(request, client_address) return None - def verify_request(self, request, client_address): - return True - - def _marshaled_dispatch(self, data, authinfo): - """ - Allow the ability to pass request-dependent objects into - the handler instance. - """ - params, method = xmlrpclib.loads(data) - - # generate response - try: - response = self._dispatch(authinfo, method, params) - # wrap response in a singleton tuple - response = (response,) - response = xmlrpclib.dumps(response, methodresponse=1) - except xmlrpclib.Fault, fault: - response = xmlrpclib.dumps(fault) - except: - # report exception back to server - response = xmlrpclib.dumps( - xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)) - ) - - return response - - def _dispatch(self, authinfo, method, params): - """ - Allow the ability to pass request-dependent objects into - the handler instance. - """ - func = None - try: - # check to see if a matching function has been registered - func = self.funcs[method] - except KeyError: - if self.instance is not None: - # call instance method directly - try: - func = self.lcl_resolve_dotted_attribute(method) - except AttributeError: - pass - - if func is not None: - # Only pass authinfo into Instance if we have are set - # up to get authinfo - if self.authinfo_callback is not None: - return func(authinfo, *params) - else: - return func(*params) - else: - raise Exception('method "%s" is not supported' % method) - - def lcl_resolve_dotted_attribute(self, method): - pyver = sys.version_info[:3] - if pyver <= (2, 3, 4): - return SimpleXMLRPCServer.resolve_dotted_attribute( - self.instance, method) - elif pyver > (2, 3, 4): - return SimpleXMLRPCServer.resolve_dotted_attribute( - self.instance, method, self.allow_dotted_names) - class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.PlgBaseSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): """ Extension to allow more fine-tuned SSL handling """ @@ -176,8 +112,24 @@ class ReqHandler: def ping(self): + authinfo = get_authinfo() + print "AUTHINFO: %s" % authinfo return "pong" +class TestServer(AuthedSSLXMLRPCServer): + """ + SSL XMLRPC server that authenticates clients based on their certificate. + """ + + def __init__(self, address, certs): + AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs) + + def auth_cb(self, request, client_address): + import random + peer_cert = request.get_peer_certificate() + email = peer_cert.get_subject().countryName + return "AUTH: %s - %d" % (email, random.randint(1, 100)) + if __name__ == '__main__': if len(sys.argv) < 4: @@ -190,7 +142,7 @@ certs['peer_ca_cert'] = sys.argv[3] print "Starting the server." - server = AuthedSSLXMLRPCServer(('localhost', 8886), None, certs) + server = TestServer(('localhost', 8886), certs) h = ReqHandler() server.register_instance(h) server.serve_forever() Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- XMLRPCServerProxy.py 9 Jul 2005 21:44:23 -0000 1.3 +++ XMLRPCServerProxy.py 10 Jul 2005 03:44:36 -0000 1.4 @@ -49,6 +49,32 @@ # Testing stuff ########################################################### + +import threading +import time +import random + +client_start = False + +_lock = threading.Lock() + +class TestClient(threading.Thread): + def __init__(self, certs): + self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs) + threading.Thread.__init__(self) + + def run(self): + while not client_start: + time.sleep(0.05) + i = 0 + while i < 5: +# _lock.acquire() + print self.server.ping() + time.sleep(0.05) +# _lock.release() + i = i + 1 + + if __name__ == '__main__': if len(sys.argv) < 4: print "Usage: python XMLRPCServerProxy.py key_and_cert ca_cert peer_ca_cert" @@ -59,5 +85,19 @@ certs['ca_cert'] = sys.argv[2] certs['peer_ca_cert'] = sys.argv[3] - s = XMLRPCServerProxy("https://127.0.0.1:8886", certs) - print s.ping() + i = 100 + while i > 0: + t = TestClient(certs) + print "Created thread %d." % i + t.start() + i = i - 1 + + time.sleep(3) + print "Unleashing threads." + client_start = True + while True: + try: + time.sleep(0.25) + except KeyboardInterrupt: + os._exit(0) + From fedora-extras-commits at redhat.com Sun Jul 10 03:44:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:39 -0400 Subject: extras-buildsys/server Builder.py, 1.3, 1.4 User.py, 1.3, 1.4 UserInterface.py, 1.16, 1.17 main.py, 1.4, 1.5 Message-ID: <200507100344.j6A3idQE019436@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/server Modified Files: Builder.py User.py UserInterface.py main.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Builder.py 7 Jul 2005 16:21:12 -0000 1.3 +++ Builder.py 10 Jul 2005 03:44:37 -0000 1.4 @@ -46,9 +46,9 @@ self._jobs = {} self._address = address if config_opts['ssl_builders']: - self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, certs) + self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs) else: - self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, None) + self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._unavail_count = 0 self._arches = [] try: Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- User.py 26 Jun 2005 14:52:30 -0000 1.3 +++ User.py 10 Jul 2005 03:44:37 -0000 1.4 @@ -34,7 +34,6 @@ self.server_admin = False - class Authenticator: """ Talks to a database of users & capabilities Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- UserInterface.py 8 Jul 2005 18:12:31 -0000 1.16 +++ UserInterface.py 10 Jul 2005 03:44:37 -0000 1.17 @@ -24,6 +24,7 @@ import copy import BuildMaster import PackageJob +from plague import AuthedXMLRPCServer # Load in the config CONFIG_LOCATION = "/etc/plague/server/" @@ -212,20 +213,23 @@ Allow/Deny operations based on user privileges """ - def enqueue(self, user, package, cvs_tag, target, buildreq=None): - if not user.own_jobs: + def enqueue(self, package, cvs_tag, target, buildreq=None): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: return (-1, "Insufficient privileges.") return UserInterface.enqueue(self, user.email, package, cvs_tag, target, buildreq) - def enqueue_srpm(self, user, package, srpm_file, target, buildreq=None): - if not user.own_jobs: + def enqueue_srpm(self, package, srpm_file, target, buildreq=None): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: return (-1, "Insufficient privileges.") return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq) - def kill_job(self, user, email, jobid): - if not user.own_jobs: + def kill_job(self, email, jobid): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: return (-1, "Insufficient privileges.") if user.email != email: return (-1, "Insufficient privileges.") @@ -236,17 +240,21 @@ return self._kill_job(user.email, job, jobid) - def list_jobs(self, user, args_dict): + def list_jobs(self, args_dict): + user = AuthedXMLRPCServer.get_authinfo() return UserInterface.list_jobs(self, args_dict) - def update_builders(self, user): - if not user.server_admin: + def update_builders(self): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.server_admin: return (-1, "Insufficient privileges.") return UserInterface.update_builders(self) - def list_builders(self, user): - if not user.server_admin: + + def list_builders(self): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.server_admin: return (-1, "Insufficient privileges.") return UserInterface.list_builders(self) Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- main.py 7 Jul 2005 17:45:08 -0000 1.4 +++ main.py 10 Jul 2005 03:44:37 -0000 1.5 @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# copyright 2005 Duke University -# written by Seth Vidal +# +# Copyright 2005 Dan Williams and Red Hat, Inc. import sys From fedora-extras-commits at redhat.com Sun Jul 10 03:44:37 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:37 -0400 Subject: extras-buildsys ChangeLog, 1.48, 1.49 Makefile, 1.6, 1.7 plague.spec, 1.9, 1.10 Message-ID: <200507100345.j6A3j7Mk019445@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340 Modified Files: ChangeLog Makefile plague.spec Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ChangeLog 8 Jul 2005 18:12:25 -0000 1.48 +++ ChangeLog 10 Jul 2005 03:44:35 -0000 1.49 @@ -1,3 +1,10 @@ +2005-07-09 Dan Williams + + * Rework the authorization framework so we don't need to + subclass/override subclass so much stuff + + * Make the specfile Python version independent + 2005-07-08 Dan Williams * Pass archjob information along to the client, Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 8 Jul 2005 03:28:19 -0000 1.6 +++ Makefile 10 Jul 2005 03:44:35 -0000 1.7 @@ -27,6 +27,8 @@ @rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME} @dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME} @rm -f /tmp/${PKGNAME}/${PKGNAME}-daily.spec + @rm -rf /tmp/${PKGNAME}/build + @rm -rf /tmp/${PKGNAME}/dist @rm -rf /tmp/${PKGNAME}/builder/certs @rm -rf /tmp/${PKGNAME}/client/certs @rm -rf /tmp/${PKGNAME}/server/certs Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plague.spec 8 Jul 2005 04:41:13 -0000 1.9 +++ plague.spec 10 Jul 2005 03:44:35 -0000 1.10 @@ -1,5 +1,3 @@ -%define pythonver 2.4 - BuildArch: noarch Summary: Distributed build system for RPMs @@ -92,7 +90,7 @@ %files common %defattr(-, root, root) -%{_libdir}/python%{pythonver}/site-packages/plague/*.py* +%{_libdir}/python?.?/site-packages/plague/*.py* %files builder %defattr(-, root, root) From fedora-extras-commits at redhat.com Sun Jul 10 04:33:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:33:27 -0400 Subject: extras-buildsys/client client.py,1.10,1.11 Message-ID: <200507100433.j6A4XRdV020587@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20570/client Modified Files: client.py Log Message: Ignore IOErrors when printing jobs Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- client.py 10 Jul 2005 03:44:36 -0000 1.10 +++ client.py 10 Jul 2005 04:33:25 -0000 1.11 @@ -110,11 +110,14 @@ print "No jobs found that match the search criteria." else: for job in jobs: - print job - for archjob in archjobs: - if archjob[1] == job[0]: - print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) - print '' + try: + print job + for archjob in archjobs: + if archjob[1] == job[0]: + print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) + print '' + except IOError: + pass def kill(server, email, jobid): From fedora-extras-commits at redhat.com Sun Jul 10 04:33:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:33:53 -0400 Subject: extras-buildsys/server UserInterface.py,1.17,1.18 Message-ID: <200507100433.j6A4Xr9d020610@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593/server Modified Files: UserInterface.py Log Message: Validate email addresses Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- UserInterface.py 10 Jul 2005 03:44:37 -0000 1.17 +++ UserInterface.py 10 Jul 2005 04:33:51 -0000 1.18 @@ -53,6 +53,17 @@ return (dbcx, curs) +def validate_email(email): + for c in email: + # For now, legal characters are '@_-.+' plus alphanumeric + if (c == '@') or (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): + pass + else: + print "Bad char is '%s'" % c + return False + return True + + class UserInterface: """ Base UserInterface class. NO AUTHENTICATION. Subclass this to provide some. @@ -134,14 +145,15 @@ first = True if args_dict.has_key('email') and args_dict['email']: - # FIXME: validate email so users can't do random SQL queries - # in place of the email address - if first: - search = search + " WHERE " - first = False + if validate_email(args_dict['email']): + if first: + search = search + " WHERE " + first = False + else: + search = search + " AND " + search = search + 'username LIKE "%%%s%%"' % args_dict['email'] else: - search = search + " AND " - search = search + 'username LIKE "%%%s%%"' % args_dict['email'] + return (-1, "Error: Invalid query.", [], []) if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] From fedora-extras-commits at redhat.com Sun Jul 10 04:43:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:43:24 -0400 Subject: extras-buildsys/etc - New directory Message-ID: <200507100443.j6A4hORU020632@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618/etc Log Message: Directory /cvs/fedora/extras-buildsys/etc added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 04:48:41 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:41 -0400 Subject: extras-buildsys/common daemonize.py,NONE,1.1 Message-ID: <200507100448.j6A4mfEk020713@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/common Added Files: daemonize.py Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder ***** Error reading new file: [Errno 2] No such file or directory: 'daemonize.py' From fedora-extras-commits at redhat.com Sun Jul 10 04:48:42 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:42 -0400 Subject: extras-buildsys/etc plague-builder.config, NONE, 1.1 plague-builder.init, NONE, 1.1 Message-ID: <200507100448.j6A4mgjl020718@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/etc Added Files: plague-builder.config plague-builder.init Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder --- NEW FILE plague-builder.config --- HOST=localhost ARCHS= --- NEW FILE plague-builder.init --- #!/bin/bash # # /etc/rc.d/init.d/plague-builder # # Start a plague builder instance # # chkconfig: 345 98 02 # description: Starts a plague builder instance # processname: plague-builder # config: /etc/sysconfig/plague-builder # pidfile: /var/run/plague-builder.pid # Source function library. . /etc/init.d/functions . /etc/sysconfig/plague-builder start() { echo -n "Starting plague-builder: " daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHS echo touch /var/lock/subsys/plague-builder return 0 } stop() { echo -n "Shutting down plague-builder: " killproc plague-builder echo rm -f /var/lock/subsys/plague-builder return 0 } restart() { stop start } case "$1" in start) start ;; stop) stop ;; status) status plague-builder ;; restart) stop start ;; condrestart) [ -f /var/lock/subsys/plague-builder ] && restart || : ;; *) echo "Usage: {start|stop|status|reload|restart[|probe]" exit 1 ;; esac exit $? From fedora-extras-commits at redhat.com Sun Jul 10 04:48:40 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:40 -0400 Subject: extras-buildsys/builder builder.py,1.10,1.11 Message-ID: <200507100448.j6A4meiB020707@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/builder Modified Files: builder.py Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- builder.py 10 Jul 2005 03:44:35 -0000 1.10 +++ builder.py 10 Jul 2005 04:48:38 -0000 1.11 @@ -34,6 +34,7 @@ from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer +from plague import daemonize # Load in the config @@ -596,11 +597,40 @@ if __name__ == '__main__': - if len(sys.argv) < 3: + state={'opts': True, 'host': None, 'archs': [], + 'daemon': False, 'pidfile': None, 'logfile': None} + + for i in sys.argv[1:]: + if state['logfile']=='': + state['logfile']=i + continue + if state['pidfile']=='': + state['pidfile']=i + continue + if i.startswith('-'): + if state['opts']: + if i=='-d': + state['daemon']=True + elif i=='-p': + state['pidfile']='' + elif i=='-l': + state['logfile']='' + elif i=='--': + state['opts']=False + continue + if not state['host']: + state['host']=i + else: + state['archs'].append(i) + + if not state['host'] or not state['archs'] or (state['pidfile']=='') or (state['logfile']==''): print "Usage:\n" - print " %s \n" % sys.argv[0] + print " %s [-p ] [-l ] [-d]\n" % sys.argv[0] print " - hostname or IP address of this machine" print " - space-separated list of arches this machine can build" + print " - file to write the PID to" + print " - file to write messages to instead of stdout" + print " -d - daemonize (i.e., detach from the terminal)" # pretty-print the available archlist archlist = "" @@ -613,8 +643,22 @@ print " Available arches: [ %s ]\n" % archlist sys.exit(1) - g_our_hostname = sys.argv[1] - localarches = sys.argv[2:] + g_our_hostname = state['host'] + localarches = state['archs'] + + if state['daemon']: + ret=daemonize.createDaemon() + if ret: + print "Daemonizing failed!" + sys.exit(2) + + if state['pidfile']: + open(state['pidfile'], 'w').write('%d\n' % os.getpid()) + + if state['logfile']: + log=open(state['logfile'], 'a') + sys.stdout=log + sys.stderr=log work_dir = config_opts['builder_work_dir'] if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): From fedora-extras-commits at redhat.com Sun Jul 10 04:48:40 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:40 -0400 Subject: extras-buildsys ChangeLog,1.49,1.50 plague.spec,1.10,1.11 Message-ID: <200507100449.j6A4nAj1020724@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652 Modified Files: ChangeLog plague.spec Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 10 Jul 2005 03:44:35 -0000 1.49 +++ ChangeLog 10 Jul 2005 04:48:38 -0000 1.50 @@ -1,5 +1,10 @@ 2005-07-09 Dan Williams + Patch from Ignacio Vazquez-Abrams + * Add initscript/daemonize support for the builder + +2005-07-09 Dan Williams + * Rework the authorization framework so we don't need to subclass/override subclass so much stuff Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plague.spec 10 Jul 2005 03:44:35 -0000 1.10 +++ plague.spec 10 Jul 2005 04:48:38 -0000 1.11 @@ -33,6 +33,9 @@ Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1 Requires: mock >= 0.3, pyOpenSSL +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description builder The Plague build client does the actual RPM package building on slave @@ -70,12 +73,27 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder +install -D -m 0755 etc/plague-builder-init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder %clean rm -rf $RPM_BUILD_ROOT +%post builder +/sbin/chkconfig --add plague-builder +. %{_sysconfdir}/sysconfig/%{name}-builder +if [ -z "$ARCHS" ] ; then + sed -ie "s/^ARCHS=.*$/ARCHS=$(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/')/" %{_sysconfdir}/sysconfig/%{name}-builder +endif + +%preun builder +if [ $1 = 0 ]; then + /sbin/service plague-builder stop &> /dev/null + /sbin/chkconfig --del plague-builder +fi + %files %defattr(-, root, root) %doc README ChangeLog @@ -98,6 +116,8 @@ %dir %{_sysconfdir}/%{name}/builder %config(noreplace) %{_sysconfdir}/%{name}/builder/CONFIG.py* %dir %{_sysconfdir}/%{name}/builder/certs +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder +%{_initrddir}/%{name}-builder %files client %defattr(-, root, root) From fedora-extras-commits at redhat.com Sun Jul 10 05:13:49 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 01:13:49 -0400 Subject: extras-buildsys README,1.6,1.7 Message-ID: <200507100513.j6A5Dn37021887@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21870 Modified Files: README Log Message: fix some minor typos and put linebreaks into README Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 7 Jul 2005 04:05:46 -0000 1.6 +++ README 10 Jul 2005 05:13:47 -0000 1.7 @@ -2,57 +2,88 @@ System Requirements: - Python 2.3 or 2.4 - - m2crypto as long as it's not 0.10 + - pyOpenSSL - sqlite python bindings - - mock (http://www.dulug.duke.edu/~skvidal/mock/) - + - mock (http://linux.duke.edu/~skvidal/mock/) + - createrepo Getting Started ------------------------------------------ -To allow users to retrieve logs and other status, you need to run an HTTP server that allows access to the result dir (the 'server_work_dir' config option). - -You will also need to set up the infrastructure for the yum repository that the builders connect to and retrieve the latest packages. This can be either HTTP, NFS, SMB, etc. You then need to point 'yum' to this repo in step (5) of the Builder Setup. +To allow users to retrieve logs and other status, you need to run an HTTP +server that allows access to the result dir (the 'server_work_dir' config +option). + +You will also need to set up the infrastructure for the yum repository that the +builders connect to and retrieve the latest packages. This can be either HTTP, +NFS, SMB, etc. You then need to point 'yum' to this repo in step (5) of the +Builder Setup. Builder Setup: 1) In the CVS checkout directory on the client, execute: make DESTDIR=/ install -2) Create a user for the builder. The builder drops root privileges before running the build, but must have root to be able to do initial setup -3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs directory +2) Create a user for the builder. The builder drops root privileges before + running the build, but must have root to be able to do initial setup +3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs + directory 4) Things to modify in the client's CONFIG.py: - - Modify the 'distro' and 'repo' options to match the targets you've configured in /etc/mock/. These targets are usually in the form of "distro-target-arch-repo". 'arch' and 'target' are passed by the build system dynamically, but 'distro' and 'repo' are hardcoded in the config file. Examples are "fedora-development-i386-core" and "fedora-development-i386-extras". -5) Configure the mock target files in /etc/mock. You only need one target file for each major arch you support. For example, you don't need separate 'ia32e' or 'amd64' config files, since these just use the normal 'x86_64' config file + - Modify the 'distro' and 'repo' options to match the targets you've + configured in /etc/mock/. These targets are usually in the form of + "distro-target-arch-repo". 'arch' and 'target' are passed by the build + system dynamically, but 'distro' and 'repo' are hardcoded in the config + file. Examples are "fedora-development-i386-core" and + "fedora-development-i386-extras". +5) Configure the mock target files in /etc/mock. You only need one target + file for each major arch you support. For example, you don't need separate + 'ia32e' or 'amd64' config files, since these just use the normal 'x86_64' + config file 6) Start the client. ex: "/usr/bin/plague-builder 127.0.0.1 i386 i686" On the Server: -1) Follow the instructions at the bottom of this file titled "Configuring SSL for your Build System" +1) Follow the instructions at the bottom of this file titled "Configuring SSL + for your Build System" 2) In the CVS checkout directory, execute: make DESTDIR=/ install -3) Copy the server Key, Cert, and CA Cert to the /etc/plague/server/certs directory -4) Copy the client authentication CA Cert to the /etc/plague/server/certs directory +3) Copy the server Key, Cert, and CA Cert to the /etc/plague/server/certs + directory +4) Copy the client authentication CA Cert to the /etc/plague/server/certs + directory 5) Things to modify in the server's CONFIG.py: - - Update the Key, Cert, and CA Cert, and client auth CA Cert file options to point to the files in steps 3 and 4 - - Modify the 'targets' option to add/remove the arches and targets you'll be building - - Modify the 'builders' option to point to the build clients you'll be using. Note the "https". - - If you want to do simple SRPM builds, set the 'use_srpm_not_cvs' option to true + - Update the Key, Cert, and CA Cert, and client auth CA Cert file options + to point to the files in steps 3 and 4 + - Modify the 'targets' option to add/remove the arches and targets you'll + be building + - Modify the 'builders' option to point to the build clients you'll be + using. Note the "https". + - If you want to do simple SRPM builds, set the 'use_srpm_not_cvs' option + to true 6) Start the server. ex: "/usr/bin/plague-server 127.0.0.1" Operation: -1) You must add a user account for any user who wishes to use the build system. This is accomplished with the 'plague-user-manager.py' tool, installed by default in /usr/bin. You add a user like this: - /usr/bin/plague-user-manager.py /etc/plague/server/userdb add dcbw at redhat.com own_jobs kill_any_job modify_users server_admin -2) Clients then run plague-client to queue jobs. When first run, plague-client creates the ~/.plague-client.cfg file - - Point the client to the server's address +1) You must add a user account for any user who wishes to use the build system. + This is accomplished with the 'plague-user-manager.py' tool, installed by + default in /usr/bin. You add a user like this: + /usr/bin/plague-user-manager.py /etc/plague/server/userdb add \ + dcbw at redhat.com own_jobs kill_any_job modify_users server_admin + +2) Clients then run plague-client to queue jobs. When first run, + plague-client creates the ~/.plague-client.cfg file + - Point the client to the server's address - Point the client to the correct certificates - - Make sure you change the email address in ~/.plague-client to match that of the 'user-cert' certificate + - Make sure you change the email address in ~/.plague-client to match + that of the 'user-cert' certificate + 3) To build a package, you use plague-client like so: /usr/bin/plague-client build ethtool /home/dcbw/ethtool-1.8-4.src.rpm devel -4) If the client returns "Package ethtool enqueued." then the enqueue was successful + +4) If the client returns "Package ethtool enqueued." then the enqueue was + successful You can list your own jobs with: /usr/bin/plague-client list @@ -63,7 +94,11 @@ Architectural Overview: ------------------------------------------ -The build system is composed of a single build server, and multiple build clients. Clients run an XMLRPC server to which the build-server delivers build jobs. The build server runs an XMLRPC server to allow submission of jobs, and to retrieve basic status information about both clients and the build system as a whole. +The build system is composed of a single build server, and multiple build +clients. Clients run an XMLRPC server to which the build-server delivers +build jobs. The build server runs an XMLRPC server to allow submission of +jobs, and to retrieve basic status information about both clients and the +build system as a whole. @@ -72,17 +107,40 @@ usage: build-client
    ie : build-client localhost sparc sparcv9 sparcv8 -Currently, build clients are limited to building one job at a time. This limitation may be removed in the future. They do not queue pending jobs, but will reject build requests when something is already building. The build server is expected to queue and manage jobs at this time, and serialize requests to build clients. This may not be the case in the future. +Currently, build clients are limited to building one job at a time. This +limitation may be removed in the future. They do not queue pending jobs, +but will reject build requests when something is already building. The build +server is expected to queue and manage jobs at this time, and serialize +requests to build clients. This may not be the case in the future. main() `- Creates: XMLRPCBuildClientServer - `- Creates: i386Arch, x86_64Arch, PPCArch, etc (subclasses of BuildClientMach) - -The client creates an XMLRPC server object (XMLRPCBuildClientServer), and then processes requests in an infinite loop. Every so often (currently 5 seconds) the server allows each build job that is still in process to update its status and perform work. The XMLRPCBuildClientServer keeps a list of local build jobs, which are architecture specific, and forwards requests and commands for each job to that specific job, keyed off a unique id. - -Each build job (BuildClientMach and its architecture-specific subclasses like i386Arch) proceeds through a number of states. Build jobs are periodically given time to do work (BuildClientMach.process()) by their BuildClientInstance (from XMLRPCBuildClientServer._process()), which is in turn periodically given time by the client's main loop. During their processing time, build jobs check their state, see if any actions have completed, and advance to the next state if needed. Communication with mock and retrieval of status from mock are done with popen2.Popen4() so that mock does not block the XMLRPC server from talking to the build server. + `- Creates: i386Arch, x86_64Arch, PPCArch, etc (subclasses + of BuildClientMach) -All communication with the build server is done through SSL to ensure the identity of each party. Both the XMLRPC server and the result file server are SSL-enabled, and require SSL certificates and keys to operate. See later section in this document on how to configure SSL certificates for your build system. +The client creates an XMLRPC server object (XMLRPCBuildClientServer), and +then processes requests in an infinite loop. Every so often (currently +5 seconds) the server allows each build job that is still in process to +update its status and perform work. The XMLRPCBuildClientServer keeps a +list of local build jobs, which are architecture specific, and forwards +requests and commands for each job to that specific job, keyed off a +unique id. + +Each build job (BuildClientMach and its architecture-specific subclasses like +i386Arch) proceeds through a number of states. Build jobs are periodically +given time to do work (BuildClientMach.process()) by their BuildClientInstance +(from XMLRPCBuildClientServer._process()), which is in turn periodically given +time by the client's main loop. During their processing time, build jobs +check their state, see if any actions have completed, and advance to the next +state if needed. Communication with mock and retrieval of status from mock +are done with popen2.Popen4() so that mock does not block the XMLRPC server +from talking to the build server. + +All communication with the build server is done through SSL to ensure the +identity of each party. Both the XMLRPC server and the result file server are +SSL-enabled, and require SSL certificates and keys to operate. See later +section in this document on how to configure SSL certificates for your build +system. @@ -90,23 +148,51 @@ usage: build-server -The build server runs two threads. The first, the XMLRPC server (XMLRPCBuildMaster class), accepts requests to enqueue jobs for build and stuffs them into an sqlite database which contains all job details. The second thread, the Build Master (BuildMaster class), pulls 'waiting' jobs from the database and builds them. A third top-level object that runs in the same thread as the Build Master is the BuildClientManager, which keeps track of build clients (ArchWelders) and their status. +The build server runs two threads. The first, the XMLRPC server +(XMLRPCBuildMaster class), accepts requests to enqueue jobs for build and +stuffs them into an sqlite database which contains all job details. The second +thread, the Build Master (BuildMaster class), pulls 'waiting' jobs from the +database and builds them. A third top-level object that runs in the same +thread as the Build Master is the BuildClientManager, which keeps track of +build clients (ArchWelders) and their status. main() |- Creates: XMLRPCBuildMaster |- Creates: BuildClientManager |- `- Creates: BuildClient (one for each remote build client) - |- `- Creates: BuildClientJob (one for each build job on each arch) + |- `- Creates: BuildClientJob (one for each build job + |- on each arch) `- Creates: BuildMaster `- Creates: BuildJob (one for each build job) -The BuildClientManager object serves as a central location for all tracking and status information about each build job on each arch. It creates an BuildClient instance for each remote build client. The BuildClient instance keeps track of specific jobs building on all architectures on that remote build client. It also serves as the XMLRPC client of the remote build client, proxying status information from it. - -BuildJobs must request that the BuildClientManager create a new BuildClientJob for each build on each architecture the BuildJob needs. If there is an available build client (since build clients only build one job at a time across all arches they support), the BuildClientManager will pass the request to the arch-specific BuildClient instance, which creates the new arch-specific BuildClientJob, and pass it back through the BuildClientManager to the parent BuildJob. If there is no available build client for the request, the BuildJob must periodically re-issue the build request to the BuildClientManager. - -BuildClientManager has a periodic processing routine that is called from the BuildMaster thread. This processing routine calls the BuildClient.process() routine on each BuildClient instance, which in turn updates its view of the remote build client's status. Thus, the BuildClientManager, through each BuildClient instance, knows the status and currently building job on each remote build client. - -BuildJobs track a single SRPM build through the entire build system. They are created from the BuildMaster thread whenever the BuildMaster finds a job entry in the sqlite database with the status of 'waiting'. BuildJobs proceed through a number of states: "initialize", "checkout", "make_srpm", "prep", "building", "finished", "cleanup", "failed", and "needsign". +The BuildClientManager object serves as a central location for all tracking and +status information about each build job on each arch. It creates a +BuildClient instance for each remote build client. The BuildClient instance +keeps track of specific jobs building on all architectures on that remote +build client. It also serves as the XMLRPC client of the remote build +client, proxying status information from it. + +BuildJobs must request that the BuildClientManager create a new BuildClientJob +for each build on each architecture the BuildJob needs. If there is an +available build client (since build clients only build one job at a time +across all arches they support), the BuildClientManager will pass the request +to the arch-specific BuildClient instance, which creates the new arch-specific +BuildClientJob, and pass it back through the BuildClientManager to the parent +BuildJob. If there is no available build client for the request, the BuildJob +must periodically re-issue the build request to the BuildClientManager. + +BuildClientManager has a periodic processing routine that is called from the +BuildMaster thread. This processing routine calls the BuildClient.process() +routine on each BuildClient instance, which in turn updates its view of the +remote build client's status. Thus, the BuildClientManager, through each +BuildClient instance, knows the status and currently building job on each +remote build client. + +BuildJobs track a single SRPM build through the entire build system. They are +created from the BuildMaster thread whenever the BuildMaster finds a job entry +in the sqlite database with the status of 'waiting'. BuildJobs proceed through +a number of states: "initialize", "checkout", "make_srpm", "prep", "building", +"finished", "cleanup", "failed", and "needsign". Flow goes like this: @@ -122,37 +208,55 @@ - failed jobs? => failed - otherwise => needsign -The BuildJob updates its status when it is periodically told to do so by the BuildManager. At this point, it will advance to the next state, or spawn build jobs that have not yet started if build clients for those architectures are now available. It stays in the "building" state until all jobs are first spawned, and then either completed or failed. - -All communication with build clients is done through SSL to ensure the identity of each party. When the client requests the SRPM to build, SSL is used. When the build server retrieves logs and RPMs from the build client, SSL is also used. This ensures that build clients can be more or less trusted, or at least that some random build client is not serving you packages that might contaminate your repository. See later section in this document on how to configure SSL certificates for your build system. +The BuildJob updates its status when it is periodically told to do so by the +BuildManager. At this point, it will advance to the next state, or spawn build +jobs that have not yet started if build clients for those architectures are +now available. It stays in the "building" state until all jobs are first +spawned, and then either completed or failed. + +All communication with build clients is done through SSL to ensure the +identity of each party. When the client requests the SRPM to build, SSL +is used. When the build server retrieves logs and RPMs from the build client, +SSL is also used. This ensures that build clients can be more or less trusted, +or at least that some random build client is not serving you packages that +might contaminate your repository. See later section in this document on how +to configure SSL certificates for your build system. Configuring SSL for your Build System -------------------------------------- -When you set up the build system, you essentially become a Certificate Authority. -Because the build server and the build clients communicate using SSL, they need -to exchange certificates to verify the others' identity. You must first create -a key/cert pair for the Build System Certificate Authority, which signs both -the build server's certificate, and each build client's certificate. +When you set up the build system, you essentially become a Certificate +Authority. Because the build server and the build clients communicate using +SSL, they need to exchange certificates to verify the others' identity. +You must first createa key/cert pair for the Build System Certificate +Authority, which signs both the build server's certificate, and each build +client's certificate. The Certificates on the Server: config_opts['server_cert'] -> server SSL certificate config_opts['server_key'] -> server private key -config_opts['ca_cert'] -> CA certificate used to sign both server and builder certificates -config_opts['ui_ca_cert'] -> CA cert that signs package maintainer's certificates, used to verify connections from plague-clients are authorized +config_opts['ca_cert'] -> CA certificate used to sign both server and builder + certificates +config_opts['ui_ca_cert'] -> CA cert that signs package maintainer's + certificates, used to verify connections from + plague-clients are authorized The Certificates on the Builders: config_opts['client_cert'] -> builder SSL certificate config_opts['client_key'] -> builder private key -config_opts['ca_cert'] -> _same_ as server's 'ca_cert', the CA certificate used to sign both server and builder certificates +config_opts['ca_cert'] -> _same_ as server's 'ca_cert', the CA certificate + used to sign both server and builder certificates -Package Maintainer certificates (used by /usr/bin/plague-client, from ~/.plague-client.cfg) +Package Maintainer certificates (used by /usr/bin/plague-client, +from ~/.plague-client.cfg) server-ca-cert -> _same_ as server and client's 'ca_cert' user-ca-cert -> CA cert that signed the package maintainer's 'user-cert' -user-key -> package maintainer's private key, can be blank if private key and certificate are in the same file -user-cert -> package maintainer's certificate, signed by 'user-ca-cert' and sent to build server to validate the plague-client's connection +user-key -> package maintainer's private key, can be blank if private key and + certificate are in the same file +user-cert -> package maintainer's certificate, signed by 'user-ca-cert' and + sent to build server to validate the plague-client's connection Setting up the Build System Certificate Authority @@ -173,7 +277,8 @@ 3. Generate the BSCA certificate -openssl req -new -x509 -key private/cakey.pem -out cacert.pem -extensions v3_ca -days 3650 +openssl req -new -x509 -key private/cakey.pem -out cacert.pem \ + -extensions v3_ca -days 3650 4. Generate a build server key @@ -208,7 +313,15 @@ or more clients. You may add clients using step 7 to create and sign their certificate requests. -9. Copy server_cert.pem, server_key.pem, and cacert.pem to a directory on the build server. IMPORTANT: make sure only the build server's user can read server_key.pem, since it is the server's private key. Then, modify the server's CONFIG.py file and point the respective config options to the _full_ path to each file. - -10. Copy client1_cert.pem, client1_key.pem, and cacert.pem to a direcrory on the build client. IMPORTANT: make sure only the build client's user can read client1_key.pem, since it is the client's private key. Then, modify the client's CONFIG.py file and point the respective config options to the _full_ path to each file. +9. Copy server_cert.pem, server_key.pem, and cacert.pem to a directory on the +build server. IMPORTANT: make sure only the build server's user can read +server_key.pem, since it is the server's private key. Then, modify the +server's CONFIG.py file and point the respective config options to the _full_ +path to each file. + +10. Copy client1_cert.pem, client1_key.pem, and cacert.pem to a direcrory on +the build client. IMPORTANT: make sure only the build client's user can read +client1_key.pem, since it is the client's private key. Then, modify the +client's CONFIG.py file and point the respective config options to the _full_ +path to each file. From rc040203 at freenet.de Sun Jul 10 05:45:26 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sun, 10 Jul 2005 07:45:26 +0200 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch,1.1,1.2 In-Reply-To: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> References: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> Message-ID: <1120974327.30532.394.camel@mccallum.corsepiu.local> On Fri, 2005-07-08 at 18:03 -0400, Adrian Reber wrote: > Author: adrian > > Update of /cvs/extras/rpms/jhead/FC-3 > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12182 > > Modified Files: > jhead-compiler-warnings.patch > Log Message: > don't reverse the other patch > > > jhead-compiler-warnings.patch: > > Index: jhead-compiler-warnings.patch > -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 > -@@ -9,7 +9,7 @@ > - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o > - > - $(OBJ)/%.o:$(SRC)/%.c > -- ${CC} ${CFLAGS} -Wall -c $< -o $@ > -+ ${CC} -O3 -Wall -c $< -o $@ You should be using the contents of RPM_OPT_FLAGS. Hard-coding -O3 should be non-acceptable unless there is a very well thought out reason to make an exception. I vote for putting this package on HOLD before this issue can be clarified. Ralf From fedora-extras-commits at redhat.com Sun Jul 10 06:08:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 02:08:26 -0400 Subject: extras-buildsys README,1.7,1.8 Message-ID: <200507100608.j6A68Qiu023051@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23034 Modified Files: README Log Message: change name of cacert.pem to ca_cert.pem to match default name in builder config files. Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- README 10 Jul 2005 05:13:47 -0000 1.7 +++ README 10 Jul 2005 06:08:24 -0000 1.8 @@ -20,14 +20,14 @@ Builder Setup. -Builder Setup: -1) In the CVS checkout directory on the client, execute: +Builder Setup: +1) In the CVS checkout directory on the builder system, execute: make DESTDIR=/ install 2) Create a user for the builder. The builder drops root privileges before running the build, but must have root to be able to do initial setup 3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs directory -4) Things to modify in the client's CONFIG.py: +4) Things to modify in the builder's CONFIG.py: - Modify the 'distro' and 'repo' options to match the targets you've configured in /etc/mock/. These targets are usually in the form of "distro-target-arch-repo". 'arch' and 'target' are passed by the build @@ -272,12 +272,12 @@ 2. Generate a BSCA private key: -openssl genrsa -out private/cakey.pem 2048 +openssl genrsa -out private/ca_key.pem 2048 3. Generate the BSCA certificate -openssl req -new -x509 -key private/cakey.pem -out cacert.pem \ +openssl req -new -x509 -key private/ca_key.pem -out ca_cert.pem \ -extensions v3_ca -days 3650 @@ -313,13 +313,13 @@ or more clients. You may add clients using step 7 to create and sign their certificate requests. -9. Copy server_cert.pem, server_key.pem, and cacert.pem to a directory on the +9. Copy server_cert.pem, server_key.pem, and ca_cert.pem to a directory on the build server. IMPORTANT: make sure only the build server's user can read server_key.pem, since it is the server's private key. Then, modify the server's CONFIG.py file and point the respective config options to the _full_ path to each file. -10. Copy client1_cert.pem, client1_key.pem, and cacert.pem to a direcrory on +10. Copy client1_cert.pem, client1_key.pem, and ca_cert.pem to a direcrory on the build client. IMPORTANT: make sure only the build client's user can read client1_key.pem, since it is the client's private key. Then, modify the client's CONFIG.py file and point the respective config options to the _full_ From fedora-extras-commits at redhat.com Sun Jul 10 06:22:27 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 02:22:27 -0400 Subject: extras-buildsys plague.spec,1.11,1.12 Message-ID: <200507100622.j6A6MSBA023103@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23086 Modified Files: plague.spec Log Message: fix spec file for initscript Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- plague.spec 10 Jul 2005 04:48:38 -0000 1.11 +++ plague.spec 10 Jul 2005 06:22:25 -0000 1.12 @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder -install -D -m 0755 etc/plague-builder-init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder +install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder %clean From fedora-extras-commits at redhat.com Sun Jul 10 06:30:19 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 02:30:19 -0400 Subject: extras-buildsys/common Makefile,1.5,1.6 Message-ID: <200507100630.j6A6UJ0l023127@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23110/common Modified Files: Makefile Log Message: add daemonize.py to plague-common Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 6 Jul 2005 21:20:55 -0000 1.5 +++ Makefile 10 Jul 2005 06:30:16 -0000 1.6 @@ -14,9 +14,10 @@ HTTPServer.py \ AuthedXMLRPCServer.py \ SSLCommon.py \ - SSLConnection.py \ + SSLConnection.py \ XMLRPCServerProxy.py \ lighttpdManager.py \ + daemonize.py \ __init__.py clean: From rc040203 at freenet.de Sun Jul 10 07:17:04 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sun, 10 Jul 2005 09:17:04 +0200 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 In-Reply-To: <42CE8CF3.4050904@shahms.com> References: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> <1120797191.30532.313.camel@mccallum.corsepiu.local> <42CE8CF3.4050904@shahms.com> Message-ID: <1120979824.30532.404.camel@mccallum.corsepiu.local> On Fri, 2005-07-08 at 07:25 -0700, Shahms King wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Ralf Corsepius wrote: > | On Thu, 2005-07-07 at 15:53 -0400, Shahms King wrote: > | > |>Author: shahms > | > | > |>Index: bazaar.spec > | > | > |>+# The stand alone annotate is meant to debug baz interals, not > installation > |>+# see: > http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html > |>+if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then > |>+ rm $RPM_BUILD_ROOT%{_bindir}/annotate > |>+fi > | > | > | Why so clumsy? > | rm -f $RPM_BUILD_ROOT%{_bindir}/annotate > | > | Ralf > > I don't find checking before removing clumsy, myself and I try to avoid > "rm -f" where possible simply on principle. What for? You want to remove annotate if it exists and that's what rm -f does. I can't imagine any situation where "test -f file && rm file" might be close to useful. Ralf From fedora-extras-commits at redhat.com Sun Jul 10 07:17:22 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 03:17:22 -0400 Subject: extras-buildsys/etc plague-builder.config, 1.1, 1.2 plague-builder.init, 1.1, 1.2 Message-ID: <200507100717.j6A7HMp2024423@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374/etc Modified Files: plague-builder.config plague-builder.init Log Message: - modify builder.py to use optparse for getting cli options default behavior now uses -a for adding architectures and checks the archs vs the archlist for this host. - modify the spec file to clean up %description for base package - modify init script and init script config file for new cli syntax for builder Index: plague-builder.config =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague-builder.config 10 Jul 2005 04:48:40 -0000 1.1 +++ plague-builder.config 10 Jul 2005 07:17:20 -0000 1.2 @@ -1,2 +1,3 @@ HOST=localhost -ARCHS= +# archsopt should be -a arch1 -a arch2 -a arch3 etc etc etc +ARCHSOPT='' Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague-builder.init 10 Jul 2005 04:48:40 -0000 1.1 +++ plague-builder.init 10 Jul 2005 07:17:20 -0000 1.2 @@ -17,7 +17,7 @@ start() { echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHS + daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHSOPT echo touch /var/lock/subsys/plague-builder return 0 From fedora-extras-commits at redhat.com Sun Jul 10 07:17:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 03:17:16 -0400 Subject: extras-buildsys plague.spec,1.12,1.13 Message-ID: <200507100717.j6A7HkGj024426@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374 Modified Files: plague.spec Log Message: - modify builder.py to use optparse for getting cli options default behavior now uses -a for adding architectures and checks the archs vs the archlist for this host. - modify the spec file to clean up %description for base package - modify init script and init script config file for new cli syntax for builder Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plague.spec 10 Jul 2005 06:22:25 -0000 1.12 +++ plague.spec 10 Jul 2005 07:17:14 -0000 1.13 @@ -15,7 +15,7 @@ %description The Plague build system is a client/server distributed build system for -building RPM packages. This package +building RPM packages. This package provides the plague server. %package common From fedora-extras-commits at redhat.com Sun Jul 10 07:17:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 03:17:16 -0400 Subject: extras-buildsys/builder builder.py,1.11,1.12 Message-ID: <200507100717.j6A7Hlgh024429@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374/builder Modified Files: builder.py Log Message: - modify builder.py to use optparse for getting cli options default behavior now uses -a for adding architectures and checks the archs vs the archlist for this host. - modify the spec file to clean up %description for base package - modify init script and init script config file for new cli syntax for builder Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- builder.py 10 Jul 2005 04:48:38 -0000 1.11 +++ builder.py 10 Jul 2005 07:17:14 -0000 1.12 @@ -35,6 +35,7 @@ from plague import lighttpdManager from plague import HTTPServer from plague import daemonize +from optparse import OptionParser # Load in the config @@ -600,63 +601,50 @@ state={'opts': True, 'host': None, 'archs': [], 'daemon': False, 'pidfile': None, 'logfile': None} - for i in sys.argv[1:]: - if state['logfile']=='': - state['logfile']=i - continue - if state['pidfile']=='': - state['pidfile']=i - continue - if i.startswith('-'): - if state['opts']: - if i=='-d': - state['daemon']=True - elif i=='-p': - state['pidfile']='' - elif i=='-l': - state['logfile']='' - elif i=='--': - state['opts']=False - continue - if not state['host']: - state['host']=i - else: - state['archs'].append(i) + archlist = "" + avail_arches = builder_dict.keys() + avail_arches.sort() + for a in avail_arches: + archlist = archlist + a + if a != avail_arches[len(avail_arches)-1]: + archlist = archlist + ", " + + usage = "Usage: %s [-p ] [-l ] [-d] -a arch1 [-a arch2] " % sys.argv[0] + parser = OptionParser(usage=usage) + parser.add_option("-p", "--pidfile", default=None, + help='file to write the PID to') + parser.add_option("-l", "--logfile", default=None, + help="location of file to write log output to") + parser.add_option("-d", "--daemon", default=False, action="store_true", + help="daemonize (i.e., detach from the terminal)") + parser.add_option("-a", "--arch", default=[], action='append', dest='archs', + help="archs this machine can build Available arches: [ %s ]" % archlist) + (opts, args) = parser.parse_args() - if not state['host'] or not state['archs'] or (state['pidfile']=='') or (state['logfile']==''): - print "Usage:\n" - print " %s [-p ] [-l ] [-d]\n" % sys.argv[0] - print " - hostname or IP address of this machine" - print " - space-separated list of arches this machine can build" - print " - file to write the PID to" - print " - file to write messages to instead of stdout" - print " -d - daemonize (i.e., detach from the terminal)" - - # pretty-print the available archlist - archlist = "" - avail_arches = builder_dict.keys() - avail_arches.sort() - for a in avail_arches: - archlist = archlist + a - if a != avail_arches[len(avail_arches)-1]: - archlist = archlist + ", " - print " Available arches: [ %s ]\n" % archlist + if len(args) == 0 or len(opts.archs) == 0: + print "Must specify hostname and at least one build arch." sys.exit(1) + + for arch in opts.archs: + if arch not in archlist: + print "Arch must be one of [ %s ]" % archlist + sys.exit(1) + + host = args[0] + g_our_hostname = host + localarches = opts.archs - g_our_hostname = state['host'] - localarches = state['archs'] - - if state['daemon']: + if opts.daemon: ret=daemonize.createDaemon() if ret: print "Daemonizing failed!" sys.exit(2) - if state['pidfile']: - open(state['pidfile'], 'w').write('%d\n' % os.getpid()) + if opts.pidfile: + open(opts.pidfile, 'w').write('%d\n' % os.getpid()) - if state['logfile']: - log=open(state['logfile'], 'a') + if opts.logfile: + log=open(opts.logfile, 'a') sys.stdout=log sys.stderr=log From fedora-extras-commits at redhat.com Sun Jul 10 07:36:20 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:20 -0400 Subject: rpms/gif2png - New directory Message-ID: <200507100736.j6A7aKho024542@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24522/gif2png Log Message: Directory /cvs/extras/rpms/gif2png added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:36:20 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:20 -0400 Subject: rpms/gif2png/devel - New directory Message-ID: <200507100736.j6A7aKbN024547@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24522/gif2png/devel Log Message: Directory /cvs/extras/rpms/gif2png/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:36:45 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:45 -0400 Subject: rpms/gif2png Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507100736.j6A7ajPD024594@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567 Added Files: Makefile import.log Log Message: Setup of module gif2png --- NEW FILE Makefile --- # Top level Makefile for module gif2png all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 10 07:36:45 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:45 -0400 Subject: rpms/gif2png/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507100736.j6A7ajaD024599@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gif2png --- NEW 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 Jul 10 07:37:31 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:37:31 -0400 Subject: rpms/gif2png import.log,1.1,1.2 Message-ID: <200507100737.j6A7bVPH024662@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24631 Modified Files: import.log Log Message: auto-import gif2png-2.5.1-1 on branch devel from gif2png-2.5.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gif2png/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2005 07:36:43 -0000 1.1 +++ import.log 10 Jul 2005 07:37:29 -0000 1.2 @@ -0,0 +1 @@ +gif2png-2_5_1-1:HEAD:gif2png-2.5.1-1.src.rpm:1120981039 From fedora-extras-commits at redhat.com Sun Jul 10 07:37:32 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:37:32 -0400 Subject: rpms/gif2png/devel gif2png.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507100737.j6A7bWIH024669@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24631/devel Modified Files: .cvsignore sources Added Files: gif2png.spec Log Message: auto-import gif2png-2.5.1-1 on branch devel from gif2png-2.5.1-1.src.rpm --- NEW FILE gif2png.spec --- ## $Id: gif2png.spec 1746 2005-07-10 07:33:23Z ensc at BIGO.ENSC.DE $ %{!?release_func:%global release_func() %1%{?dist}} Summary: A GIF to PNG converter Name: gif2png Version: 2.5.1 Release: %release_func 1 License: BSD Group: Applications/Multimedia URL: http://www.catb.org/~esr/gif2png/ Source0: http://www.catb.org/~esr/gif2png/%name-%version.tar.gz BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: libpng-devel %package -n web2png Summary: A GIF to PNG converter for entire directory hierarchies Group: Applications/Multimedia Requires: gif2png = %version-%release Requires: python %description The gif2png program converts files from the obsolescent Graphic Interchange Format to Portable Network Graphics. The conversion preserves all graphic information, including transparency, perfectly. The gif2png program can even recover data from corrupted GIFs. There exists a 'web2png' program in a separate package which is able to convert entire directory hierarchies. %description -n web2png The gif2png program converts files from the obsolescent Graphic Interchange Format to Portable Network Graphics. The conversion preserves all graphic information, including transparency, perfectly. The gif2png program can even recover data from corrupted GIFs. The distribution also includes a Python script, web2png, that will convert entire web hierarchies (images and HTML or PHP pages). %prep %setup -q %build %configure %__make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %__make DESTDIR="$RPM_BUILD_ROOT" install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %_bindir/gif2png %_mandir/*/gif2png.* %files -n web2png %defattr(-,root,root,-) %_bindir/web2png %_mandir/*/web2png.* %changelog * Tue Jul 5 2005 Enrico Scholz - 2.5.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gif2png/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2005 07:36:43 -0000 1.1 +++ .cvsignore 10 Jul 2005 07:37:29 -0000 1.2 @@ -0,0 +1 @@ +gif2png-2.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gif2png/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2005 07:36:43 -0000 1.1 +++ sources 10 Jul 2005 07:37:30 -0000 1.2 @@ -0,0 +1 @@ +85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 07:41:35 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:41:35 -0400 Subject: rpms/gif2png/FC-3 - New directory Message-ID: <200507100741.j6A7fZ2f024764@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24740/FC-3 Log Message: Directory /cvs/extras/rpms/gif2png/FC-3 added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:41:36 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:41:36 -0400 Subject: rpms/gif2png/FC-4 - New directory Message-ID: <200507100741.j6A7faGu024769@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24740/FC-4 Log Message: Directory /cvs/extras/rpms/gif2png/FC-4 added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:43:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:43:07 -0400 Subject: rpms/gif2png/FC-3 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 gif2png.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507100743.j6A7h7m1024823@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24793/FC-3 Added Files: .cvsignore Makefile gif2png.spec sources Log Message: initial checkin --- NEW FILE .cvsignore --- gif2png-2.5.1.tar.gz ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' ***** Error reading new file: [Errno 2] No such file or directory: 'gif2png.spec' --- NEW FILE sources --- 85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 07:43:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:43:07 -0400 Subject: rpms/gif2png/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 gif2png.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507100743.j6A7h7ix024828@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24793/FC-4 Added Files: .cvsignore Makefile gif2png.spec sources Log Message: initial checkin --- NEW FILE .cvsignore --- gif2png-2.5.1.tar.gz ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' ***** Error reading new file: [Errno 2] No such file or directory: 'gif2png.spec' --- NEW FILE sources --- 85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 07:47:31 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:47:31 -0400 Subject: common tobuild,1.1885,1.1886 Message-ID: <200507100747.j6A7lVE3024922@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24905 Modified Files: tobuild Log Message: request build of rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1885 retrieving revision 1.1886 diff -u -r1.1885 -r1.1886 --- tobuild 9 Jul 2005 21:18:19 -0000 1.1885 +++ tobuild 10 Jul 2005 07:47:29 -0000 1.1886 @@ -32,3 +32,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel +ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 07:47:56 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:47:56 -0400 Subject: common tobuild,1.1886,1.1887 Message-ID: <200507100747.j6A7luhj024985@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24968 Modified Files: tobuild Log Message: request build of rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1886 retrieving revision 1.1887 diff -u -r1.1886 -r1.1887 --- tobuild 10 Jul 2005 07:47:29 -0000 1.1886 +++ tobuild 10 Jul 2005 07:47:54 -0000 1.1887 @@ -33,3 +33,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 +ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 10 07:48:21 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:48:21 -0400 Subject: common tobuild,1.1887,1.1888 Message-ID: <200507100748.j6A7mLfn025047@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25030 Modified Files: tobuild Log Message: request build of rpms/gif2png/devel gif2png-2_5_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1887 retrieving revision 1.1888 diff -u -r1.1887 -r1.1888 --- tobuild 10 Jul 2005 07:47:54 -0000 1.1887 +++ tobuild 10 Jul 2005 07:48:19 -0000 1.1888 @@ -34,3 +34,4 @@ oliver rpms/icmpdn/devel icmpdn-0_3-2 devel ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 +ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 10 07:49:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:49:07 -0400 Subject: rpms/gif2png/FC-3 branch,NONE,1.1 Message-ID: <200507100749.j6A7n7qs025076@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25059/FC-3 Added Files: branch Log Message: initial checkin --- NEW FILE branch --- FC-3 From fedora-extras-commits at redhat.com Sun Jul 10 07:49:08 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:49:08 -0400 Subject: rpms/gif2png/FC-4 branch,NONE,1.1 Message-ID: <200507100749.j6A7n8Tg025092@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25059/FC-4 Added Files: branch Log Message: initial checkin --- NEW FILE branch --- FC-4 From adrian at fht-esslingen.de Sun Jul 10 10:05:32 2005 From: adrian at fht-esslingen.de (Adrian Reber) Date: Sun, 10 Jul 2005 12:05:32 +0200 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch,1.1,1.2 In-Reply-To: <1120974327.30532.394.camel@mccallum.corsepiu.local> References: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> <1120974327.30532.394.camel@mccallum.corsepiu.local> Message-ID: <20050710100532.GA12084@lisas.de> On Sun, Jul 10, 2005 at 07:45:26AM +0200, Ralf Corsepius wrote: > On Fri, 2005-07-08 at 18:03 -0400, Adrian Reber wrote: > > Author: adrian > > > > Update of /cvs/extras/rpms/jhead/FC-3 > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12182 > > > > Modified Files: > > jhead-compiler-warnings.patch > > Log Message: > > don't reverse the other patch > > > > > > jhead-compiler-warnings.patch: > > > > Index: jhead-compiler-warnings.patch > > > -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 > > -@@ -9,7 +9,7 @@ > > - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o > > - > > - $(OBJ)/%.o:$(SRC)/%.c > > -- ${CC} ${CFLAGS} -Wall -c $< -o $@ > > -+ ${CC} -O3 -Wall -c $< -o $@ > You should be using the contents of RPM_OPT_FLAGS. > > Hard-coding -O3 should be non-acceptable unless there is a very well > thought out reason to make an exception. > > I vote for putting this package on HOLD before this issue can be > clarified. This patch is removing the hard-coding -O3 again. The tarball does -O3 and I had a patch which removed it. Then a second patch reversed it to -O3 again by accident and this patch reverses it back to ${CFLAGS}. Adrian From fedora-extras-commits at redhat.com Sun Jul 10 10:52:13 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 06:52:13 -0400 Subject: common tobuild,1.1888,1.1889 Message-ID: <200507101052.j6AAqDRA032552@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32535 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1888 retrieving revision 1.1889 diff -u -r1.1888 -r1.1889 --- tobuild 10 Jul 2005 07:48:19 -0000 1.1888 +++ tobuild 10 Jul 2005 10:52:11 -0000 1.1889 @@ -1,37 +1 @@ -# this is the build control file. the format is -# user repo tag target status -# -ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel -jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 -ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 -ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 -ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel -ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 -ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 -ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel -scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 -scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 -scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel -adrian rpms/jhead/devel jhead-2_4-1_fc5 devel -lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel -uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -adrian rpms/jhead/devel jhead-2_4-2_fc5 devel -adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 -adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 -adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 -adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 -adrian rpms/jhead/devel jhead-2_4-3_fc5 devel -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 -petersen rpms/scim/devel scim-1_3_3-1_fc5 devel -ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 -ixs rpms/barcode/devel barcode-0_98-6_fc5 devel -ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 -ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 -oliver rpms/icmpdn/devel icmpdn-0_3-2 devel -ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 -ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 -ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 10:56:34 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 06:56:34 -0400 Subject: rpms/moomps/FC-3 .cvsignore,1.3,1.4 Message-ID: <200507101056.j6AAuYW7032584@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32567 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 May 2005 19:39:10 -0000 1.3 +++ .cvsignore 10 Jul 2005 10:56:32 -0000 1.4 @@ -1 +1 @@ -moomps-5.1.tar.bz2 +moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 10 11:00:46 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 07:00:46 -0400 Subject: rpms/moodss/FC-3 .cvsignore,1.4,1.5 Message-ID: <200507101100.j6AB0kn3032635@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32618 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 May 2005 20:03:42 -0000 1.4 +++ .cvsignore 10 Jul 2005 11:00:44 -0000 1.5 @@ -1 +1 @@ -moodss-20.1.tar.bz2 +moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 10 11:02:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 10 Jul 2005 07:02:01 -0400 Subject: common tobuild,1.1889,1.1890 Message-ID: <200507101102.j6AB2osS001246@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32613 Modified Files: tobuild Log Message: readded header Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1889 retrieving revision 1.1890 diff -u -r1.1889 -r1.1890 --- tobuild 10 Jul 2005 10:52:11 -0000 1.1889 +++ tobuild 10 Jul 2005 11:01:59 -0000 1.1890 @@ -1 +1,4 @@ -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +# this is the build control file. the format is +# user repo tag target status +# + From fedora-extras-commits at redhat.com Sun Jul 10 11:06:23 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 07:06:23 -0400 Subject: common tobuild,1.1890,1.1891 Message-ID: <200507101106.j6AB6rPJ001287@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1270 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1890 retrieving revision 1.1891 diff -u -r1.1890 -r1.1891 --- tobuild 10 Jul 2005 11:01:59 -0000 1.1890 +++ tobuild 10 Jul 2005 11:06:19 -0000 1.1891 @@ -2,3 +2,4 @@ # user repo tag target status # +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 11:31:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 10 Jul 2005 07:31:36 -0400 Subject: common tobuild,1.1891,1.1892 Message-ID: <200507101131.j6ABVadM001647@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1630 Modified Files: tobuild Log Message: repair broken commit Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1891 retrieving revision 1.1892 diff -u -r1.1891 -r1.1892 --- tobuild 10 Jul 2005 11:06:19 -0000 1.1891 +++ tobuild 10 Jul 2005 11:31:34 -0000 1.1892 @@ -1,5 +1,38 @@ # this is the build control file. the format is # user repo tag target status # - +ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel +jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 +ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 +ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 +ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel +ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 +ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 +ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel +scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 +scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 +scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel +adrian rpms/jhead/devel jhead-2_4-1_fc5 devel +lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel +uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel +adrian rpms/jhead/devel jhead-2_4-2_fc5 devel +adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 +adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 +adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 +adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 +adrian rpms/jhead/devel jhead-2_4-3_fc5 devel +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 +petersen rpms/scim/devel scim-1_3_3-1_fc5 devel +ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 +ixs rpms/barcode/devel barcode-0_98-6_fc5 devel +ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 +ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 +oliver rpms/icmpdn/devel icmpdn-0_3-2 devel +ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 +ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 +ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 13:49:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 09:49:21 -0400 Subject: rpms/xbase/devel xbase-2.0.0-fixconfig.patch, NONE, 1.1 xbase.spec, 1.1, 1.2 Message-ID: <200507101349.j6ADnLRc004251@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4183/devel Modified Files: xbase.spec Added Files: xbase-2.0.0-fixconfig.patch Log Message: Resolve bugzilla 162845 xbase-2.0.0-fixconfig.patch: --- NEW FILE xbase-2.0.0-fixconfig.patch --- --- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 +++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 @@ -5,7 +5,7 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/xbase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase.spec 4 Jul 2005 14:54:32 -0000 1.1 +++ xbase.spec 10 Jul 2005 13:49:18 -0000 1.2 @@ -1,11 +1,12 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz +Patch0: xbase-2.0.0-fixconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-static @@ -72,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 +- fix xbase-config --ld (bugzilla 162845) + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) From fedora-extras-commits at redhat.com Sun Jul 10 13:49:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 09:49:15 -0400 Subject: rpms/xbase/FC-3 xbase-2.0.0-fixconfig.patch, NONE, 1.1 xbase.spec, 1.1, 1.2 Message-ID: <200507101349.j6ADnjKB004255@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4183/FC-3 Modified Files: xbase.spec Added Files: xbase-2.0.0-fixconfig.patch Log Message: Resolve bugzilla 162845 xbase-2.0.0-fixconfig.patch: --- NEW FILE xbase-2.0.0-fixconfig.patch --- --- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 +++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 @@ -5,7 +5,7 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-3/xbase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase.spec 4 Jul 2005 14:54:32 -0000 1.1 +++ xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 @@ -1,11 +1,12 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz +Patch0: xbase-2.0.0-fixconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-static @@ -72,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 +- fix xbase-config --ld (bugzilla 162845) + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) From fedora-extras-commits at redhat.com Sun Jul 10 13:49:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 09:49:15 -0400 Subject: rpms/xbase/FC-4 xbase-2.0.0-fixconfig.patch, NONE, 1.1 xbase.spec, 1.1, 1.2 Message-ID: <200507101349.j6ADnjTZ004258@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4183/FC-4 Modified Files: xbase.spec Added Files: xbase-2.0.0-fixconfig.patch Log Message: Resolve bugzilla 162845 xbase-2.0.0-fixconfig.patch: --- NEW FILE xbase-2.0.0-fixconfig.patch --- --- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 +++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 @@ -5,7 +5,7 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-4/xbase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase.spec 4 Jul 2005 14:54:32 -0000 1.1 +++ xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 @@ -1,11 +1,12 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz +Patch0: xbase-2.0.0-fixconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-static @@ -72,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 +- fix xbase-config --ld (bugzilla 162845) + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) From fedora-extras-commits at redhat.com Sun Jul 10 14:21:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:20 -0400 Subject: rpms/libapreq2 - New directory Message-ID: <200507101421.j6AELKRb005448@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5428/libapreq2 Log Message: Directory /cvs/extras/rpms/libapreq2 added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 14:21:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:20 -0400 Subject: rpms/libapreq2/devel - New directory Message-ID: <200507101421.j6AELKEI005453@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5428/libapreq2/devel Log Message: Directory /cvs/extras/rpms/libapreq2/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 14:21:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:41 -0400 Subject: rpms/libapreq2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507101421.j6AELfAF005504@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5473 Added Files: Makefile import.log Log Message: Setup of module libapreq2 --- NEW FILE Makefile --- # Top level Makefile for module libapreq2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 10 14:21:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:41 -0400 Subject: rpms/libapreq2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507101421.j6AELfdH005509@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5473/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libapreq2 --- NEW 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 Jul 10 14:22:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:22:47 -0400 Subject: rpms/libapreq2 import.log,1.1,1.2 Message-ID: <200507101422.j6AEMlMS005580@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5547 Modified Files: import.log Log Message: auto-import libapreq2-2.05-0.6 on branch devel from libapreq2-2.05-0.6.src.rpm Initial import. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libapreq2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2005 14:21:38 -0000 1.1 +++ import.log 10 Jul 2005 14:22:45 -0000 1.2 @@ -0,0 +1 @@ +libapreq2-2_05-0_6:HEAD:libapreq2-2.05-0.6.src.rpm:1121005356 From fedora-extras-commits at redhat.com Sun Jul 10 14:22:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:22:47 -0400 Subject: rpms/libapreq2/devel libapreq2-build.patch, NONE, 1.1 libapreq2-httpd.conf, NONE, 1.1 libapreq2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507101422.j6AEMlqF005589@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5547/devel Modified Files: .cvsignore sources Added Files: libapreq2-build.patch libapreq2-httpd.conf libapreq2.spec Log Message: auto-import libapreq2-2.05-0.6 on branch devel from libapreq2-2.05-0.6.src.rpm Initial import. libapreq2-build.patch: --- NEW FILE libapreq2-build.patch --- --- glue/Makefile.am~ 2005-04-16 05:19:36.000000000 +0300 +++ glue/Makefile.am 2005-05-05 12:14:29.000000000 +0300 @@ -15,7 +15,7 @@ cd perl; $(MAKE) test perl_install: - cd perl; $(MAKE) install + cd perl; $(MAKE) pure_install perl_clean: -cd perl; $(MAKE) clean --- NEW FILE libapreq2-httpd.conf --- # # mod_apreq HTTP Parsing Library Module # LoadModule apreq_module modules/mod_apreq2.so --- NEW FILE libapreq2.spec --- %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}} Name: libapreq2 Version: 2.05 Release: 0.6 Summary: Generic Apache Request Library Group: System Environment/Libraries License: Apache Software License URL: http://httpd.apache.org/apreq/ Source0: http://www.cpan.org/authors/id/J/JO/JOESUF/%{name}-%{version}-dev.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 BuildRequires: httpd-devel >= 2.0.48 BuildRequires: libtool BuildRequires: apr-devel >= 0.9.4 BuildRequires: apr-util-devel >= 0.9.4 BuildRequires: perl(ExtUtils::XSBuilder) BuildRequires: mod_perl-devel >= 2.0.0-0.rc5 Requires: httpd-mmn = %(cat $(%{apxs} -q INCLUDEDIR)/.mmn || echo ERROR) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Provides: libapreq = %{version}-%{release} %description %{summary}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: httpd-devel >= 2.0.48 Provides: libapreq-devel = %{version}-%{release} %description devel %{summary}. %package -n perl-%{name} Summary: Perl interface to %{name} Group: Development/Libraries Requires: mod_perl >= 2.0.0-0.rc5 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-libapreq = %{version}-%{release} %description -n perl-%{name} %{summary}. %prep %setup -q -n %{name}-%{version}-dev %patch0 ./buildconf %build %configure \ --disable-dependency-tracking \ --disable-static \ --with-apache2-apxs=%{apxs} \ --enable-perl-glue \ --with-perl-opts=INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/apreq.conf cp -pR docs/html __docs ; rm __docs/installdox find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : # make test # requires write access to system locations? %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig [ $1 -eq 1 ] && %{_initrddir}/httpd condrestart >/dev/null || : %postun /sbin/ldconfig %{_initrddir}/httpd condrestart >/dev/null || : %files %defattr(-,root,root,-) %doc CHANGES LICENSE NOTICE README %config(noreplace) %{_sysconfdir}/httpd/conf.d/apreq.conf %{_libdir}/libapreq2.so.* %{_libdir}/httpd/modules/mod_apreq2.so %exclude %{_libdir}/httpd/modules/mod_apreq2.la %files devel %defattr(-,root,root,-) %doc __docs/* %{_bindir}/apreq2-config %{_includedir}/apreq2/ %{_includedir}/httpd/apreq2/ %{_libdir}/libapreq2.so %exclude %{_libdir}/libapreq2.la %files -n perl-%{name} %defattr(-,root,root,-) %doc glue/perl/README %{perl_vendorarch}/auto/APR/ %{perl_vendorarch}/Apache2/ %{perl_vendorarch}/APR/ %{_mandir}/man3/A*::*.3* %changelog * Wed Jun 29 2005 Ville Skytt?? - 2.05-0.6 - Rebuild with mod_perl 2.0.1. - Drop static libs. * Sat Jun 18 2005 Ville Skytt?? - 2.05-0.5 - Rebuild for FC4. * Tue May 24 2005 Ville Skytt?? - 2.05-0.4 - Require httpd-mmn. * Sat May 21 2005 Ville Skytt?? - 2.05-0.3 - Rebuild with mod_perl 2.0.0. * Wed May 18 2005 Ville Skytt?? - 2.05-0.2 - Prevent %%post from failing at first install if httpd is not running. - Provide (perl-)libapreq(-devel). * Thu May 5 2005 Ville Skytt?? - 2.05-0.1 - 2.05-dev, aclocal patch applied upstream. * Sat Dec 4 2004 Ville Skytt?? - 0:2.04_03-0.fdr.2 - Buildrequire mod_perl-devel, not mod_perl. * Wed Aug 18 2004 Ville Skytt?? - 0:2.03_04-0.fdr.1 - Update to 2.03_04. - Disable dependency tracking to speed up the build. * Thu May 27 2004 Ville Skytt?? - 0:2.03-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2005 14:21:39 -0000 1.1 +++ .cvsignore 10 Jul 2005 14:22:45 -0000 1.2 @@ -0,0 +1 @@ +libapreq2-2.05-dev.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2005 14:21:39 -0000 1.1 +++ sources 10 Jul 2005 14:22:45 -0000 1.2 @@ -0,0 +1 @@ +0985e102b6d2bc9c747a56b04a85cba6 libapreq2-2.05-dev.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 16:15:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 12:15:00 -0400 Subject: rpms/bochs/FC-4 .cvsignore, 1.4, 1.5 bochs.spec, 1.9, 1.10 sources, 1.4, 1.5 bochs-precision.patch, 1.1, NONE Message-ID: <200507101615.j6AGFU6e008156@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bochs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8116/FC-4 Modified Files: .cvsignore bochs.spec sources Removed Files: bochs-precision.patch Log Message: 2.2.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bochs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 May 2005 15:36:35 -0000 1.4 +++ .cvsignore 10 Jul 2005 16:14:57 -0000 1.5 @@ -1,2 +1,2 @@ dlxlinux4.tar.gz -bochs-2.2.tar.gz +bochs-2.2.1.tar.gz Index: bochs.spec =================================================================== RCS file: /cvs/extras/rpms/bochs/FC-4/bochs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bochs.spec 29 May 2005 18:08:59 -0000 1.9 +++ bochs.spec 10 Jul 2005 16:14:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: bochs -Version: 2.2 -Release: 2 +Version: 2.2.1 +Release: 1%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators @@ -11,7 +11,6 @@ Patch0: %{name}-nonet-build.patch Patch1: %{name}-dlxreadme.patch Patch2: %{name}-config.patch -Patch3: %{name}-precision.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils @@ -44,7 +43,6 @@ %setup -q %patch0 -p0 %patch1 -p0 -%patch3 -p0 # Uh-oh, great! %{__perl} -pi -e \ 's|wx_needs_gtk2=0|wx_needs_gtk2=1| ; @@ -124,6 +122,9 @@ %changelog +* Sat Jul 9 2005 Ville Skytt?? - 2.2.1-1 +- 2.2.1, precision patch applied upstream. + * Sun May 29 2005 Ville Skytt?? - 2.2-2 - Try to fix x86_64 build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bochs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 May 2005 15:36:35 -0000 1.4 +++ sources 10 Jul 2005 16:14:57 -0000 1.5 @@ -1,2 +1,2 @@ 379269841ae5aef95e4ec56d6d186532 dlxlinux4.tar.gz -2f0d82bda2193242a2d7ece1917016c1 bochs-2.2.tar.gz +50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz --- bochs-precision.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 10 16:15:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 12:15:01 -0400 Subject: rpms/bochs/devel .cvsignore, 1.4, 1.5 bochs.spec, 1.9, 1.10 sources, 1.4, 1.5 bochs-precision.patch, 1.1, NONE Message-ID: <200507101615.j6AGFVaZ008161@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bochs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8116/devel Modified Files: .cvsignore bochs.spec sources Removed Files: bochs-precision.patch Log Message: 2.2.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 May 2005 15:36:35 -0000 1.4 +++ .cvsignore 10 Jul 2005 16:14:58 -0000 1.5 @@ -1,2 +1,2 @@ dlxlinux4.tar.gz -bochs-2.2.tar.gz +bochs-2.2.1.tar.gz Index: bochs.spec =================================================================== RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bochs.spec 29 May 2005 18:08:59 -0000 1.9 +++ bochs.spec 10 Jul 2005 16:14:58 -0000 1.10 @@ -1,6 +1,6 @@ Name: bochs -Version: 2.2 -Release: 2 +Version: 2.2.1 +Release: 1%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators @@ -11,7 +11,6 @@ Patch0: %{name}-nonet-build.patch Patch1: %{name}-dlxreadme.patch Patch2: %{name}-config.patch -Patch3: %{name}-precision.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils @@ -44,7 +43,6 @@ %setup -q %patch0 -p0 %patch1 -p0 -%patch3 -p0 # Uh-oh, great! %{__perl} -pi -e \ 's|wx_needs_gtk2=0|wx_needs_gtk2=1| ; @@ -124,6 +122,9 @@ %changelog +* Sat Jul 9 2005 Ville Skytt?? - 2.2.1-1 +- 2.2.1, precision patch applied upstream. + * Sun May 29 2005 Ville Skytt?? - 2.2-2 - Try to fix x86_64 build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bochs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 May 2005 15:36:35 -0000 1.4 +++ sources 10 Jul 2005 16:14:58 -0000 1.5 @@ -1,2 +1,2 @@ 379269841ae5aef95e4ec56d6d186532 dlxlinux4.tar.gz -2f0d82bda2193242a2d7ece1917016c1 bochs-2.2.tar.gz +50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz --- bochs-precision.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 10 19:59:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 15:59:34 -0400 Subject: extras-buildsys ChangeLog,1.50,1.51 Message-ID: <200507101959.j6AJxYZ3011853@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11822 Modified Files: ChangeLog Log Message: 2005-07-10 Dan Williams * server/PackageJob.py server/BuildMaster.py - Reduce total threadcount by breaking PackageJob runs into two threads, so that no thread executes while the package is waiting for a builder Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChangeLog 10 Jul 2005 04:48:38 -0000 1.50 +++ ChangeLog 10 Jul 2005 19:59:32 -0000 1.51 @@ -1,3 +1,11 @@ +2005-07-10 Dan Williams + + * server/PackageJob.py + server/BuildMaster.py + - Reduce total threadcount by breaking PackageJob runs into + two threads, so that no thread executes while the package + is waiting for a builder + 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams From fedora-extras-commits at redhat.com Sun Jul 10 19:59:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 15:59:35 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.12, 1.13 BuilderManager.py, 1.1, 1.2 PackageJob.py, 1.4, 1.5 Message-ID: <200507101959.j6AJxZSf011861@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11822/server Modified Files: BuildMaster.py BuilderManager.py PackageJob.py Log Message: 2005-07-10 Dan Williams * server/PackageJob.py server/BuildMaster.py - Reduce total threadcount by breaking PackageJob runs into two threads, so that no thread executes while the package is waiting for a builder Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- BuildMaster.py 8 Jul 2005 18:12:31 -0000 1.12 +++ BuildMaster.py 10 Jul 2005 19:59:32 -0000 1.13 @@ -282,7 +282,6 @@ self._building_jobs_lock.acquire() self._building_jobs.append(job) self._building_jobs_lock.release() - job.start() self._new_queue = [] Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BuilderManager.py 5 Jul 2005 21:08:03 -0000 1.1 +++ BuilderManager.py 10 Jul 2005 19:59:32 -0000 1.2 @@ -131,7 +131,7 @@ for req in self._queue: parent = req['parent'] stage = parent.get_cur_stage() - if (stage != 'prep') and (stage != 'building'): + if (stage != 'prep') and (stage != 'building') and (stage != 'waiting'): self._queue.remove(req) continue # Find a free builder for this request Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PackageJob.py 7 Jul 2005 18:17:51 -0000 1.4 +++ PackageJob.py 10 Jul 2005 19:59:32 -0000 1.5 @@ -64,10 +64,26 @@ def __str__(self): return self.args - - -http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") +class PackageJobController(threading.Thread): + """ + A class that controls PackageJob objects through specific phases. + Python seems to have issues with threads, so to reduce the total + running threadcount, we split the PackageJob runs up into two threads, + one for everything up to the "build" stage, and then the actual + "build" stage. This class provides the actual running thread. + """ + def __init__(self, pkg_job, start_stage, end_stage): + self._pkg_job = pkg_job + if not end_stage: + end_stage = 'aaaaa' + self._end_stage = end_stage + self._pkg_job._set_cur_stage(start_stage) + threading.Thread.__init__(self) + + def run(self): + while not self._pkg_job.is_done() and not self._pkg_job.get_cur_stage() == self._end_stage: + self._pkg_job.process() def is_build_job_stage_valid(stage): @@ -75,21 +91,24 @@ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] + stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] if stage in stages: return True return False - -class PackageJob(threading.Thread): +class PackageJob: """ Controller object for building 1 SRPM on multiple arches """ + http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") + def __init__(self, uid, username, package, cvs_tag, repo, buildmaster, hostname): - self.curstage = 'initialize' + self.curstage = '' self.bm = buildmaster - self.hostname = hostname self.uid = uid + pjc = PackageJobController(self, 'initialize', 'waiting') + + self.hostname = hostname self.username = username self.starttime = time.time() self.endtime = None @@ -109,7 +128,7 @@ self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() - threading.Thread.__init__(self) + pjc.start() def get_cur_stage(self): return self.curstage @@ -332,7 +351,7 @@ shutil.copy(self.srpm_path, self.stage_dir) # Must also copy SRPM to where the build client can get it over HTTP - http_pkg_path = self._make_stage_dir(http_dir) + http_pkg_path = self._make_stage_dir(self.http_dir) self.srpm_http_path = os.path.join(http_pkg_path, srpm) shutil.copy(self.srpm_path, self.srpm_http_path) self.srpm_path = srpm_in_dir @@ -345,7 +364,7 @@ def _request_one_arch_job(self, arch): # Construct SPRM URL - srpm_http_base = self.srpm_http_path[len(http_dir):] + srpm_http_base = self.srpm_http_path[len(self.http_dir):] if config_opts['ssl_builders'] == True: method = "https://" else: @@ -368,6 +387,13 @@ if self.archjobs[job.arch] != None: log("%s (%s/%s): Already have archjob for this arch (%s). New job UID is %s." % (self.uid, self.package, job.arch, self.archjobs[job.arch].jobid, job.jobid)) self.archjobs[job.arch] = job + + # If this is the first archjob, that means we are now building. + # So we start up the second PackageJobController thread. + if self.curstage == 'waiting': + t = PackageJobController(self, 'building', None) + t.start() + self._archjobs_lock.release() log("%s (%s/%s): Builder UID is %s" % (self.uid, self.package, job.arch, job.jobid)) @@ -401,48 +427,48 @@ def wake(self): self._event.set() - def run(self): - while not self.is_done(): - # Advance to next stage based on current stage + def process(self): + # Advance to next stage based on current stage + try: wait = False - - try: - if self.curstage == 'initialize': - self._checkout() - elif self.curstage == 'checkout': - self._make_srpm() - elif self.curstage == 'make_srpm': - self._prep() - elif self.curstage == 'prep' or self.curstage == 'building': - wait = self._monitor() - elif self.curstage == 'finished': - self._add_to_repo() - elif self.curstage == 'addtorepo': - wait = True - elif self.curstage == 'repodone': - self._succeeded() - except PrepError, e: - if not self.no_cvs: - shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) - subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - self.email_result(resultstring=e.args, subject=subj) - self._failed() - except BuildError, e: - subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - self.email_result(resultstring=e.args, subject=subj) - # Kill remaining jobs on other arches - self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if job: - job.die() - self._archjobs_lock.release() - self._failed() - else: - # Wait to be woken up when long-running operations complete - if wait: - while not self._event.isSet(): - self._event.wait() - self._event.clear() + if self.curstage == 'initialize': + self._checkout() + elif self.curstage == 'checkout': + self._make_srpm() + elif self.curstage == 'make_srpm': + self._prep() + self._set_cur_stage('waiting') + # When prep is done, the first thread ends + elif self.curstage == 'building': + wait = self._monitor() + elif self.curstage == 'finished': + self._add_to_repo() + elif self.curstage == 'addtorepo': + wait = True + elif self.curstage == 'repodone': + self._succeeded() + except PrepError, e: + if not self.no_cvs: + shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + self._failed() + except BuildError, e: + subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + # Kill remaining jobs on other arches + self._archjobs_lock.acquire() + for job in self.archjobs.values(): + if job: + job.die() + self._archjobs_lock.release() + self._failed() + else: + # Wait to be woken up when long-running operations complete + if wait: + while not self._event.isSet(): + self._event.wait() + self._event.clear() def _monitor(self): self._set_cur_stage('building') From fedora-extras-commits at redhat.com Sun Jul 10 20:02:16 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 16:02:16 -0400 Subject: extras-buildsys/server BuilderManager.py,1.2,1.3 Message-ID: <200507102002.j6AK2cLe012953@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12935/server Modified Files: BuilderManager.py Log Message: Add warning for http + ssl_builders Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BuilderManager.py 10 Jul 2005 19:59:32 -0000 1.2 +++ BuilderManager.py 10 Jul 2005 20:02:14 -0000 1.3 @@ -74,6 +74,9 @@ if address.startswith('https') and not config_opts['ssl_builders']: print "Builder address (%s) starts with 'https', but the 'ssl_builders' option is set to False." % address os._exit(1) + elif address.startswith('http:') and config_opts['ssl_builders']: + print "Builder address (%s) starts with 'http', but the 'ssl_builders' option is set to True." % address + os._exit(1) # If the address is already in our running_builders list, skip it skip = False From fedora-extras-commits at redhat.com Sun Jul 10 20:32:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:16 -0400 Subject: rpms/perl-Class-Data-Inheritable - New directory Message-ID: <200507102032.j6AKWGSI013074@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/perl-Class-Data-Inheritable Log Message: Directory /cvs/extras/rpms/perl-Class-Data-Inheritable added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 20:32:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:17 -0400 Subject: rpms/perl-Class-Data-Inheritable/devel - New directory Message-ID: <200507102032.j6AKWHp4013079@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/perl-Class-Data-Inheritable/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Data-Inheritable/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 20:32:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:30 -0400 Subject: rpms/perl-Class-Data-Inheritable Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200507102032.j6AKWUu3013130@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13099 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Data-Inheritable --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Data-Inheritable all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 10 20:32:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:31 -0400 Subject: rpms/perl-Class-Data-Inheritable/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507102032.j6AKWVf5013136@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13099/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Data-Inheritable --- NEW 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 Jul 10 20:32:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:49 -0400 Subject: rpms/perl-Class-Data-Inheritable import.log,1.1,1.2 Message-ID: <200507102032.j6AKWn2g013195@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164 Modified Files: import.log Log Message: auto-import perl-Class-Data-Inheritable-0.02-3 on branch devel from perl-Class-Data-Inheritable-0.02-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2005 20:32:28 -0000 1.1 +++ import.log 10 Jul 2005 20:32:47 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Data-Inheritable-0_02-3:HEAD:perl-Class-Data-Inheritable-0.02-3.src.rpm:1121027623 From fedora-extras-commits at redhat.com Sun Jul 10 20:32:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:49 -0400 Subject: rpms/perl-Class-Data-Inheritable/devel perl-Class-Data-Inheritable.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507102032.j6AKWnpv013202@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164/devel Modified Files: .cvsignore sources Added Files: perl-Class-Data-Inheritable.spec Log Message: auto-import perl-Class-Data-Inheritable-0.02-3 on branch devel from perl-Class-Data-Inheritable-0.02-3.src.rpm --- NEW FILE perl-Class-Data-Inheritable.spec --- Name: perl-Class-Data-Inheritable Version: 0.02 Release: 3%{?dist} Summary: Inheritable, overridable class data Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-Data-Inheritable/ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Class-Data-Inheritable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Class::Data::Inheritable is for creating accessor/mutators to class data. That is, if you want to store something about your class as a whole (instead of about a single object). This data is then inherited by your subclasses and can be overriden. %prep %setup -q -n Class-Data-Inheritable-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{perl_vendorlib}/Class %{_mandir}/man3/*.3* %changelog * Sun Jul 10 2005 Tom "spot" Callaway 0.02-3 - changed /Class/Data to /Class, for proper ownership * 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-Data-Inheritable/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2005 20:32:29 -0000 1.1 +++ .cvsignore 10 Jul 2005 20:32:47 -0000 1.2 @@ -0,0 +1 @@ +Class-Data-Inheritable-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2005 20:32:29 -0000 1.1 +++ sources 10 Jul 2005 20:32:47 -0000 1.2 @@ -0,0 +1 @@ +d3a9fff92ede1085643341179fd9263b Class-Data-Inheritable-0.02.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 22:05:53 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 10 Jul 2005 18:05:53 -0400 Subject: devel/sylpheed .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 sylpheed.spec, 1.18, 1.19 Message-ID: <200507102206.j6AM6NC8015516@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Sun Jul 10 2005 Michael Schwendt - 2.0.0-0.4.beta5 - Update to 2.0.0beta5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 5 Jul 2005 17:05:40 -0000 1.8 +++ .cvsignore 10 Jul 2005 22:05:30 -0000 1.9 @@ -1 +1 @@ -sylpheed-2.0.0beta4.tar.bz2 +sylpheed-2.0.0beta5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Jul 2005 17:06:03 -0000 1.8 +++ sources 10 Jul 2005 22:05:30 -0000 1.9 @@ -1 +1 @@ -675b998ac6e4d2d6c0dce1442209de83 sylpheed-2.0.0beta4.tar.bz2 +4f022a15bda3d01b025d02e3875bf09a sylpheed-2.0.0beta5.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sylpheed.spec 6 Jul 2005 13:42:16 -0000 1.18 +++ sylpheed.spec 10 Jul 2005 22:05:31 -0000 1.19 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.4.beta4 +Release: 0.4.beta5 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,8 +16,7 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -BuildRequires: autoconf -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta4.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta5.tar.bz2 Source1: sylpheed.1 Patch2: sylpheed-default-browser.patch @@ -39,12 +38,11 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta4 +%setup -q -n %{name}-2.0.0beta5 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop %build -autoconf %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ %{?_without_compface:--disable-compface} \ %{?_with_ldap:--enable-ldap} \ @@ -83,6 +81,9 @@ %{_mandir}/man1 %changelog +* Sun Jul 10 2005 Michael Schwendt - 2.0.0-0.4.beta5 +- Update to 2.0.0beta5. + * Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.4.beta4 - Update to 2.0.0beta4. From fedora-extras-commits at redhat.com Mon Jul 11 00:30:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 20:30:38 -0400 Subject: extras-buildsys/server ArchJob.py, 1.4, 1.5 Builder.py, 1.4, 1.5 CONFIG.py, 1.16, 1.17 Message-ID: <200507110030.j6B0UcX3018054@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18033/server Modified Files: ArchJob.py Builder.py CONFIG.py Log Message: - Add some locking around most calls to xmlrpc servers since Python is is flakey here with threads Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ArchJob.py 8 Jul 2005 17:23:45 -0000 1.4 +++ ArchJob.py 11 Jul 2005 00:30:36 -0000 1.5 @@ -106,6 +106,7 @@ del attrdict def _send_repo_unlocked(self): + self.builder.xmlrpc_lock_acquire() try: self._server.repo_unlocked(self.jobid) except socket.error, e: @@ -114,9 +115,11 @@ self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass + self.builder.xmlrpc_lock_release() def _dl_files(self): files = [] + self.builder.xmlrpc_lock_acquire() try: files = self._server.files(self.jobid) except socket.error, e: @@ -125,6 +128,7 @@ self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass + self.builder.xmlrpc_lock_release() return files def process(self): @@ -234,7 +238,9 @@ def die(self): if self.status == 'initialize' or self.status == 'running': + self.builder.xmlrpc_lock_acquire() self._server.die(self.jobid) + self.builder.xmlrpc_lock_release() self._set_status('done') Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Builder.py 10 Jul 2005 03:44:37 -0000 1.4 +++ Builder.py 11 Jul 2005 00:30:36 -0000 1.5 @@ -37,6 +37,11 @@ certs['peer_ca_cert'] = config_opts['ca_cert'] +# Python's xmlrpclib & httplib are a bit dodgy with +# threads, so lets lock xmlrpc operations +builder_xmlrpc_lock = threading.Lock() + + class Builder(threading.Thread): """ Tracks all jobs on a builder instance """ @@ -51,10 +56,13 @@ self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._unavail_count = 0 self._arches = [] + builder_xmlrpc_lock.acquire() try: self._arches = self._server.supported_arches() except socket.error: + builder_xmlrpc_lock.release() raise RuntimeError + builder_xmlrpc_lock.release() self._alive = True self._arches.append('noarch') self._server_lock = threading.Lock() @@ -62,6 +70,12 @@ self._prepping_jobs = False threading.Thread.__init__(self) + def xmlrpc_lock_acquire(self): + builder_xmlrpc_lock.acquire() + + def xmlrpc_lock_release(self): + builder_xmlrpc_lock.release() + def arches(self): return self._arches @@ -83,12 +97,14 @@ if not arch in self._arches or not self.available(): raise RuntimeError + builder_xmlrpc_lock.acquire() self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) except (socket.error, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() + builder_xmlrpc_lock.release() if jobid == 0: raise RuntimeError @@ -102,6 +118,7 @@ def _update_cur_job(self): cur_jobid = None + builder_xmlrpc_lock.acquire() self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() @@ -110,6 +127,7 @@ else: self._unavail_count = 0 self._server_lock.release() + builder_xmlrpc_lock.release() # Update the current job's status if self._unavail_count == 0: Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- CONFIG.py 6 Jul 2005 21:21:00 -0000 1.16 +++ CONFIG.py 11 Jul 2005 00:30:36 -0000 1.17 @@ -87,6 +87,6 @@ # Builder Clients -config_opts['builders'] = [ 'http://127.0.0.1:8888' ] +config_opts['builders'] = [ 'https://127.0.0.1:8888' ] From fedora-extras-commits at redhat.com Mon Jul 11 02:11:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 22:11:09 -0400 Subject: extras-buildsys plague.spec,1.13,1.14 Message-ID: <200507110211.j6B2B9Nd020583@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20554 Modified Files: plague.spec Log Message: Ignore SRPMs and debuginfo RPMs for the createrepo, Patch from Ignacio Vazquez-Abrams to fix builder spec's %post section Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plague.spec 10 Jul 2005 07:17:14 -0000 1.13 +++ plague.spec 11 Jul 2005 02:11:07 -0000 1.14 @@ -84,8 +84,8 @@ %post builder /sbin/chkconfig --add plague-builder . %{_sysconfdir}/sysconfig/%{name}-builder -if [ -z "$ARCHS" ] ; then - sed -ie "s/^ARCHS=.*$/ARCHS=$(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/')/" %{_sysconfdir}/sysconfig/%{name}-builder +if [ -z "$ARCHSOPT" ] ; then + sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder endif %preun builder From fedora-extras-commits at redhat.com Mon Jul 11 02:11:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 22:11:10 -0400 Subject: extras-buildsys/server Repo.py,1.8,1.9 Message-ID: <200507110211.j6B2BAvL020589@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20554/server Modified Files: Repo.py Log Message: Ignore SRPMs and debuginfo RPMs for the createrepo, Patch from Ignacio Vazquez-Abrams to fix builder spec's %post section Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Repo.py 9 Jul 2005 21:54:08 -0000 1.8 +++ Repo.py 11 Jul 2005 02:11:08 -0000 1.9 @@ -82,7 +82,7 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() - (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q %s' % self._repodir) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % self._repodir) if s != 0: print "createrepo failed with exit status %d!" % s From fedora-extras-commits at redhat.com Mon Jul 11 02:26:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 22:26:08 -0400 Subject: extras-buildsys plague.spec,1.14,1.15 Message-ID: <200507110226.j6B2Q8mP020626@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20609 Modified Files: plague.spec Log Message: Fix builder %post Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plague.spec 11 Jul 2005 02:11:07 -0000 1.14 +++ plague.spec 11 Jul 2005 02:26:05 -0000 1.15 @@ -86,7 +86,7 @@ . %{_sysconfdir}/sysconfig/%{name}-builder if [ -z "$ARCHSOPT" ] ; then sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder -endif +fi %preun builder if [ $1 = 0 ]; then From fedora-extras-commits at redhat.com Mon Jul 11 03:23:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:23:24 -0400 Subject: extras-buildsys/server main.py,1.5,1.6 Message-ID: <200507110323.j6B3NOJG021843@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781/server Modified Files: main.py Log Message: 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemon support for the server Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- main.py 10 Jul 2005 03:44:37 -0000 1.5 +++ main.py 11 Jul 2005 03:23:22 -0000 1.6 @@ -60,12 +60,35 @@ ################################################################# if __name__ == '__main__': - if len(sys.argv) < 2: - print "Usage:\n" - print " %s \n" % sys.argv[0] + usage = "Usage: %s [-p ] [-l ] [-d] " % sys.argv[0] + parser = OptionParser(usage=usage) + parser.add_option("-p", "--pidfile", default=None, + help='file to write the PID to') + parser.add_option("-l", "--logfile", default=None, + help="location of file to write log output to") + parser.add_option("-d", "--daemon", default=False, action="store_true", + help="daemonize (i.e., detach from the terminal)") + (opts, args) = parser.parse_args() + + if (not len(args) == 1): + print "Must specify a single hostname." sys.exit(1) - hostname = sys.argv[1] + hostname = args[0] + + if opts.daemon: + ret=daemonize.createDaemon() + if ret: + print "Daemonizing failed!" + sys.exit(2) + + if opts.pidfile: + open(opts.pidfile, 'w').write('%d\n' % os.getpid()) + + if opts.logfile: + log=open(opts.logfile, 'a') + sys.stdout=log + sys.stderr=log builder_manager = BuilderManager.BuilderManager() From fedora-extras-commits at redhat.com Mon Jul 11 03:23:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:23:23 -0400 Subject: extras-buildsys ChangeLog,1.51,1.52 plague.spec,1.15,1.16 Message-ID: <200507110323.j6B3NNfF021833@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781 Modified Files: ChangeLog plague.spec Log Message: 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemon support for the server Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ChangeLog 10 Jul 2005 19:59:32 -0000 1.51 +++ ChangeLog 11 Jul 2005 03:23:21 -0000 1.52 @@ -1,5 +1,10 @@ 2005-07-10 Dan Williams + Patch from Ignacio Vazquez-Abrams + * Add initscript/daemon support for the server + +2005-07-10 Dan Williams + * server/PackageJob.py server/BuildMaster.py - Reduce total threadcount by breaking PackageJob runs into Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- plague.spec 11 Jul 2005 02:26:05 -0000 1.15 +++ plague.spec 11 Jul 2005 03:23:21 -0000 1.16 @@ -12,6 +12,10 @@ Requires: python-sqlite, pyOpenSSL, createrepo Requires: %{name}-common = %{version}-%{release} Requires: lighttpd +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description The Plague build system is a client/server distributed build system for @@ -34,6 +38,7 @@ Requires: yum >= 2.2.1 Requires: mock >= 0.3, pyOpenSSL Requires(post): /sbin/chkconfig +Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -75,14 +80,27 @@ make DESTDIR=$RPM_BUILD_ROOT install install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder +install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server +install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server %clean rm -rf $RPM_BUILD_ROOT +%post +/sbin/chkconfig --add plague-server +/sbin/service plague-server condrestart >> /dev/null || : + +%preun +if [ $1 = 0 ]; then + /sbin/service plague-server stop &> /dev/null + /sbin/chkconfig --del plague-server +fi + %post builder /sbin/chkconfig --add plague-builder +/sbin/service plague-builder condrestart >> /dev/null || : . %{_sysconfdir}/sysconfig/%{name}-builder if [ -z "$ARCHSOPT" ] ; then sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder @@ -105,6 +123,8 @@ %dir %{_sysconfdir}/%{name}/server/certs %dir %{_sysconfdir}/%{name}/server/addl_pkg_arches %{_sysconfdir}/%{name}/server/addl_pkg_arches/* +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +%{_initrddir}/%{name}-server %files common %defattr(-, root, root) From fedora-extras-commits at redhat.com Mon Jul 11 03:23:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:23:23 -0400 Subject: extras-buildsys/etc plague-server.config, NONE, 1.1 plague-server.init, NONE, 1.1 plague-builder.init, 1.2, 1.3 Message-ID: <200507110323.j6B3NNb4021839@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781/etc Modified Files: plague-builder.init Added Files: plague-server.config plague-server.init Log Message: 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemon support for the server --- NEW FILE plague-server.config --- HOST=localhost --- NEW FILE plague-server.init --- #!/bin/bash # # /etc/rc.d/init.d/plague-server # # Start a plague server instance # # chkconfig: 345 98 02 # description: Starts a plague server instance # processname: plague-server # config: /etc/sysconfig/plague-server # pidfile: /var/run/plague-server.pid # Source function library. . /etc/init.d/functions . /etc/sysconfig/plague-server start() { echo -n "Starting plague-server: " daemon plague-server -d -p /var/run/plague-server.pid -l /var/log/plague-server.log $HOST echo touch /var/lock/subsys/plague-server return 0 } stop() { echo -n "Shutting down plague-server: " killproc plague-server echo rm -f /var/lock/subsys/plague-server return 0 } restart() { stop start } case "$1" in start) start ;; stop) stop ;; status) status plague-server ;; restart) stop start ;; condrestart) [ -f /var/lock/subsys/plague-server ] && restart || : ;; *) echo "Usage: {start|stop|status|reload|restart[|probe]" exit 1 ;; esac exit $? Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plague-builder.init 10 Jul 2005 07:17:20 -0000 1.2 +++ plague-builder.init 11 Jul 2005 03:23:21 -0000 1.3 @@ -17,7 +17,7 @@ start() { echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHSOPT + daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOST $ARCHSOPT echo touch /var/lock/subsys/plague-builder return 0 From fedora-extras-commits at redhat.com Mon Jul 11 03:26:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:26:23 -0400 Subject: extras-buildsys/server main.py,1.6,1.7 Message-ID: <200507110326.j6B3QNBE021884@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21867/server Modified Files: main.py Log Message: Import daemonize module Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- main.py 11 Jul 2005 03:23:22 -0000 1.6 +++ main.py 11 Jul 2005 03:26:21 -0000 1.7 @@ -21,6 +21,7 @@ from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer +from plague import daemonize import SimpleXMLRPCServer sys.path.append('/usr/share/plague/server') From rc040203 at freenet.de Mon Jul 11 03:38:00 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Mon, 11 Jul 2005 05:38:00 +0200 Subject: APPROVED: perl-Class-Data-Inheritable Message-ID: <1121053081.30532.423.camel@mccallum.corsepiu.local> %description Class::Data::Inheritable is for creating accessor/mutators to class data. That is, if you want to store something about your class as a whole (instead of about a single object). This data is then inherited by your subclasses and can be overriden. Maintainer: Tom "Spot" Callaway Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Mon Jul 11 03:42:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:42:09 -0400 Subject: extras-buildsys/common HTTPServer.py,1.4,1.5 Message-ID: <200507110342.j6B3g99E021924@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21907/common Modified Files: HTTPServer.py Log Message: Python 2.2 fixups Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- HTTPServer.py 7 Jul 2005 19:10:14 -0000 1.4 +++ HTTPServer.py 11 Jul 2005 03:42:06 -0000 1.5 @@ -129,13 +129,18 @@ print "Creating random test data..." f = open(os.path.join(srcdir, "testfile.dat"), "w") x = 1 + import random while x < 10000: - f.write(os.urandom(50)) + try: + f.write(os.urandom(50)) + except AttributeError: + s = str(random.randint(0, 255)) + f.write(s) x = x + 1 f.close() print "Starting the server." - server = PlgHTTPServer(('localhost', 8886), srcdir, certs) + server = PlgHTTPServerManager(('localhost', 8886), srcdir, certs) server.start() while True: From fedora-extras-commits at redhat.com Mon Jul 11 03:46:17 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:46:17 -0400 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.4,1.5 Message-ID: <200507110346.j6B3kHgH021965@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21948/common Modified Files: XMLRPCServerProxy.py Log Message: Python 2.2 fixups Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- XMLRPCServerProxy.py 10 Jul 2005 03:44:36 -0000 1.4 +++ XMLRPCServerProxy.py 11 Jul 2005 03:46:15 -0000 1.5 @@ -30,7 +30,11 @@ def make_connection(self, host): # Handle username and password. - host, extra_headers, x509 = self.get_host_info(host) + try: + host, extra_headers, x509 = self.get_host_info(host) + except AttributeError: + # Yay for Python 2.2 + pass _host, _port = urllib.splitport(host) return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) From adrian at lisas.de Mon Jul 11 06:12:46 2005 From: adrian at lisas.de (Adrian Reber) Date: Mon, 11 Jul 2005 08:12:46 +0200 Subject: APPROVED: nexuiz-data Message-ID: <20050711061246.GA16410@lisas.de> %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, 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. Maintained by : Adrian Reber & Matthias Saou Reviewed by : Matthias Saou & Adrian Reber From adrian at lisas.de Mon Jul 11 06:13:59 2005 From: adrian at lisas.de (Adrian Reber) Date: Mon, 11 Jul 2005 08:13:59 +0200 Subject: APPROVED: nexuiz Message-ID: <20050711061359.GB16410@lisas.de> %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, focused on providing basic, old style deathmatches. Maintained by : Adrian Reber & Matthias Saou Reviewed by : Matthias Saou & Adrian Reber -------------- 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 Mon Jul 11 09:19:46 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:19:46 -0400 Subject: web/html/docs/release-notes/fc4/ru - New directory Message-ID: <200507110919.j6B9Jk2u029561@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29547/ru Log Message: Directory /cvs/fedora/web/html/docs/release-notes/fc4/ru added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 09:21:48 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:21:48 -0400 Subject: web/html/docs/release-notes/fc4/ru/figs - New directory Message-ID: <200507110921.j6B9Lm2n029596@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/figs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29576/figs Log Message: Directory /cvs/fedora/web/html/docs/release-notes/fc4/ru/figs added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 09:21:48 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:21:48 -0400 Subject: web/html/docs/release-notes/fc4/ru/stylesheet-images - New directory Message-ID: <200507110921.j6B9LmmY029601@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29576/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/release-notes/fc4/ru/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 09:57:25 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:57:25 -0400 Subject: web/html/docs/release-notes/fc4/ru fedora.css, NONE, 1.1 index.php, NONE, 1.1 Message-ID: <200507110957.j6B9vPTR029784@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728 Added Files: fedora.css index.php Log Message: Adding Russian translation of shipped release notes. --- 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; } ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Jul 11 09:57:26 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:57:26 -0400 Subject: web/html/docs/release-notes/fc4/ru/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: <200507110957.j6B9vQZb029792@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728/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: Adding Russian translation of shipped release notes. From fedora-extras-commits at redhat.com Mon Jul 11 09:57:26 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:57:26 -0400 Subject: web/html/docs/release-notes/fc4/ru/figs Fedora_Desktop.png, NONE, 1.1 Message-ID: <200507110957.j6B9vQ8v029789@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/figs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728/figs Added Files: Fedora_Desktop.png Log Message: Adding Russian translation of shipped release notes. From fedora-extras-commits at redhat.com Mon Jul 11 10:00:21 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 06:00:21 -0400 Subject: web/html/docs/release-notes index.php,1.3,1.4 Message-ID: <200507111000.j6BA0Lss029826@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29809 Modified Files: index.php Log Message: Out of process, but working somehow Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 10 Jun 2005 21:17:39 -0000 1.3 +++ index.php 11 Jul 2005 10:00:19 -0000 1.4 @@ -25,6 +25,7 @@
  • Fedora Core 3
      • From fedora-extras-commits at redhat.com Mon Jul 11 14:19:46 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 11 Jul 2005 10:19:46 -0400 Subject: common tobuild,1.1892,1.1893 Message-ID: <200507111419.j6BEJkq0003305@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3288 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1892 retrieving revision 1.1893 diff -u -r1.1892 -r1.1893 --- tobuild 10 Jul 2005 11:31:34 -0000 1.1892 +++ tobuild 11 Jul 2005 14:19:44 -0000 1.1893 @@ -36,3 +36,4 @@ ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 11 14:20:53 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 11 Jul 2005 10:20:53 -0400 Subject: common tobuild,1.1893,1.1894 Message-ID: <200507111420.j6BEKs1E003372@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3355 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1893 retrieving revision 1.1894 diff -u -r1.1893 -r1.1894 --- tobuild 11 Jul 2005 14:19:44 -0000 1.1893 +++ tobuild 11 Jul 2005 14:20:51 -0000 1.1894 @@ -37,3 +37,4 @@ ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel +oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 11 14:21:22 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 11 Jul 2005 10:21:22 -0400 Subject: common tobuild,1.1894,1.1895 Message-ID: <200507111421.j6BELMTN003438@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3421 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1894 retrieving revision 1.1895 diff -u -r1.1894 -r1.1895 --- tobuild 11 Jul 2005 14:20:51 -0000 1.1894 +++ tobuild 11 Jul 2005 14:21:20 -0000 1.1895 @@ -38,3 +38,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 +oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 11 14:43:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:43:42 -0400 Subject: rpms/logjam/devel logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.15, 1.16 Message-ID: <200507111443.j6BEhgUx003534@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/devel Modified Files: logjam.spec Added Files: logjam-4.5-patch8-manfix.patch Log Message: New version. logjam-4.5-patch8-manfix.patch: --- NEW FILE logjam-4.5-patch8-manfix.patch --- --- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500 +++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500 @@ -328,7 +328,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- logjam.spec 14 Apr 2005 21:51:26 -0000 1.15 +++ logjam.spec 11 Jul 2005 14:43:40 -0000 1.16 @@ -1,38 +1,42 @@ %define use_xmms 1 -Name: logjam -Version: 4.4.1 -Release: 8 -Epoch: 1 -Summary: GTK2 client for LiveJournal -License: GPL -Group: User Interface/Desktops -URL: http://logjam.danga.com/ -Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2 -Requires: curl >= 7.9, gtkspell +Name: logjam +Version: 4.5 +Release: 0.1patch8%{?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 +Requires: curl >= 7.9, gtkspell %if %{use_xmms} -BuildRequires: xmms-devel +BuildRequires: xmms-devel %endif -BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel -BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel -Obsoletes: loserjabber, logjam-gnome -BuildRoot: %{_tmppath}/logjam-%{version}.root -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-gtkhtml3.6.patch -Patch4: logjam-4.4.1-cleanups.patch -Patch5: logjam-4.4.1-fedora-desktop.patch +BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel +BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel +BuildRequires: libsoup-devel, sqlite-devel +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 +Patch5: logjam-4.5-patch8-manfix.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). %if %{use_xmms} %package xmms -Summary: LogJam helper binary -Group: User Interface/Desktops -Requires: logjam, xmms -BuildRequires: xmms-devel +Summary: LogJam helper binary +Group: User Interface/Desktops +Requires: logjam, xmms +BuildRequires: xmms-devel %description xmms This is a helper binary for LogJam which is used to get the @@ -40,19 +44,23 @@ %endif %prep -%setup -n %{name}-%{version} -q +%setup -n %{name}-%{version}-patch8 -q %patch0 -p1 -b .offline-segfaultfix %patch1 -p1 -b .rupo %patch2 -p1 -b .backdated -%patch3 -p1 -b .gtkhtml36 -%patch4 -p1 -b .cleanups -%patch5 -p1 -b .desktop +%patch3 -p1 -b .cleanups +%patch4 -p1 -b .desktop +%patch5 -p1 -b .manfix %build -%configure \ +%configure --with-sqlite3 \ %if %{use_xmms} --with-xmms %endif +cp libtool protocol/liblivejournal +cd gen +./regen.sh +cd .. make %install @@ -83,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 4.5-0.1patch8 +- bump to patch8 + * Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-8 - actually apply patch. :P From fedora-extras-commits at redhat.com Mon Jul 11 14:43:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:43:36 -0400 Subject: rpms/logjam/FC-3 logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.6, 1.7 Message-ID: <200507111444.j6BEi6g8003540@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/FC-3 Modified Files: logjam.spec Added Files: logjam-4.5-patch8-manfix.patch Log Message: New version. logjam-4.5-patch8-manfix.patch: --- NEW FILE logjam-4.5-patch8-manfix.patch --- --- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500 +++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500 @@ -328,7 +328,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- logjam.spec 11 Feb 2005 06:01:16 -0000 1.6 +++ logjam.spec 11 Jul 2005 14:43:34 -0000 1.7 @@ -1,37 +1,42 @@ %define use_xmms 1 -Name: logjam -Version: 4.4.1 -Release: 3 -Epoch: 1 -Summary: The GTK2-client for LiveJournal -License: GPL -Group: User Interface/Desktops -URL: http://logjam.danga.com/ -Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2 -Source1: logjam.desktop -Requires: curl >= 7.9, gtkspell +Name: logjam +Version: 4.5 +Release: 0.1patch8%{?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 +Requires: curl >= 7.9, gtkspell %if %{use_xmms} -BuildRequires: xmms-devel +BuildRequires: xmms-devel %endif -BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel -BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel -Obsoletes: loserjabber, logjam-gnome -BuildRoot: %{_tmppath}/logjam-%{version}.root -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-gtkhtml3.1.patch +BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel +BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel +BuildRequires: libsoup-devel +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 +Patch5: logjam-4.5-patch8-manfix.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). %if %{use_xmms} %package xmms -Summary: LogJam helper binary -Group: User Interface/Desktops -Requires: logjam, xmms -BuildRequires: xmms-devel +Summary: LogJam helper binary +Group: User Interface/Desktops +Requires: logjam, xmms +BuildRequires: xmms-devel %description xmms This is a helper binary for LogJam which is used to get the @@ -39,17 +44,23 @@ %endif %prep -%setup -n %{name}-%{version} -q +%setup -n %{name}-%{version}-patch8 -q %patch0 -p1 -b .offline-segfaultfix %patch1 -p1 -b .rupo %patch2 -p1 -b .backdated -%patch3 -p1 -b .gtkhtml31 +%patch3 -p1 -b .cleanups +%patch4 -p1 -b .desktop +%patch5 -p1 -b .manfix %build %configure \ %if %{use_xmms} --with-xmms %endif +cp libtool protocol/liblivejournal +cd gen +./regen.sh +cd .. make %install @@ -57,19 +68,19 @@ mkdir -p $RPM_BUILD_ROOT %makeinstall %find_lang %{name} -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora-Extras \ - %{SOURCE1} + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT/%{_datadir}/applications/logjam.desktop %files -f %{name}.lang %defattr(-,root,root) +%doc doc/README COPYING doc/TODO %{_bindir}/logjam %{_mandir}/man1/logjam.1.gz %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/logjam* -%doc doc/README COPYING doc/TODO %if %{use_xmms} %files xmms @@ -80,6 +91,26 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 4.5-0.1patch8 +- bump to patch8 + +* Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-8 +- actually apply patch. :P + +* Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-7 +- touch up package included .desktop file and use it. + +* Wed Apr 6 2005 Tom "spot" Callaway 4.4.1-6 +- Fix dual .desktop file issue + +* Fri Mar 13 2005 Tom "spot" Callaway 4.4.1-5 +- Cleanups for compiler errors brought to light in Bugzilla 149865 +- Change X-Fedora-Extras to X-Fedora + +* Fri Feb 25 2005 Tom "spot" Callaway 4.4.1-4 +- Rebuilt for FC4/devel +- Replace Gtkhtml 3.1 patch with Gtkhtml 3.6 patch + * Thu Feb 10 2005 Tom "spot" Callaway 4.4.1-3 - Bump to current version - Compile fix patch is obsoleted @@ -140,7 +171,7 @@ * Tue Apr 29 2003 Tom "spot" Callaway - bump to 4.1.2 - and i follow the tracks that lead me down, i'll never follow whats right - + * Sat Apr 12 2003 Tom "spot" Callaway - bump to 4.1.1 - black velvet with that slow southern style @@ -163,7 +194,7 @@ * Mon Jan 07 2002 Tom "spot" Callaway - 3.0.2 release, spec cleanups * Mon Nov 12 2001 Tom "spot" Callaway - - 3.0.1 release, lots of new features/bugfixes. + - 3.0.1 release, lots of new features/bugfixes. * Fri Sep 07 2001 Tom "spot" Callaway - Rebuild without ssl for compat. :~( * Thu Sep 06 2001 Tom "spot" Callaway From fedora-extras-commits at redhat.com Mon Jul 11 14:43:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:43:36 -0400 Subject: rpms/logjam/FC-4 logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.15, 1.16 Message-ID: <200507111444.j6BEi7h6003541@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/FC-4 Modified Files: logjam.spec Added Files: logjam-4.5-patch8-manfix.patch Log Message: New version. logjam-4.5-patch8-manfix.patch: --- NEW FILE logjam-4.5-patch8-manfix.patch --- --- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500 +++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500 @@ -328,7 +328,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- logjam.spec 14 Apr 2005 21:51:26 -0000 1.15 +++ logjam.spec 11 Jul 2005 14:43:34 -0000 1.16 @@ -1,38 +1,42 @@ %define use_xmms 1 -Name: logjam -Version: 4.4.1 -Release: 8 -Epoch: 1 -Summary: GTK2 client for LiveJournal -License: GPL -Group: User Interface/Desktops -URL: http://logjam.danga.com/ -Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2 -Requires: curl >= 7.9, gtkspell +Name: logjam +Version: 4.5 +Release: 0.1patch8%{?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 +Requires: curl >= 7.9, gtkspell %if %{use_xmms} -BuildRequires: xmms-devel +BuildRequires: xmms-devel %endif -BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel -BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel -Obsoletes: loserjabber, logjam-gnome -BuildRoot: %{_tmppath}/logjam-%{version}.root -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-gtkhtml3.6.patch -Patch4: logjam-4.4.1-cleanups.patch -Patch5: logjam-4.4.1-fedora-desktop.patch +BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel +BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel +BuildRequires: libsoup-devel, sqlite-devel +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 +Patch5: logjam-4.5-patch8-manfix.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). %if %{use_xmms} %package xmms -Summary: LogJam helper binary -Group: User Interface/Desktops -Requires: logjam, xmms -BuildRequires: xmms-devel +Summary: LogJam helper binary +Group: User Interface/Desktops +Requires: logjam, xmms +BuildRequires: xmms-devel %description xmms This is a helper binary for LogJam which is used to get the @@ -40,19 +44,23 @@ %endif %prep -%setup -n %{name}-%{version} -q +%setup -n %{name}-%{version}-patch8 -q %patch0 -p1 -b .offline-segfaultfix %patch1 -p1 -b .rupo %patch2 -p1 -b .backdated -%patch3 -p1 -b .gtkhtml36 -%patch4 -p1 -b .cleanups -%patch5 -p1 -b .desktop +%patch3 -p1 -b .cleanups +%patch4 -p1 -b .desktop +%patch5 -p1 -b .manfix %build -%configure \ +%configure --with-sqlite3 \ %if %{use_xmms} --with-xmms %endif +cp libtool protocol/liblivejournal +cd gen +./regen.sh +cd .. make %install @@ -83,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 4.5-0.1patch8 +- bump to patch8 + * Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-8 - actually apply patch. :P From fedora-extras-commits at redhat.com Mon Jul 11 14:46:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:46:25 -0400 Subject: rpms/logjam/devel sources,1.3,1.4 Message-ID: <200507111446.j6BEkPTs003609@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558/devel Modified Files: sources Log Message: New sources. Index: sources =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Feb 2005 05:39:25 -0000 1.3 +++ sources 11 Jul 2005 14:46:23 -0000 1.4 @@ -1 +1,2 @@ f16f68a4a6b15fb5bb650614f3ff081c logjam-4.4.1.tar.bz2 +0acb70ccb88d6334af22e56e4b521c6b logjam-4.5-patch8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 14:46:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:46:19 -0400 Subject: rpms/logjam/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200507111446.j6BEkod3003613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558/FC-3 Modified Files: .cvsignore sources Log Message: New sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/.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 11 Jul 2005 14:46:17 -0000 1.4 @@ -1 +1,2 @@ logjam-4.4.1.tar.bz2 +logjam-4.5-patch8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Feb 2005 05:39:25 -0000 1.3 +++ sources 11 Jul 2005 14:46:17 -0000 1.4 @@ -1 +1,2 @@ f16f68a4a6b15fb5bb650614f3ff081c logjam-4.4.1.tar.bz2 +0acb70ccb88d6334af22e56e4b521c6b logjam-4.5-patch8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 14:46:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:46:20 -0400 Subject: rpms/logjam/FC-4 sources,1.3,1.4 Message-ID: <200507111446.j6BEko1B003617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558/FC-4 Modified Files: sources Log Message: New sources. Index: sources =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Feb 2005 05:39:25 -0000 1.3 +++ sources 11 Jul 2005 14:46:18 -0000 1.4 @@ -1 +1,2 @@ f16f68a4a6b15fb5bb650614f3ff081c logjam-4.4.1.tar.bz2 +0acb70ccb88d6334af22e56e4b521c6b logjam-4.5-patch8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 15:22:58 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 11 Jul 2005 11:22:58 -0400 Subject: extras-buildsys/server main.py,1.7,1.8 Message-ID: <200507111522.j6BFMwX4004778@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4761/server Modified Files: main.py Log Message: import OptionParser Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- main.py 11 Jul 2005 03:26:21 -0000 1.7 +++ main.py 11 Jul 2005 15:22:56 -0000 1.8 @@ -23,6 +23,7 @@ from plague import HTTPServer from plague import daemonize import SimpleXMLRPCServer +from optparse import OptionParser sys.path.append('/usr/share/plague/server') From fedora-extras-commits at redhat.com Mon Jul 11 16:40:30 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 11 Jul 2005 12:40:30 -0400 Subject: fedora-security/audit README,1.2,1.3 Message-ID: <200507111640.j6BGeUGR006230@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6208 Modified Files: README Log Message: Note that this archive is just for issues known to the public; others are tracked separately. Index: README =================================================================== RCS file: /cvs/fedora/fedora-security/audit/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README 28 Jun 2005 07:44:45 -0000 1.2 +++ README 11 Jul 2005 16:40:28 -0000 1.3 @@ -1,3 +1,5 @@ +** Note that you must not put embargoed issues into this directory ** + Process: A. Each time Mitre sends out a CVE update From jpo at di.uminho.pt Mon Jul 11 17:23:15 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Mon, 11 Jul 2005 18:23:15 +0100 Subject: libevent: FC-3 and FC-4 branches Message-ID: <42D2AB03.10508@di.uminho.pt> Ralf, Could you request the creation of the FC-3 and FC-4 branches in the following page http://fedoraproject.org/wiki/Extras/CVSSyncNeeded? tia, 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 Mon Jul 11 17:40:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:36 -0400 Subject: rpms/perl-Template-Toolkit - New directory Message-ID: <200507111740.j6BHeasL007481@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7461/perl-Template-Toolkit Log Message: Directory /cvs/extras/rpms/perl-Template-Toolkit added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 17:40:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:36 -0400 Subject: rpms/perl-Template-Toolkit/devel - New directory Message-ID: <200507111740.j6BHeak8007486@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7461/perl-Template-Toolkit/devel Log Message: Directory /cvs/extras/rpms/perl-Template-Toolkit/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 17:40:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:53 -0400 Subject: rpms/perl-Template-Toolkit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507111740.j6BHer57007537@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7506 Added Files: Makefile import.log Log Message: Setup of module perl-Template-Toolkit --- NEW FILE Makefile --- # Top level Makefile for module perl-Template-Toolkit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 11 17:40:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:53 -0400 Subject: rpms/perl-Template-Toolkit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507111740.j6BHerXW007542@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7506/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Template-Toolkit --- NEW 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 Jul 11 17:41:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:41:39 -0400 Subject: rpms/perl-Template-Toolkit import.log,1.1,1.2 Message-ID: <200507111741.j6BHfdOe007607@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7575 Modified Files: import.log Log Message: auto-import perl-Template-Toolkit-2.14-4 on branch devel from perl-Template-Toolkit-2.14-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Jul 2005 17:40:51 -0000 1.1 +++ import.log 11 Jul 2005 17:41:37 -0000 1.2 @@ -0,0 +1 @@ +perl-Template-Toolkit-2_14-4:HEAD:perl-Template-Toolkit-2.14-4.src.rpm:1121103752 From fedora-extras-commits at redhat.com Mon Jul 11 17:41:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:41:40 -0400 Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit-gdpngtest.patch, NONE, 1.1 perl-Template-Toolkit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507111741.j6BHfexH007615@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7575/devel Modified Files: .cvsignore sources Added Files: perl-Template-Toolkit-gdpngtest.patch perl-Template-Toolkit.spec Log Message: auto-import perl-Template-Toolkit-2.14-4 on branch devel from perl-Template-Toolkit-2.14-4.src.rpm perl-Template-Toolkit-gdpngtest.patch: --- NEW FILE perl-Template-Toolkit-gdpngtest.patch --- https://rt.cpan.org/NoAuth/Bug.html?id=7864 --- t/gd.t~ 2003-04-30 11:04:32.000000000 +0300 +++ t/gd.t 2005-03-14 02:49:02.956699022 +0200 @@ -84,7 +84,8 @@ -- test -- [% FILTER replace('.'); # - # This is test3 from GD-1.xx/t/GD.t + # This is test4 from GD-2.23/t/GD.t (note *.png-1): + # od -vAn -w35 -tx1 test.out.4.png-1 | tr -d ' ' # USE im = GD.Image(100,50); black = im.colorAllocate(0, 0, 0); @@ -96,13 +97,13 @@ END; -%][% im.png | hex -%] -- expect -- 89504e470d0a1a0a0000000d4948445200000064000000320203000000d75b962d0000 -000c504c5445000000ffffffff00000000ff011d334a000000bc49444154789cad94c1 +000c504c5445000000ffffffff00000000ff011d334a000000bc49444154388dad94c1 0d83300c451309ba01cc93117a203d3002d3f4403680037fca8a448526f1b710ea3fe6 c9f9b163db984b6ae4e3ce4755e7d64f88f2cf82787c151c0105eaf0ab708276ca0886 83bc7280d5919033a80c39826c1502a4a4fa1a608d6414c8e6c865e9ba560298894d32 926c9291680338636580b742e4a7ed8f7b10b2dc2272a27baafff5e1f9dca90eafb5f2 3ffc4f791ff0dee1fda6f428ef6b3e0bcafcf09953e694cfb6b20f941da2ec1dbeaba2 -b2fdf60111b64d2854ccf25e0000000049454e44ae426082 +b2fdf60111b64d28a110a5c20000000049454e44ae426082 -- test -- [% FILTER replace('.'); # --- NEW FILE perl-Template-Toolkit.spec --- Name: perl-Template-Toolkit Version: 2.14 Release: 4%{?dist} Summary: Template processing system Group: Development/Libraries License: GPL or Artistic URL: http://www.template-toolkit.org/ Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-%{version}.tar.gz #Patch0: https://rt.cpan.org/NoAuth/Bug.html?id=7864 Patch0: %{name}-gdpngtest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1, tetex-dvips, tetex-latex BuildRequires: perl(AppConfig), perl(Text::Autoformat), perl(GD::Graph3d), perl(GD::Graph) BuildRequires: perl(GD::Text), perl(Image::Info), perl(Image::Size), perl(Pod::POM) BuildRequires: perl(Tie::DBI), perl(XML::DOM), perl(XML::RSS), perl(XML::XPath) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Template Toolkit is a collection of modules which implement a fast, flexible, powerful and extensible template processing system. It was originally designed and remains primarily useful for generating dynamic web content, but it can be used equally well for processing any other kind of text based documents: HTML, XML, POD, PostScript, LaTeX, and so on. %package examples Summary: Examples of how to use Template Toolkit Group: Documentation Requires: %{name} = %{version}-%{release} %description examples %{summary}. %prep %setup -q -n Template-Toolkit-%{version} %patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. cat < %{name}-prov #!/bin/sh %{__perl_provides} \ | grep -v 'perl(bytes)' \ | grep -v 'perl(CGI)' \ | grep -v 'perl(XML::DOM::' \ | grep -v 'perl(XML::XPath::' EOF %define __perl_provides %{_builddir}/Template-Toolkit-%{version}/%{name}-prov chmod +x %{__perl_provides} %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \ TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT _docs # install (+ INSTALLARCHLIB) instead of pure_install to get docs # and the template library installed too make install \ PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} \ TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 find $RPM_BUILD_ROOT -type f -name perllocal.pod -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/* mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes HACKING README TODO _docs/* %{_bindir}/tpage %{_bindir}/ttree %{perl_vendorarch}/Template.pm %{perl_vendorarch}/auto/Template %{perl_vendorarch}/Template %{_datadir}/tt2 # The examples get their own package due to size. %exclude %{_datadir}/tt2/examples %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %files examples %defattr(-,root,root,-) %{_datadir}/tt2/examples %changelog * Mon Jul 11 2005 Tom "spot" Callaway - 2.14-4 - put examples in their own subpackage * Sat Jul 9 2005 Ville Skytt?? - 2.14-3 - Filter false positive provides. - Include template library, switch to %%{_datadir}/tt2. - Tune build dependencies for full test suite coverage. - Fix and enable GD tests. - Include more documentation. - Fine tune dir ownerships and file permissions. * Fri Jul 8 2005 Tom "spot" Callaway 2.14-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 2.14-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2005 17:40:51 -0000 1.1 +++ .cvsignore 11 Jul 2005 17:41:38 -0000 1.2 @@ -0,0 +1 @@ +Template-Toolkit-2.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2005 17:40:51 -0000 1.1 +++ sources 11 Jul 2005 17:41:38 -0000 1.2 @@ -0,0 +1 @@ +0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz From fedora-extras-commits at redhat.com Mon Jul 11 18:22:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 11 Jul 2005 14:22:32 -0400 Subject: rpms/rpmlint/FC-4 rpmlint-disttag.patch, NONE, 1.1 rpmlint-execs.patch, NONE, 1.1 rpmlint-initvars.patch, NONE, 1.1 rpmlint.spec, 1.14, 1.15 Message-ID: <200507111822.j6BIMWVp008873@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8832/FC-4 Modified Files: rpmlint.spec Added Files: rpmlint-disttag.patch rpmlint-execs.patch rpmlint-initvars.patch Log Message: * Thu Jul 7 2005 Ville Skytt?? - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully expanded shell variables and quotation in init scripts. rpmlint-disttag.patch: --- NEW FILE rpmlint-disttag.patch --- Index: TagsCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/TagsCheck.py,v retrieving revision 1.84 diff -u -r1.84 TagsCheck.py --- TagsCheck.py 1 Jul 2005 02:59:46 -0000 1.84 +++ TagsCheck.py 6 Jul 2005 14:19:23 -0000 @@ -419,6 +419,7 @@ packager_regex=re.compile(Config.getOption('Packager', DEFAULT_PACKAGER)) basename_regex=re.compile('/?([^/]+)$') changelog_version_regex=re.compile('[^>]([^ >]+)\s*$') +fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$') release_ext=Config.getOption('ReleaseExtension', 'mdk') extension_regex=release_ext and re.compile(release_ext + '$') use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1) @@ -626,7 +627,8 @@ expected=version + '-' + release if epoch is not None: expected=str(epoch) + ':' + expected - if expected != ret.group(1): + if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)): + printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected) # provides=pkg.provides() rpmlint-execs.patch: --- NEW FILE rpmlint-execs.patch --- Index: FilesCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/FilesCheck.py,v retrieving revision 1.87 diff -u -r1.87 FilesCheck.py --- FilesCheck.py 17 Jun 2005 09:48:34 -0000 1.87 +++ FilesCheck.py 6 Jul 2005 14:19:21 -0000 @@ -186,6 +186,7 @@ shellbang_regex=re.compile('^#!\s*(\S*)') interpreter_regex=re.compile('^/(usr/)?s?bin/[^/]+$') script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/') +libtool_archive_regex=re.compile('\.la$') for idx in range(0, len(dangling_exceptions)): dangling_exceptions[idx][0]=re.compile(dangling_exceptions[idx][0]) @@ -552,10 +553,10 @@ if res: if not interpreter_regex.search(res.group(1)): printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"') - else: + elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)): printError(pkg, 'script-without-shellbang', f) - if mode & 0111 == 0: + if mode & 0111 == 0 and not doc_regex.search(f): printError(pkg, 'non-executable-script', f, oct(perm)) if line.endswith('\r\n'): printError(pkg, 'wrong-script-end-of-line-encoding', f) rpmlint-initvars.patch: --- NEW FILE rpmlint-initvars.patch --- Index: InitScriptCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v retrieving revision 1.14 diff -u -r1.14 InitScriptCheck.py --- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14 +++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000 @@ -17,7 +17,7 @@ rc_regex=re.compile('^/etc(/rc.d)?/init.d/') chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE) -subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE) +subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE) chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE) status_regex=re.compile('^[^#]*status', re.MULTILINE) reload_regex=re.compile('^[^#]*reload', re.MULTILINE) @@ -86,7 +86,7 @@ error=1 if name[0] == '$': value=Pkg.substitute_shell_vars(name, content) - if value == basename: + if value == basename or value[0] == '$': error=0 if error: printError(pkg, 'incoherent-subsys', f, name) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rpmlint.spec 20 Jun 2005 18:02:36 -0000 1.14 +++ rpmlint.spec 11 Jul 2005 18:22:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.70 -Release: 2 +Release: 4%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,6 +10,9 @@ Source1: %{name}-fedora-config Patch0: %{name}-svcdefault.patch Patch1: %{name}-confmsg.patch +Patch2: %{name}-disttag.patch +Patch3: %{name}-initvars.patch +Patch4: %{name}-execs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,6 +32,9 @@ %setup -q %patch0 %patch1 +%patch2 +%patch3 +%patch4 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py for f in AUTHORS ChangeLog ; do @@ -80,6 +86,11 @@ %changelog +* Thu Jul 7 2005 Ville Skytt?? - 0.70-4 +- Fix false "positives" from libtool archives confused as scripts, + non-executable scripts installed in docs, FE disttags, unsuccessfully + expanded shell variables and quotation in init scripts. + * Mon Jun 20 2005 Ville Skytt?? - 0.70-2 - 0.70, use sed instead of perl during build. - Default configuration improvements: allow Development/Debug group (for From fedora-extras-commits at redhat.com Mon Jul 11 18:22:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 11 Jul 2005 14:22:33 -0400 Subject: rpms/rpmlint/devel rpmlint-disttag.patch, NONE, 1.1 rpmlint-execs.patch, NONE, 1.1 rpmlint-initvars.patch, NONE, 1.1 rpmlint.spec, 1.14, 1.15 Message-ID: <200507111822.j6BIMXjg008885@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8832/devel Modified Files: rpmlint.spec Added Files: rpmlint-disttag.patch rpmlint-execs.patch rpmlint-initvars.patch Log Message: * Thu Jul 7 2005 Ville Skytt?? - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully expanded shell variables and quotation in init scripts. rpmlint-disttag.patch: --- NEW FILE rpmlint-disttag.patch --- Index: TagsCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/TagsCheck.py,v retrieving revision 1.84 diff -u -r1.84 TagsCheck.py --- TagsCheck.py 1 Jul 2005 02:59:46 -0000 1.84 +++ TagsCheck.py 6 Jul 2005 14:19:23 -0000 @@ -419,6 +419,7 @@ packager_regex=re.compile(Config.getOption('Packager', DEFAULT_PACKAGER)) basename_regex=re.compile('/?([^/]+)$') changelog_version_regex=re.compile('[^>]([^ >]+)\s*$') +fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$') release_ext=Config.getOption('ReleaseExtension', 'mdk') extension_regex=release_ext and re.compile(release_ext + '$') use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1) @@ -626,7 +627,8 @@ expected=version + '-' + release if epoch is not None: expected=str(epoch) + ':' + expected - if expected != ret.group(1): + if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)): + printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected) # provides=pkg.provides() rpmlint-execs.patch: --- NEW FILE rpmlint-execs.patch --- Index: FilesCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/FilesCheck.py,v retrieving revision 1.87 diff -u -r1.87 FilesCheck.py --- FilesCheck.py 17 Jun 2005 09:48:34 -0000 1.87 +++ FilesCheck.py 6 Jul 2005 14:19:21 -0000 @@ -186,6 +186,7 @@ shellbang_regex=re.compile('^#!\s*(\S*)') interpreter_regex=re.compile('^/(usr/)?s?bin/[^/]+$') script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/') +libtool_archive_regex=re.compile('\.la$') for idx in range(0, len(dangling_exceptions)): dangling_exceptions[idx][0]=re.compile(dangling_exceptions[idx][0]) @@ -552,10 +553,10 @@ if res: if not interpreter_regex.search(res.group(1)): printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"') - else: + elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)): printError(pkg, 'script-without-shellbang', f) - if mode & 0111 == 0: + if mode & 0111 == 0 and not doc_regex.search(f): printError(pkg, 'non-executable-script', f, oct(perm)) if line.endswith('\r\n'): printError(pkg, 'wrong-script-end-of-line-encoding', f) rpmlint-initvars.patch: --- NEW FILE rpmlint-initvars.patch --- Index: InitScriptCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v retrieving revision 1.14 diff -u -r1.14 InitScriptCheck.py --- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14 +++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000 @@ -17,7 +17,7 @@ rc_regex=re.compile('^/etc(/rc.d)?/init.d/') chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE) -subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE) +subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE) chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE) status_regex=re.compile('^[^#]*status', re.MULTILINE) reload_regex=re.compile('^[^#]*reload', re.MULTILINE) @@ -86,7 +86,7 @@ error=1 if name[0] == '$': value=Pkg.substitute_shell_vars(name, content) - if value == basename: + if value == basename or value[0] == '$': error=0 if error: printError(pkg, 'incoherent-subsys', f, name) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rpmlint.spec 20 Jun 2005 18:03:06 -0000 1.14 +++ rpmlint.spec 11 Jul 2005 18:22:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.70 -Release: 3 +Release: 4%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,6 +10,9 @@ Source1: %{name}-fedora-config Patch0: %{name}-svcdefault.patch Patch1: %{name}-confmsg.patch +Patch2: %{name}-disttag.patch +Patch3: %{name}-initvars.patch +Patch4: %{name}-execs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,6 +32,9 @@ %setup -q %patch0 %patch1 +%patch2 +%patch3 +%patch4 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py for f in AUTHORS ChangeLog ; do @@ -80,6 +86,11 @@ %changelog +* Thu Jul 7 2005 Ville Skytt?? - 0.70-4 +- Fix false "positives" from libtool archives confused as scripts, + non-executable scripts installed in docs, FE disttags, unsuccessfully + expanded shell variables and quotation in init scripts. + * Mon Jun 20 2005 Ville Skytt?? - 0.70-3 - 0.70, use sed instead of perl during build. - Default configuration improvements: allow Development/Debug group (for From ville.skytta at iki.fi Mon Jul 11 18:37:47 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Mon, 11 Jul 2005 21:37:47 +0300 Subject: APPROVED: perl-Template-Toolkit Message-ID: <1121107067.2892.308.camel@localhost.localdomain> The Template Toolkit is a collection of modules which implement a fast, flexible, powerful and extensible template processing system. Reviewer: Ville Skytt? Maintainer: Tom Callaway From fedora-extras-commits at redhat.com Mon Jul 11 19:00:01 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 11 Jul 2005 15:00:01 -0400 Subject: owners - Imported sources Message-ID: <200507111900.j6BJ012e009065@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9051 Log Message: Initial import Status: Vendor Tag: FEDORA Release Tags: V0_0 N owners/owners.list No conflicts created by this import From fedora-extras-commits at redhat.com Mon Jul 11 19:16:04 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 11 Jul 2005 15:16:04 -0400 Subject: fedora-security/audit fc4,1.18,1.19 Message-ID: <200507111916.j6BJG4Rl010289@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10272 Modified Files: fc4 Log Message: Note mysql fix for CAN-2004-2149 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fc4 10 Jul 2005 20:41:25 -0000 1.18 +++ fc4 11 Jul 2005 19:16:02 -0000 1.19 @@ -305,7 +305,7 @@ 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) 2004-2154 version (cups, fixed 1.2.21rc1) -2004-2149 ** mysql +2004-2149 version (mysql, fixed 4.1.5) 2004-2136 ignore (dm-crypt) design 2004-2135 ignore (kernel) design 2004-2093 ignore (rsync, not security issue) From fedora-extras-commits at redhat.com Mon Jul 11 19:35:52 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 11 Jul 2005 15:35:52 -0400 Subject: owners owners.list,1.1.1.1,1.2 Message-ID: <200507111935.j6BJZqTI010410@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10393 Modified Files: owners.list Log Message: description field Index: owners.list =================================================================== RCS file: /cvs/fedora/owners/owners.list,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- owners.list 11 Jul 2005 18:59:59 -0000 1.1.1.1 +++ owners.list 11 Jul 2005 19:35:50 -0000 1.2 @@ -1,5 +1,5 @@ # Format: -# product|component|initialowner|initialqacontact|initialcclist +# product|component|description|initialowner|initialqacontact|initialcclist # # If you don't know what product & component are, ask someone who knows bugzilla :) # initialowner is the initial owner of bugs on this component @@ -8,9 +8,9 @@ # # All e-mail addresses used here MUST correspond to existing bugzilla accounts! -Fedora Infrastructure|Account System|sopwith at redhat.com||wtogami at redhat.com -Fedora Infrastructure|cvs|gafton at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com -Fedora Infrastructure|extras buildsys|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com -Fedora Infrastructure|other|wtogami at redhat.com||sopwith at redhat.com -Fedora Infrastructure|update system|lmacken at redhat.com|notting at redhat.com| -Fedora Infrastructure|website|gdk at redhat.com|sopwith at redhat.com|wtogami at redhat.com +Fedora Infrastructure|Account System|accounts.fedora.redhat.com|sopwith at redhat.com||wtogami at redhat.com +Fedora Infrastructure|cvs|For issues related to the Fedora CVS system.|gafton at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com +Fedora Infrastructure|extras buildsys|For issues related to the Fedora Extras build system.|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com +Fedora Infrastructure|other|Anything else|wtogami at redhat.com||sopwith at redhat.com +Fedora Infrastructure|update system|The Fedora Core update system|lmacken at redhat.com|notting at redhat.com| +Fedora Infrastructure|website|For issues related to the Fedora web site.|gdk at redhat.com|sopwith at redhat.com|wtogami at redhat.com From fedora-extras-commits at redhat.com Mon Jul 11 20:13:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 11 Jul 2005 16:13:39 -0400 Subject: extras-buildsys/server BuilderManager.py,1.3,1.4 Repo.py,1.9,1.10 Message-ID: <200507112013.j6BKDdO6011759@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11740/server Modified Files: BuilderManager.py Repo.py Log Message: Use cached-mode createrepo (requires latest CVS) and reload builders on the fly Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BuilderManager.py 10 Jul 2005 20:02:14 -0000 1.3 +++ BuilderManager.py 11 Jul 2005 20:13:37 -0000 1.4 @@ -36,7 +36,9 @@ self._builders_lock = threading.Lock() # List of addresses of possible builders + self._builders_lock.acquire() self.possible_builders = config_opts['builders'] + self._builders_lock.release() self.running_builders = [] builder_list = self.update_builders() @@ -68,6 +70,11 @@ def update_builders(self): self._builders_lock.acquire() + + # Load in any new builders from the config file + execfile("/etc/plague/server/CONFIG.py") + self.possible_builders = config_opts['builders'] + builder_list = [] for address in self.possible_builders: # If the address is "https" but we aren't set up for SSL, exit Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Repo.py 11 Jul 2005 02:11:08 -0000 1.9 +++ Repo.py 11 Jul 2005 20:13:37 -0000 1.10 @@ -37,6 +37,9 @@ self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): os.makedirs(self._repodir) + self._repo_cache_dir = os.path.join(config_opts['repo_dir'], "cache", target) + if not os.path.exists(self._repo_cache_dir): + os.makedirs(self._repo_cache_dir) self._lock = threading.Lock() self._repo_additions = [] self._lock_count = 0 @@ -82,9 +85,9 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() - (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % self._repodir) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: - print "createrepo failed with exit status %d!" % s + print "Error: createrepo failed with exit status %d!" % s def run(self): From fedora-extras-commits at redhat.com Mon Jul 11 20:33:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:33:02 -0400 Subject: rpms/gambas/FC-3 gambas.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200507112033.j6BKX2fC011850@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11804/FC-3 Modified Files: gambas.spec sources Log Message: Bump to 1.0.8 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gambas.spec 4 Jul 2005 14:35:30 -0000 1.4 +++ gambas.spec 11 Jul 2005 20:32:59 -0000 1.5 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.6-gcc4.patch +Patch0: gambas-1.0.7-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,12 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 +- bump for another new version + +* Thu Jul 7 2005 Tom "spot" Callaway 1.0.7-1 +- bump for new version + * Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 - clean up BuildRequires - remove doubling of README in %doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 16:43:05 -0000 1.2 +++ sources 11 Jul 2005 20:32:59 -0000 1.3 @@ -1 +1,2 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 +730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 20:33:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:33:02 -0400 Subject: rpms/gambas/FC-4 .cvsignore, 1.2, 1.3 gambas.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507112033.j6BKX2aN011858@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11804/FC-4 Modified Files: .cvsignore gambas.spec sources Log Message: Bump to 1.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/.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 11 Jul 2005 20:33:00 -0000 1.3 @@ -1 +1,2 @@ gambas-1.0.6.tar.bz2 +gambas-1.0.8.tar.bz2 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gambas.spec 4 Jul 2005 14:35:31 -0000 1.4 +++ gambas.spec 11 Jul 2005 20:33:00 -0000 1.5 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.6-gcc4.patch +Patch0: gambas-1.0.7-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,12 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 +- bump for another new version + +* Thu Jul 7 2005 Tom "spot" Callaway 1.0.7-1 +- bump for new version + * Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 - clean up BuildRequires - remove doubling of README in %doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 16:43:05 -0000 1.2 +++ sources 11 Jul 2005 20:33:00 -0000 1.3 @@ -1 +1,2 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 +730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 20:33:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:33:03 -0400 Subject: rpms/gambas/devel gambas.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200507112033.j6BKX3a6011865@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11804/devel Modified Files: gambas.spec sources Log Message: Bump to 1.0.8 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gambas.spec 4 Jul 2005 14:34:38 -0000 1.4 +++ gambas.spec 11 Jul 2005 20:33:01 -0000 1.5 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.6-gcc4.patch +Patch0: gambas-1.0.7-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,12 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 +- bump for another new version + +* Thu Jul 7 2005 Tom "spot" Callaway 1.0.7-1 +- bump for new version + * Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 - clean up BuildRequires - remove doubling of README in %doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 16:43:05 -0000 1.2 +++ sources 11 Jul 2005 20:33:01 -0000 1.3 @@ -1 +1,2 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 +730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 20:35:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:35:20 -0400 Subject: owners owners.list,1.5,1.6 Message-ID: <200507112035.j6BKZKGE011915@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11896 Modified Files: owners.list Log Message: perl-Template-Toolkit Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- owners.list 11 Jul 2005 20:02:38 -0000 1.5 +++ owners.list 11 Jul 2005 20:35:18 -0000 1.6 @@ -559,6 +559,7 @@ Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-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-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-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 Mon Jul 11 20:37:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:37:51 -0400 Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.1, 1.2 Message-ID: <200507112037.j6BKbpaG011973@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11954/devel Modified Files: perl-Template-Toolkit.spec Log Message: Remove BR: perl(Tie::DBI) Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Template-Toolkit.spec 11 Jul 2005 17:41:38 -0000 1.1 +++ perl-Template-Toolkit.spec 11 Jul 2005 20:37:49 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Template-Toolkit Version: 2.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Template processing system Group: Development/Libraries License: GPL or Artistic @@ -13,7 +13,7 @@ BuildRequires: perl >= 1:5.6.1, tetex-dvips, tetex-latex BuildRequires: perl(AppConfig), perl(Text::Autoformat), perl(GD::Graph3d), perl(GD::Graph) BuildRequires: perl(GD::Text), perl(Image::Info), perl(Image::Size), perl(Pod::POM) -BuildRequires: perl(Tie::DBI), perl(XML::DOM), perl(XML::RSS), perl(XML::XPath) +BuildRequires: perl(XML::DOM), perl(XML::RSS), perl(XML::XPath) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -94,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway - 2.14-5 +- don't need Tie::DBI as a BuildRequires, since we're not running + the tests + * Mon Jul 11 2005 Tom "spot" Callaway - 2.14-4 - put examples in their own subpackage From fedora-extras-commits at redhat.com Mon Jul 11 20:49:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 11 Jul 2005 16:49:03 -0400 Subject: common tobuild,1.1895,1.1896 Message-ID: <200507112049.j6BKn3uJ012534@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12517 Modified Files: tobuild Log Message: request build of rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1895 retrieving revision 1.1896 diff -u -r1.1895 -r1.1896 --- tobuild 11 Jul 2005 14:21:20 -0000 1.1895 +++ tobuild 11 Jul 2005 20:49:01 -0000 1.1896 @@ -39,3 +39,4 @@ oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 +awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 12 00:53:33 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:53:33 -0400 Subject: rpms/kinput2/devel kinput2.spec,1.2,1.3 Message-ID: <200507120053.j6C0rXRF017389@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17372 Modified Files: kinput2.spec Log Message: * Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc5 - use proper xinput script for kinput2-wnn. Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kinput2.spec 30 Jun 2005 11:24:25 -0000 1.2 +++ kinput2.spec 12 Jul 2005 00:53:31 -0000 1.3 @@ -25,7 +25,7 @@ Name: kinput2 Version: v3.1 -Release: 25%{?dist} +Release: 26%{?dist} License: Distributable BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: xorg-x11-devel @@ -169,7 +169,7 @@ install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna %endif %if %{is_wnn_used} -install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn +install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn %endif %clean @@ -244,6 +244,9 @@ %{_sysconfdir}/X11/xinit/xinput.d %changelog +* Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc5 +- use proper xinput script for kinput2-wnn. + * Thu Jun 30 2005 Akira TAGOH - v3.1-25.fc5 - Import into Extras. From fedora-extras-commits at redhat.com Tue Jul 12 00:54:25 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:54:25 -0400 Subject: common tobuild,1.1896,1.1897 Message-ID: <200507120054.j6C0sP3c017452@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435 Modified Files: tobuild Log Message: request build of rpms/kinput2/devel kinput2-v3_1-26_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1896 retrieving revision 1.1897 diff -u -r1.1896 -r1.1897 --- tobuild 11 Jul 2005 20:49:01 -0000 1.1896 +++ tobuild 12 Jul 2005 00:54:23 -0000 1.1897 @@ -40,3 +40,4 @@ oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 +tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 12 00:57:43 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:57:43 -0400 Subject: rpms/kinput2/FC-4 kinput2.spec,1.2,1.3 Message-ID: <200507120057.j6C0vhte017488@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17471 Modified Files: kinput2.spec Log Message: * Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc4 - use proper xinput script for kinput2-wnn Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/FC-4/kinput2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kinput2.spec 30 Jun 2005 11:20:53 -0000 1.2 +++ kinput2.spec 12 Jul 2005 00:57:41 -0000 1.3 @@ -25,7 +25,7 @@ Name: kinput2 Version: v3.1 -Release: 24%{?dist} +Release: 26%{?dist} License: Distributable BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: xorg-x11-devel @@ -169,7 +169,7 @@ install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna %endif %if %{is_wnn_used} -install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn +install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn %endif %clean @@ -244,7 +244,10 @@ %{_sysconfdir}/X11/xinit/xinput.d %changelog -* Thu Jul 30 2005 Akira TAGOH - v3.1-24.fc4 +* Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc4 +- use proper xinput script for kinput2-wnn + +* Thu Jun 30 2005 Akira TAGOH - v3.1-24.fc4 - Import into Extras for FC4. * Tue Feb 8 2005 Akira TAGOH - v3.1-24 From fedora-extras-commits at redhat.com Tue Jul 12 00:58:34 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:58:34 -0400 Subject: common tobuild,1.1897,1.1898 Message-ID: <200507120058.j6C0wYRY017550@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17533 Modified Files: tobuild Log Message: request build of rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1897 retrieving revision 1.1898 diff -u -r1.1897 -r1.1898 --- tobuild 12 Jul 2005 00:54:23 -0000 1.1897 +++ tobuild 12 Jul 2005 00:58:32 -0000 1.1898 @@ -41,3 +41,4 @@ oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel +tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 12 01:04:19 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:04:19 -0400 Subject: rpms/uim/devel .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 uim.spec, 1.14, 1.15 Message-ID: <200507120104.j6C14nrH018664@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18643 Modified Files: .cvsignore sources uim.spec Log Message: * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch - uim-0.4.6-fix-typo-in-configure.patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Apr 2005 12:51:45 -0000 1.6 +++ .cvsignore 12 Jul 2005 01:03:48 -0000 1.7 @@ -5,3 +5,4 @@ uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz uim-0.4.6.tar.gz +uim-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Apr 2005 12:51:45 -0000 1.5 +++ sources 12 Jul 2005 01:03:48 -0000 1.6 @@ -1 +1 @@ -a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz +1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- uim.spec 29 Jun 2005 13:10:18 -0000 1.14 +++ uim.spec 12 Jul 2005 01:03:48 -0000 1.15 @@ -4,8 +4,8 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.6 -Release: 5 +Version: 0.4.7 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -17,8 +17,6 @@ Requires(post): %{_sbindir}/alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig -Patch0: uim-0.4.6-multilib.patch -Patch1: uim-0.4.6-fix-typo-in-configure.patch Patch2: uim-0.4.6-dont-require-devel-pkgs.patch %package devel @@ -124,8 +122,6 @@ %prep %setup -q -%patch0 -p1 -b .multilib -%patch1 -p1 -b .typo %patch2 -p1 -b .dlopen # patch creation: @@ -229,6 +225,7 @@ %{_libdir}/uim/plugin/libuim-custom-enabler.so %{_datadir}/uim/pixmaps %{_datadir}/uim/helperdata +%{_mandir}/man1/uim-xim.1* %files devel %defattr (-, root, root) @@ -291,6 +288,12 @@ %{_datadir}/uim/skk*.scm %changelog +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 +- New upstream release. +- removed the patches. fixed in upstream. + - uim-0.4.6-multilib.patch + - uim-0.4.6-fix-typo-in-configure.patch + * Wed Jun 29 2005 Akira TAGOH - 0.4.6-5 - built with --without-scim explicitly. it doesn't work actually. From fedora-extras-commits at redhat.com Tue Jul 12 01:07:26 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:07:26 -0400 Subject: common tobuild,1.1898,1.1899 Message-ID: <200507120107.j6C17QlH018755@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18731 Modified Files: tobuild Log Message: request build of rpms/uim/devel uim-0_4_7-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1898 retrieving revision 1.1899 diff -u -r1.1898 -r1.1899 --- tobuild 12 Jul 2005 00:58:32 -0000 1.1898 +++ tobuild 12 Jul 2005 01:07:24 -0000 1.1899 @@ -42,3 +42,4 @@ awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 +tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 12 01:22:49 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:22:49 -0400 Subject: rpms/uim/FC-4 uim-0.4.6-dont-require-devel-pkgs.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 uim.spec, 1.11, 1.12 Message-ID: <200507120122.j6C1Mngj018818@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18794 Modified Files: .cvsignore sources uim.spec Added Files: uim-0.4.6-dont-require-devel-pkgs.patch Log Message: * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch - uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-dont-require-devel-pkgs.patch: --- NEW FILE uim-0.4.6-dont-require-devel-pkgs.patch --- diff -ruN uim-0.4.6.orig/uim/anthy.c uim-0.4.6/uim/anthy.c --- uim-0.4.6.orig/uim/anthy.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/anthy.c 2005-06-13 18:57:15.000000000 +0900 @@ -43,8 +43,8 @@ #define LIBANTHY_SO "libanthy.dylib" #define LIBANTHYDIC_SO "libanthydic.dylib" #else - #define LIBANTHY_SO "libanthy.so" - #define LIBANTHYDIC_SO "libanthydic.so" + #define LIBANTHY_SO "libanthy.so.0" + #define LIBANTHYDIC_SO "libanthydic.so.0" #endif /*__APPLE__*/ diff -ruN uim-0.4.6.orig/uim/canna.c uim-0.4.6/uim/canna.c --- uim-0.4.6.orig/uim/canna.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/canna.c 2005-06-13 18:56:33.000000000 +0900 @@ -48,7 +48,7 @@ /* #define UIM_CANNA_DEBUG */ #define MAX_CONTEXT 256 -#define LIBCANNA_SO "libcanna.so" +#define LIBCANNA_SO "libcanna.so.1" #define BUFSIZE 1024 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Apr 2005 12:51:45 -0000 1.6 +++ .cvsignore 12 Jul 2005 01:22:47 -0000 1.7 @@ -5,3 +5,4 @@ uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz uim-0.4.6.tar.gz +uim-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Apr 2005 12:51:45 -0000 1.5 +++ sources 12 Jul 2005 01:22:47 -0000 1.6 @@ -1 +1 @@ -a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz +1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- uim.spec 16 May 2005 10:07:53 -0000 1.11 +++ uim.spec 12 Jul 2005 01:22:47 -0000 1.12 @@ -4,20 +4,21 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.6 -Release: 3 +Version: 0.4.7 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz Source1: xinput.d-uim -Patch0: uim-0.4.6-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel BuildRequires: anthy-devel Canna-devel Requires(post): %{_sbindir}/alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig +Patch2: uim-0.4.6-dont-require-devel-pkgs.patch + %package devel Summary: Development files for the Uim library Group: Development/Libraries @@ -117,11 +118,11 @@ %description skk This package provides support for SKK, a Japanese input method. -%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) +%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) %prep %setup -q -%patch0 -p1 -b .multilib +%patch2 -p1 -b .dlopen # patch creation: libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf @@ -129,7 +130,7 @@ touch uim/config.h.in %build -%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule +%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim make %install @@ -142,7 +143,7 @@ %find_lang %{name} -find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list +find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang # compress large doc @@ -214,6 +215,7 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* %dir %{_datadir}/uim @@ -223,18 +225,17 @@ %{_libdir}/uim/plugin/libuim-custom-enabler.so %{_datadir}/uim/pixmaps %{_datadir}/uim/helperdata +%{_mandir}/man1/uim-xim.1* %files devel %defattr (-, root, root) %dir %{_datadir}/uim -%{_bindir}/uim-sh %{_includedir}/uim/ %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_datadir}/uim/uim-sh.scm %files gtk2 %defattr (-, root, root) @@ -242,6 +243,7 @@ %{_bindir}/uim-helper-candwin-gtk %{_bindir}/uim-helper-toolbar-gtk %{_bindir}/uim-helper-toolbar-gtk-systray +%{_bindir}/uim-pref-gtk %{_bindir}/uim-toolbar-gtk %{_bindir}/uim-toolbar-gtk-systray %{_bindir}/uim-im-switcher-gtk @@ -286,6 +288,20 @@ %{_datadir}/uim/skk*.scm %changelog +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 +- New upstream release. +- removed the patches. fixed in upstream. + - uim-0.4.6-multilib.patch + - uim-0.4.6-fix-typo-in-configure.patch + +* Wed Jun 29 2005 Akira TAGOH - 0.4.6-5 +- built with --without-scim explicitly. it doesn't work actually. + +* Mon Jun 13 2005 Akira TAGOH - 0.4.6-4 +- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building. +- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen + the shared libraries without -devel packages. + * Mon May 16 2005 Akira TAGOH - 0.4.6-3 - uim-0.4.6-multilib.patch: applied to fix a build issue for libquiminputcontextplugin.so. (John Thacker, #156880) From fedora-extras-commits at redhat.com Tue Jul 12 01:23:29 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:23:29 -0400 Subject: common tobuild,1.1899,1.1900 Message-ID: <200507120123.j6C1NTm0018880@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18863 Modified Files: tobuild Log Message: request build of rpms/uim/FC-4 uim-0_4_7-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1899 retrieving revision 1.1900 diff -u -r1.1899 -r1.1900 --- tobuild 12 Jul 2005 01:07:24 -0000 1.1899 +++ tobuild 12 Jul 2005 01:23:27 -0000 1.1900 @@ -43,3 +43,4 @@ tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel +tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 12 01:30:35 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:30:35 -0400 Subject: rpms/uim/FC-3 uim-0.4.6-dont-require-devel-pkgs.patch, NONE, 1.1 uim-0.4.6-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 uim.spec, 1.4, 1.5 xinput.d-uim, 1.1, 1.2 Message-ID: <200507120130.j6C1UZ5f018935@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18907 Modified Files: .cvsignore sources uim.spec xinput.d-uim Added Files: uim-0.4.6-dont-require-devel-pkgs.patch uim-0.4.6-multilib.patch Log Message: * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch - uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-dont-require-devel-pkgs.patch: --- NEW FILE uim-0.4.6-dont-require-devel-pkgs.patch --- diff -ruN uim-0.4.6.orig/uim/anthy.c uim-0.4.6/uim/anthy.c --- uim-0.4.6.orig/uim/anthy.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/anthy.c 2005-06-13 18:57:15.000000000 +0900 @@ -43,8 +43,8 @@ #define LIBANTHY_SO "libanthy.dylib" #define LIBANTHYDIC_SO "libanthydic.dylib" #else - #define LIBANTHY_SO "libanthy.so" - #define LIBANTHYDIC_SO "libanthydic.so" + #define LIBANTHY_SO "libanthy.so.0" + #define LIBANTHYDIC_SO "libanthydic.so.0" #endif /*__APPLE__*/ diff -ruN uim-0.4.6.orig/uim/canna.c uim-0.4.6/uim/canna.c --- uim-0.4.6.orig/uim/canna.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/canna.c 2005-06-13 18:56:33.000000000 +0900 @@ -48,7 +48,7 @@ /* #define UIM_CANNA_DEBUG */ #define MAX_CONTEXT 256 -#define LIBCANNA_SO "libcanna.so" +#define LIBCANNA_SO "libcanna.so.1" #define BUFSIZE 1024 uim-0.4.6-multilib.patch: --- NEW FILE uim-0.4.6-multilib.patch --- diff -ur uim-0.4.6.orig/configure.ac uim-0.4.6/configure.ac --- uim-0.4.6.orig/configure.ac 2005-05-11 11:46:09.000000000 -0400 +++ uim-0.4.6/configure.ac 2005-05-11 11:46:26.000000000 -0400 @@ -613,7 +613,7 @@ fi LDFLAGS=$_SAVE_LDFLAGS - QT_LIBS="-L/usr/X11R6/lib $QT_LDFLAGS $QT_LIB -lXext -lX11" + QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11" _SAVE_CXXFLAGS=$CXXFLAGS _SAVE_LIBS=$LIBS Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2005 05:39:46 -0000 1.5 +++ .cvsignore 12 Jul 2005 01:30:32 -0000 1.6 @@ -4,3 +4,4 @@ uim-0.4.5.tar.gz uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz +uim-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2005 04:51:20 -0000 1.4 +++ sources 12 Jul 2005 01:30:32 -0000 1.5 @@ -1 +1 @@ -10d48b4a5db1f19b8cf9f5099265aa4c uim-0.4.5.1.tar.gz +1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- uim.spec 24 Feb 2005 05:39:46 -0000 1.4 +++ uim.spec 12 Jul 2005 01:30:32 -0000 1.5 @@ -4,17 +4,20 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.5.1 -Release: 1 +Version: 0.4.7 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries -URL: http://freedesktop.org/Software/uim -Source0: http://freedesktop.org/Software/UimDownload/%{name}-%{version}.tar.gz +URL: http://uim.freedesktop.org/ +Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz Source1: xinput.d-uim BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gtk2-devel -BuildRequires: gnome-panel-devel -Requires(post,postun): %{_sbindir}/alternatives +BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel +BuildRequires: anthy-devel Canna-devel +Requires(post): %{_sbindir}/alternatives /sbin/ldconfig +Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig + +Patch2: uim-0.4.6-dont-require-devel-pkgs.patch %package devel Summary: Development files for the Uim library @@ -25,40 +28,50 @@ Summary: GTK+2 support for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %package gnome Summary: GNOME Applet for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} -Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf +Requires(post): %{_sbindir}/bonobo-activation-sysconf +Requires(postun): %{_sbindir}/bonobo-activation-sysconf + +%package qt +Summary: Qt support for Uim +Group: User Interface/Desktops +Requires: uim = %{version}-%{release} %package anthy Summary: Anthy support for Uim Group: System Environment/Libraries Requires: anthy Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %package canna Summary: Canna support for Uim Group: System Environment/Libraries Requires: Canna Canna-devel Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %package skk Summary: SKK support for Uim Group: System Environment/Libraries Requires: skkdic Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %description Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +support Gtk+'s immodule, Qt's immodule and XIM. This package provides the input method library, the XIM bridge and most of the input methods. @@ -71,8 +84,7 @@ %description devel Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all -languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +languages. This package contains the header files and the libraries which is needed for developing Uim applications. @@ -80,19 +92,23 @@ %description gtk2 Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all -languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +languages. This package provides the Gtk IM module and helper program. %description gnome Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all -languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +languages. This package provides the GNOME panel applet. +%description qt +Uim is a multilingual input method library. Uim aims to +provide secure and useful input methods for all + +This package provides the Qt IM module and helper programs. + %description anthy This package provides support for Anthy, a Japanese input method. @@ -102,38 +118,40 @@ %description skk This package provides support for SKK, a Japanese input method. -%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) +%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) %prep %setup -q +%patch2 -p1 -b .dlopen -%ifarch x86_64 # patch creation: libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf # touch uim/config.h.in, otherwise autoheader will run again touch uim/config.h.in -%endif %build -%configure +%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim make %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim %find_lang %{name} -find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list +find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang # compress large doc bzip2 ChangeLog +# remove the unnecessary files +rm $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*.{a,la} + %clean rm -rf $RPM_BUILD_ROOT @@ -197,63 +215,121 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* %dir %{_datadir}/uim %{_datadir}/uim/tables %{_sysconfdir}/X11/xinit/xinput.d +%dir %{_libdir}/uim +%{_libdir}/uim/plugin/libuim-custom-enabler.so +%{_datadir}/uim/pixmaps +%{_datadir}/uim/helperdata +%{_mandir}/man1/uim-xim.1* %files devel %defattr (-, root, root) %dir %{_datadir}/uim -%{_bindir}/uim-sh -%{_includedir}/uim/* +%{_includedir}/uim/ %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_datadir}/uim/uim-sh.scm %files gtk2 %defattr (-, root, root) %{_bindir}/uim-candwin-gtk -%{_bindir}/uim-im-switcher -%{_bindir}/uim-input-pad-ja +%{_bindir}/uim-helper-candwin-gtk +%{_bindir}/uim-helper-toolbar-gtk +%{_bindir}/uim-helper-toolbar-gtk-systray +%{_bindir}/uim-pref-gtk %{_bindir}/uim-toolbar-gtk %{_bindir}/uim-toolbar-gtk-systray +%{_bindir}/uim-im-switcher-gtk +%{_bindir}/uim-input-pad-ja %{_libdir}/gtk-2.0/2.*/immodules %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %dir %{_datadir}/uim -%{_datadir}/uim/icons +%{_datadir}/applications/uim.desktop %files gnome %defattr (-, root, root) +%{_libexecdir}/uim-helper-applet %{_libexecdir}/uim-toolbar-applet %{_libdir}/bonobo/servers/GNOME_UimApplet.server +%files qt +%defattr (-, root, root) +%{_bindir}/uim-candwin-qt +%{_bindir}/uim-chardict-qt +%{_bindir}/uim-im-switcher-qt +%{_bindir}/uim-pref-qt +%{_bindir}/uim-toolbar-qt +%{_libdir}/qt-3.*/plugins/inputmethods +%exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a + %files anthy %defattr (-, root, root) +%{_libdir}/uim/plugin/libuim-anthy.so %dir %{_datadir}/uim -%{_datadir}/uim/anthy.scm +%{_datadir}/uim/anthy*.scm %files canna %defattr (-, root, root) +%{_libdir}/uim/plugin/libuim-canna.so %dir %{_datadir}/uim -%{_datadir}/uim/canna.scm +%{_datadir}/uim/canna*.scm %files skk %defattr (-, root, root) +%{_libdir}/uim/plugin/libuim-skk.so %dir %{_datadir}/uim %{_datadir}/uim/skk*.scm %changelog +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 +- New upstream release. +- removed the patches. fixed in upstream. + - uim-0.4.6-multilib.patch + - uim-0.4.6-fix-typo-in-configure.patch + +* Wed Jun 29 2005 Akira TAGOH - 0.4.6-5 +- built with --without-scim explicitly. it doesn't work actually. + +* Mon Jun 13 2005 Akira TAGOH - 0.4.6-4 +- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building. +- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen + the shared libraries without -devel packages. + +* Mon May 16 2005 Akira TAGOH - 0.4.6-3 +- uim-0.4.6-multilib.patch: applied to fix a build issue for + libquiminputcontextplugin.so. (John Thacker, #156880) + +* Fri May 6 2005 Akira TAGOH - 0.4.6-2 +- added BuildRequires: ncurses-devel. (#156880) + +* Mon Apr 18 2005 Akira TAGOH - 0.4.6-1 +- New upstream release. (#155173) + - fixed missing return statement issue. (#150304) +- Updated upstream URL. +- ensure to build with Canna and anthy. +- enabled Qt immodule. +- added QT_IM_MODULE=uim to xinput.d-uim + +* Fri Apr 1 2005 Michael Schwendt - 0.4.5.1-2 +- Include headers directory in -devel package. + +* Fri Mar 4 2005 Ville Skytt?? +- Split context marked dependency syntax to work around #118773. +- Add ldconfig scriptlet dependencies. + * Thu Feb 24 2005 Akira TAGOH - 0.4.5.1-1 - New upstream release. - security fix. - support xinput script. -* Sun Feb 20 2005 Thorsten Leemhuis 0.4.5-2 - Added autoreconf-patch; fixes build on x86_64 * Wed Jan 12 2005 Akira TAGOH 0.4.5-1 Index: xinput.d-uim =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/xinput.d-uim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xinput.d-uim 24 Feb 2005 05:39:46 -0000 1.1 +++ xinput.d-uim 12 Jul 2005 01:30:32 -0000 1.2 @@ -1,3 +1,4 @@ XIM=uim XIM_PROGRAM=uim-xim GTK_IM_MODULE=uim +QT_IM_MODULE=uim From fedora-extras-commits at redhat.com Tue Jul 12 01:32:06 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:32:06 -0400 Subject: common tobuild,1.1900,1.1901 Message-ID: <200507120132.j6C1W6iK018999@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18982 Modified Files: tobuild Log Message: request build of rpms/uim/FC-3 uim-0_4_7-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1900 retrieving revision 1.1901 diff -u -r1.1900 -r1.1901 --- tobuild 12 Jul 2005 01:23:27 -0000 1.1900 +++ tobuild 12 Jul 2005 01:32:04 -0000 1.1901 @@ -44,3 +44,4 @@ tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 +tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 12 03:39:58 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Mon, 11 Jul 2005 23:39:58 -0400 Subject: rpms/proj import.log,1.7,1.8 Message-ID: <200507120339.j6C3dw1x021416@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21384 Modified Files: import.log Log Message: auto-import proj-4.4.9-1 on branch FC-4 from proj-4.4.9-1.src.rpm Updated to proj-4.4.9 and to address bug 150013 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Jul 2005 05:23:35 -0000 1.7 +++ import.log 12 Jul 2005 03:39:56 -0000 1.8 @@ -4,3 +4,4 @@ proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421 proj-4_4_9-0:HEAD:proj-4.4.9-0.src.rpm:1120711939 proj-4_4_9-1:HEAD:proj-4.4.9-1.src.rpm:1120800198 +proj-4_4_9-1:FC-4:proj-4.4.9-1.src.rpm:1121139578 From fedora-extras-commits at redhat.com Tue Jul 12 03:39:59 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Mon, 11 Jul 2005 23:39:59 -0400 Subject: rpms/proj/FC-4 pj_gridinfo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 proj.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507120339.j6C3dx2l021426@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21384/FC-4 Modified Files: .cvsignore proj.spec sources Added Files: pj_gridinfo.patch Log Message: auto-import proj-4.4.9-1 on branch FC-4 from proj-4.4.9-1.src.rpm Updated to proj-4.4.9 and to address bug 150013 pj_gridinfo.patch: --- NEW FILE pj_gridinfo.patch --- *** src/pj_gridinfo.c 2004-10-29 21:03:03.000000000 -0700 --- src/pj_gridinfo.c.new 2005-07-07 21:48:25.000000000 -0700 *************** *** 490,496 **** { if( getenv("PROJ_DEBUG") != NULL ) fprintf( stderr, "pj_gridinfo_init_ntv2(): " ! "failed to find parent %8.8s for %.\n", (const char *) header+24, gi->ct->id ); for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} --- 490,496 ---- { if( getenv("PROJ_DEBUG") != NULL ) fprintf( stderr, "pj_gridinfo_init_ntv2(): " ! "failed to find parent %8.8s for %s\n", (const char *) header+24, gi->ct->id ); for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jan 2005 09:45:21 -0000 1.2 +++ .cvsignore 12 Jul 2005 03:39:57 -0000 1.3 @@ -1,2 +1,2 @@ -proj-4.4.8.tar.gz proj-nad27-1.1.tar.gz +proj-4.4.9.tar.gz Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/FC-4/proj.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proj.spec 22 May 2005 16:33:49 -0000 1.4 +++ proj.spec 12 Jul 2005 03:39:57 -0000 1.5 @@ -1,16 +1,17 @@ Name: proj -Version: 4.4.8 -Release: 6 +Version: 4.4.9 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering License: MIT URL: http://www.remotesensing.org/proj/ -Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz +Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright Patch0: proj.copyright.patch Patch1: proj.test_scripts.patch +Patch2: pj_gridinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel @@ -48,6 +49,10 @@ gzip -dc %{SOURCE1} | tar -xvvf - cd .. +# Patch for Bug 150013 +cp %{PATCH2} ./ +%patch2 -p0 -b .buildroot + %build %configure make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -88,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Thu Jul 7 2005 Shawn McCann - 4.4.9-1 +- Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source. + * Sun May 22 2005 Michael Schwendt - 4.4.8-6 - rebuilt @@ -120,4 +128,3 @@ - to comply with both Fedora and RedHat 9 packaging guidelines. - Split files into proj, proj-devel, and proj-nad (additional grids) - and adjusted the EXE path in the test scripts. - Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:45:21 -0000 1.2 +++ sources 12 Jul 2005 03:39:57 -0000 1.3 @@ -1,2 +1,2 @@ -1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz 66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz +3cc5c2407c213aadfd154c8df80efd6c proj-4.4.9.tar.gz From oliver at linux-kernel.at Tue Jul 12 07:16:54 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Tue, 12 Jul 2005 09:16:54 +0200 Subject: libevent: FC-3 and FC-4 branches In-Reply-To: <42D2AB03.10508@di.uminho.pt> References: <42D2AB03.10508@di.uminho.pt> Message-ID: <42D36E66.6090107@linux-kernel.at> On 07/11/2005 07:23 PM, Jos? Pedro Oliveira wrote: > Ralf, > > Could you request the creation of the FC-3 and FC-4 branches in the > following page http://fedoraproject.org/wiki/Extras/CVSSyncNeeded? Someone allready did, it seems. Best, Oliver From fedora-extras-commits at redhat.com Tue Jul 12 07:55:55 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 12 Jul 2005 03:55:55 -0400 Subject: fedora-security/audit fc4,1.19,1.20 Message-ID: <200507120755.j6C7ttb8026293@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26274 Modified Files: fc4 Log Message: Updates from CVE mails 20050711 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fc4 11 Jul 2005 19:16:02 -0000 1.19 +++ fc4 12 Jul 2005 07:55:53 -0000 1.20 @@ -1,7 +1,7 @@ -Up to date CVE as of CVE email 20050710 -Up to date FC4 as of 20050710 +Up to date CVE as of CVE email 20050711 +Up to date FC4 as of 20050711 -** marks items that need attention +** are items that need attention 2005-2177 ** net-snmp (fixed 5.2.1.2) 2005-2114 ** mozilla @@ -9,6 +9,7 @@ 2005-2088 VULNERABLE (httpd) 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] +2005-1768 version (kernel, fixed 2.6.6) 2005-1765 ** kernel 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] From fedora-extras-commits at redhat.com Tue Jul 12 15:33:45 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 12 Jul 2005 11:33:45 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.22,1.23 Message-ID: <200507121533.j6CFXjlD004008@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3991 Modified Files: bittorrent.spec Log Message: * Tue Jul 11 2005 Paul Howarth 4.1.2-5 - 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 offer build option not to delete usr/group on uninstall - don't generate redundant python-abi dependency for FC >= 4 Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bittorrent.spec 7 Jul 2005 06:08:31 -0000 1.22 +++ bittorrent.spec 12 Jul 2005 15:33:43 -0000 1.23 @@ -1,11 +1,10 @@ %define desktopvendor fedora -%define delete_user_on_uninstall 0 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent Version: 4.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -21,7 +20,10 @@ BuildRequires: python-devel desktop-file-utils gettext Requires: python +# FC4 and later auto-generate python version dependency +%if "%{fedora}" < "4" || 0%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +%endif Provides: python-khashmir Obsoletes: python-khashmir < %{version}-%{release} @@ -31,10 +33,6 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -%if %{delete_user_on_uninstall} -Requires(postun): %{_sbindir}/userdel -Requires(postun): %{_sbindir}/groupdel -%endif Requires(postun): /sbin/service %description @@ -107,7 +105,7 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install %{__rm} -rf $RPM_BUILD_ROOT @@ -121,7 +119,7 @@ %{__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}/pixmaps/bittorrent.png +%{__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 @@ -153,18 +151,17 @@ if [ $1 -gt 0 ]; then /sbin/service btseed condrestart &>/dev/null || : /sbin/service bttrack condrestart &>/dev/null || : -%if %{delete_user_on_uninstall} -else - %{_sbindir}/userdel torrent &>/dev/null || : - %{_sbindir}/groupdel torrent &>/dev/null || : -%endif 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 -f bittorrent.lang %defattr(-,root,root,-) @@ -202,9 +199,17 @@ %{_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 Jul 11 2005 Paul Howarth 4.1.2-5 +- 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 offer build option not to delete usr/group on uninstall +- don't generate redundant python-abi dependency for FC >= 4 + * Thu Jul 7 2005 Paul Howarth 4.1.2-4 - bump and rebuild From fedora-extras-commits at redhat.com Tue Jul 12 15:35:23 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 12 Jul 2005 11:35:23 -0400 Subject: web/html/download mirrors.php,1.20,1.21 Message-ID: <200507121535.j6CFZNFo004039@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4022 Modified Files: mirrors.php Log Message: Added links for ftp.unina.it Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mirrors.php 6 Jul 2005 19:19:18 -0000 1.20 +++ mirrors.php 12 Jul 2005 15:35:21 -0000 1.21 @@ -310,6 +310,8 @@
    • Netherlands From fedora-extras-commits at redhat.com Tue Jul 12 16:38:48 2005 From: fedora-extras-commits at redhat.com (Elena Zannoni (ezannoni)) Date: Tue, 12 Jul 2005 12:38:48 -0400 Subject: web/html/projects/systemtap index.php,NONE,1.1 Message-ID: <200507121638.j6CGcm3o005525@cvs-int.fedora.redhat.com> Author: ezannoni Update of /cvs/fedora/web/html/projects/systemtap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5509 Added Files: index.php Log Message: Initial web page creation for the systemtap project. ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Tue Jul 12 17:20:25 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 12 Jul 2005 13:20:25 -0400 Subject: web/html/download mirrors.php,1.21,1.22 Message-ID: <200507121720.j6CHKPtN006817@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6800 Modified Files: mirrors.php Log Message: Added trailing slash on ftp://ftp.unina.it....../ for consistency's sake. Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mirrors.php 12 Jul 2005 15:35:21 -0000 1.21 +++ mirrors.php 12 Jul 2005 17:20:23 -0000 1.22 @@ -310,7 +310,7 @@
      • From fedora-extras-commits at redhat.com Tue Jul 12 19:46:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 12 Jul 2005 15:46:31 -0400 Subject: rpms/blacs/devel Bmake.inc, 1.1, 1.2 Bmake.inc.64bit, 1.1, 1.2 blacs.spec, 1.6, 1.7 Message-ID: <200507121946.j6CJkVED011348@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/devel Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: shared lib version of blacs Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc 24 Apr 2005 17:42:47 -0000 1.1 +++ Bmake.inc 12 Jul 2005 19:46:29 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc.64bit 5 May 2005 14:43:52 -0000 1.1 +++ Bmake.inc.64bit 12 Jul 2005 19:46:29 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib64 MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6 +++ blacs.spec 12 Jul 2005 19:46:29 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -16,9 +16,13 @@ Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit BuildRequires: gcc-gfortran -BuildRequires: lapack, blas, lam -Requires: lapack, blas, lam +# Lam before 7.1.1-5 is missing: +# -shared library support +# -fPIC compilation flag +BuildRequires: lapack, blas, lam >= 7.1.1-5 +Requires: lapack, blas, lam >= 7.1.1-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blacs-shared.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -31,11 +35,20 @@ parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. +%package devel +Summary: Development libraries for blacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for blacs. + %prep %setup -q -c -n %{name} %setup -q -D -T -a 1 -n %{name} +%patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 +%ifarch ppc64 sparc64 x86_64 ia64 cp -f %{SOURCE9} ./Bmake.inc %else cp -f %{SOURCE2} . @@ -44,10 +57,10 @@ %build cd BLACS/ make mpi + cd TESTING/ make -cd .. -cd .. +cd ../.. cp %{SOURCE3} mpi_prop.ps cp %{SOURCE4} blacs_install.ps @@ -62,13 +75,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} cd BLACS/LIB -for f in *.a; do +for f in *.a *.so*; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done cd ../TESTING/EXE cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir} cd ${RPM_BUILD_ROOT}%{_libdir} +for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do + ln -fs $i.so.1.0.0 $i.so.1 + ln -s $i.so.1.0.0 $i.so +done +cd .. %post -p /sbin/ldconfig @@ -78,12 +96,22 @@ rm -fr ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,0755) %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps %{_bindir}/x*test_MPI-LINUX-0 -%{_libdir}/libmpiblacs* +%{_libdir}/libmpiblacs*.so.* + +%files devel +%defattr(-,root,root,0755) +%{_libdir}/libmpiblacs*.a +%{_libdir}/libmpiblacs*.so %changelog +* Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 +- split static lib and .so into -devel package +- fix Bmake files for shared library support +- build shared libraries + * Tue May 10 2005 Tom "spot" Callaway 1.1-8 - g77 needs some special compile flags, edited Bmake.inc* From fedora-extras-commits at redhat.com Tue Jul 12 19:46:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 12 Jul 2005 15:46:25 -0400 Subject: rpms/blacs/FC-3 Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.6, 1.7 Message-ID: <200507121946.j6CJkuUd011353@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/FC-3 Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: shared lib version of blacs Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/Bmake.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Bmake.inc 10 May 2005 19:23:54 -0000 1.3 +++ Bmake.inc 12 Jul 2005 19:46:23 -0000 1.4 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = g77 - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/Bmake.inc.64bit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc.64bit 10 May 2005 19:23:54 -0000 1.2 +++ Bmake.inc.64bit 12 Jul 2005 19:46:23 -0000 1.3 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib64 MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = g77 - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6 +++ blacs.spec 12 Jul 2005 19:46:23 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -16,9 +16,13 @@ Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit BuildRequires: gcc-g77 -BuildRequires: lapack, blas, lam -Requires: lapack, blas, lam +# Lam before 7.1.1-5 is missing: +# -shared library support +# -fPIC compilation flag +BuildRequires: lapack, blas, lam >= 7.1.1-5 +Requires: lapack, blas, lam >= 7.1.1-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blacs-shared.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -31,11 +35,20 @@ parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. +%package devel +Summary: Development libraries for blacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for blacs. + %prep %setup -q -c -n %{name} %setup -q -D -T -a 1 -n %{name} +%patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 +%ifarch ppc64 sparc64 x86_64 ia64 cp -f %{SOURCE9} ./Bmake.inc %else cp -f %{SOURCE2} . @@ -44,10 +57,10 @@ %build cd BLACS/ make mpi + cd TESTING/ make -cd .. -cd .. +cd ../.. cp %{SOURCE3} mpi_prop.ps cp %{SOURCE4} blacs_install.ps @@ -62,13 +75,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} cd BLACS/LIB -for f in *.a; do +for f in *.a *.so*; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done cd ../TESTING/EXE cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir} cd ${RPM_BUILD_ROOT}%{_libdir} +for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do + ln -fs $i.so.1.0.0 $i.so.1 + ln -s $i.so.1.0.0 $i.so +done +cd .. %post -p /sbin/ldconfig @@ -78,12 +96,22 @@ rm -fr ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,0755) %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps %{_bindir}/x*test_MPI-LINUX-0 -%{_libdir}/libmpiblacs* +%{_libdir}/libmpiblacs*.so.* + +%files devel +%defattr(-,root,root,0755) +%{_libdir}/libmpiblacs*.a +%{_libdir}/libmpiblacs*.so %changelog +* Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 +- split static lib and .so into -devel package +- fix Bmake files for shared library support +- build shared libraries + * Tue May 10 2005 Tom "spot" Callaway 1.1-8 - g77 needs some special compile flags, edited Bmake.inc* From fedora-extras-commits at redhat.com Tue Jul 12 19:46:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 12 Jul 2005 15:46:26 -0400 Subject: rpms/blacs/FC-4 Bmake.inc, 1.1, 1.2 Bmake.inc.64bit, 1.1, 1.2 blacs.spec, 1.6, 1.7 Message-ID: <200507121946.j6CJku8O011358@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/FC-4 Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: shared lib version of blacs Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc 24 Apr 2005 17:42:47 -0000 1.1 +++ Bmake.inc 12 Jul 2005 19:46:24 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc.64bit,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc.64bit 5 May 2005 14:43:52 -0000 1.1 +++ Bmake.inc.64bit 12 Jul 2005 19:46:24 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib64 MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6 +++ blacs.spec 12 Jul 2005 19:46:24 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -16,9 +16,13 @@ Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit BuildRequires: gcc-gfortran -BuildRequires: lapack, blas, lam -Requires: lapack, blas, lam +# Lam before 7.1.1-5 is missing: +# -shared library support +# -fPIC compilation flag +BuildRequires: lapack, blas, lam >= 7.1.1-5 +Requires: lapack, blas, lam >= 7.1.1-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blacs-shared.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -31,11 +35,20 @@ parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. +%package devel +Summary: Development libraries for blacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for blacs. + %prep %setup -q -c -n %{name} %setup -q -D -T -a 1 -n %{name} +%patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 +%ifarch ppc64 sparc64 x86_64 ia64 cp -f %{SOURCE9} ./Bmake.inc %else cp -f %{SOURCE2} . @@ -44,10 +57,10 @@ %build cd BLACS/ make mpi + cd TESTING/ make -cd .. -cd .. +cd ../.. cp %{SOURCE3} mpi_prop.ps cp %{SOURCE4} blacs_install.ps @@ -62,13 +75,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} cd BLACS/LIB -for f in *.a; do +for f in *.a *.so*; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done cd ../TESTING/EXE cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir} cd ${RPM_BUILD_ROOT}%{_libdir} +for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do + ln -fs $i.so.1.0.0 $i.so.1 + ln -s $i.so.1.0.0 $i.so +done +cd .. %post -p /sbin/ldconfig @@ -78,12 +96,22 @@ rm -fr ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,0755) %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps %{_bindir}/x*test_MPI-LINUX-0 -%{_libdir}/libmpiblacs* +%{_libdir}/libmpiblacs*.so.* + +%files devel +%defattr(-,root,root,0755) +%{_libdir}/libmpiblacs*.a +%{_libdir}/libmpiblacs*.so %changelog +* Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 +- split static lib and .so into -devel package +- fix Bmake files for shared library support +- build shared libraries + * Tue May 10 2005 Tom "spot" Callaway 1.1-8 - g77 needs some special compile flags, edited Bmake.inc* From fedora-extras-commits at redhat.com Tue Jul 12 19:59:21 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 12 Jul 2005 15:59:21 -0400 Subject: rpms/bash-completion/FC-4 .cvsignore, 1.6, 1.7 bash-completion.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200507121959.j6CJxLiv011479@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11444/FC-4 Modified Files: .cvsignore bash-completion.spec sources Log Message: 20050712. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2005 18:50:09 -0000 1.6 +++ .cvsignore 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -bash-completion-20050121.tar.bz2 +bash-completion-20050712.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bash-completion.spec 3 Mar 2005 19:46:39 -0000 1.7 +++ bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 @@ -1,12 +1,12 @@ Name: bash-completion -Version: 20050121 -Release: 2 +Version: 20050712 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2 +Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -127,6 +127,9 @@ %changelog +* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +- 20050712. + * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2005 18:50:09 -0000 1.6 +++ sources 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 +4f38a59eabf97a6dd7db0f10c0ee5063 bash-completion-20050712.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 12 19:59:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 12 Jul 2005 15:59:22 -0400 Subject: rpms/bash-completion/devel .cvsignore, 1.6, 1.7 bash-completion.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200507121959.j6CJxMCr011487@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11444/devel Modified Files: .cvsignore bash-completion.spec sources Log Message: 20050712. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2005 18:50:09 -0000 1.6 +++ .cvsignore 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -bash-completion-20050121.tar.bz2 +bash-completion-20050712.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bash-completion.spec 3 Mar 2005 19:46:39 -0000 1.7 +++ bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 @@ -1,12 +1,12 @@ Name: bash-completion -Version: 20050121 -Release: 2 +Version: 20050712 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2 +Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -127,6 +127,9 @@ %changelog +* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +- 20050712. + * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2005 18:50:09 -0000 1.6 +++ sources 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 +4f38a59eabf97a6dd7db0f10c0ee5063 bash-completion-20050712.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 12 20:12:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 12 Jul 2005 16:12:34 -0400 Subject: extras-buildsys/server CONFIG.py, 1.17, 1.18 PackageJob.py, 1.5, 1.6 main.py, 1.8, 1.9 Message-ID: <200507122012.j6CKCYwh012700@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644/server Modified Files: CONFIG.py PackageJob.py main.py Log Message: 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running * Add aliasing/mapping of plague targets to CVS targets, to allow for different CVS directory names than what our targets are Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- CONFIG.py 11 Jul 2005 00:30:36 -0000 1.17 +++ CONFIG.py 12 Jul 2005 20:12:32 -0000 1.18 @@ -57,6 +57,16 @@ # config_opts['targets'] = { 'devel' : ['i386'] } + +# If you're using CVS building, sometimes the CVS directory layout won't match +# the targets we've defined in config_opts['target']. Add aliases for them +# here, like "{ 'devel': 'development', '4': 'FC-4' } +# +# Mapping - our_target: cvs_target + +config_opts['cvs_target_map'] = {} + + # Target Optional Arches # # These are arches that submitters _may_ build packages on, but packages won't Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PackageJob.py 10 Jul 2005 19:59:32 -0000 1.5 +++ PackageJob.py 12 Jul 2005 20:12:32 -0000 1.6 @@ -286,8 +286,17 @@ def _make_srpm(self): self._set_cur_stage('make_srpm') + + # Map our target (self.target) to the CVS target alias, since CVS may have + # different target names that we expose + cvs_target_map = config_opts['cvs_target_map'] + try: + cvs_target = cvs_target_map[self.target] + except KeyError: + cvs_target = self.target + self.srpm_path = None - srpm_dir = os.path.join(self.checkout_tmpdir, self.package, self.target) + srpm_dir = os.path.join(self.checkout_tmpdir, self.package, cvs_target) if not os.path.exists(srpm_dir): msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) raise PrepError(msg) Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- main.py 11 Jul 2005 15:22:56 -0000 1.8 +++ main.py 12 Jul 2005 20:12:32 -0000 1.9 @@ -18,6 +18,7 @@ import sys import os +import socket from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer @@ -101,16 +102,22 @@ # Create the BuildMaster XMLRPC server UI_PORT = 8887 ui = None - if config_opts['ssl_frontend'] == True: - ui_certs = {} - ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] - ui_certs['ca_cert'] = config_opts['ca_cert'] - ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] - ui = UserInterfaceSSLAuth(builder_manager, bm) - bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) - else: - ui = UserInterfaceNoAuth(builder_manager, bm) - bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) + try: + if config_opts['ssl_frontend'] == True: + ui_certs = {} + ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] + ui_certs['ca_cert'] = config_opts['ca_cert'] + ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] + ui = UserInterfaceSSLAuth(builder_manager, bm) + bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) + else: + ui = UserInterfaceNoAuth(builder_manager, bm) + bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) + except socket.error, e: + if e[0] == 98: # Address already in use + print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) + os._exit(1) + bm_server.register_instance(ui) # SRPM fileserver From fedora-extras-commits at redhat.com Tue Jul 12 20:12:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 12 Jul 2005 16:12:28 -0400 Subject: extras-buildsys ChangeLog,1.52,1.53 Message-ID: <200507122012.j6CKCwqh012717@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644 Modified Files: ChangeLog Log Message: 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running * Add aliasing/mapping of plague targets to CVS targets, to allow for different CVS directory names than what our targets are Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ChangeLog 11 Jul 2005 03:23:21 -0000 1.52 +++ ChangeLog 12 Jul 2005 20:12:23 -0000 1.53 @@ -1,3 +1,11 @@ +2005-07-12 Dan Williams + + * Warn user and exit if server or builder is already running + + * Add aliasing/mapping of plague targets to CVS targets, to + allow for different CVS directory names than what our + targets are + 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams From fedora-extras-commits at redhat.com Tue Jul 12 20:12:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 12 Jul 2005 16:12:33 -0400 Subject: extras-buildsys/builder builder.py,1.12,1.13 Message-ID: <200507122013.j6CKD3i6012720@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644/builder Modified Files: builder.py Log Message: 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running * Add aliasing/mapping of plague targets to CVS targets, to allow for different CVS directory names than what our targets are Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- builder.py 10 Jul 2005 07:17:14 -0000 1.12 +++ builder.py 12 Jul 2005 20:12:30 -0000 1.13 @@ -678,10 +678,16 @@ print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) xmlrpc_port = config_opts['xmlrpc_port'] - if config_opts['ssl_buildserver']: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) - else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None) + try: + if config_opts['ssl_buildserver']: + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) + else: + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_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?" % (g_our_hostname, xmlrpc_port) + os._exit(1) + bcs = XMLRPCBuilderServer(localarches) xmlserver.register_instance(bcs) From fedora-extras-commits at redhat.com Tue Jul 12 20:20:50 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 16:20:50 -0400 Subject: web/include navigation.inc,1.6,1.7 Message-ID: <200507122020.j6CKKoqv012840@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12823 Modified Files: navigation.inc Log Message: add systemtap to projects list Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- navigation.inc 24 Jun 2005 16:02:32 -0000 1.6 +++ navigation.inc 12 Jul 2005 20:20:48 -0000 1.7 @@ -37,6 +37,7 @@ //"QA"=>array("uri"=>"/projects/qa/"), "SELinux"=>array("uri"=>"/projects/selinux/"), "Stateless Linux"=>array("uri"=>"/projects/stateless/"), + "SystemTap"=>array("uri"=>"/projects/systemtap/"), "Translations"=>array("uri"=>"/projects/translations/"), "Virtualization"=>array("uri"=>"/projects/virtualization/"), //"Additional Projects"=>array("uri"=>"/projects/additional-projects/"), From fedora-extras-commits at redhat.com Tue Jul 12 21:51:49 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 17:51:49 -0400 Subject: rpms/mercurial/devel .cvsignore, 1.2, 1.3 mercurial.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507122151.j6CLpnDm014394@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14373 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.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 12 Jul 2005 21:51:47 -0000 1.3 @@ -1 +1 @@ -mercurial-0.6.tar.gz +mercurial-0.6b.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mercurial.spec 1 Jul 2005 19:53:16 -0000 1.1 +++ mercurial.spec 12 Jul 2005 21:51:47 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6 +Version: 0.6b Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Jul 12 2005 Jeremy Katz - 0.6b +- update to new upstream 0.6b + * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 19:53:16 -0000 1.2 +++ sources 12 Jul 2005 21:51:47 -0000 1.3 @@ -1 +1 @@ -25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz +502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 21:52:40 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 17:52:40 -0400 Subject: rpms/mercurial/FC-3 mercurial.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200507122152.j6CLqeiR014453@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14434 Modified Files: mercurial.spec sources Log Message: * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/mercurial.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mercurial.spec 1 Jul 2005 19:53:16 -0000 1.1 +++ mercurial.spec 12 Jul 2005 21:52:38 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6 +Version: 0.6b Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Jul 12 2005 Jeremy Katz - 0.6b +- update to new upstream 0.6b + * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 19:53:16 -0000 1.2 +++ sources 12 Jul 2005 21:52:38 -0000 1.3 @@ -1 +1 @@ -25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz +502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 21:52:53 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 17:52:53 -0400 Subject: rpms/mercurial/FC-4 mercurial.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200507122152.j6CLqroP014507@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14488 Modified Files: mercurial.spec sources Log Message: * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mercurial.spec 1 Jul 2005 19:53:16 -0000 1.1 +++ mercurial.spec 12 Jul 2005 21:52:51 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6 +Version: 0.6b Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Jul 12 2005 Jeremy Katz - 0.6b +- update to new upstream 0.6b + * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 19:53:16 -0000 1.2 +++ sources 12 Jul 2005 21:52:51 -0000 1.3 @@ -1 +1 @@ -25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz +502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 22:35:38 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 12 Jul 2005 18:35:38 -0400 Subject: rpms/nfswatch/devel .cvsignore, 1.2, 1.3 nfswatch.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507122235.j6CMZcZM015931@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/nfswatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15910 Modified Files: .cvsignore nfswatch.spec sources Log Message: New upstream version 4.99.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nfswatch/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2005 08:05:17 -0000 1.2 +++ .cvsignore 12 Jul 2005 22:35:35 -0000 1.3 @@ -1 +1 @@ -nfswatch-4.99.2.tar.gz +nfswatch-4.99.4.tar.gz Index: nfswatch.spec =================================================================== RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nfswatch.spec 1 Jun 2005 12:42:01 -0000 1.3 +++ nfswatch.spec 12 Jul 2005 22:35:35 -0000 1.4 @@ -1,13 +1,13 @@ # $Id$ Summary: An NFS traffic monitoring tool Name: nfswatch -Version: 4.99.2 -Release: 3%{?dist} +Version: 4.99.4 +Release: 1%{?dist} License: BSD URL: http://nfswatch.sourceforge.net Group: Applications/Internet -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sf.net/nfswatch/%{name}-%{version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,50 +47,20 @@ %{_mandir}/man8/* %changelog -* Wed Jun 1 2005 Christian Iseli +* Tue Jul 12 2005 Christian Iseli 4.99.4-1 + - new upstream version + +* Wed Jun 1 2005 Christian Iseli 4.99.2-3 - rebuilt -* Mon May 09 2005 Christian Iseli +* Mon May 09 2005 Christian Iseli 4.99.2-2 - rebuilt -* Fri Apr 22 2005 Christian Iseli - - 2005-04-22 17:50 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.2. - - 2005-04-22 17:46 c4chris - * nfswatch.spec: Fix spec file for Fedora Extras. - - 2005-04-22 17:30 c4chris - * Makefile: Handle RPM_OPT_FLAGS in Makefile. - - 2005-02-25 22:54 c4chris - * rpcfilter.c, rpcutil.c, xdr.c: Add a few comments. - - 2005-02-25 17:49 c4chris - * nfswatch.spec: Update changelog. - -* Fri Feb 25 2005 Christian Iseli - - 2005-02-25 17:43 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.1. - - 2005-02-25 17:34 c4chris - * nfswatch.h, util.c: Fix c_proc size in a couple structures. - - 2005-02-25 16:14 c4chris - * nfswatch.8: Add Linux info to man page. - - 2005-02-25 15:09 c4chris - * rpcutil.c: Fix xdr_callmsg usage on 64-bit Linux. - - 2005-02-25 10:52 c4chris - * linux.map.h, netaddr.c, parsenfsfh.c, rpcfilter.c, util.c: Parse - NFS file handles in Linux. - - 2005-02-23 23:50 c4chris - * linux.map.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c: Get NFS3 to compile on Linux. Cleanup a bit. - - 2005-02-23 22:41 c4chris - * Makefile, externs.h, rpcdefs.h, rpcfilter.c, xdr.c: Finish NFS3 - setup for Solaris. - - 2005-02-23 16:11 c4chris - * externs.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c, xdr.c: Started crude hack to get NFS3 working - on Solaris. - - 2005-02-07 19:21 c4chris - * linux.map.h, nfslogsum.c, nfswatch.h, osf.map.h, pktfilter.c, - rpcfilter.c, sgi.map.h, ultrix.map.h, util.c: Start work on - NFSv3. Remove ND (Sun's network disk) stuff. +* Fri Apr 22 2005 Christian Iseli 4.99.2-1 + - new upstream version + +* Fri Feb 25 2005 Christian Iseli 4.99.1-1 + - new upstream version -* Sun Feb 6 2005 Christian Iseli +* Sun Feb 6 2005 Christian Iseli 4.99.0-1 - Create spec file. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nfswatch/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2005 08:05:17 -0000 1.2 +++ sources 12 Jul 2005 22:35:35 -0000 1.3 @@ -1 +1 @@ -874d4206284725c2373c20565bc31539 nfswatch-4.99.2.tar.gz +2e287f204158dafe830fbf4341aecf66 nfswatch-4.99.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 22:41:34 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 12 Jul 2005 18:41:34 -0400 Subject: rpms/nfswatch/FC-4 .cvsignore, 1.2, 1.3 nfswatch.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507122241.j6CMfYP8016006@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/nfswatch/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985 Modified Files: .cvsignore nfswatch.spec sources Log Message: New upstream version 4.99.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nfswatch/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2005 08:05:17 -0000 1.2 +++ .cvsignore 12 Jul 2005 22:41:32 -0000 1.3 @@ -1 +1 @@ -nfswatch-4.99.2.tar.gz +nfswatch-4.99.4.tar.gz Index: nfswatch.spec =================================================================== RCS file: /cvs/extras/rpms/nfswatch/FC-4/nfswatch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nfswatch.spec 1 Jun 2005 12:39:40 -0000 1.3 +++ nfswatch.spec 12 Jul 2005 22:41:32 -0000 1.4 @@ -1,13 +1,13 @@ # $Id$ Summary: An NFS traffic monitoring tool Name: nfswatch -Version: 4.99.2 -Release: 3%{?dist} +Version: 4.99.4 +Release: 1%{?dist} License: BSD URL: http://nfswatch.sourceforge.net Group: Applications/Internet -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sf.net/nfswatch/%{name}-%{version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,50 +47,20 @@ %{_mandir}/man8/* %changelog -* Wed Jun 1 2005 Christian Iseli +* Tue Jul 12 2005 Christian Iseli 4.99.4-1 + - new upstream version + +* Wed Jun 1 2005 Christian Iseli 4.99.2-3 - rebuilt for FC4 -* Mon May 09 2005 Christian Iseli +* Mon May 09 2005 Christian Iseli 4.99.2-2 - rebuilt -* Fri Apr 22 2005 Christian Iseli - - 2005-04-22 17:50 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.2. - - 2005-04-22 17:46 c4chris - * nfswatch.spec: Fix spec file for Fedora Extras. - - 2005-04-22 17:30 c4chris - * Makefile: Handle RPM_OPT_FLAGS in Makefile. - - 2005-02-25 22:54 c4chris - * rpcfilter.c, rpcutil.c, xdr.c: Add a few comments. - - 2005-02-25 17:49 c4chris - * nfswatch.spec: Update changelog. - -* Fri Feb 25 2005 Christian Iseli - - 2005-02-25 17:43 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.1. - - 2005-02-25 17:34 c4chris - * nfswatch.h, util.c: Fix c_proc size in a couple structures. - - 2005-02-25 16:14 c4chris - * nfswatch.8: Add Linux info to man page. - - 2005-02-25 15:09 c4chris - * rpcutil.c: Fix xdr_callmsg usage on 64-bit Linux. - - 2005-02-25 10:52 c4chris - * linux.map.h, netaddr.c, parsenfsfh.c, rpcfilter.c, util.c: Parse - NFS file handles in Linux. - - 2005-02-23 23:50 c4chris - * linux.map.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c: Get NFS3 to compile on Linux. Cleanup a bit. - - 2005-02-23 22:41 c4chris - * Makefile, externs.h, rpcdefs.h, rpcfilter.c, xdr.c: Finish NFS3 - setup for Solaris. - - 2005-02-23 16:11 c4chris - * externs.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c, xdr.c: Started crude hack to get NFS3 working - on Solaris. - - 2005-02-07 19:21 c4chris - * linux.map.h, nfslogsum.c, nfswatch.h, osf.map.h, pktfilter.c, - rpcfilter.c, sgi.map.h, ultrix.map.h, util.c: Start work on - NFSv3. Remove ND (Sun's network disk) stuff. +* Fri Apr 22 2005 Christian Iseli 4.99.2-1 + - new upstream version + +* Fri Feb 25 2005 Christian Iseli 4.99.1-1 + - new upstream version -* Sun Feb 6 2005 Christian Iseli +* Sun Feb 6 2005 Christian Iseli 4.99.0-1 - Create spec file. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nfswatch/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2005 08:05:17 -0000 1.2 +++ sources 12 Jul 2005 22:41:32 -0000 1.3 @@ -1 +1 @@ -874d4206284725c2373c20565bc31539 nfswatch-4.99.2.tar.gz +2e287f204158dafe830fbf4341aecf66 nfswatch-4.99.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 22:58:53 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 12 Jul 2005 18:58:53 -0400 Subject: CVSROOT avail,1.8,1.9 Message-ID: <200507122258.j6CMwrwJ016091@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072 Modified Files: avail Log Message: Adding a row for the FDP page, and a newly trained committer. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- avail 5 Jul 2005 22:04:21 -0000 1.8 +++ avail 12 Jul 2005 22:58:51 -0000 1.9 @@ -45,3 +45,5 @@ unavail | | fedora-security avail | mjc,bressers,jorton,notting,gafton,sopwith,katzj | fedora-security + +avail | pfrields | web/html/projects/docs From ed at eh3.com Wed Jul 13 00:01:11 2005 From: ed at eh3.com (Ed Hill) Date: Tue, 12 Jul 2005 20:01:11 -0400 Subject: APPROVED: keychain Message-ID: <1121212871.15220.17.camel@ernie> Package summary: Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents. It acts as a front-end to the agents, allowing you to easily have one long-running agent process per system, rather than per login session. This dramatically reduces the number of times you need to enter your passphrase from once per new login session to once every time your local machine is rebooted. Maintainer: Alexander Dalloz Reviewers: Ed Hill, Ville Skytt?, Chris Grau -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Wed Jul 13 07:55:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:55:53 -0400 Subject: rpms/gkrellm-freq/devel - New directory Message-ID: <200507130755.j6D7trMO029577@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29552/gkrellm-freq/devel Log Message: Directory /cvs/extras/rpms/gkrellm-freq/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 07:55:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:55:53 -0400 Subject: rpms/gkrellm-freq - New directory Message-ID: <200507130755.j6D7trnX029572@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29552/gkrellm-freq Log Message: Directory /cvs/extras/rpms/gkrellm-freq added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 07:56:19 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:56:19 -0400 Subject: rpms/gkrellm-freq Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507130756.j6D7uJ0L029628@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29597 Added Files: Makefile import.log Log Message: Setup of module gkrellm-freq --- NEW FILE Makefile --- # Top level Makefile for module gkrellm-freq all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 13 07:56:20 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:56:20 -0400 Subject: rpms/gkrellm-freq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507130756.j6D7uKZa029633@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29597/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gkrellm-freq --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Jul 13 07:57:09 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Wed, 13 Jul 2005 09:57:09 +0200 Subject: APPROVED : gkrellm-aclock & gkrellm-freq Message-ID: <20050713095709.24b68c50@python2> gkrellm-aclock : Analog clock plugin for GKrellM, the GNU Krell Monitor. gkrellm-freq : This plugin for GKrellM, the GNU Krell Monitor, displays the current CPU speed using the "dynamic" cpufrequency scheme. Maintainer : Matthias Saou Reviewer : Michael Schwendt -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1390_FC4.s3 Load : 0.41 0.52 0.46 From fedora-extras-commits at redhat.com Wed Jul 13 07:57:05 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:57:05 -0400 Subject: rpms/gkrellm-freq import.log,1.1,1.2 Message-ID: <200507130757.j6D7vZuP029695@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29661 Modified Files: import.log Log Message: auto-import gkrellm-freq-0.1.1-1 on branch devel from gkrellm-freq-0.1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jul 2005 07:56:17 -0000 1.1 +++ import.log 13 Jul 2005 07:57:03 -0000 1.2 @@ -0,0 +1 @@ +gkrellm-freq-0_1_1-1:HEAD:gkrellm-freq-0.1.1-1.src.rpm:1121241411 From fedora-extras-commits at redhat.com Wed Jul 13 07:57:06 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:57:06 -0400 Subject: rpms/gkrellm-freq/devel gkrellm-freq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507130757.j6D7va6v029699@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29661/devel Modified Files: .cvsignore sources Added Files: gkrellm-freq.spec Log Message: auto-import gkrellm-freq-0.1.1-1 on branch devel from gkrellm-freq-0.1.1-1.src.rpm --- NEW FILE gkrellm-freq.spec --- %define gkplugindir %{_libdir}/gkrellm2/plugins Summary: CPU frequency display plugin for GKrellM Name: gkrellm-freq Version: 0.1.1 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.peakunix.net/gkfreq/ Source: http://www.peakunix.net/downloads/gkfreq-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gkrellm >= 2.2.0 BuildRequires: gkrellm-devel >= 2.2.0 %description This plugin for GKrellM, the GNU Krell Monitor, displays the current CPU speed using the "dynamic" cpufrequency scheme. %prep %setup -n gkfreq-%{version} %build # Trivial manual build, the "build" script does the same without our optflags %{__cc} %{optflags} -fPIC `pkg-config gtk+-2.0 --cflags` -c gkfreq.c %{__cc} %{optflags} -fPIC -shared -o gkfreq.so gkfreq.o %install %{__rm} -rf %{buildroot} %{__install} -D -m 0755 gkfreq.so \ %{buildroot}%{gkplugindir}/gkfreq.so %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc CHANGES COPYING README %{gkplugindir}/gkfreq.so %changelog * Tue Jul 12 2005 Matthias Saou 0.1.1-1 - Initial RPM release, split out from my old gkrellm-plugins package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2005 07:56:17 -0000 1.1 +++ .cvsignore 13 Jul 2005 07:57:03 -0000 1.2 @@ -0,0 +1 @@ +gkfreq-0.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2005 07:56:18 -0000 1.1 +++ sources 13 Jul 2005 07:57:03 -0000 1.2 @@ -0,0 +1 @@ +d4186d02a9fbc55bbf1854399e78946a gkfreq-0.1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 08:00:51 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:00:51 -0400 Subject: rpms/gkrellm-aclock - New directory Message-ID: <200507130800.j6D80p0V029813@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29789/gkrellm-aclock Log Message: Directory /cvs/extras/rpms/gkrellm-aclock added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 08:00:52 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:00:52 -0400 Subject: rpms/gkrellm-aclock/devel - New directory Message-ID: <200507130800.j6D80qve029818@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29789/gkrellm-aclock/devel Log Message: Directory /cvs/extras/rpms/gkrellm-aclock/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 08:01:51 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:01:51 -0400 Subject: rpms/gkrellm-aclock Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507130801.j6D81pEF030915@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30901 Added Files: Makefile import.log Log Message: Setup of module gkrellm-aclock --- NEW FILE Makefile --- # Top level Makefile for module gkrellm-aclock all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 13 08:02:16 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:02:16 -0400 Subject: rpms/gkrellm-aclock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507130802.j6D82GjO030936@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30901/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gkrellm-aclock --- NEW 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 Jul 13 08:06:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:06:47 -0400 Subject: rpms/gkrellm-aclock import.log,1.1,1.2 Message-ID: <200507130807.j6D87Jfl031286@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31252 Modified Files: import.log Log Message: auto-import gkrellm-aclock-0.3.3-1 on branch devel from gkrellm-aclock-0.3.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jul 2005 08:01:49 -0000 1.1 +++ import.log 13 Jul 2005 08:06:30 -0000 1.2 @@ -0,0 +1 @@ +gkrellm-aclock-0_3_3-1:HEAD:gkrellm-aclock-0.3.3-1.src.rpm:1121241930 From fedora-extras-commits at redhat.com Wed Jul 13 08:06:50 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:06:50 -0400 Subject: rpms/gkrellm-aclock/devel gkrellm-aclock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507130807.j6D87QbP031288@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31252/devel Modified Files: .cvsignore sources Added Files: gkrellm-aclock.spec Log Message: auto-import gkrellm-aclock-0.3.3-1 on branch devel from gkrellm-aclock-0.3.3-1.src.rpm --- NEW FILE gkrellm-aclock.spec --- %define gkplugindir %{_libdir}/gkrellm2/plugins Summary: Analog clock plugin for GKrellM Name: gkrellm-aclock Version: 0.3.3 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.geocities.com/m_muthukumar/gkrellaclock.html Source: http://www.geocities.com/m_muthukumar/gkrellaclock-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gkrellm >= 2.2.0 BuildRequires: gkrellm-devel >= 2.2.0 %description Analog clock plugin for GKrellM, the GNU Krell Monitor. %prep %setup -n gkrellAclock-%{version} %build %{__make} CFLAGS="%{optflags}" %install %{__rm} -rf %{buildroot} %{__install} -D -m 0755 gkrellaclock.so \ %{buildroot}%{gkplugindir}/gkrellaclock.so %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog README %{gkplugindir}/gkrellaclock.so %changelog * Tue Jul 12 2005 Matthias Saou 0.3.3-1 - Initial RPM release, split out from my old gkrellm-plugins package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2005 08:02:14 -0000 1.1 +++ .cvsignore 13 Jul 2005 08:06:47 -0000 1.2 @@ -0,0 +1 @@ +gkrellaclock-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2005 08:02:14 -0000 1.1 +++ sources 13 Jul 2005 08:06:47 -0000 1.2 @@ -0,0 +1 @@ +6524cd0f5e803071776e97075ed1462c gkrellaclock-0.3.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 08:16:07 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:16:07 -0400 Subject: owners owners.list,1.6,1.7 Message-ID: <200507130816.j6D8G7wr031614@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31597 Modified Files: owners.list Log Message: Added gkrellm-aclock and gkrellm-freq. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- owners.list 11 Jul 2005 20:35:18 -0000 1.6 +++ owners.list 13 Jul 2005 08:16:05 -0000 1.7 @@ -193,6 +193,8 @@ Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.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| Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|compton at pcompton.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 09:22:16 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 13 Jul 2005 05:22:16 -0400 Subject: fedora-security/audit fc4,1.20,1.21 Message-ID: <200507130922.j6D9MGUA000452@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv435 Modified Files: fc4 Log Message: Update based on FEDORA-2005-553 which is move to upstream 1.4.1 plus backported patches Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fc4 12 Jul 2005 07:55:53 -0000 1.20 +++ fc4 13 Jul 2005 09:22:13 -0000 1.21 @@ -39,6 +39,7 @@ 2005-1705 version (gdb, fixed 6.3) 2005-1704 version (gdb, fixed 6.3) 2005-1704 ** (binutils) [since FEDORA-2005-498] +2005-1689 backport (krb5) [since FEDORA-2005-553] 2005-1686 ignore (gedit, not a vulnerability) 2005-1636 VULNERABLE (mysql, fixed 4.1.12) minor issue 2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0 @@ -91,6 +92,8 @@ 2005-1228 backport (gzip) from srpm 2005-1194 backport (nasm) from srpm 2005-1184 ignore (kernel) expected to not be an issue +2005-1175 backport (krb5) [since FEDORA-2005-553] +2005-1174 backport (krb5) [since FEDORA-2005-553] 2005-1160 version (firefox, mozilla) 2005-1159 version (firefox, mozilla) 2005-1158 version (firefox, fixed 1.0.3) @@ -184,11 +187,12 @@ 2005-0504 version (kernel, doesn't build in 2.6) 2005-0490 version (curl, fixed 7.13.1) 2005-0488 VULNERABLE (telnet) [#159299] +2005-0488 backport (krb5) [since FEDORA-2005-553] 2005-0473 version (gaim, fixed 1.1.3) 2005-0472 version (gaim, fixed 1.1.3) -2005-0469 backport (krb5, fixed 1.4.1) patch in srpm +2005-0469 version (krb5, fixed 1.4.1) [since FEDORA-2005-553] was backport since GA 2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch -2005-0468 backport (krb5, fixed 1.4.1) patch in srpm +2005-0468 version (krb5, fixed 1.4.1) [since FEDORA-2005-553] was backport since GA 2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch 2005-0449 version (kernel, fixed 2.6.11) 2005-0448 VULNERABLE (perl) @@ -673,6 +677,7 @@ 2004-0177 version (kernel, fixed 2.6.6) 2004-0176 version (ethereal, fixed 0.10.3) 2004-0175 version (openssh, fixed 3.4p1) +2004-0175 backport (krb5) [since FEDORA-2005-553] 2004-0174 version (httpd, fixed 2.0.49) 2004-0173 version (httpd, fixed 2.0.49) 2004-0164 version (racoon) From fedora-extras-commits at redhat.com Wed Jul 13 09:26:48 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 05:26:48 -0400 Subject: common tobuild,1.1901,1.1902 Message-ID: <200507130926.j6D9Qmb7000524@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv507 Modified Files: tobuild Log Message: request build of rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1901 retrieving revision 1.1902 diff -u -r1.1901 -r1.1902 --- tobuild 12 Jul 2005 01:32:04 -0000 1.1901 +++ tobuild 13 Jul 2005 09:26:46 -0000 1.1902 @@ -45,3 +45,4 @@ tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 +thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 13 09:27:30 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 05:27:30 -0400 Subject: common tobuild,1.1902,1.1903 Message-ID: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv569 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1902 retrieving revision 1.1903 diff -u -r1.1902 -r1.1903 --- tobuild 13 Jul 2005 09:26:46 -0000 1.1902 +++ tobuild 13 Jul 2005 09:27:28 -0000 1.1903 @@ -46,3 +46,4 @@ tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel +thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 13 09:29:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:29:47 -0400 Subject: rpms/ddskk - New directory Message-ID: <200507130929.j6D9Tl1c000662@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642/ddskk Log Message: Directory /cvs/extras/rpms/ddskk added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 09:29:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:29:47 -0400 Subject: rpms/ddskk/devel - New directory Message-ID: <200507130929.j6D9TlY2000667@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642/ddskk/devel Log Message: Directory /cvs/extras/rpms/ddskk/devel added to the repository From paul at city-fan.org Wed Jul 13 09:29:57 2005 From: paul at city-fan.org (Paul Howarth) Date: Wed, 13 Jul 2005 10:29:57 +0100 Subject: common tobuild,1.1902,1.1903 In-Reply-To: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> References: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> Message-ID: <42D4DF15.8080304@city-fan.org> Matthias Saou (thias) wrote: > Author: thias > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv569 > > Modified Files: > tobuild > Log Message: > request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 for devel Did I miss a notification about the build system being re-enabled? Paul. From fedora-extras-commits at redhat.com Wed Jul 13 09:30:07 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:07 -0400 Subject: rpms/ddskk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507130930.j6D9U7lW000718@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687 Added Files: Makefile import.log Log Message: Setup of module ddskk --- NEW FILE Makefile --- # Top level Makefile for module ddskk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 13 09:30:07 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:07 -0400 Subject: rpms/ddskk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507130930.j6D9U7Q8000723@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ddskk --- NEW 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 Jul 13 09:30:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:46 -0400 Subject: rpms/ddskk import.log,1.1,1.2 Message-ID: <200507130930.j6D9UkE2000788@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756 Modified Files: import.log Log Message: auto-import ddskk-12.2.0-6 on branch devel from ddskk-12.2.0-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ddskk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jul 2005 09:30:04 -0000 1.1 +++ import.log 13 Jul 2005 09:30:44 -0000 1.2 @@ -0,0 +1 @@ +ddskk-12_2_0-6:HEAD:ddskk-12.2.0-6.src.rpm:1121247036 From fedora-extras-commits at redhat.com Wed Jul 13 09:30:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:47 -0400 Subject: rpms/ddskk/devel ddskk-init.el, NONE, 1.1 ddskk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507130930.j6D9UlZt000794@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756/devel Modified Files: .cvsignore sources Added Files: ddskk-init.el ddskk.spec Log Message: auto-import ddskk-12.2.0-6 on branch devel from ddskk-12.2.0-6.src.rpm --- NEW FILE ddskk-init.el --- ;;; ddskk-init.el (require 'skk-setup) (require 'skk-leim) (setq skk-server-host "localhost") (setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L") (setq skk-tut-file "/usr/share/skk/SKK.tut") --- NEW FILE ddskk.spec --- # [for Emacs] -*- coding: utf-8 -*- %define apelminver 10.2 %define pkgdir %{_datadir}/xemacs/mule-packages Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs Name: ddskk Version: 12.2.0 Release: 6 License: GPL Group: Applications/Editors URL: http://openlab.ring.gr.jp/skk/main.html Source0: http://openlab.ring.gr.jp/skk/maintrunk/ddskk-%{version}.tar.bz2 Source1: ddskk-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch BuildRequires: emacs, apel >= %{apelminver} Requires: apel >= %{apelminver} Provides: skk Obsoletes: skk, ddskk-el %description Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program, an input method of Japanese). It forked from the maintrunk, SKK version 10.56. It consists of a simple core and many optional programs which provide extensive features, however, our target is to more simplify core, and more expand its optional features. This package does not include dictionaries or a skkserver. Please install them separately. %package xemacs Summary: Daredevil SKK - Simple Kana to Kanji conversion program for XEmacs Group: Applications/Editors Requires: apel-xemacs BuildRequires: apel-xemacs, xemacs %description xemacs Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program, an input method of Japanese). It forked from the maintrunk, SKK version 10.56. It consists of a simple core and many optional programs which provide extensive features, however, our target is to more simplify core, and more expand its optional features. This package does not include dictionaries or a skkserver. Please install them separately. %prep %setup -q %build %install rm -fr %buildroot mkdir -p %buildroot%{_datadir}/emacs/site-lisp/site-start.d/ # needed for make install-info mkdir -p %buildroot%{_datadir}/info make EMACS=emacs PREFIX=%buildroot%{_prefix} \ SKK_LISPDIR=%buildroot%{_datadir}/emacs/site-lisp/ddskk install install -m 644 etc/SKK.tut %buildroot%{_datadir}/skk install -m 644 etc/SKK.tut.E %buildroot%{_datadir}/skk install -m 644 %SOURCE1 %buildroot%{_datadir}/emacs/site-lisp/site-start.d rm -f %buildroot/%{_infodir}/dir make clean make PACKAGEDIR=%buildroot%{pkgdir} install-package # don't compress ja info pages %define __os_install_post %{nil} %clean rm -fr %buildroot %post /sbin/install-info %{_infodir}/skk.info %{_infodir}/dir %preun /sbin/install-info --delete %{_infodir}/skk.info %{_infodir}/dir %files %defattr(-,root,root) %doc ChangeLog READMEs %{_datadir}/emacs/site-lisp/ddskk %{_datadir}/emacs/site-lisp/site-start.d/ddskk-init.el %{_datadir}/skk %{_infodir}/* %files xemacs defattr(-,root,root) %doc ChangeLog READMEs %{pkgdir} %changelog * Wed Jul 13 2005 Jens Petersen - 12.2.0-6 - initial import to Fedora Extras - bring back the xemacs subpackages * Wed Feb 23 2005 Elliot Lee 12.2.0-5 - Remove xemacs * Wed Oct 6 2004 Jens Petersen - 12.2.0-4 - drop requirements on emacs/xemacs for -nox users (Lars Hupfeldt Nielsen, 134479) * Wed Sep 22 2004 Jens Petersen - 12.2.0-3 - clean up ddskk-init.el * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Nov 5 2003 Jens Petersen - 12.2.0-1 - 12.2.0 release - ddskk-11.6.0-tmp-file.patch no longer needed * Mon Jul 28 2003 Jens Petersen - 11.6.0-12 - ddskk no longer provides ddskk-el - don't compress Japanese info files - install/uninstall info manual in info dir file during post/preun * Thu Jul 10 2003 Jens Petersen - 11.6.0-11 - apply ddskk-11.6.0-tmp-file.patch from debian to fix temp file vulnerability CAN-2003-0539 (#98924) * Wed Jan 22 2003 Tim Powers - rebuilt * Tue Dec 24 2002 Jens Petersen 11.6.0-9 - place xemacs package under datadir - setup quietly - use buildroot macro instead of RPM_BUILD_ROOT - include info files except info dir file - own mule-packages and down - update url - encode spec file in utf-8 * Fri Jun 21 2002 Tim Powers - automated rebuild * Thu May 23 2002 Tim Powers - automated rebuild * Mon Mar 11 2002 Jens Petersen 21.6.0-6 - provide ddskk-el to make rpmlint happy - don't buildrequire semi * Mon Feb 25 2002 Jens Petersen 21.6.0-5 - free ride through the build system * Thu Jan 31 2002 Jens Petersen 21.6.0-4 - install in mule-packages not site-packages - own lisp/skk dir * Wed Jan 09 2002 Tim Powers 21.6.0-3 - automated rebuild * Tue Jan 8 2002 Jens Petersen 21.6.0-2 - Updated changelog entry below for 21.6.0-1 * Tue Jan 8 2002 Jens Petersen 21.6.0-1 - Update to 11.6.0 release - Make XEmacs package - Add filevar for iso-8859-1 coding for teg - Don't need to mkdir site-lisp/ddskk datadir/skk, but need datadir/info * Wed Aug 29 2001 Trond Eivind Glomsr??d 21.3.20010617-2 - Add semi as a BuildPrereq (#45159) - s/Copyright/License/ - Don't define a name on top and then use it in the header * Mon Jun 25 2001 SATO Satoru 21.3.20010617-1 - 2001.6.17 - fix the dependency (now we have the apel alone). - ddskk-el is disused * Wed Feb 28 2001 SATO Satoru - fix the Group * Wed Feb 28 2001 SATO Satoru - fix the dependencies: [Build]Requires - add ddskk-init.el * Wed Feb 28 2001 SATO Satoru - rebuild to re-import into the tree - new upstream snapshot * Mon Dec 28 2000 SATO Satoru - fix SPEC * Mon Dec 25 2000 SATO Satoru - new upstream (cvs current snapshot) * Mon Sep 11 2000 Matt Wilson - added %%defattr(-,root,root) to the el subpackage * Tue Sep 6 2000 Satoru Sato - fix SPEC (check dependencies) * Tue Sep 5 2000 Satoru Sato - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ddskk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2005 09:30:05 -0000 1.1 +++ .cvsignore 13 Jul 2005 09:30:45 -0000 1.2 @@ -0,0 +1 @@ +ddskk-12.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ddskk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2005 09:30:05 -0000 1.1 +++ sources 13 Jul 2005 09:30:45 -0000 1.2 @@ -0,0 +1 @@ +3b0f2a2ff13508d6dbb2a3b09369c444 ddskk-12.2.0.tar.bz2 From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Jul 13 09:33:21 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Wed, 13 Jul 2005 11:33:21 +0200 Subject: common tobuild,1.1902,1.1903 In-Reply-To: <42D4DF15.8080304@city-fan.org> References: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> <42D4DF15.8080304@city-fan.org> Message-ID: <20050713113321.3eaa441c@python2> Paul Howarth wrote : > Matthias Saou (thias) wrote: > > Author: thias > > > > Update of /cvs/extras/common > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv569 > > > > Modified Files: > > tobuild > > Log Message: > > request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 for devel > > Did I miss a notification about the build system being re-enabled? Nope, but AFAIK, when the build system comes back up, it processes all the requests from the file, so I assumed I could safely spool the requests, although I obviously don't expect any builds to happen right now. Maybe I assumed wrong? Matthias -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1390_FC4.s3 Load : 0.32 0.29 0.41 From fedora-extras-commits at redhat.com Wed Jul 13 10:20:46 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 13 Jul 2005 06:20:46 -0400 Subject: common tobuild,1.1903,1.1904 Message-ID: <200507131020.j6DAKkZB002044@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2027 Modified Files: tobuild Log Message: request build of rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1903 retrieving revision 1.1904 diff -u -r1.1903 -r1.1904 --- tobuild 13 Jul 2005 09:27:28 -0000 1.1903 +++ tobuild 13 Jul 2005 10:20:43 -0000 1.1904 @@ -47,3 +47,4 @@ tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel +awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 10:35:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:35:57 -0400 Subject: rpms/SoQt/devel SoQt.spec,1.9,1.10 Message-ID: <200507131035.j6DAZvGh002101@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2083 Modified Files: SoQt.spec Log Message: - Rebuild against Coin-2.4.3. - Let devel provide Coin2-SoQt-devel. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/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 13 Jul 2005 10:35:55 -0000 1.10 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Libraries @@ -42,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Requires: autoconf Requires: Coin2-devel qt-devel -Provides: Coin2-SoQt = %{version}-%{release} +Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries %description devel @@ -96,6 +96,10 @@ %{_mandir}/man?/*.?.gz %changelog +* 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. From fedora-extras-commits at redhat.com Wed Jul 13 10:42:34 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:42:34 -0400 Subject: rpms/Coin2/FC-4 .cvsignore, 1.5, 1.6 Coin2.spec, 1.11, 1.12 sources, 1.5, 1.6 Coin-2.4.1-doxygen.diff, 1.1, NONE Message-ID: <200507131042.j6DAgYfS002162@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2141 Modified Files: .cvsignore Coin2.spec sources Removed Files: Coin-2.4.1-doxygen.diff Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 May 2005 07:36:38 -0000 1.5 +++ .cvsignore 13 Jul 2005 10:42:32 -0000 1.6 @@ -1,3 +1,3 @@ -Coin-2.4.1-libtool.diff.bz2 -Coin-2.4.1-simacros.diff.bz2 -Coin-2.4.1.tar.gz +Coin-2.4.3-libtool.diff.bz2 +Coin-2.4.3-simacros.diff.bz2 +Coin-2.4.3.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Coin2.spec 19 May 2005 06:35:04 -0000 1.11 +++ Coin2.spec 13 Jul 2005 10:42:32 -0000 1.12 @@ -1,15 +1,19 @@ +# +# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# + %define coin_includedir %{_includedir}/Coin2 %define coin_htmldir %{_datadir}/Coin2 -%define srcvers 2.4.1 - %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: %{srcvers} +Version: 2.4.3 Release: 1%{?dist} License: GPL @@ -21,10 +25,9 @@ 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.1-simacros.diff.bz2 -Patch4: Coin-2.4.1-libtool.diff.bz2 +Patch3: Coin-2.4.3-simacros.diff.bz2 +Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff -Patch6: Coin-2.4.1-doxygen.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU @@ -57,7 +60,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ src/glue/freetype.c @@ -112,6 +114,9 @@ %doc %{coin_htmldir} %changelog +* Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 +- Upstream update. + * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2005 07:36:38 -0000 1.5 +++ sources 13 Jul 2005 10:42:32 -0000 1.6 @@ -1,3 +1,3 @@ -5f4301006d7568e39cdd641695d0c53d Coin-2.4.1-libtool.diff.bz2 -c0e21c3da25204eb5406196acf9d3587 Coin-2.4.1-simacros.diff.bz2 -9a6757dc9fb9fbeaa1c033ea670b31a1 Coin-2.4.1.tar.gz +e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 +4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 +57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz --- Coin-2.4.1-doxygen.diff DELETED --- From fedora-extras-commits at redhat.com Wed Jul 13 10:49:13 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:49:13 -0400 Subject: common tobuild,1.1904,1.1905 Message-ID: <200507131049.j6DAnD3D002298@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2281 Modified Files: tobuild Log Message: request build of rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1904 retrieving revision 1.1905 diff -u -r1.1904 -r1.1905 --- tobuild 13 Jul 2005 10:20:43 -0000 1.1904 +++ tobuild 13 Jul 2005 10:49:11 -0000 1.1905 @@ -48,3 +48,4 @@ thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 +corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 10:51:29 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:51:29 -0400 Subject: common tobuild,1.1905,1.1906 Message-ID: <200507131051.j6DApTBL002338@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321 Modified Files: tobuild Log Message: request build of rpms/SoQt/devel SoQt-1_2_0-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1905 retrieving revision 1.1906 diff -u -r1.1905 -r1.1906 --- tobuild 13 Jul 2005 10:49:11 -0000 1.1905 +++ tobuild 13 Jul 2005 10:51:27 -0000 1.1906 @@ -49,3 +49,4 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 +corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 13 11:27:09 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 13 Jul 2005 07:27:09 -0400 Subject: common tobuild,1.1906,1.1907 Message-ID: <200507131127.j6DBR9wp003593@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3576 Modified Files: tobuild Log Message: request build of rpms/icmpdn/FC-3 icmpdn-0_3-2 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1906 retrieving revision 1.1907 diff -u -r1.1906 -r1.1907 --- tobuild 13 Jul 2005 10:51:27 -0000 1.1906 +++ tobuild 13 Jul 2005 11:27:07 -0000 1.1907 @@ -50,3 +50,4 @@ awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel +oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 11:27:22 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 13 Jul 2005 07:27:22 -0400 Subject: common tobuild,1.1907,1.1908 Message-ID: <200507131127.j6DBRMmg003630@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3611 Modified Files: tobuild Log Message: request build of rpms/icmpdn/FC-4 icmpdn-0_3-2 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1907 retrieving revision 1.1908 diff -u -r1.1907 -r1.1908 --- tobuild 13 Jul 2005 11:27:07 -0000 1.1907 +++ tobuild 13 Jul 2005 11:27:20 -0000 1.1908 @@ -51,3 +51,4 @@ corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 +oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 13:02:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 13 Jul 2005 09:02:10 -0400 Subject: owners owners.list,1.7,1.8 Message-ID: <200507131303.j6DD3Ce2006427@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6408 Modified Files: owners.list Log Message: transfer package leafnode to contributor "eyecon" Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- owners.list 13 Jul 2005 08:16:05 -0000 1.7 +++ owners.list 13 Jul 2005 13:02:08 -0000 1.8 @@ -325,7 +325,7 @@ 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|| Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org| -Fedora Extras|leafnode|A leafsite NNTP server|extras-qa at fedoraproject.org|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| Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 13:07:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 13 Jul 2005 09:07:27 -0400 Subject: owners owners.list,1.8,1.9 Message-ID: <200507131307.j6DD7Ruj006490@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6454 Modified Files: owners.list Log Message: substitute || with |extras-qa at fedoraproject.org| for consistency with the other ~95% of the packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- owners.list 13 Jul 2005 13:02:08 -0000 1.8 +++ owners.list 13 Jul 2005 13:07:25 -0000 1.9 @@ -37,7 +37,7 @@ Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| 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|| +Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|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| @@ -66,7 +66,7 @@ Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cd-discid|utility to get CDDB discid information|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|| +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|centericq|Text mode menu- and window-driven IM|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -76,9 +76,9 @@ 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| -Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|| +Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.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|| +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| 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 @@ -96,15 +96,15 @@ Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| 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|| +Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|adrian at lisas.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| Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|| -Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|| +Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org| Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| @@ -125,17 +125,17 @@ Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|| +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|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|| -Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|| +Fedora Extras|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|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| 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|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|| -Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|| -Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|| +Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ez-ipupdate|Client for Dynamic DNS Services|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|factory|A C++ class library for multivariate polynomial data|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -148,22 +148,22 @@ Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|firefox|firefox browser|wtogami at redhat.com|| +Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org| 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|| +Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.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| Fedora Extras|fluxconf|Configuration utility for fluxbox|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|fortune-mod|A program which will display a fortune|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| -Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|| +Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|| +Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|freeze|freeze/melt/fcat compression utilities|Nicolas.Mailhot at laPoste.net|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| @@ -189,10 +189,10 @@ 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|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|| +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| Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|| +Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.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| @@ -225,7 +225,7 @@ 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-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|| +Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -274,7 +274,7 @@ 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| -Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|| +Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org| @@ -292,7 +292,7 @@ Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| -Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|| +Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org| @@ -307,7 +307,7 @@ Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|k3b-ape|Monkey's audio decoder/encoder plugin for K3b|mihai at xcyb.org|extras-qa at fedoraproject.org| -Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|| +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|kernel-module-thinkpad|IBM ThinkPad support kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -323,7 +323,7 @@ Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org| 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|| +Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.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| @@ -375,7 +375,7 @@ Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libstatgrab|Make system statistics|oliver at linux-kernel.at|extras-qa at fedoraproject.org| -Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|| +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|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org| @@ -415,26 +415,26 @@ 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|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|| -Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|| +Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|mgopen-fonts|Truetype greek fonts|paskalis at di.uoa.gr|extras-qa at fedoraproject.org| Fedora Extras|mhash|Thread-safe hash algorithms library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|| +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|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| -Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|| -Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|| -Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|| +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| Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com||wtogami at redhat.com +Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com 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|| +Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|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|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org| @@ -451,10 +451,10 @@ Fedora Extras|nomarch|GPLed Arc de-archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| -Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|| +Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|ocaml|The Objective Caml compiler and programming environment|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org| -Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|| +Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|openal|Open Audio Library|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org| @@ -465,7 +465,7 @@ Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|| +Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|Package Review|Choose this to request QA on a new package|dkl at redhat.com|dkl at redhat.com| @@ -572,7 +572,7 @@ 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-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|| +Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org| 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|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -664,7 +664,7 @@ Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|recode|Conversion between character sets and surfaces.|extras-orphan at fedoraproject.org|| +Fedora Extras|recode|Conversion between character sets and surfaces.|extras-orphan at fedoraproject.org|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| @@ -680,7 +680,7 @@ Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|rzip|A large-file compression program|i at stingr.net|| +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|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org| @@ -693,18 +693,18 @@ 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| -Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|| +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|| -Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|extras-orphan at fedoraproject.org|| -Fedora Extras|SDL_net|SDL portable network library|extras-orphan 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_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|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| Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|| +Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org| 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| @@ -731,13 +731,13 @@ Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|synce|For bugs related to the synce component|gafton at redhat.com|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|| +Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org| 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|tdl|To-do list manager|extras-orphan at fedoraproject.org|| -Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|| +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| Fedora Extras|tetex-armtex|Support for typesetting Armenian with TeX and LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|tetex-beamer|A LaTeX class for producing presentations and slides|jpo at di.uminho.pt|extras-qa at fedoraproject.org| @@ -755,7 +755,7 @@ Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|| +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|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org| @@ -782,7 +782,7 @@ 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| -Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de||wtogami at redhat.com +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|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| @@ -791,7 +791,7 @@ 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|| +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|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| @@ -806,10 +806,10 @@ 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| Fedora Extras|xbindkeys|Binds keys or mouse buttons to shell commands under X|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|| +Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xca|Graphical X.509 certificate management tool|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|| +Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 14:10:17 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 13 Jul 2005 10:10:17 -0400 Subject: owners owners.list,1.9,1.10 Message-ID: <200507131410.j6DEAHO5008248@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8231 Modified Files: owners.list Log Message: add ncview Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- owners.list 13 Jul 2005 13:07:25 -0000 1.9 +++ owners.list 13 Jul 2005 14:10:15 -0000 1.10 @@ -437,6 +437,7 @@ Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|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|ncview|A visual browser for netCDF format files|ed at eh3.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|nethack-falconseye|NetHack - Falcon's Eye|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 14:18:06 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Wed, 13 Jul 2005 10:18:06 -0400 Subject: web/html/download mirrors.php,1.22,1.23 Message-ID: <200507131418.j6DEI6DA008285@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8268 Modified Files: mirrors.php Log Message: Added dti.ad.jp urls for ftp and http Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mirrors.php 12 Jul 2005 17:20:23 -0000 1.22 +++ mirrors.php 13 Jul 2005 14:18:04 -0000 1.23 @@ -518,6 +518,8 @@
    • ftp://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
    • http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
    • rsync://ftp.nara.wide.ad.jp/fedora/
      • +
    • ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/
      • +
    • http://ftp.dti.ad.jp/pub/Linux/Fedora/core/
  • Korea From fedora-extras-commits at redhat.com Wed Jul 13 15:21:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:21:07 -0400 Subject: extras-buildsys ChangeLog,1.53,1.54 Message-ID: <200507131521.j6DFL7Ig009636@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601 Modified Files: ChangeLog Log Message: 2005-07-13 Dan Williams * common/AuthedXMLRPCServer.py common/SSLCommon.py common/SSLConnection.py - Play better with Python 2.2 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ChangeLog 12 Jul 2005 20:12:23 -0000 1.53 +++ ChangeLog 13 Jul 2005 15:21:05 -0000 1.54 @@ -1,3 +1,10 @@ +2005-07-13 Dan Williams + + * common/AuthedXMLRPCServer.py + common/SSLCommon.py + common/SSLConnection.py + - Play better with Python 2.2 + 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running From fedora-extras-commits at redhat.com Wed Jul 13 15:21:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:21:07 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.3, 1.4 SSLCommon.py, 1.9, 1.10 SSLConnection.py, 1.1, 1.2 Message-ID: <200507131521.j6DFL7t7009644@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/common Modified Files: AuthedXMLRPCServer.py SSLCommon.py SSLConnection.py Log Message: 2005-07-13 Dan Williams * common/AuthedXMLRPCServer.py common/SSLCommon.py common/SSLConnection.py - Play better with Python 2.2 Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AuthedXMLRPCServer.py 10 Jul 2005 03:44:36 -0000 1.3 +++ AuthedXMLRPCServer.py 13 Jul 2005 15:21:05 -0000 1.4 @@ -84,6 +84,9 @@ if sys.version_info[:3] > (2, 2, 3): SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) + else: + self.funcs = {} + self.instance = None def get_authinfo(self, request, client_address): if self.authinfo_callback: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SSLCommon.py 6 Jul 2005 21:20:55 -0000 1.9 +++ SSLCommon.py 13 Jul 2005 15:21:05 -0000 1.10 @@ -88,30 +88,10 @@ self.server_port = port -class PlgHTTPSResponse(httplib.HTTPResponse): - def __init__(self, sock, debuglevel=0, strict=0, method=None): - self.fp = socket._fileobject(sock, "rb", 0) - self.debuglevel = debuglevel - self.strict = strict - self._method = method - - self.msg = None - - # from the Status-Line of the response - self.version = httplib._UNKNOWN # HTTP-Version - self.status = httplib._UNKNOWN # Status-Code - self.reason = httplib._UNKNOWN # Reason-Phrase - - self.chunked = httplib._UNKNOWN # is "chunked" being used? - self.chunk_left = httplib._UNKNOWN # bytes left to read in current chunk - self.length = httplib._UNKNOWN # number of bytes left in response - self.will_close = httplib._UNKNOWN # conn will close at end of response - - class PlgHTTPSConnection(httplib.HTTPConnection): "This class allows communication via SSL." - response_class = PlgHTTPSResponse + response_class = httplib.HTTPResponse def __init__(self, host, port=None, ssl_context=None, strict=None): httplib.HTTPConnection.__init__(self, host, port, strict) Index: SSLConnection.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SSLConnection.py 6 Jul 2005 21:20:55 -0000 1.1 +++ SSLConnection.py 13 Jul 2005 15:21:05 -0000 1.2 @@ -25,6 +25,10 @@ so I'm making a proxy instead of subclassing. """ self.__dict__["conn"] = conn + self.__dict__["close_refcount"] = 0 + self.__dict__["closed"] = False + def __del__(self): + self.__dict__["conn"].close() def __getattr__(self,name): return getattr(self.__dict__["conn"], name) def __setattr__(self,name, value): @@ -49,11 +53,21 @@ We need to use socket._fileobject Because SSL.Connection doesn't have a 'dup'. Not exactly sure WHY this is, but this is backed up by comments in socket.py and SSL/connection.c + + Since httplib.HTTPSResponse/HTTPConnection depend on the + socket being duplicated when they close it, we refcount the + socket object and don't actually close until its count is 0. """ - return socket._fileobject(self, mode, bufsize) + self.__dict__["close_refcount"] = self.__dict__["close_refcount"] + 1 + return PlgFileObject(self, mode, bufsize) def close(self): - self.shutdown() - self.__dict__["conn"].close() + if self.__dict__["closed"]: + return + if self.__dict__["close_refcount"] == 0: + self.shutdown() + self.__dict__["conn"].close() + self.__dict__["closed"] = True + self.__dict__["close_refcount"] = self.__dict__["close_refcount"] - 1 def recv(self, bufsize): ret = None try: @@ -62,3 +76,16 @@ pass return ret +class PlgFileObject(socket._fileobject): + def close(self): + """ + socket._fileobject doesn't actually _close_ the socket, + which we want it to do, so we have to override. + """ + try: + if self._sock: + self.flush() + self._sock.close() + finally: + self._sock = None + From fedora-extras-commits at redhat.com Wed Jul 13 15:26:12 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 13 Jul 2005 11:26:12 -0400 Subject: rpms/kyum/devel .cvsignore, 1.2, 1.3 kyum.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507131526.j6DFQChn009682@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9661 Modified Files: .cvsignore kyum.spec sources Log Message: Description: Update to new upstream release, build failed, upstream author notified about the issue. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jun 2005 16:37:40 -0000 1.2 +++ .cvsignore 13 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -kyum-0.7.1.tar.gz +kyum-0.7.2.tar.gz Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 +++ kyum.spec 13 Jul 2005 15:26:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: kyum -Version: 0.7.1 -Release: 3 +Version: 0.7.2 +Release: 1 Summary: Graphical User Frontend (GUI) for yum @@ -67,6 +67,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-1 +- Update to new upstream release + * Tue Jun 21 2005 Jochen Schmitt 0.7.1-3 - Add precompiled python files into package Index: sources =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jun 2005 16:37:40 -0000 1.2 +++ sources 13 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -2d12023542d55affa51d6312a761b70a kyum-0.7.1.tar.gz +0c2eb29c22a4a23d3971eb0ce8d79f99 kyum-0.7.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 15:47:16 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 13 Jul 2005 11:47:16 -0400 Subject: CVSROOT avail,1.9,1.10 config,1.2,1.3 loginfo,1.10,1.11 Message-ID: <200507131547.j6DFlG5u010025@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/devel/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10004 Modified Files: avail config loginfo Log Message: Update config files. Index: avail =================================================================== RCS file: /cvs/devel/CVSROOT/avail,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- avail 12 Jul 2005 22:58:51 -0000 1.9 +++ avail 13 Jul 2005 15:47:14 -0000 1.10 @@ -16,34 +16,3 @@ avail | gafton,notting,sopwith,wtogami,katzj | CVSROOT # trusted developers that can add modules avail | | CVSROOT/modules -avail | kwade | CVSROOT/avail - -# Fedora Web site -unavail | | web -avail | gafton,tfox,notting,sopwith,gdk,katzj,kwade | web -avail | havill,hp,bennet | web -avail | katzj | web/html/projects/anaconda-installer -avail | bfox | web/html/projects/config-tools -avail | blizzard,krh | web/html/projects/desktop -avail | wcohen | web/html/projects/additional-projects/benchmarks -avail | sopwith,dwalsh,kwade | web/html/projects/selinux -avail | ezannoni | web/html/projects/additional-projects/gdb -avail | alikins,trobert | web/html/download -avail | llch | web/html/projects/i18n -avail | sarahs | web/html/projects/translations -avail | harald | web/html/projects/config-tools -avail | kwade | web/html/docs -avail | sarahs | web/html/participate/translation-faq -avail | sarahs | web/html/participate/translation-guide -avail | sarahs | web/html/participate/translation-windows -avail | dmalcolm | web/html/projects/stateless -avail | dmalcolm | web/html/docs/stateless -avail | riel | web/html/docs/virtualisation -avail | riel | web/html/projects/virtualisation -avail | ezannoni | web/html/projects/systemtap -avail | harald | web/html/docs/udev - -unavail | | fedora-security -avail | mjc,bressers,jorton,notting,gafton,sopwith,katzj | fedora-security - -avail | pfrields | web/html/projects/docs Index: config =================================================================== RCS file: /cvs/devel/CVSROOT/config,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config 30 Mar 2005 17:52:18 -0000 1.2 +++ config 13 Jul 2005 15:47:14 -0000 1.3 @@ -2,7 +2,7 @@ #SystemAuth=no # Put CVS lock files in this directory rather than directly in the repository. -LockDir=/var/lock/cvs/fedora +LockDir=/var/lock/cvs/devel # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top # level of the new working directory when using the `cvs checkout' Index: loginfo =================================================================== RCS file: /cvs/devel/CVSROOT/loginfo,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- loginfo 3 Jun 2005 21:21:59 -0000 1.10 +++ loginfo 13 Jul 2005 15:47:14 -0000 1.11 @@ -26,6 +26,5 @@ # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal ALL $CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com -ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com +ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/devel localdelivery at cvs-int.fedora.redhat.com From fedora-extras-commits at redhat.com Wed Jul 13 15:47:40 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 13 Jul 2005 11:47:40 -0400 Subject: CVSROOT modules,1.2,1.3 Message-ID: <200507131547.j6DFleJC010049@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/devel/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10032 Modified Files: modules Log Message: update config files Index: modules =================================================================== RCS file: /cvs/devel/CVSROOT/modules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- modules 3 Jun 2005 21:15:57 -0000 1.2 +++ modules 13 Jul 2005 15:47:38 -0000 1.3 @@ -25,4 +25,4 @@ # can be useful for creating a module that consists of many directories # spread out over the entire source repository. -fedora . +devel . From fedora-extras-commits at redhat.com Wed Jul 13 15:51:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:51:44 -0400 Subject: extras-buildsys/server BuildMaster.py,1.13,1.14 Message-ID: <200507131551.j6DFpikU010099@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10082/server Modified Files: BuildMaster.py Log Message: Exit when we can't open the job database. Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- BuildMaster.py 10 Jul 2005 19:59:32 -0000 1.13 +++ BuildMaster.py 13 Jul 2005 15:51:42 -0000 1.14 @@ -123,7 +123,9 @@ s = "%s" % e if s == 'unable to open database file': print "Unable to open the jobs database. Exiting..." - os._exit(1) + else: + print "Error: sqlite could not open the database. Reason: %s" % s + os._exit(1) self.curs = self.dbcx.cursor() ensure_job_db_tables(self.dbcx) From fedora-extras-commits at redhat.com Wed Jul 13 15:53:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:53:10 -0400 Subject: extras-buildsys/server BuildMaster.py,1.14,1.15 Message-ID: <200507131553.j6DFrAfQ010122@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10105/server Modified Files: BuildMaster.py Log Message: Simplify database error message. Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- BuildMaster.py 13 Jul 2005 15:51:42 -0000 1.14 +++ BuildMaster.py 13 Jul 2005 15:53:08 -0000 1.15 @@ -120,11 +120,7 @@ try: self.dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3) except sqlite.DatabaseError, e: - s = "%s" % e - if s == 'unable to open database file': - print "Unable to open the jobs database. Exiting..." - else: - print "Error: sqlite could not open the database. Reason: %s" % s + 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) From fedora-extras-commits at redhat.com Wed Jul 13 16:07:59 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:07:59 -0400 Subject: rpms/libfwbuilder/FC-3 .cvsignore, 1.3, 1.4 libfwbuilder.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507131607.j6DG7xL3011290@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/libfwbuilder/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11269 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 17:53:10 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:07:57 -0000 1.4 @@ -1,2 +1 @@ -libfwbuilder-2.0.5.tar.gz -libfwbuilder-2.0.6.tar.gz +libfwbuilder-2.0.8.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/libfwbuilder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libfwbuilder.spec 3 Mar 2005 17:53:10 -0000 1.4 +++ libfwbuilder.spec 13 Jul 2005 16:07:57 -0000 1.5 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.6 -Release: 1 +Version: 2.0.8 +Release: 1.FC3 License: GPL Group: System Environment/Libraries Url: http://www.fwbuilder.org/ @@ -70,6 +70,9 @@ %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC3 +- New upstream version + * Thu Mar 3 2005 Steve Grubb 2.0.6-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 17:53:10 -0000 1.3 +++ sources 13 Jul 2005 16:07:57 -0000 1.4 @@ -1,2 +1 @@ -7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz -d53a69f5774fc987779ac0df4e54beb6 libfwbuilder-2.0.6.tar.gz +a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 16:10:43 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:10:43 -0400 Subject: rpms/libfwbuilder/FC-4 .cvsignore, 1.3, 1.4 libfwbuilder.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507131610.j6DGAhg3011363@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/libfwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11342 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:04:58 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:10:41 -0000 1.4 @@ -1,2 +1 @@ -libfwbuilder-2.0.5.tar.gz -libfwbuilder-2.0.6.tar.gz +libfwbuilder-2.0.8.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/libfwbuilder.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libfwbuilder.spec 22 May 2005 22:58:26 -0000 1.7 +++ libfwbuilder.spec 13 Jul 2005 16:10:41 -0000 1.8 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1.FC4 License: GPL Group: System Environment/Libraries URL: http://www.fwbuilder.org/ @@ -71,6 +71,9 @@ %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:04:58 -0000 1.3 +++ sources 13 Jul 2005 16:10:41 -0000 1.4 @@ -1,2 +1 @@ -7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz -d53a69f5774fc987779ac0df4e54beb6 libfwbuilder-2.0.6.tar.gz +a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 16:12:14 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:12:14 -0400 Subject: rpms/libfwbuilder/devel .cvsignore, 1.3, 1.4 libfwbuilder.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507131612.j6DGCEuG011438@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11417 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:04:58 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:12:12 -0000 1.4 @@ -1,2 +1 @@ -libfwbuilder-2.0.5.tar.gz -libfwbuilder-2.0.6.tar.gz +libfwbuilder-2.0.8.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libfwbuilder.spec 22 May 2005 22:58:26 -0000 1.7 +++ libfwbuilder.spec 13 Jul 2005 16:12:12 -0000 1.8 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1 License: GPL Group: System Environment/Libraries URL: http://www.fwbuilder.org/ @@ -71,6 +71,9 @@ %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:04:58 -0000 1.3 +++ sources 13 Jul 2005 16:12:12 -0000 1.4 @@ -1,2 +1 @@ -7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz -d53a69f5774fc987779ac0df4e54beb6 libfwbuilder-2.0.6.tar.gz +a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 16:25:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 12:25:25 -0400 Subject: extras-buildsys/common .cvsignore,1.1,1.2 Message-ID: <200507131625.j6DGPPfZ011525@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11508/common Modified Files: .cvsignore Log Message: Add more files Index: .cvsignore =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jun 2005 12:53:36 -0000 1.1 +++ .cvsignore 13 Jul 2005 16:25:23 -0000 1.2 @@ -5,3 +5,4 @@ SimpleSSLXMLRPCServer.pyc SSLCommon.pyc SSLXMLRPCServerProxy.pyc +SSLConnection.pyc From fedora-extras-commits at redhat.com Wed Jul 13 16:40:52 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:40:52 -0400 Subject: rpms/fwbuilder/FC-3 .cvsignore, 1.3, 1.4 fwbuilder.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507131640.j6DGeq0I011717@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/fwbuilder/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11696 Modified Files: .cvsignore fwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC3 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 17:55:26 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:40:50 -0000 1.4 @@ -1,2 +1,4 @@ fwbuilder-2.0.5.tar.gz fwbuilder-2.0.6.tar.gz +fwbuilder-2.0.8.tar.gz +fwbuilder.desktop Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-3/fwbuilder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fwbuilder.spec 3 Mar 2005 18:46:53 -0000 1.5 +++ fwbuilder.spec 13 Jul 2005 16:40:50 -0000 1.6 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.6 -Release: 1 +Version: 2.0.8 +Release: 1.FC3 License: GPL Group: Applications/System URL: http://www.fwbuilder.org/ @@ -10,7 +10,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.6 +BuildRequires: libfwbuilder-devel = 2.0.8 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -85,6 +85,12 @@ %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt +%doc doc/ReleaseNotes_2.0.6.html +%doc doc/ReleaseNotes_2.0.6.txt +%doc doc/ReleaseNotes_2.0.7.html +%doc doc/ReleaseNotes_2.0.7.txt +%doc doc/ReleaseNotes_2.0.8.html +%doc doc/ReleaseNotes_2.0.8.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* @@ -152,6 +158,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC3 +- New upstream version + * Thu Mar 3 2005 Steve Grubb 2.0.6-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 17:55:26 -0000 1.3 +++ sources 13 Jul 2005 16:40:50 -0000 1.4 @@ -1,2 +1,2 @@ -03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz -41554801c43e14a48b19ade91e5a14cd fwbuilder-2.0.6.tar.gz +37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz +8047b8aabc56f1005f7e551278083922 fwbuilder.desktop From fedora-extras-commits at redhat.com Wed Jul 13 16:41:53 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:41:53 -0400 Subject: rpms/fwbuilder/FC-4 .cvsignore, 1.3, 1.4 fwbuilder.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507131641.j6DGfrfp011817@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/fwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11794 Modified Files: .cvsignore fwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:05:57 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:41:51 -0000 1.4 @@ -1,2 +1,4 @@ fwbuilder-2.0.5.tar.gz fwbuilder-2.0.6.tar.gz +fwbuilder-2.0.8.tar.gz +fwbuilder.desktop Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fwbuilder.spec 22 May 2005 22:58:47 -0000 1.8 +++ fwbuilder.spec 13 Jul 2005 16:41:51 -0000 1.9 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1.FC4 License: GPL Group: Applications/System @@ -11,7 +11,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.6 +BuildRequires: libfwbuilder-devel = 2.0.8 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -86,6 +86,12 @@ %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt +%doc doc/ReleaseNotes_2.0.6.html +%doc doc/ReleaseNotes_2.0.6.txt +%doc doc/ReleaseNotes_2.0.7.html +%doc doc/ReleaseNotes_2.0.7.txt +%doc doc/ReleaseNotes_2.0.8.html +%doc doc/ReleaseNotes_2.0.8.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* @@ -153,6 +159,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:05:57 -0000 1.3 +++ sources 13 Jul 2005 16:41:51 -0000 1.4 @@ -1,2 +1,2 @@ -03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz -41554801c43e14a48b19ade91e5a14cd fwbuilder-2.0.6.tar.gz +37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz +8047b8aabc56f1005f7e551278083922 fwbuilder.desktop From fedora-extras-commits at redhat.com Wed Jul 13 16:42:55 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:42:55 -0400 Subject: rpms/fwbuilder/devel .cvsignore, 1.3, 1.4 fwbuilder.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507131642.j6DGgtOo011932@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911 Modified Files: .cvsignore fwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:05:57 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:42:53 -0000 1.4 @@ -1,2 +1,4 @@ fwbuilder-2.0.5.tar.gz fwbuilder-2.0.6.tar.gz +fwbuilder-2.0.8.tar.gz +fwbuilder.desktop Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fwbuilder.spec 22 May 2005 22:58:47 -0000 1.8 +++ fwbuilder.spec 13 Jul 2005 16:42:53 -0000 1.9 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1 License: GPL Group: Applications/System @@ -11,7 +11,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.6 +BuildRequires: libfwbuilder-devel = 2.0.8 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -86,6 +86,12 @@ %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt +%doc doc/ReleaseNotes_2.0.6.html +%doc doc/ReleaseNotes_2.0.6.txt +%doc doc/ReleaseNotes_2.0.7.html +%doc doc/ReleaseNotes_2.0.7.txt +%doc doc/ReleaseNotes_2.0.8.html +%doc doc/ReleaseNotes_2.0.8.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* @@ -153,6 +159,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:05:57 -0000 1.3 +++ sources 13 Jul 2005 16:42:53 -0000 1.4 @@ -1,2 +1,2 @@ -03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz -41554801c43e14a48b19ade91e5a14cd fwbuilder-2.0.6.tar.gz +37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz +8047b8aabc56f1005f7e551278083922 fwbuilder.desktop From fedora-extras-commits at redhat.com Wed Jul 13 17:20:00 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 13 Jul 2005 13:20:00 -0400 Subject: owners owners.list,1.10,1.11 Message-ID: <200507131720.j6DHK0Ra013444@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13425 Modified Files: owners.list Log Message: update gai and gai-pal Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- owners.list 13 Jul 2005 14:10:15 -0000 1.10 +++ owners.list 13 Jul 2005 17:19:58 -0000 1.11 @@ -169,10 +169,10 @@ 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|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gai|Generic Applet Interface|msalim at cs.indiana.edu|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| Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| -Fedora Extras|gai-pal|GAI Pal applet|msalim at cs.indiana.edu|extras-qa at fedoraproject.org| +Fedora Extras|gai-pal|GAI Pal applet|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|galculator|GTK 2 based scientific calculator|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|anvil at livna.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 18:27:37 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:27:37 -0400 Subject: owners owners.list,1.11,1.12 Message-ID: <200507131827.j6DIRbL8014849@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14832 Modified Files: owners.list Log Message: Fix spaces that were on the liboil line, for a strange reason. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- owners.list 13 Jul 2005 17:19:58 -0000 1.11 +++ owners.list 13 Jul 2005 18:27:35 -0000 1.12 @@ -359,7 +359,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|liboil | Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|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| Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 18:32:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:32:43 -0400 Subject: common tobuild,1.1908,1.1909 Message-ID: <200507131832.j6DIWhjv014957@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940 Modified Files: tobuild Log Message: request build of rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1908 retrieving revision 1.1909 diff -u -r1.1908 -r1.1909 --- tobuild 13 Jul 2005 11:27:20 -0000 1.1908 +++ tobuild 13 Jul 2005 18:32:41 -0000 1.1909 @@ -52,3 +52,4 @@ corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 +thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 18:33:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:33:29 -0400 Subject: common tobuild,1.1909,1.1910 Message-ID: <200507131833.j6DIXTAL015024@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15007 Modified Files: tobuild Log Message: request build of rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1909 retrieving revision 1.1910 diff -u -r1.1909 -r1.1910 --- tobuild 13 Jul 2005 18:32:41 -0000 1.1909 +++ tobuild 13 Jul 2005 18:33:27 -0000 1.1910 @@ -53,3 +53,4 @@ oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 +thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 18:34:13 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:34:13 -0400 Subject: common tobuild,1.1910,1.1911 Message-ID: <200507131834.j6DIYDrt015115@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15098 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1910 retrieving revision 1.1911 diff -u -r1.1910 -r1.1911 --- tobuild 13 Jul 2005 18:33:27 -0000 1.1910 +++ tobuild 13 Jul 2005 18:34:11 -0000 1.1911 @@ -54,3 +54,4 @@ oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 +thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 18:37:45 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:37:45 -0400 Subject: common tobuild,1.1911,1.1912 Message-ID: <200507131837.j6DIbjiM015148@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15131 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1911 retrieving revision 1.1912 diff -u -r1.1911 -r1.1912 --- tobuild 13 Jul 2005 18:34:11 -0000 1.1911 +++ tobuild 13 Jul 2005 18:37:43 -0000 1.1912 @@ -55,3 +55,4 @@ thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 +thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 19:36:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 15:36:14 -0400 Subject: extras-buildsys/etc plague-builder.init, 1.3, 1.4 plague-builder.config, 1.2, NONE Message-ID: <200507131936.j6DJaEAZ016492@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16444/etc Modified Files: plague-builder.init Removed Files: plague-builder.config Log Message: 2005-07-13 Dan Williams * builder/builder.py builder/CONFIG.py etc/plague-builder.config etc/plague-builder.init - Move arches and hostname into the CONFIG.py file, since its already instance-specific. Change the initscripts to reference the config file, which gets passed to the builder on the command line now. Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plague-builder.init 11 Jul 2005 03:23:21 -0000 1.3 +++ plague-builder.init 13 Jul 2005 19:36:12 -0000 1.4 @@ -13,11 +13,9 @@ # Source function library. . /etc/init.d/functions -. /etc/sysconfig/plague-builder - start() { echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOST $ARCHSOPT + daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log -c /etc/plague/builder/CONFIG.py echo touch /var/lock/subsys/plague-builder return 0 --- plague-builder.config DELETED --- From fedora-extras-commits at redhat.com Wed Jul 13 19:36:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 15:36:08 -0400 Subject: extras-buildsys ChangeLog,1.54,1.55 Message-ID: <200507131936.j6DJacqO016495@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16444 Modified Files: ChangeLog Log Message: 2005-07-13 Dan Williams * builder/builder.py builder/CONFIG.py etc/plague-builder.config etc/plague-builder.init - Move arches and hostname into the CONFIG.py file, since its already instance-specific. Change the initscripts to reference the config file, which gets passed to the builder on the command line now. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 13 Jul 2005 15:21:05 -0000 1.54 +++ ChangeLog 13 Jul 2005 19:36:06 -0000 1.55 @@ -1,5 +1,16 @@ 2005-07-13 Dan Williams + * builder/builder.py + builder/CONFIG.py + etc/plague-builder.config + etc/plague-builder.init + - Move arches and hostname into the CONFIG.py file, since + its already instance-specific. Change the initscripts + to reference the config file, which gets passed + to the builder on the command line now. + +2005-07-13 Dan Williams + * common/AuthedXMLRPCServer.py common/SSLCommon.py common/SSLConnection.py From fedora-extras-commits at redhat.com Wed Jul 13 19:36:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 15:36:08 -0400 Subject: extras-buildsys/builder CONFIG.py,1.5,1.6 builder.py,1.13,1.14 Message-ID: <200507131936.j6DJadTS016499@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16444/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-13 Dan Williams * builder/builder.py builder/CONFIG.py etc/plague-builder.config etc/plague-builder.init - Move arches and hostname into the CONFIG.py file, since its already instance-specific. Change the initscripts to reference the config file, which gets passed to the builder on the command line now. Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CONFIG.py 6 Jul 2005 21:20:49 -0000 1.5 +++ CONFIG.py 13 Jul 2005 19:36:06 -0000 1.6 @@ -22,6 +22,8 @@ config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 +config_opts['hostname'] = 'localhost' +config_opts['arches'] = ['i386', 'i486', 'i586', 'i686'] BUILDER_DIR = "/etc/plague/builder" Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- builder.py 12 Jul 2005 20:12:30 -0000 1.13 +++ builder.py 13 Jul 2005 19:36:06 -0000 1.14 @@ -38,17 +38,9 @@ from optparse import OptionParser -# Load in the config -execfile("/etc/plague/builder/CONFIG.py") - use_lighttpd = False -g_our_hostname = None certs = {} -certs['key_and_cert'] = config_opts['builder_key_and_cert'] -certs['ca_cert'] = config_opts['ca_cert'] -certs['peer_ca_cert'] = config_opts['ca_cert'] - def get_url_for_file(file_path): """ Return a URL pointing to a particular file in our work dir """ @@ -62,7 +54,7 @@ method = "https://" else: method = "http://" - full_url = method + g_our_hostname + ":" + port + "/" + file_part + full_url = method + config_opts['hostname'] + ":" + port + "/" + file_part return urllib.quote(full_url) @@ -469,16 +461,16 @@ return bcp -def log(string): - if config_opts['debug']: - print string - class XMLRPCBuilderServer: def __init__(self, localarches): self.ids = {} # unique id => awclass instance self.localarches = localarches self.cur_job = 0 + def log(string): + if config_opts['debug']: + print string + def process(self): # Give jobs some time to update their status and do their thing jobid = 0 @@ -490,7 +482,7 @@ def start(self, target, arch, srpm_url): if self.cur_job != 0: - log("Tried to build '%s' when already buiding something" % srpm_url) + self.log("Tried to build '%s' when already buiding something" % srpm_url) return 0 cur_time = time.time() @@ -505,10 +497,10 @@ self.ids[uniqid] = job job.start() filename = os.path.basename(srpm_url) - log("%s: started %s on %s arch %s at time %d" % (uniqid, filename, + self.log("%s: started %s on %s arch %s at time %d" % (uniqid, filename, target, arch, cur_time)) else: - log("%s: Failed request for %s on %s UNSUPPORTED arch %s at time %d" % + self.log("%s: Failed request for %s on %s UNSUPPORTED arch %s at time %d" % (uniqid, srpm_url, target, arch, cur_time)) uniqid = 0 self.cur_job = uniqid @@ -609,7 +601,7 @@ if a != avail_arches[len(avail_arches)-1]: archlist = archlist + ", " - usage = "Usage: %s [-p ] [-l ] [-d] -a arch1 [-a arch2] " % sys.argv[0] + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, help='file to write the PID to') @@ -617,22 +609,32 @@ help="location of file to write log output to") parser.add_option("-d", "--daemon", default=False, action="store_true", help="daemonize (i.e., detach from the terminal)") - parser.add_option("-a", "--arch", default=[], action='append', dest='archs', - help="archs this machine can build Available arches: [ %s ]" % archlist) + parser.add_option("-c", "--configfile", default=None, + help="location of the builder config file") (opts, args) = parser.parse_args() - if len(args) == 0 or len(opts.archs) == 0: - print "Must specify hostname and at least one build arch." + if not opts.configfile: + print "Must specify the config file." sys.exit(1) - - for arch in opts.archs: + + if not os.path.exists(opts.configfile): + print "Could not find the config file %s" % opts.configfile + sys.exit(1) + + if not os.access(opts.configfile, os.R_OK): + print "Could not read the config file %s" % opts.configfile + sys.exit(1) + + # Load in the config + execfile(opts.configfile) + certs['key_and_cert'] = config_opts['builder_key_and_cert'] + certs['ca_cert'] = config_opts['ca_cert'] + certs['peer_ca_cert'] = config_opts['ca_cert'] + + for arch in config_opts['arches']: if arch not in archlist: - print "Arch must be one of [ %s ]" % archlist + print "Arch '%s' must be one of [ %s ]" % (arch, archlist) sys.exit(1) - - host = args[0] - g_our_hostname = host - localarches = opts.archs if opts.daemon: ret=daemonize.createDaemon() @@ -644,9 +646,9 @@ open(opts.pidfile, 'w').write('%d\n' % os.getpid()) if opts.logfile: - log=open(opts.logfile, 'a') - sys.stdout=log - sys.stderr=log + logf=open(opts.logfile, 'a') + sys.stdout=logf + sys.stderr=logf work_dir = config_opts['builder_work_dir'] if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): @@ -662,12 +664,12 @@ key_and_cert = config_opts['builder_key_and_cert'] else: key_and_cert = None - http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) + http_server = lighttpdManager.lighttpdManager(http_cnf_file, config_opts['hostname'], port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs) else: - http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, None) + http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, None) http_server.start() # Stop running as root @@ -676,19 +678,19 @@ time.sleep(1) os._exit(1) - print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + print "Binding to address '%s' with arches: [%s]" % (config_opts['hostname'], string.join(config_opts['arches'])) xmlrpc_port = config_opts['xmlrpc_port'] try: if config_opts['ssl_buildserver']: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((config_opts['hostname'], xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None) + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((config_opts['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?" % (g_our_hostname, xmlrpc_port) + print "Error: couldn't bind to address '%s:%s'. Is the builder already running?" % (config_opts['hostname'], xmlrpc_port) os._exit(1) - bcs = XMLRPCBuilderServer(localarches) + bcs = XMLRPCBuilderServer(config_opts['arches']) xmlserver.register_instance(bcs) last_time = time.time() @@ -706,5 +708,8 @@ last_time = time.time() http_server.stop() - time.sleep(2) + try: + time.sleep(2) + except KeyboardInterrupt, e: + pass os._exit(0) From fedora-extras-commits at redhat.com Wed Jul 13 20:03:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 13 Jul 2005 16:03:53 -0400 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.9,1.10 Message-ID: <200507132003.j6DK3rUS017693@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17675 Modified Files: xemacs-sumo.spec Log Message: Remove mew and skk, they're in separate packages again (#162952). Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xemacs-sumo.spec 2 Jun 2005 16:56:41 -0000 1.9 +++ xemacs-sumo.spec 13 Jul 2005 20:03:28 -0000 1.10 @@ -3,7 +3,7 @@ Summary: XEmacs Lisp packages Name: xemacs-sumo Version: %(echo %{sumo_ver} | tr -d -) -Release: 6 +Release: 7 License: GPL Group: Applications/Editors Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2 @@ -27,12 +27,9 @@ Provides: ruby-mode-xemacs Obsoletes: ruby-mode-xemacs tm # Provides/Obsoletes for upgradeability from the latest FC version, needed -# until (if?) there will be separate apel, mew, and ddskk packages for -# XEmacs again. ddskk-xemacs is not provided because the -# version shipping here is the original skk, not ddskk. It is obsoleted -# anyway to for the sake of smooth upgrades. -Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2 -Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5 +# until (if?) there will be a separate apel package for XEmacs again. +Provides: apel-xemacs = 10.2 +Obsoletes: apel-xemacs < 10.6-6 Patch0: %{name}-jde-equal.patch Patch1: %{name}-sql-abbrev.patch Patch6: auctex-texsite-jlatex-detect-69129.patch @@ -125,6 +122,14 @@ %build %define _xemacs_batch xemacs-nox -batch -vanilla +# mew is provided by mew-xemacs, and skk by ddskk-xemacs +%_xemacs_batch -l package-admin -eval \ + "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" +rmdir xemacs-packages/{etc,lisp,man}/mew +%_xemacs_batch -l package-admin -eval \ + "(package-admin-delete-binary-package 'skk \"mule-packages\")" +rmdir mule-packages/{etc,lisp,man}/skk + export EMACSPACKAGEPATH=`pwd` %_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* @@ -197,6 +202,9 @@ %changelog +* Wed Jul 13 2005 Ville Skytt?? - 20050505-7 +- Remove mew and skk, they're in separate packages again (#162952). + * Thu Jun 2 2005 Ville Skytt?? - 20050505-6 - Make sure we're using files included in this package when byte-recompiling patched *.el; also allows the byte-compilation From fedora-extras-commits at redhat.com Wed Jul 13 20:08:29 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 13 Jul 2005 16:08:29 -0400 Subject: fedora-security/audit fc4,1.21,1.22 Message-ID: <200507132008.j6DK8T9S017760@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17743 Modified Files: fc4 Log Message: net-snmp updates. Commit this quick before the mail with all the Mozilla issues comes in. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fc4 13 Jul 2005 09:22:13 -0000 1.21 +++ fc4 13 Jul 2005 20:08:27 -0000 1.22 @@ -3,9 +3,10 @@ ** are items that need attention -2005-2177 ** net-snmp (fixed 5.2.1.2) +2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla 2005-2096 backport (zlib) [since FEDORA-2005-523] +2005-2096 backport (rpm) [since FEDORA-2005-565] 2005-2088 VULNERABLE (httpd) 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] @@ -34,7 +35,7 @@ 2005-1751 ** nmap 2005-1751 ** openldap 2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518] -2005-1740 version (net-snmp, fixed 5.2.1) +2005-1740 backport (net-snmp, not fixed) 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1] 2005-1705 version (gdb, fixed 6.3) 2005-1704 version (gdb, fixed 6.3) From fedora-extras-commits at redhat.com Wed Jul 13 21:49:17 2005 From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon)) Date: Wed, 13 Jul 2005 17:49:17 -0400 Subject: rpms/leafnode/FC-4 .cvsignore, 1.3, 1.4 leafnode.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507132149.j6DLnHtO019201@cvs-int.fedora.redhat.com> Author: eyecon Update of /cvs/extras/rpms/leafnode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19180 Modified Files: .cvsignore leafnode.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:40:45 -0000 1.3 +++ .cvsignore 13 Jul 2005 21:49:15 -0000 1.4 @@ -1 +1 @@ -leafnode-1.9.53.rel.tar.bz2 +leafnode-1.11.3.rel.tar.bz2 Index: leafnode.spec =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/leafnode.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- leafnode.spec 22 May 2005 22:37:21 -0000 1.8 +++ leafnode.spec 13 Jul 2005 21:49:15 -0000 1.9 @@ -1,6 +1,6 @@ Name: leafnode -Version: 1.9.53 -Release: 3 +Version: 1.11.3 +Release: 2.FC4 Summary: Leaf site offline NNTP server License: MIT, GPL, LGPL @@ -23,10 +23,10 @@ newsserver of the ISP. %description -l de -Leafnode ist ein offline-Newsserver, der vor allem f?r den typischen +Leafnode ist ein offline-Newsserver, der vor allem fr den typischen Einzelnutzer-Rechner ohne permanente Internetanbindung geeignet ist. Leafnode bezieht automatisch die Newsgroups, die der oder die Nutzer -regelm??ig lesen, vom Newsserver des Providers. +regelm???ig lesen, vom Newsserver des Providers. %prep @@ -76,7 +76,7 @@ %doc COPYING COPYING.GPL COPYING.LGPL CREDITS ChangeLog ChangeLog.old %doc FAQ.* INSTALL -%doc NEWS PCRE_README README* TODO ADD-ONS +%doc NEWS README* TODO ADD-ONS %lang(de) %doc _doc_german/doc_german %dir %attr(2755,news,news) %spooldir @@ -92,6 +92,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 13 2005 David Hart - 1.11.3-2 +- Rebuilt +- Update to 1.11.3 release (Jun 8 05) +- Remove PCRE_README +- Reorganize and clean up config file. Separate global, per-news server + and remote access options. +- Change initial options to assume broadband rather than dial-up. +- TODO: Edit all text files for grammar, spelling and lucidity. + * Sun May 22 2005 Jeremy Katz - 1.9.53-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:40:45 -0000 1.3 +++ sources 13 Jul 2005 21:49:15 -0000 1.4 @@ -1 +1 @@ -79c3b65ded9dbf86b065d79ae98a5211 leafnode-1.9.53.rel.tar.bz2 +ba30c14e2950cdd98891a997b5a6eab8 leafnode-1.11.3.rel.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 13 22:35:25 2005 From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon)) Date: Wed, 13 Jul 2005 18:35:25 -0400 Subject: rpms/leafnode/FC-4 leafnode.spec,1.9,1.10 Message-ID: <200507132235.j6DMZPLM020433@cvs-int.fedora.redhat.com> Author: eyecon Update of /cvs/extras/rpms/leafnode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416 Modified Files: leafnode.spec Log Message: Index: leafnode.spec =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/leafnode.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- leafnode.spec 13 Jul 2005 21:49:15 -0000 1.9 +++ leafnode.spec 13 Jul 2005 22:35:23 -0000 1.10 @@ -1,6 +1,6 @@ Name: leafnode Version: 1.11.3 -Release: 2.FC4 +Release: 2%{?dist} Summary: Leaf site offline NNTP server License: MIT, GPL, LGPL From fedora-extras-commits at redhat.com Thu Jul 14 06:26:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:26:53 -0400 Subject: rpms/synaptic/FC-4 synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.11, 1.12 Message-ID: <200507140627.j6E6RNxc030007@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929/FC-4 Modified Files: .cvsignore sources synaptic.spec Added Files: synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch Log Message: 0.57.2 from Panu (#159189). synaptic-0.57-desktop.patch: --- NEW FILE synaptic-0.57-desktop.patch --- --- synaptic-0.57/data/synaptic.desktop.in.dt 2005-06-08 18:59:14.000000000 +0300 +++ synaptic-0.57/data/synaptic.desktop.in 2005-07-07 15:25:00.000000000 +0300 @@ -2,11 +2,10 @@ _Name=Synaptic Package Manager _GenericName=Package Manager _Comment=Install, remove and upgrade software packages -Exec=gksu -u root /usr/sbin/synaptic +Exec=synaptic Icon=synaptic.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 -Categories=PackageManager;GTK;System;Application -NotShowIn=KDE \ No newline at end of file +Categories=PackageManager;GTK;System;Application; synaptic-0.57-firefox.patch: --- NEW FILE synaptic-0.57-firefox.patch --- --- synaptic/gtk/rgmainwindow.cc.firefox 2005-07-12 22:24:04.000000000 +0300 +++ synaptic/gtk/rgmainwindow.cc 2005-07-12 22:24:57.000000000 +0300 @@ -2293,7 +2293,15 @@ system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &"); } #endif - else if (is_binary_in_path("mozilla")) { + else if (is_binary_in_path("firefox")) { + // mozilla eats bookmarks when run under sudo (because it does not + // change $HOME) - is this needed for firefox as well? + if(getenv("SUDO_USER") != NULL) { + struct passwd *pw = getpwuid(0); + setenv("HOME", pw->pw_dir, 1); + } + system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &"); + } else if (is_binary_in_path("mozilla")) { // mozilla eats bookmarks when run under sudo (because it does not // change $HOME) if(getenv("SUDO_USER") != NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 +++ .cvsignore 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -synaptic-0.55.3.tar.gz +synaptic-0.57.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:31:07 -0000 1.4 +++ sources 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz +dd753e953caa053279d342e3bc269128 synaptic-0.57.2.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/synaptic.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- synaptic.spec 6 Apr 2005 22:13:32 -0000 1.11 +++ synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 @@ -2,18 +2,17 @@ Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.55.3 -Release: 3 +Version: 0.57.2 +Release: 1%{?dist} License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Patch0: synaptic-0.57-desktop.patch +Patch1: synaptic-0.57-firefox.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk -# This isn't really a requirement mozilla works as well for a help browser, -# however konqueror and firefox don't apparently work so... -Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 @@ -30,9 +29,11 @@ %prep %setup -q +%patch0 -p1 -b .dt +%patch1 -p1 -b .firefox %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} %install @@ -41,7 +42,7 @@ %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic @@ -64,22 +65,16 @@ EOF # Remove the default menu entries and install our own -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop -# need to remove original Exec and fixup later as the default .desktop -# uses gksu which isn't available desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode=0644 \ --add-category X-Fedora \ - --add-category Application \ --add-category SystemSetup \ - --remove-key=Exec \ data/%{name}.desktop -echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +99,19 @@ %{_mandir}/man8/%{name}.8* %changelog +* Tue Jul 12 2005 Panu Matilainen 0.57.2-1 +- remove explicit yelp dependency, add support for browsing help with + firefox (#163036) +- configure with --disable-dependency-tracking + +* Thu Jul 07 2005 Panu Matilainen +- update to 0.57.2 +- remove kde-desktop file +- correct path in desktop file + +* Wed Jun 29 2005 Panu Matilainen 0.57-1 +- update to 0.57 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Jul 14 06:26:52 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:26:52 -0400 Subject: rpms/synaptic/FC-3 synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.8, 1.9 Message-ID: <200507140627.j6E6RMRx030002@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929/FC-3 Modified Files: .cvsignore sources synaptic.spec Added Files: synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch Log Message: 0.57.2 from Panu (#159189). synaptic-0.57-desktop.patch: --- NEW FILE synaptic-0.57-desktop.patch --- --- synaptic-0.57/data/synaptic.desktop.in.dt 2005-06-08 18:59:14.000000000 +0300 +++ synaptic-0.57/data/synaptic.desktop.in 2005-07-07 15:25:00.000000000 +0300 @@ -2,11 +2,10 @@ _Name=Synaptic Package Manager _GenericName=Package Manager _Comment=Install, remove and upgrade software packages -Exec=gksu -u root /usr/sbin/synaptic +Exec=synaptic Icon=synaptic.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 -Categories=PackageManager;GTK;System;Application -NotShowIn=KDE \ No newline at end of file +Categories=PackageManager;GTK;System;Application; synaptic-0.57-firefox.patch: --- NEW FILE synaptic-0.57-firefox.patch --- --- synaptic/gtk/rgmainwindow.cc.firefox 2005-07-12 22:24:04.000000000 +0300 +++ synaptic/gtk/rgmainwindow.cc 2005-07-12 22:24:57.000000000 +0300 @@ -2293,7 +2293,15 @@ system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &"); } #endif - else if (is_binary_in_path("mozilla")) { + else if (is_binary_in_path("firefox")) { + // mozilla eats bookmarks when run under sudo (because it does not + // change $HOME) - is this needed for firefox as well? + if(getenv("SUDO_USER") != NULL) { + struct passwd *pw = getpwuid(0); + setenv("HOME", pw->pw_dir, 1); + } + system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &"); + } else if (is_binary_in_path("mozilla")) { // mozilla eats bookmarks when run under sudo (because it does not // change $HOME) if(getenv("SUDO_USER") != NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 +++ .cvsignore 14 Jul 2005 06:26:49 -0000 1.5 @@ -1 +1 @@ -synaptic-0.55.3.tar.gz +synaptic-0.57.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:31:07 -0000 1.4 +++ sources 14 Jul 2005 06:26:49 -0000 1.5 @@ -1 +1 @@ -cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz +dd753e953caa053279d342e3bc269128 synaptic-0.57.2.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-3/synaptic.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synaptic.spec 29 Jan 2005 21:20:56 -0000 1.8 +++ synaptic.spec 14 Jul 2005 06:26:49 -0000 1.9 @@ -1,21 +1,21 @@ - -%define desktop_vendor fedora +%define desktop_vendor fedora Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.55.3 -Release: 2 +Version: 0.57.2 +Release: 1%{?dist} + License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Patch0: synaptic-0.57-desktop.patch +Patch1: synaptic-0.57-firefox.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk -# This isn't really a requirement mozilla works as well for a help browser, -# however konqueror and firefox don't apparently work so... -Requires: yelp -Requires(post,postun): scrollkeeper -BuildRequires: apt-devel >= 0:0.5.4, rpm-devel >= 0:4.0 +Requires(post): scrollkeeper +Requires(postun): scrollkeeper +BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser @@ -24,14 +24,16 @@ %description Synaptic is a graphical package management -program for apt. It provides the same features as the apt-get command line +program for apt. It provides the same features as the apt-get command line utility with a GUI front-end based on Gtk+ %prep %setup -q +%patch0 -p1 -b .dt +%patch1 -p1 -b .firefox %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} %install @@ -40,7 +42,7 @@ %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic @@ -63,22 +65,16 @@ EOF # Remove the default menu entries and install our own -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop -# need to remove original Exec and fixup later as the default .desktop -# uses gksu which isn't available desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode=0644 \ --add-category X-Fedora \ - --add-category Application \ --add-category SystemSetup \ - --remove-key=Exec \ data/%{name}.desktop -echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -103,6 +99,25 @@ %{_mandir}/man8/%{name}.8* %changelog +* Tue Jul 12 2005 Panu Matilainen 0.57.2-1 +- remove explicit yelp dependency, add support for browsing help with + firefox (#163036) +- configure with --disable-dependency-tracking + +* Thu Jul 07 2005 Panu Matilainen +- update to 0.57.2 +- remove kde-desktop file +- correct path in desktop file + +* Wed Jun 29 2005 Panu Matilainen 0.57-1 +- update to 0.57 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Fri Mar 4 2005 Ville Skytt?? +- Split context marked dependency syntax to work around #118773. + * Sat Jan 29 2005 Warren Togami 0.55.3-2 - ExcludeArch: x86_64 ppc64 @@ -172,7 +187,7 @@ * Thu Oct 23 2003 Panu Matilainen 0.45-0.fdr.1 - update to 0.45 -- support FC release naming +- support FC release naming * Thu Sep 25 2003 Panu Matilainen 0.44-0.fdr.1 - update to 0.44 @@ -191,7 +206,7 @@ * Sat Aug 02 2003 Panu Matilainen 0.40-0.fdr.1 - address issues in #313 / 13 -* Wed Jul 30 2003 Panu Matilainen +* Wed Jul 30 2003 Panu Matilainen - update to 0.40 - drop gtk requirement from 2.2 to 2.0 @@ -203,7 +218,7 @@ - automatically pick up rh version - drop patches (merged upstream) -* Tue May 27 2003 Panu Matilainen +* Tue May 27 2003 Panu Matilainen - patch to make it build with GTK 2.0 * Sat May 24 2003 Panu Matilainen 0.36.1-0.fdr.3 @@ -212,7 +227,7 @@ * Fri May 16 2003 Panu Matilainen 0.36.1-0.fdr.2 - missing buildrequires: gettext -* Thu Apr 24 2003 Panu Matilainen +* Thu Apr 24 2003 Panu Matilainen - add sources.list.d support * Tue Apr 22 2003 Panu Matilainen 0.36.1-0.fdr.1 From fedora-extras-commits at redhat.com Thu Jul 14 06:26:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:26:53 -0400 Subject: rpms/synaptic/devel synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.11, 1.12 Message-ID: <200507140627.j6E6RO11030012@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929/devel Modified Files: .cvsignore sources synaptic.spec Added Files: synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch Log Message: 0.57.2 from Panu (#159189). synaptic-0.57-desktop.patch: --- NEW FILE synaptic-0.57-desktop.patch --- --- synaptic-0.57/data/synaptic.desktop.in.dt 2005-06-08 18:59:14.000000000 +0300 +++ synaptic-0.57/data/synaptic.desktop.in 2005-07-07 15:25:00.000000000 +0300 @@ -2,11 +2,10 @@ _Name=Synaptic Package Manager _GenericName=Package Manager _Comment=Install, remove and upgrade software packages -Exec=gksu -u root /usr/sbin/synaptic +Exec=synaptic Icon=synaptic.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 -Categories=PackageManager;GTK;System;Application -NotShowIn=KDE \ No newline at end of file +Categories=PackageManager;GTK;System;Application; synaptic-0.57-firefox.patch: --- NEW FILE synaptic-0.57-firefox.patch --- --- synaptic/gtk/rgmainwindow.cc.firefox 2005-07-12 22:24:04.000000000 +0300 +++ synaptic/gtk/rgmainwindow.cc 2005-07-12 22:24:57.000000000 +0300 @@ -2293,7 +2293,15 @@ system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &"); } #endif - else if (is_binary_in_path("mozilla")) { + else if (is_binary_in_path("firefox")) { + // mozilla eats bookmarks when run under sudo (because it does not + // change $HOME) - is this needed for firefox as well? + if(getenv("SUDO_USER") != NULL) { + struct passwd *pw = getpwuid(0); + setenv("HOME", pw->pw_dir, 1); + } + system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &"); + } else if (is_binary_in_path("mozilla")) { // mozilla eats bookmarks when run under sudo (because it does not // change $HOME) if(getenv("SUDO_USER") != NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 +++ .cvsignore 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -synaptic-0.55.3.tar.gz +synaptic-0.57.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:31:07 -0000 1.4 +++ sources 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz +dd753e953caa053279d342e3bc269128 synaptic-0.57.2.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- synaptic.spec 6 Apr 2005 22:13:32 -0000 1.11 +++ synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 @@ -2,18 +2,17 @@ Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.55.3 -Release: 3 +Version: 0.57.2 +Release: 1%{?dist} License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Patch0: synaptic-0.57-desktop.patch +Patch1: synaptic-0.57-firefox.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk -# This isn't really a requirement mozilla works as well for a help browser, -# however konqueror and firefox don't apparently work so... -Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 @@ -30,9 +29,11 @@ %prep %setup -q +%patch0 -p1 -b .dt +%patch1 -p1 -b .firefox %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} %install @@ -41,7 +42,7 @@ %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic @@ -64,22 +65,16 @@ EOF # Remove the default menu entries and install our own -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop -# need to remove original Exec and fixup later as the default .desktop -# uses gksu which isn't available desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode=0644 \ --add-category X-Fedora \ - --add-category Application \ --add-category SystemSetup \ - --remove-key=Exec \ data/%{name}.desktop -echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +99,19 @@ %{_mandir}/man8/%{name}.8* %changelog +* Tue Jul 12 2005 Panu Matilainen 0.57.2-1 +- remove explicit yelp dependency, add support for browsing help with + firefox (#163036) +- configure with --disable-dependency-tracking + +* Thu Jul 07 2005 Panu Matilainen +- update to 0.57.2 +- remove kde-desktop file +- correct path in desktop file + +* Wed Jun 29 2005 Panu Matilainen 0.57-1 +- update to 0.57 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From ville.skytta at iki.fi Thu Jul 14 06:31:44 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 14 Jul 2005 09:31:44 +0300 Subject: APPROVED: gdome2 Message-ID: <1121322704.2872.53.camel@localhost.localdomain> gdome2 is a fast, light and complete DOM level 2 implementation based on libxml2. Although it has been written for the GNOME project, it can be used stand-alone. http://gdome2.cs.unibo.it/ Reviewer: Matthias Saou Maintainer: Ville Skytt? From fedora-extras-commits at redhat.com Thu Jul 14 06:35:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:29 -0400 Subject: rpms/gdome2 - New directory Message-ID: <200507140635.j6E6ZTHT030106@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086/gdome2 Log Message: Directory /cvs/extras/rpms/gdome2 added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 06:35:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:29 -0400 Subject: rpms/gdome2/devel - New directory Message-ID: <200507140635.j6E6ZTRY030111@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086/gdome2/devel Log Message: Directory /cvs/extras/rpms/gdome2/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 06:35:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:49 -0400 Subject: rpms/gdome2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507140635.j6E6ZnD5030165@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30134 Added Files: Makefile import.log Log Message: Setup of module gdome2 --- NEW FILE Makefile --- # Top level Makefile for module gdome2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 14 06:35:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:50 -0400 Subject: rpms/gdome2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507140635.j6E6Zod1030170@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30134/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gdome2 --- NEW 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 Jul 14 06:36:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:36:49 -0400 Subject: rpms/gdome2 import.log,1.1,1.2 Message-ID: <200507140637.j6E6bJNV030244@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30206 Modified Files: import.log Log Message: auto-import gdome2-0.8.1-0.2 on branch devel from gdome2-0.8.1-0.2.src.rpm Initial import. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdome2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 06:35:47 -0000 1.1 +++ import.log 14 Jul 2005 06:36:47 -0000 1.2 @@ -0,0 +1 @@ +gdome2-0_8_1-0_2:HEAD:gdome2-0.8.1-0.2.src.rpm:1121322999 From fedora-extras-commits at redhat.com Thu Jul 14 06:36:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:36:50 -0400 Subject: rpms/gdome2/devel gdome2-destdir.patch, NONE, 1.1 gdome2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507140636.j6E6aoLb030239@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30206/devel Modified Files: .cvsignore sources Added Files: gdome2-destdir.patch gdome2.spec Log Message: auto-import gdome2-0.8.1-0.2 on branch devel from gdome2-0.8.1-0.2.src.rpm Initial import. gdome2-destdir.patch: --- NEW FILE gdome2-destdir.patch --- --- gtk-doc/Makefile.am~ 2002-04-04 09:58:04.000000000 +0300 +++ gtk-doc/Makefile.am 2003-09-23 21:57:45.000000000 +0300 @@ -33,9 +33,9 @@ rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt install-data-local: - -install -d -m 0755 $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -install -d -m 0755 $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) .PHONY : html sgml templates scan --- gtk-doc/Makefile.in~ 2003-09-11 01:51:12.000000000 +0300 +++ gtk-doc/Makefile.in 2003-09-23 21:58:18.000000000 +0300 @@ -268,9 +268,9 @@ rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt install-data-local: - -install -d -m 0755 $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -install -d -m 0755 $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) .PHONY : html sgml templates scan --- NEW FILE gdome2.spec --- Name: gdome2 Version: 0.8.1 Release: 0.2 Summary: DOM level 2 library for accessing XML files. Group: System Environment/Libraries License: LGPL URL: http://gdome2.cs.unibo.it/ Source: http://gdome2.cs.unibo.it/tarball/%{name}-%{version}.tar.gz Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel >= 2.4.26 BuildRequires: glib2-devel >= 2.2.0 %description gdome2 is a fast, light and complete DOM level 2 implementation based on libxml2. Although it has been written for the GNOME project, it can be used stand-alone. A DOM implementation (also called a host implementation) is what makes a parsed XML or HTML document available for processing via the DOM interface. gdome2 currently supports the "Core", "XML", "Events" and "MutationEvents" modules from the DOM 2 Recommendation (see http://www.w3.org/TR/DOM-Level-2-Core/ and http://www.w3.org/TR/DOM-L evel-2-Events/), and is supposed to become a full implementation of all the DOM Level 2 standard. Now gdome2 also partially supports the XPath module from the DOM level 3 drafts. %package devel Summary: Development files for gdome2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: glib2-devel >= 2.2.0 Requires: libxml2-devel >= 2.4.26 %description devel This package contains the header files and static libraries for developing with gdome2. %prep %setup -q %patch0 -p0 %build export GLIB_CONFIG="pkg-config glib-2.0" # to fix gdome-config(1) %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check || : # xpath check dumps core on FC4 with libxml2 2.6.19 if [ "`(xml2-config --version)`" = "2.6.19" ] ; then make check || : else make check fi %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB MAINTAINERS README %{_libdir}/libgdome.so.* %files devel %defattr(-,root,root,-) %doc %{_datadir}/gtk-doc/ %{_bindir}/gdome-config %{_includedir}/libgdome/ %{_libdir}/libgdome.so %exclude %{_libdir}/libgdome.la %{_libdir}/gdomeConf.sh %{_datadir}/aclocal/gdome2.m4 %{_libdir}/pkgconfig/gdome2.pc %{_mandir}/man1/gdome-config.1* %changelog * Tue Jul 12 2005 Ville Skytt?? - 0.8.1-0.2 - Allow test suite to fail only with libxml2 2.6.19. - Drop some unneeded docs. * Wed Jun 22 2005 Ville Skytt?? - 0.8.1-0.1 - Rebuild for FC4, don't fail if test suite fails (it does w/libxml2 2.6.19). - Don't build static libs. * Thu Feb 12 2004 Ville Skytt?? - 0:0.8.1-0.fdr.1 - Update to 0.8.1. * Sun Oct 19 2003 Ville Skytt?? - 0:0.8.0-0.fdr.3 - Remove (empty) NEWS from docs. * Mon Oct 13 2003 Ville Skytt?? - 0:0.8.0-0.fdr.2 - Fix source permissions. * Tue Sep 23 2003 Ville Skytt?? - 0:0.8.0-0.fdr.1 - Update to 0.8.0. * Fri Aug 1 2003 Ville Skytt?? - 0:0.7.4-0.fdr.1 - Update to 0.7.4. - Fedorafied. * Sun Dec 29 2002 Paolo Casarini patch provided by Oron Peled - %defattr(-,root,root) wasn't set for documents in the devel package. This cause wrong ownership of docs in non-root builds. - Update URL: and Source: locations - s/Copyright:/License:/ * Sun Mar 31 2002 Paolo Casarini - updated descriptions and summaries * Sat Dec 15 2001 Paolo Casarini - updated descriptions and summaries * Tue Oct 23 2001 Paolo Casarini - added the gdome-config.1 man page * Mon Aug 6 2001 Paolo Casarini - Merge of the Andrew release with mine * Thu Aug 2 2001 Andrew Chatham - Spec file created * Tue Jul 3 2001 Paolo Casarini - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 06:35:47 -0000 1.1 +++ .cvsignore 14 Jul 2005 06:36:47 -0000 1.2 @@ -0,0 +1 @@ +gdome2-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 06:35:47 -0000 1.1 +++ sources 14 Jul 2005 06:36:47 -0000 1.2 @@ -0,0 +1 @@ +bfc114e59eec50cbda8e4ece751ff022 gdome2-0.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 06:39:35 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:39:35 -0400 Subject: rpms/gdome2/devel gdome2.spec,1.1,1.2 Message-ID: <200507140639.j6E6dZ3o030306@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30289 Modified Files: gdome2.spec Log Message: Use disttag. Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdome2.spec 14 Jul 2005 06:36:47 -0000 1.1 +++ gdome2.spec 14 Jul 2005 06:39:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: gdome2 Version: 0.8.1 -Release: 0.2 +Release: 1%{?dist} Summary: DOM level 2 library for accessing XML files. Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Thu Jul 14 2005 Ville Skytt?? - 0.8.1-1 +- Use disttag. + * Tue Jul 12 2005 Ville Skytt?? - 0.8.1-0.2 - Allow test suite to fail only with libxml2 2.6.19. - Drop some unneeded docs. From fedora-extras-commits at redhat.com Thu Jul 14 06:46:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:46:46 -0400 Subject: rpms/gdome2/devel gdome2.spec,1.2,1.3 Message-ID: <200507140646.j6E6kk2k030356@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30339 Modified Files: gdome2.spec Log Message: ... Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdome2.spec 14 Jul 2005 06:39:33 -0000 1.2 +++ gdome2.spec 14 Jul 2005 06:46:44 -0000 1.3 @@ -1,7 +1,7 @@ Name: gdome2 Version: 0.8.1 Release: 1%{?dist} -Summary: DOM level 2 library for accessing XML files. +Summary: DOM level 2 library for accessing XML files Group: System Environment/Libraries License: LGPL From fedora-extras-commits at redhat.com Thu Jul 14 06:47:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:47:40 -0400 Subject: owners owners.list,1.12,1.13 Message-ID: <200507140647.j6E6le2O030384@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30367 Modified Files: owners.list Log Message: Add gdome2. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- owners.list 13 Jul 2005 18:27:35 -0000 1.12 +++ owners.list 14 Jul 2005 06:47:38 -0000 1.13 @@ -185,6 +185,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|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| Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 14 07:24:21 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 14 Jul 2005 03:24:21 -0400 Subject: rpms/libifp/devel 10-libifp.rules, NONE, 1.1 libifp.hotplug, 1.1, 1.2 libifp.spec, 1.3, 1.4 libifp.usermap, 1.1, NONE Message-ID: <200507140724.j6E7OLHo031774@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31754 Modified Files: libifp.hotplug libifp.spec Added Files: 10-libifp.rules Removed Files: libifp.usermap Log Message: Modified for new udev --- NEW FILE 10-libifp.rules --- BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x100[135789]", RUN+="/sbin/libifp-hotplug" BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x101[01]", RUN+="/sbin/libifp-hotplug" Index: libifp.hotplug =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.hotplug,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libifp.hotplug 7 Jul 2005 23:02:41 -0000 1.1 +++ libifp.hotplug 14 Jul 2005 07:24:19 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/bash # -# /etc/hotplug/usb/libifp +# /sbin/libifp-hotplug # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libifp.spec 7 Jul 2005 23:02:41 -0000 1.3 +++ libifp.spec 14 Jul 2005 07:24:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: libifp Version: 1.0.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general-purpose library-driver for iRiver's iFP portable audio players Group: System Environment/Base @@ -8,7 +8,7 @@ URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz Source1: libifp.hotplug -Source2: libifp.usermap +Source2: 10-libifp.rules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -39,8 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; -install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp -install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/libifp-hotplug +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-libifp.rules %clean rm -rf $RPM_BUILD_ROOT @@ -53,7 +53,8 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* -%{_sysconfdir}/hotplug/usb/* +/sbin/* +%{_sysconfdir}/udev/rules.d/*.rules %files devel %defattr(-,root,root,-) @@ -63,6 +64,9 @@ %{_mandir}/man3/* %changelog +* Thu Jul 14 2005 Ignacio Vazquez-Abrams 1.0.0.1-2 +- Modified for new udev + * Thu Jul 7 2005 Ignacio Vazquez-Abrams - Added Per Bjornsson's hotplug files --- libifp.usermap DELETED --- From fedora-extras-commits at redhat.com Thu Jul 14 07:57:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:11 -0400 Subject: rpms/bwm-ng - New directory Message-ID: <200507140757.j6E7vBsI031884@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864/bwm-ng Log Message: Directory /cvs/extras/rpms/bwm-ng added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 07:57:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:11 -0400 Subject: rpms/bwm-ng/devel - New directory Message-ID: <200507140757.j6E7vB1J031889@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864/bwm-ng/devel Log Message: Directory /cvs/extras/rpms/bwm-ng/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 07:57:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:28 -0400 Subject: rpms/bwm-ng Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507140757.j6E7vSSF031940@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909 Added Files: Makefile import.log Log Message: Setup of module bwm-ng --- NEW FILE Makefile --- # Top level Makefile for module bwm-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 Thu Jul 14 07:57:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:28 -0400 Subject: rpms/bwm-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507140757.j6E7vSBw031945@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bwm-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 Thu Jul 14 07:58:01 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:58:01 -0400 Subject: rpms/bwm-ng import.log,1.1,1.2 Message-ID: <200507140758.j6E7w1tb032015@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983 Modified Files: import.log Log Message: auto-import bwm-ng-0.5-5 on branch devel from bwm-ng-0.5-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 07:57:26 -0000 1.1 +++ import.log 14 Jul 2005 07:57:59 -0000 1.2 @@ -0,0 +1 @@ +bwm-ng-0_5-5:HEAD:bwm-ng-0.5-5.src.rpm:1121327872 From fedora-extras-commits at redhat.com Thu Jul 14 07:58:02 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:58:02 -0400 Subject: rpms/bwm-ng/devel bwm-ng.conf, NONE, 1.1 bwm-ng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507140758.j6E7w2vU032022@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983/devel Modified Files: .cvsignore sources Added Files: bwm-ng.conf bwm-ng.spec Log Message: auto-import bwm-ng-0.5-5 on branch devel from bwm-ng-0.5-5.src.rpm --- NEW FILE bwm-ng.conf --- DYNAMIC=1 PACKETS=0 INPUT=libstatgrab OUTPUT=curses --- NEW FILE bwm-ng.spec --- # $Id: bwm-ng.spec,v 1.7 2005/07/14 07:17:13 oliver Exp $ Summary: Bandwidth Monitor NG Name: bwm-ng Version: 0.5 Release: 5%{?dist} License: GPL Group: Applications/System URL: http://www.volker-gropp.de/ Source0: http://www.volker-gropp.de/bwm-ng/bwm-ng-%{version}.tar.gz Source1: bwm-ng.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: net-tools, procps BuildRequires: ncurses-devel, libstatgrab-devel %description A small and simple curses base bandwidth monitor. No big features. %prep %setup -q %build %configure --enable-64bit \ --enable-netstatbyte \ --enable-netstatlink \ --with-ncurses \ --with-time \ --with-getopt_long \ --with-getifaddrs \ --with-sysctl \ --with-procnetdev \ --with-libstatgrab \ --with-netstatlinux \ --without-strip %{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -D -m755 src/bwm-ng $RPM_BUILD_ROOT%{_bindir}/bwm-ng install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bwm-ng.conf install -D -m644 bwm-ng.1 $RPM_BUILD_ROOT%{_mandir}/man1/bwm-ng.1 %clean rm -rf $RPM_BUILD_ROOT %files %doc AUTHORS README changelog bwm-ng.conf-example bwm-ng.css %config %{_sysconfdir}/bwm-ng.conf %{_bindir}/bwm-ng %{_mandir}/man1/bwm-ng.1* %changelog * Thu Jul 14 2005 Oliver Falk - 0.5-5 - Integrated Matthias changes, after his review * Thu May 19 2005 Oliver Falk - 0.5-4.2 - Specfile cleanup * Fri Mar 25 2005 Oliver Falk - 0.5-4.1 - Check with lint says: bwm-ng hardcoded-packager-tag Oliver: FIXED * Wed Mar 16 2005 Oliver Falk - 0.5-4 - Fix, still build pre1 :-/ * Wed Mar 16 2005 Oliver Falk - 0.5-3 - Update to real 0.5, not only 0.5pre1 * Tue Feb 15 2005 Oliver Falk - 0.5-2 - Make use of libstatgrab, by using it in the default config * Tue Feb 15 2005 Oliver Falk - 0.5-1 - Fix warnings spotted by rpmlint - Update - Update dependencies and add various configure switches, so this little thingy is no longer _little_ :-) * Tue Oct 19 2004 Oliver Falk - 0.4-pre1-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 07:57:26 -0000 1.1 +++ .cvsignore 14 Jul 2005 07:58:00 -0000 1.2 @@ -0,0 +1 @@ +bwm-ng-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 07:57:26 -0000 1.1 +++ sources 14 Jul 2005 07:58:00 -0000 1.2 @@ -0,0 +1 @@ +4c5197527c985dc8b45973dfd00deca0 bwm-ng-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 08:00:51 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 04:00:51 -0400 Subject: owners owners.list,1.13,1.14 Message-ID: <200507140800.j6E80pNZ032105@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088 Modified Files: owners.list Log Message: * Add bwm-ng Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- owners.list 14 Jul 2005 06:47:38 -0000 1.13 +++ owners.list 14 Jul 2005 08:00:49 -0000 1.14 @@ -57,6 +57,7 @@ Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 14 08:02:27 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 14 Jul 2005 04:02:27 -0400 Subject: common tobuild,1.1912,1.1913 Message-ID: <200507140803.j6E83UaX001011@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1912 retrieving revision 1.1913 diff -u -r1.1912 -r1.1913 --- tobuild 13 Jul 2005 18:37:43 -0000 1.1912 +++ tobuild 14 Jul 2005 08:02:07 -0000 1.1913 @@ -56,3 +56,4 @@ thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 08:04:58 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 04:04:58 -0400 Subject: common tobuild,1.1913,1.1914 Message-ID: <200507140804.j6E84wQB001120@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1052 Modified Files: tobuild Log Message: request build of rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1913 retrieving revision 1.1914 diff -u -r1.1913 -r1.1914 --- tobuild 14 Jul 2005 08:02:07 -0000 1.1913 +++ tobuild 14 Jul 2005 08:04:31 -0000 1.1914 @@ -57,3 +57,4 @@ thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel +oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 09:14:01 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 14 Jul 2005 05:14:01 -0400 Subject: fedora-security/audit fc4,1.22,1.23 Message-ID: <200507140914.j6E9E1XP002819@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2802 Modified Files: fc4 Log Message: Yesterdays updates, including Mozilla and Firefox batch Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fc4 13 Jul 2005 20:08:27 -0000 1.22 +++ fc4 14 Jul 2005 09:13:59 -0000 1.23 @@ -1,13 +1,36 @@ -Up to date CVE as of CVE email 20050711 -Up to date FC4 as of 20050711 +Up to date CVE as of CVE email 20050714 +Up to date FC4 as of 20050714 ** are items that need attention +2005-2270 VULNERABLE (firefox, fixed 1.0.5) +2005-2270 VULNERABLE (mozilla, fixed 1.7.9) +2005-2269 VULNERABLE (firefox, fixed 1.0.5) +2005-2269 VULNERABLE (mozilla, fixed 1.7.9) +2005-2268 VULNERABLE (firefox, fixed 1.0.5) +2005-2268 VULNERABLE (mozilla, fixed 1.7.9) +2005-2267 VULNERABLE (firefox, fixed 1.0.5) +2005-2266 VULNERABLE (firefox, fixed 1.0.5) +2005-2266 VULNERABLE (mozilla, fixed 1.7.9) +2005-2265 VULNERABLE (firefox, fixed 1.0.5) +2005-2265 VULNERABLE (mozilla, fixed 1.7.9) +2005-2264 VULNERABLE (firefox, fixed 1.0.5) +2005-2263 VULNERABLE (firefox, fixed 1.0.5) +2005-2263 VULNERABLE (mozilla, fixed 1.7.9) +2005-2262 VULNERABLE (firefox, fixed 1.0.5) +2005-2261 VULNERABLE (thunderbird, fixed 1.0.5) +2005-2261 VULNERABLE (firefox, fixed 1.0.5) +2005-2261 VULNERABLE (mozilla, fixed 1.7.9) +2005-2260 VULNERABLE (firefox, fixed 1.0.5) +2005-2260 VULNERABLE (mozilla, fixed 1.7.9) 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] +2005-2095 VULNERABLE (squirrelmail) 2005-2088 VULNERABLE (httpd) +2005-1937 VULNERABLE (firefox, fixed 1.0.5) +2005-1937 VULNERABLE (mozilla, fixed 1.7.9) 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] 2005-1768 version (kernel, fixed 2.6.6) From fedora-extras-commits at redhat.com Thu Jul 14 11:05:05 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 14 Jul 2005 07:05:05 -0400 Subject: owners owners.list,1.14,1.15 Message-ID: <200507141105.j6EB5aVG005225@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5211 Modified Files: owners.list Log Message: Add perl-Want Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- owners.list 14 Jul 2005 08:00:49 -0000 1.14 +++ owners.list 14 Jul 2005 11:05:03 -0000 1.15 @@ -589,6 +589,7 @@ Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|anvil at livna.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 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 From fedora-extras-commits at redhat.com Thu Jul 14 14:13:15 2005 From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon)) Date: Thu, 14 Jul 2005 10:13:15 -0400 Subject: common tobuild,1.1914,1.1915 Message-ID: <200507141413.j6EEDFIR008789@cvs-int.fedora.redhat.com> Author: eyecon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8772 Modified Files: tobuild Log Message: request build of rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1914 retrieving revision 1.1915 diff -u -r1.1914 -r1.1915 --- tobuild 14 Jul 2005 08:04:31 -0000 1.1914 +++ tobuild 14 Jul 2005 14:13:13 -0000 1.1915 @@ -58,3 +58,4 @@ thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel +eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 14 14:57:35 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 14 Jul 2005 10:57:35 -0400 Subject: rpms/kyum/devel kyum-0.7.2-DlgInfo.patch, NONE, 1.1 kyum.spec, 1.5, 1.6 Message-ID: <200507141457.j6EEvZoK008956@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8936 Modified Files: kyum.spec Added Files: kyum-0.7.2-DlgInfo.patch Log Message: Description: Patch DlgInfo.h to solve problem of automated generating of Makefiles. kyum-0.7.2-DlgInfo.patch: --- NEW FILE kyum-0.7.2-DlgInfo.patch --- --- kyum-0.7.2/src/DlgInfo.h.org 2005-07-14 16:42:09.000000000 +0200 +++ kyum-0.7.2/src/DlgInfo.h 2005-07-14 16:43:14.000000000 +0200 @@ -31,6 +31,8 @@ class DlgInfo : public KDialogBase { + Q_OBJECT + public: enum MsgID { @@ -41,8 +43,6 @@ QCheckBox * m_pCheckDisable; MsgID m_msgID; - Q_OBJECT - public: DlgInfo(QWidget * pParent, MsgID msgID); virtual ~ DlgInfo(); Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kyum.spec 13 Jul 2005 15:26:10 -0000 1.5 +++ kyum.spec 14 Jul 2005 14:57:33 -0000 1.6 @@ -1,6 +1,6 @@ Name: kyum Version: 0.7.2 -Release: 1 +Release: 3 Summary: Graphical User Frontend (GUI) for yum @@ -9,6 +9,7 @@ URL: http://kde-apps.org/content/show.php?content=22185 Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch +Patch2: kyum-0.7.2-DlgInfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +29,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -67,6 +69,12 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Thu Jul 14 2005 Jochen Schmitt 0.7.2-3 +- Patch DlgInfo.h to generate proper Makefiles (calling of moc) + +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-2 +- Patch for missing DlgInfo.moc + * Wed Jul 13 2005 Jochen Schmitt 0.7.2-1 - Update to new upstream release From fedora-extras-commits at redhat.com Thu Jul 14 16:49:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 14 Jul 2005 12:49:28 -0400 Subject: owners owners.list,1.15,1.16 Message-ID: <200507141649.j6EGnSmB011543@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526 Modified Files: owners.list Log Message: changed owner of libcdio Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- owners.list 14 Jul 2005 11:05:03 -0000 1.15 +++ owners.list 14 Jul 2005 16:49:25 -0000 1.16 @@ -335,7 +335,7 @@ Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|libcdio|A CD-ROM input and control library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|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|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 14 16:56:31 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 14 Jul 2005 12:56:31 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.5, 1.6 freeciv.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507141656.j6EGuVXL011586@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 14 2005 Brian Pepple - 2.0.3 - Update to 2.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Jun 2005 21:22:30 -0000 1.5 +++ .cvsignore 14 Jul 2005 16:56:29 -0000 1.6 @@ -1,2 +1,2 @@ +freeciv-2.0.3.tar.bz2 stdsounds2.tar.gz -freeciv-2.0.2.tar.bz2 Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- freeciv.spec 14 Jun 2005 21:22:30 -0000 1.9 +++ freeciv.spec 14 Jul 2005 16:56:29 -0000 1.10 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: The Freeciv multi-player strategy game @@ -87,6 +87,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 14 2005 Brian Pepple - 2.0.3 +- Update to 2.0.3. + * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 - Update to 2.0.2. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Jun 2005 21:22:30 -0000 1.5 +++ sources 14 Jul 2005 16:56:29 -0000 1.6 @@ -1,2 +1,2 @@ +3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz -dadd040a767dd5e1a7f1e18c7dfa756f freeciv-2.0.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 14 17:00:15 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 14 Jul 2005 13:00:15 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.5, 1.6 freeciv.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507141700.j6EH0FGh011650@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11629 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 14 2005 Brian Pepple - 2.0.3 - Update to 2.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Jun 2005 14:55:39 -0000 1.5 +++ .cvsignore 14 Jul 2005 17:00:13 -0000 1.6 @@ -1,2 +1,2 @@ -freeciv-2.0.2.tar.bz2 +freeciv-2.0.3.tar.bz2 stdsounds2.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- freeciv.spec 16 Jun 2005 14:55:39 -0000 1.9 +++ freeciv.spec 14 Jul 2005 17:00:13 -0000 1.10 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: The Freeciv multi-player strategy game @@ -87,6 +87,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 14 2005 Brian Pepple - 2.0.3 +- Update to 2.0.3. + * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 - Update to 2.0.2. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Jun 2005 14:55:39 -0000 1.5 +++ sources 14 Jul 2005 17:00:13 -0000 1.6 @@ -1,2 +1,2 @@ -dadd040a767dd5e1a7f1e18c7dfa756f freeciv-2.0.2.tar.bz2 +3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 18:00:28 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 14 Jul 2005 14:00:28 -0400 Subject: mock mock-yum,NONE,1.1 Makefile,1.3,1.4 Message-ID: <200507141800.j6EI0SES013059@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029 Modified Files: Makefile Added Files: mock-yum Log Message: add mock-yum wrapper to remove the selinux LD_PRELOAD. also, only set the LD_PRELOAD for use with running yum --- NEW FILE mock-yum --- #!/usr/bin/python # Basically a copy of /usr/bin/yum that removes the LD_PRELOAD set by mock import os, sys if os.environ.has_key("LD_PRELOAD"): del os.environ["LD_PRELOAD"] import yum sys.path.insert(0, "/usr/share/yum-cli") import yummain try: yummain.main(sys.argv[1:]) except KeyboardInterrupt, e: print >> sys.stderr, "\n\nExiting on user cancel." sys.exit(1) Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 27 Jun 2005 03:43:11 -0000 1.3 +++ Makefile 14 Jul 2005 18:00:26 -0000 1.4 @@ -21,6 +21,7 @@ install: mkdir -p $(DESTDIR)/usr/bin/ install -m 755 mock.py $(DESTDIR)/usr/bin/mock + install -m 755 mock-yum $(DESTDIR)/usr/libexec/mock-yum mkdir -p $(DESTDIR)/var/lib/mock for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done From fedora-extras-commits at redhat.com Thu Jul 14 18:00:28 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 14 Jul 2005 14:00:28 -0400 Subject: mock/src mock-helper.c,1.6,1.7 Message-ID: <200507141800.j6EI0S2h013065@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/mock/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029/src Modified Files: mock-helper.c Log Message: add mock-yum wrapper to remove the selinux LD_PRELOAD. also, only set the LD_PRELOAD for use with running yum Index: mock-helper.c =================================================================== RCS file: /cvs/fedora/mock/src/mock-helper.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mock-helper.c 23 Jun 2005 20:00:45 -0000 1.6 +++ mock-helper.c 14 Jul 2005 18:00:26 -0000 1.7 @@ -133,7 +133,7 @@ /* argv[0] should by convention be the binary name to be executed */ void -do_command (const char *filename, char *const argv[]) +do_command (const char *filename, char *const argv[], int use_selinux_preload) { /* do not trust user environment; * copy over allowed env vars, after setting PATH and HOME ourselves @@ -163,7 +163,7 @@ #ifdef USE_SELINUX /* add LD_PRELOAD for our selinux lib if selinux is in use is set */ - if (is_selinux_enabled() > 0) + if ((is_selinux_enabled() > 0) && (use_selinux_preload == 1)) { ld_preload = strdup("LD_PRELOAD=libselinux-mock.so"); printf("adding ld_preload of %s\n", ld_preload); @@ -198,7 +198,7 @@ /* do we allow this dir ? */ check_dir_allowed (rootsdir, argv[2]); - do_command ("/usr/sbin/chroot", &(argv[1])); + do_command ("/usr/sbin/chroot", &(argv[1]), 0); } /* @@ -235,7 +235,7 @@ error ("unallowed mount type"); /* all checks passed, execute */ - do_command ("/bin/mount", &(argv[1])); + do_command ("/bin/mount", &(argv[1]), 0); } /* clean out a chroot dir */ @@ -254,7 +254,7 @@ check_dir_allowed (rootsdir, argv[3]); /* all checks passed, execute */ - do_command ("/bin/rm", &(argv[1])); + do_command ("/bin/rm", &(argv[1]), 0); } /* perform rpm commands on root */ @@ -273,7 +273,7 @@ check_dir_allowed (rootsdir, argv[3]); /* all checks passed, execute */ - do_command ("/bin/rpm", &(argv[1])); + do_command ("/bin/rpm", &(argv[1]), 0); } @@ -292,7 +292,7 @@ check_dir_allowed (rootsdir, argv[3]); /* all checks passed, execute */ - do_command ("/usr/bin/yum", &(argv[1])); + do_command ("/usr/libexec/mock-yum", &(argv[1]), 1); } @@ -308,7 +308,7 @@ check_dir_allowed (rootsdir, argv[2]); /* all checks passed, execute */ - do_command ("/bin/umount", &(argv[1])); + do_command ("/bin/umount", &(argv[1]), 1); } /* make /dev/ device nodes */ @@ -338,7 +338,7 @@ /* removed specific checks so we can make more than just /dev/null */ /* all checks passed, execute */ - do_command ("/bin/mknod", &(argv[1])); + do_command ("/bin/mknod", &(argv[1]), 0); } int From fedora-extras-commits at redhat.com Thu Jul 14 18:44:59 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:44:59 -0400 Subject: rpms/perl-Crypt-CBC - New directory Message-ID: <200507141845.j6EIixqH014304@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14280/perl-Crypt-CBC Log Message: Directory /cvs/extras/rpms/perl-Crypt-CBC added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 18:45:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:00 -0400 Subject: rpms/perl-Crypt-CBC/devel - New directory Message-ID: <200507141845.j6EIj0wM014309@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14280/perl-Crypt-CBC/devel Log Message: Directory /cvs/extras/rpms/perl-Crypt-CBC/devel added to the repository From andreas at bawue.net Thu Jul 14 18:46:32 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 14 Jul 2005 20:46:32 +0200 (CEST) Subject: APPROVED: perl-Crypt-CBC Message-ID: This is Crypt::CBC, a Perl-only implementation of the cryptographic cipher block chaining mode (CBC). In combination with a block cipher such as Crypt::DES or Crypt::IDEA, you can encrypt and decrypt messages of arbitrarily long length. The encrypted messages are compatible with the encryption format used by SSLeay. Reviewer: Ville Skytt? Maintainer: Andreas Thienemann From fedora-extras-commits at redhat.com Thu Jul 14 18:45:17 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:17 -0400 Subject: rpms/perl-Crypt-CBC Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507141845.j6EIjHPM014354@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327 Added Files: Makefile import.log Log Message: Setup of module perl-Crypt-CBC --- NEW FILE Makefile --- # Top level Makefile for module perl-Crypt-CBC all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 14 18:45:18 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:18 -0400 Subject: rpms/perl-Crypt-CBC/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507141845.j6EIjIxj014359@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Crypt-CBC --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From andreas at bawue.net Thu Jul 14 18:47:16 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 14 Jul 2005 20:47:16 +0200 (CEST) Subject: APPROVED: perl-Crypt-Blowfish Message-ID: Crypt::Blowfish is an XS-based implementation of the Blowfish cryptography algorithm designed by Bruce Schneier. It's designed to take full advantage of Crypt::CBC when desired. Blowfish keys may be up to 448 bits (56 bytes) long. Reviewer: Ville Skytt? Maintainer: Andreas Thienemann From fedora-extras-commits at redhat.com Thu Jul 14 18:45:56 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:56 -0400 Subject: rpms/perl-Crypt-CBC/devel perl-Crypt-CBC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507141846.j6EIkR8c014429@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14391/devel Modified Files: .cvsignore sources Added Files: perl-Crypt-CBC.spec Log Message: auto-import perl-Crypt-CBC-2.14-1 on branch devel from perl-Crypt-CBC-2.14-1.src.rpm --- NEW FILE perl-Crypt-CBC.spec --- Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC Version: 2.14 Release: 1%{?dist} License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-CBC/ Source0: http://search.cpan.org/CPAN/authors/id/L/LD/LDS/Crypt-CBC-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl >= 2:5.8.0 %description This is Crypt::CBC, a Perl-only implementation of the cryptographic cipher block chaining mode (CBC). In combination with a block cipher such as Crypt::DES or Crypt::IDEA, you can encrypt and decrypt messages of arbitrarily long length. The encrypted messages are compatible with the encryption format used by SSLeay. %prep %setup -q -n Crypt-CBC-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README eg/ %{perl_vendorlib}/Crypt/ %{_mandir}/man3/*.3* %changelog * Thu Jul 14 2005 Andreas Thienemann - 2.14-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 18:45:16 -0000 1.1 +++ .cvsignore 14 Jul 2005 18:45:54 -0000 1.2 @@ -0,0 +1 @@ +Crypt-CBC-2.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 18:45:16 -0000 1.1 +++ sources 14 Jul 2005 18:45:54 -0000 1.2 @@ -0,0 +1 @@ +68a955e9d6440fa4752fd203ce5b8886 Crypt-CBC-2.14.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 18:45:56 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:56 -0400 Subject: rpms/perl-Crypt-CBC import.log,1.1,1.2 Message-ID: <200507141846.j6EIkQhw014425@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14391 Modified Files: import.log Log Message: auto-import perl-Crypt-CBC-2.14-1 on branch devel from perl-Crypt-CBC-2.14-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 18:45:15 -0000 1.1 +++ import.log 14 Jul 2005 18:45:54 -0000 1.2 @@ -0,0 +1 @@ +perl-Crypt-CBC-2_14-1:HEAD:perl-Crypt-CBC-2.14-1.src.rpm:1121366754 From fedora-extras-commits at redhat.com Thu Jul 14 18:48:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:01 -0400 Subject: rpms/perl-Crypt-Blowfish - New directory Message-ID: <200507141848.j6EIm1X9014535@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14509/perl-Crypt-Blowfish Log Message: Directory /cvs/extras/rpms/perl-Crypt-Blowfish added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 18:48:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:01 -0400 Subject: rpms/perl-Crypt-Blowfish/devel - New directory Message-ID: <200507141848.j6EIm1Gq014540@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14509/perl-Crypt-Blowfish/devel Log Message: Directory /cvs/extras/rpms/perl-Crypt-Blowfish/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 18:48:25 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:25 -0400 Subject: rpms/perl-Crypt-Blowfish Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507141848.j6EImP55014594@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14567 Added Files: Makefile import.log Log Message: Setup of module perl-Crypt-Blowfish --- NEW FILE Makefile --- # Top level Makefile for module perl-Crypt-Blowfish all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 14 18:48:26 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:26 -0400 Subject: rpms/perl-Crypt-Blowfish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507141848.j6EImQor014599@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14567/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Crypt-Blowfish --- NEW 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 Jul 14 18:49:04 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:49:04 -0400 Subject: rpms/perl-Crypt-Blowfish import.log,1.1,1.2 Message-ID: <200507141849.j6EInYD4014675@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636 Modified Files: import.log Log Message: auto-import perl-Crypt-Blowfish-2.09-1 on branch devel from perl-Crypt-Blowfish-2.09-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 18:48:23 -0000 1.1 +++ import.log 14 Jul 2005 18:49:02 -0000 1.2 @@ -0,0 +1 @@ +perl-Crypt-Blowfish-2_09-1:HEAD:perl-Crypt-Blowfish-2.09-1.src.rpm:1121366942 From fedora-extras-commits at redhat.com Thu Jul 14 18:49:04 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:49:04 -0400 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636/devel Modified Files: .cvsignore sources Added Files: perl-Crypt-Blowfish.spec Log Message: auto-import perl-Crypt-Blowfish-2.09-1 on branch devel from perl-Crypt-Blowfish-2.09-1.src.rpm --- NEW FILE perl-Crypt-Blowfish.spec --- Summary: XS Blowfish implementation for Perl Name: perl-Crypt-Blowfish Version: 2.09 Release: 1%{?dist} License: Distributable Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Blowfish/ Source0: http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl-Crypt-CBC BuildRequires: perl-Crypt-CBC %description Crypt::Blowfish is an XS-based implementation of the Blowfish cryptography algorithm designed by Bruce Schneier. It's designed to take full advantage of Crypt::CBC when desired. Blowfish keys may be up to 448 bits (56 bytes) long. %prep %setup -q -n Crypt-Blowfish-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name *.bs -a -size 0 -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/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYRIGHT Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt/ %{_mandir}/man3/*.3* %changelog * Thu Jul 14 2005 Andreas Thienemann - 2.09-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 18:48:24 -0000 1.1 +++ .cvsignore 14 Jul 2005 18:49:02 -0000 1.2 @@ -0,0 +1 @@ +Crypt-Blowfish-2.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 18:48:24 -0000 1.1 +++ sources 14 Jul 2005 18:49:02 -0000 1.2 @@ -0,0 +1 @@ +bbd037e1eb20778f3d636dff345ed02f Crypt-Blowfish-2.09.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 18:55:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:55:00 -0400 Subject: owners owners.list,1.16,1.17 Message-ID: <200507141855.j6EIt0jM014803@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14780 Modified Files: owners.list Log Message: Added perl-Crypt-Blowfish and perl-Crypt-CBC Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- owners.list 14 Jul 2005 16:49:25 -0000 1.16 +++ owners.list 14 Jul 2005 18:54:58 -0000 1.17 @@ -495,6 +495,8 @@ Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|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 Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From ville.skytta at iki.fi Thu Jul 14 18:58:00 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 14 Jul 2005 21:58:00 +0300 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> References: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> Message-ID: <1121367480.2872.157.camel@localhost.localdomain> On Thu, 2005-07-14 at 14:49 -0400, Andreas Thienemann wrote: One more catch: > find $RPM_BUILD_ROOT -name *.bs -a -size 0 -exec rm -f {} ';' Adding quotes around *.bs would be better. Otherwise *.bs expands to Blowfish.bs already by the shell before "find" even runs, because Blowfish.bs happens to be in the same dir where that command is run. In this case, it doesn't really affect the results though, but better to always do it correctly. From fedora-extras-commits at redhat.com Thu Jul 14 19:04:29 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:04:29 -0400 Subject: common tobuild,1.1915,1.1916 Message-ID: <200507141904.j6EJ4pML016055@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16036 Modified Files: tobuild Log Message: request build of rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1915 retrieving revision 1.1916 diff -u -r1.1915 -r1.1916 --- tobuild 14 Jul 2005 14:13:13 -0000 1.1915 +++ tobuild 14 Jul 2005 19:04:25 -0000 1.1916 @@ -59,3 +59,4 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 +ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel From andreas at bawue.net Thu Jul 14 19:06:44 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 14 Jul 2005 21:06:44 +0200 (CEST) Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1121367480.2872.157.camel@localhost.localdomain> References: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> <1121367480.2872.157.camel@localhost.localdomain> Message-ID: On Thu, 14 Jul 2005, Ville Skytt? wrote: > > find $RPM_BUILD_ROOT -name *.bs -a -size 0 -exec rm -f {} ';' > Adding quotes around *.bs would be better. Otherwise *.bs expands to > Blowfish.bs already by the shell before "find" even runs, because > Blowfish.bs happens to be in the same dir where that command is run. In > this case, it doesn't really affect the results though, but better to > always do it correctly. Thx. I think in this specific case, it would never shellexpand. But yeah, thanks for pointing it out. bye, andreas From fedora-extras-commits at redhat.com Thu Jul 14 19:07:08 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:07:08 -0400 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec,1.1,1.2 Message-ID: <200507141907.j6EJ786J016090@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16073 Modified Files: perl-Crypt-Blowfish.spec Log Message: Quotingfix Index: perl-Crypt-Blowfish.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-Blowfish.spec 14 Jul 2005 18:49:02 -0000 1.1 +++ perl-Crypt-Blowfish.spec 14 Jul 2005 19:07:06 -0000 1.2 @@ -1,7 +1,7 @@ Summary: XS Blowfish implementation for Perl Name: perl-Crypt-Blowfish Version: 2.09 -Release: 1%{?dist} +Release: 2%{?dist} License: Distributable Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Blowfish/ @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name *.bs -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name "*.bs" -a -size 0 -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/* @@ -46,6 +46,10 @@ %{_mandir}/man3/*.3* %changelog +* Thu Jul 14 2005 Andreas Thienemann - 2.09-2 +- Fixed find line to not shellexpand. + + * Thu Jul 14 2005 Andreas Thienemann - 2.09-1 - Initial package From fedora-extras-commits at redhat.com Thu Jul 14 19:12:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:12:05 -0400 Subject: extras-buildsys ChangeLog,1.55,1.56 Message-ID: <200507141912.j6EJCZub016198@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148 Modified Files: ChangeLog Log Message: 2005-07-14 Dan Williams * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() - Fix misdeclaration of log() which caused a traceback in some instances * server/Builder.py - Kill any job the builder is running when the server starts up * server/BuildMaster.py - Restart interrupted jobs when the server starts up - Remove old query queue code that's no longer used * server/PackageJob.py server/UserInterface.py - is_build_job_stage_valid -> is_package_job_stage_valid Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ChangeLog 13 Jul 2005 19:36:06 -0000 1.55 +++ ChangeLog 14 Jul 2005 19:12:03 -0000 1.56 @@ -1,3 +1,22 @@ +2005-07-14 Dan Williams + + * builder/builder.py + - Make the builder not hang if you interrupt it in the middle + of a time.sleep() + - Fix misdeclaration of log() which caused a traceback in some + instances + + * server/Builder.py + - Kill any job the builder is running when the server starts up + + * server/BuildMaster.py + - Restart interrupted jobs when the server starts up + - Remove old query queue code that's no longer used + + * server/PackageJob.py + server/UserInterface.py + - is_build_job_stage_valid -> is_package_job_stage_valid + 2005-07-13 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Thu Jul 14 19:12:06 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:12:06 -0400 Subject: extras-buildsys/builder builder.py,1.14,1.15 Message-ID: <200507141912.j6EJCat0016201@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148/builder Modified Files: builder.py Log Message: 2005-07-14 Dan Williams * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() - Fix misdeclaration of log() which caused a traceback in some instances * server/Builder.py - Kill any job the builder is running when the server starts up * server/BuildMaster.py - Restart interrupted jobs when the server starts up - Remove old query queue code that's no longer used * server/PackageJob.py server/UserInterface.py - is_build_job_stage_valid -> is_package_job_stage_valid Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- builder.py 13 Jul 2005 19:36:06 -0000 1.14 +++ builder.py 14 Jul 2005 19:12:03 -0000 1.15 @@ -167,7 +167,10 @@ start_time = time.time() mockstatusfile = os.path.join(self._state_dir, 'status') while not os.path.exists(mockstatusfile): - time.sleep(0.5) + try: + time.sleep(0.5) + except KeyboardInterrupt: + pass # if mock exited with an error report that error and not # the missing status file. exit_status = self._pobj.poll() @@ -239,7 +242,10 @@ string = f.read(4) except OSError, e: if e.errno == errno.EAGAIN: - time.sleep(0.25) + try: + time.sleep(0.25) + except KeyboardInterrupt: + pass continue else: if len(string) < 4: @@ -467,7 +473,7 @@ self.localarches = localarches self.cur_job = 0 - def log(string): + def log(self, string): if config_opts['debug']: print string @@ -675,7 +681,10 @@ # Stop running as root if drop_privs() == -1: http_server.stop() - time.sleep(1) + try: + time.sleep(1) + except KeyboardInterrupt: + pass os._exit(1) print "Binding to address '%s' with arches: [%s]" % (config_opts['hostname'], string.join(config_opts['arches'])) From fedora-extras-commits at redhat.com Thu Jul 14 19:12:06 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:12:06 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.15, 1.16 Builder.py, 1.5, 1.6 PackageJob.py, 1.6, 1.7 UserInterface.py, 1.18, 1.19 Message-ID: <200507141912.j6EJCa21016205@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148/server Modified Files: BuildMaster.py Builder.py PackageJob.py UserInterface.py Log Message: 2005-07-14 Dan Williams * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() - Fix misdeclaration of log() which caused a traceback in some instances * server/Builder.py - Kill any job the builder is running when the server starts up * server/BuildMaster.py - Restart interrupted jobs when the server starts up - Remove old query queue code that's no longer used * server/PackageJob.py server/UserInterface.py - is_build_job_stage_valid -> is_package_job_stage_valid Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- BuildMaster.py 13 Jul 2005 15:53:08 -0000 1.15 +++ BuildMaster.py 14 Jul 2005 19:12:04 -0000 1.16 @@ -111,9 +111,6 @@ self._archjob_status_updates = {} self._archjob_status_updates_lock = threading.Lock() - self._query_queue = [] - self._query_queue_lock = threading.Lock() - self._building_jobs = [] self._building_jobs_lock = threading.Lock() @@ -125,11 +122,40 @@ self.curs = self.dbcx.cursor() ensure_job_db_tables(self.dbcx) + self._restart_interrupted_jobs() + threading.Thread.__init__(self) def __del__(self): self.dbcx.close() + def _restart_interrupted_jobs(self): + """ Restart interrupted jobs from our db. """ + self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed")') + self.dbcx.commit() + jobs = self.curs.fetchall() + + if len(jobs) == 0: + return + + for row in jobs: + uniqid = row[0] + # Kill any archjobs that are left around + self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uniqid) + self.dbcx.commit() + + # Now requeue the job + try: + repo = self.repos[row[4]] + except KeyError: + print "%s (%s): Target '%s' not found." % (uniqid, row[2], row[4]) + else: + job = PackageJob.PackageJob(uniqid, row[1], row[2], row[3], repo, self, self.hostname) + print "%s (%s): Restarting '%s' on target '%s'" % (uniqid, row[2], row[3], row[4]) + self._building_jobs_lock.acquire() + self._building_jobs.append(job) + self._building_jobs_lock.release() + def stop(self): self.should_stop = True for repo in self.repos.values(): @@ -285,28 +311,6 @@ self._new_queue_lock.release() - def queue_query(self, query): - self._query_queue_lock.acquire() - if query.sql: - self._query_queue.append(query) - self._query_queue_lock.release() - - def _process_queries(self): - self._query_queue_lock.acquire() - - for query in self._query_queue: - self.curs.execute(query.sql) - self.dbcx.commit() - data = self.curs.fetchall() - results = [] - for row in data: - tempX = [ item for item in row ] - results.append(tempX) - query.result = results - query.done = True - self._query_queue.remove(query) - self._query_queue_lock.release() - def _have_work(self): have_work = False self._new_queue_lock.acquire() @@ -316,13 +320,6 @@ if have_work: return True - self._query_queue_lock.acquire() - if len(self._query_queue) > 0: - have_work = True - self._query_queue_lock.release() - if have_work: - return True - self._status_updates_lock.acquire() if len(self._status_updates) > 0: have_work = True @@ -366,9 +363,6 @@ # Start any new jobs self._start_new_jobs() - # Execute any queued queries from other threads - self._process_queries() - last_time = time.time() while not self._have_work() and time.time() <= last_time + 5: time.sleep(0.25) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Builder.py 11 Jul 2005 00:30:36 -0000 1.5 +++ Builder.py 14 Jul 2005 19:12:04 -0000 1.6 @@ -54,6 +54,7 @@ self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs) else: self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) + self._server_lock = threading.Lock() self._unavail_count = 0 self._arches = [] builder_xmlrpc_lock.acquire() @@ -65,9 +66,19 @@ builder_xmlrpc_lock.release() self._alive = True self._arches.append('noarch') - self._server_lock = threading.Lock() self._stop = False self._prepping_jobs = False + + # Kill any jobs currently running on the builder + (jobid, status) = self._get_cur_job_and_status() + if jobid and jobid != 0: + builder_xmlrpc_lock.acquire() + try: + self._server.die(jobid) + except: + pass + builder_xmlrpc_lock.release() + threading.Thread.__init__(self) def xmlrpc_lock_acquire(self): @@ -115,8 +126,9 @@ return job - def _update_cur_job(self): - cur_jobid = None + def _get_cur_job_and_status(self): + jobid = None + status = None builder_xmlrpc_lock.acquire() self._server_lock.acquire() @@ -129,6 +141,11 @@ self._server_lock.release() builder_xmlrpc_lock.release() + return (jobid, status) + + def _update_cur_job(self): + (jobid, status) = self._get_cur_job_and_status() + # Update the current job's status if self._unavail_count == 0: try: Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PackageJob.py 12 Jul 2005 20:12:32 -0000 1.6 +++ PackageJob.py 14 Jul 2005 19:12:04 -0000 1.7 @@ -86,12 +86,12 @@ self._pkg_job.process() -def is_build_job_stage_valid(stage): +def is_package_job_stage_valid(stage): """ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] + stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] if stage in stages: return True return False Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- UserInterface.py 10 Jul 2005 04:33:51 -0000 1.18 +++ UserInterface.py 14 Jul 2005 19:12:04 -0000 1.19 @@ -157,7 +157,7 @@ if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] - if PackageJob.is_build_job_stage_valid(status): + if PackageJob.is_package_job_stage_valid(status): if first: search = search + " WHERE " first = False From fedora-extras-commits at redhat.com Thu Jul 14 19:25:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:25:24 -0400 Subject: extras-buildsys ChangeLog,1.56,1.57 Message-ID: <200507141925.j6EJPOFu016257@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16228 Modified Files: ChangeLog Log Message: 2005-07-14 Dan Williams * server/PackageJob.py - Include log URL in email notifications Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 14 Jul 2005 19:12:03 -0000 1.56 +++ ChangeLog 14 Jul 2005 19:25:22 -0000 1.57 @@ -1,5 +1,10 @@ 2005-07-14 Dan Williams + * server/PackageJob.py + - Include log URL in email notifications + +2005-07-14 Dan Williams + * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() From fedora-extras-commits at redhat.com Thu Jul 14 19:25:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:25:25 -0400 Subject: extras-buildsys/server PackageJob.py,1.7,1.8 Message-ID: <200507141925.j6EJPP64016263@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16228/server Modified Files: PackageJob.py Log Message: 2005-07-14 Dan Williams * server/PackageJob.py - Include log URL in email notifications Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- PackageJob.py 14 Jul 2005 19:12:04 -0000 1.7 +++ PackageJob.py 14 Jul 2005 19:25:22 -0000 1.8 @@ -464,7 +464,8 @@ self._failed() except BuildError, e: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - self.email_result(resultstring=e.args, subject=subj) + msg = "%s\n\n Build logs may be found at %s" % (e.args, self._make_log_url()) + self.email_result(resultstring=msg, subject=subj) # Kill remaining jobs on other arches self._archjobs_lock.acquire() for job in self.archjobs.values(): @@ -541,9 +542,15 @@ self._set_cur_stage('repodone') self.wake() + def _make_log_url(self, arch=None): + return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release) + def _succeeded(self): self._set_cur_stage('needsign') - resultstring = "%s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target) + resultstring = """ %s (%s): Build on target %s succeeded. + + Build logs may be found at %s +""" % (self.uid, self.name, self.target, self._make_log_url()) self.email_result(resultstring) self.bm.notify_job_done(self) From fedora-extras-commits at redhat.com Thu Jul 14 19:27:45 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 14 Jul 2005 15:27:45 -0400 Subject: common tobuild,1.1916,1.1917 Message-ID: <200507141927.j6EJRjMR016316@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16299 Modified Files: tobuild Log Message: request build of rpms/splint/devel splint-3_1_1-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1916 retrieving revision 1.1917 diff -u -r1.1916 -r1.1917 --- tobuild 14 Jul 2005 19:04:25 -0000 1.1916 +++ tobuild 14 Jul 2005 19:27:43 -0000 1.1917 @@ -60,3 +60,4 @@ oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel +pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 19:31:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:31:32 -0400 Subject: common tobuild,1.1917,1.1918 Message-ID: <200507141932.j6EJW2nN016364@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332/common Modified Files: tobuild Log Message: quotefix and correct build order Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1917 retrieving revision 1.1918 diff -u -r1.1917 -r1.1918 --- tobuild 14 Jul 2005 19:27:43 -0000 1.1917 +++ tobuild 14 Jul 2005 19:31:30 -0000 1.1918 @@ -59,5 +59,6 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 +ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 19:31:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:31:32 -0400 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec,1.2,1.3 Message-ID: <200507141932.j6EJW2nb016367@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332/devel Modified Files: perl-Crypt-Blowfish.spec Log Message: quotefix and correct build order Index: perl-Crypt-Blowfish.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-Blowfish.spec 14 Jul 2005 19:07:06 -0000 1.2 +++ perl-Crypt-Blowfish.spec 14 Jul 2005 19:31:30 -0000 1.3 @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name "*.bs" -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.bs' -a -size 0 -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/* From fedora-extras-commits at redhat.com Thu Jul 14 19:43:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:43:26 -0400 Subject: extras-buildsys Makefile,1.7,1.8 Message-ID: <200507141943.j6EJhQeu016430@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16413 Modified Files: Makefile Log Message: Add a 'test-srpm' target Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 10 Jul 2005 03:44:35 -0000 1.7 +++ Makefile 14 Jul 2005 19:43:24 -0000 1.8 @@ -46,3 +46,8 @@ rm -rf build dist mkdir build dist rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba $(PKGNAME).spec + +test-srpm: archive + rm -rf build dist + mkdir build dist + rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -bs $(PKGNAME).spec From fedora-extras-commits at redhat.com Thu Jul 14 19:56:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 15:56:39 -0400 Subject: owners owners.list,1.17,1.18 Message-ID: <200507141957.j6EJvAPt016497@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16480 Modified Files: owners.list Log Message: Officially orphan perl-Net-SCP, perl-Net-SSH, rpmproc. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- owners.list 14 Jul 2005 18:54:58 -0000 1.17 +++ owners.list 14 Jul 2005 19:56:37 -0000 1.18 @@ -547,9 +547,9 @@ 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-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 -Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Net-SSH|Perl extension for secure shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -680,7 +680,7 @@ Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|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|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|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 Thu Jul 14 20:01:38 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 16:01:38 -0400 Subject: rpms/perl-Crypt-CBC/devel perl-Crypt-CBC.spec,1.1,1.2 Message-ID: <200507142002.j6EK2X9e017612@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16512 Modified Files: perl-Crypt-CBC.spec Log Message: better handling of example files Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/perl-Crypt-CBC.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-CBC.spec 14 Jul 2005 18:45:54 -0000 1.1 +++ perl-Crypt-CBC.spec 14 Jul 2005 20:01:12 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-CBC/ @@ -20,6 +20,7 @@ %prep %setup -q -n Crypt-CBC-%{version} +chmod 644 eg/*.pl %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -45,6 +46,10 @@ %{_mandir}/man3/*.3* %changelog +* Thu Jul 14 2005 Andreas Thienemann - 2.14-2 +- Remove execute permissions from example files + + * Thu Jul 14 2005 Andreas Thienemann - 2.14-1 - Initial package From fedora-extras-commits at redhat.com Thu Jul 14 20:02:35 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 16:02:35 -0400 Subject: common tobuild,1.1918,1.1919 Message-ID: <200507142003.j6EK3U8s017632@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17610 Modified Files: tobuild Log Message: Change buildrevision Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1918 retrieving revision 1.1919 diff -u -r1.1918 -r1.1919 --- tobuild 14 Jul 2005 19:31:30 -0000 1.1918 +++ tobuild 14 Jul 2005 20:02:33 -0000 1.1919 @@ -59,6 +59,6 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 -ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-1_fc5 devel -ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel +ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-2_fc5 devel +ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 20:54:36 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Thu, 14 Jul 2005 16:54:36 -0400 Subject: web/html/download mirrors.php,1.23,1.24 Message-ID: <200507142054.j6EKsa3s017834@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17817 Modified Files: mirrors.php Log Message: Added url for calserv.unl.edu Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mirrors.php 13 Jul 2005 14:18:04 -0000 1.23 +++ mirrors.php 14 Jul 2005 20:54:34 -0000 1.24 @@ -120,6 +120,7 @@
  • ftp://mirror.colorado.edu/pub/fedora/linux/core/
  • ftp://mirrors.csumb.edu/fedora/updates/ (Updates only)
  • ftp://ftp.applios.net/pub/fedora/linux/core
    • +
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
  • Canada From fedora-extras-commits at redhat.com Thu Jul 14 21:13:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:13:27 -0400 Subject: extras-buildsys/etc plague-builder.config, 1.3, 1.4 plague-builder.init, 1.4, 1.5 Message-ID: <200507142113.j6ELDRac019065@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19016/etc Modified Files: plague-builder.init Added Files: plague-builder.config Log Message: 2005-07-14 Dan Williams * etc/plague-builder.init etc/plague-builder.config - Allow multiple builders to be started/stopped at one time. plague-builder.config must be copied to /etc/sysconfig/plague-builder and have the CONFIGS variable defined to be a space-separated list of builder config files, with the whole list enclosed in quotes Index: plague-builder.config =================================================================== RCS file: plague-builder.config diff -N plague-builder.config --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ plague-builder.config 14 Jul 2005 21:13:25 -0000 1.4 @@ -0,0 +1 @@ +CONFIGS="/etc/plague/builder/CONFIG.py" Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague-builder.init 13 Jul 2005 19:36:12 -0000 1.4 +++ plague-builder.init 14 Jul 2005 21:13:25 -0000 1.5 @@ -13,19 +13,56 @@ # Source function library. . /etc/init.d/functions +. /etc/sysconfig/plague-builder + + +start_one() { + PORT=$1 + echo -n "Starting plague-builder on port $PORT: " + daemon plague-builder -d -p /var/run/plague-builder-$PORT.pid -l /var/log/plague-builder-$PORT.log -c $config + echo + touch /var/lock/subsys/plague-builder-$PORT + return 0 +} + start() { - echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log -c /etc/plague/builder/CONFIG.py - echo - touch /var/lock/subsys/plague-builder - return 0 + for config in $CONFIGS; do + # Get the builder's XMLRPC port #, which should be unique + PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` + start_one $PORT + done + return 0 } +stop_one() { + PORT=$1 + echo -n "Shutting down plague-builder on port $PORT: " + killproc plague-builder-$PORT + echo + rm -f /var/lock/subsys/plague-builder-$PORT + return 0 +} + stop() { - echo -n "Shutting down plague-builder: " - killproc plague-builder - echo - rm -f /var/lock/subsys/plague-builder + for config in $CONFIGS; do + # Get the builder's XMLRPC port #, which should be unique + PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` + stop_one $PORT + done + return 0 +} + +condrestart() { + [ -f /var/lock/subsys/plague-builder ] && restart || : + + for config in $CONFIGS; do + # Get the builder's XMLRPC port #, which should be unique + PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` + if [ -f /var/lock/subsys/plague-builder-$PORT ]; then + stop_one $PORT + start_one $PORT + fi + done return 0 } @@ -36,23 +73,23 @@ case "$1" in start) - start - ;; + start + ;; stop) - stop - ;; + stop + ;; status) - status plague-builder - ;; + status plague-builder + ;; restart) - stop - start - ;; + stop + start + ;; condrestart) - [ -f /var/lock/subsys/plague-builder ] && restart || : - ;; + condrestart + ;; *) - echo "Usage: {start|stop|status|reload|restart[|probe]" + echo "Usage: {start|stop|status|reload|restart[|probe]" exit 1 ;; esac From fedora-extras-commits at redhat.com Thu Jul 14 21:13:22 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:13:22 -0400 Subject: extras-buildsys ChangeLog,1.57,1.58 Message-ID: <200507142113.j6ELDqqM019068@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19016 Modified Files: ChangeLog Log Message: 2005-07-14 Dan Williams * etc/plague-builder.init etc/plague-builder.config - Allow multiple builders to be started/stopped at one time. plague-builder.config must be copied to /etc/sysconfig/plague-builder and have the CONFIGS variable defined to be a space-separated list of builder config files, with the whole list enclosed in quotes Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- ChangeLog 14 Jul 2005 19:25:22 -0000 1.57 +++ ChangeLog 14 Jul 2005 21:13:20 -0000 1.58 @@ -1,5 +1,14 @@ 2005-07-14 Dan Williams + * etc/plague-builder.init + etc/plague-builder.config + - Allow multiple builders to be started/stopped at one time. + plague-builder.config must be copied to /etc/sysconfig/plague-builder + and have the CONFIGS variable defined to be a space-separated + list of builder config files, with the whole list enclosed in quotes + +2005-07-14 Dan Williams + * server/PackageJob.py - Include log URL in email notifications From fedora-extras-commits at redhat.com Thu Jul 14 21:13:22 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:13:22 -0400 Subject: extras-buildsys/builder builder.py,1.15,1.16 Message-ID: <200507142113.j6ELDqui019071@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19016/builder Modified Files: builder.py Log Message: 2005-07-14 Dan Williams * etc/plague-builder.init etc/plague-builder.config - Allow multiple builders to be started/stopped at one time. plague-builder.config must be copied to /etc/sysconfig/plague-builder and have the CONFIGS variable defined to be a space-separated list of builder config files, with the whole list enclosed in quotes Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- builder.py 14 Jul 2005 19:12:03 -0000 1.15 +++ builder.py 14 Jul 2005 21:13:20 -0000 1.16 @@ -649,7 +649,10 @@ sys.exit(2) if opts.pidfile: - open(opts.pidfile, 'w').write('%d\n' % os.getpid()) + f = open(opts.pidfile, 'w') + f.write('%d\n' % os.getpid()) + f.flush() + f.close() if opts.logfile: logf=open(opts.logfile, 'a') From fedora-extras-commits at redhat.com Thu Jul 14 21:49:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:49:49 -0400 Subject: extras-buildsys plague.spec,1.16,1.17 Message-ID: <200507142150.j6ELoJ3c019175@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142 Modified Files: plague.spec Log Message: Fix up the builder initscript Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- plague.spec 11 Jul 2005 03:23:21 -0000 1.16 +++ plague.spec 14 Jul 2005 21:49:47 -0000 1.17 @@ -101,10 +101,6 @@ %post builder /sbin/chkconfig --add plague-builder /sbin/service plague-builder condrestart >> /dev/null || : -. %{_sysconfdir}/sysconfig/%{name}-builder -if [ -z "$ARCHSOPT" ] ; then - sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder -fi %preun builder if [ $1 = 0 ]; then From fedora-extras-commits at redhat.com Thu Jul 14 21:49:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:49:50 -0400 Subject: extras-buildsys/etc plague-builder.init,1.5,1.6 Message-ID: <200507142150.j6ELoKpt019178@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142/etc Modified Files: plague-builder.init Log Message: Fix up the builder initscript Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plague-builder.init 14 Jul 2005 21:13:25 -0000 1.5 +++ plague-builder.init 14 Jul 2005 21:49:47 -0000 1.6 @@ -18,8 +18,9 @@ start_one() { PORT=$1 + CONFIG_FILE=$2 echo -n "Starting plague-builder on port $PORT: " - daemon plague-builder -d -p /var/run/plague-builder-$PORT.pid -l /var/log/plague-builder-$PORT.log -c $config + daemon plague-builder -d -p /var/run/plague-builder-$PORT.pid -l /var/log/plague-builder-$PORT.log -c $CONFIG_FILE echo touch /var/lock/subsys/plague-builder-$PORT return 0 @@ -29,7 +30,7 @@ for config in $CONFIGS; do # Get the builder's XMLRPC port #, which should be unique PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` - start_one $PORT + start_one $PORT $config done return 0 } From fedora-extras-commits at redhat.com Fri Jul 15 01:23:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 21:23:18 -0400 Subject: extras-buildsys README,1.8,1.9 Message-ID: <200507150123.j6F1NIuN023944@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23927 Modified Files: README Log Message: Fix up the readme Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- README 10 Jul 2005 06:08:24 -0000 1.8 +++ README 15 Jul 2005 01:23:15 -0000 1.9 @@ -1,4 +1,4 @@ -Fedora Extras Build System +fFedora Extras Build System System Requirements: - Python 2.3 or 2.4 @@ -94,42 +94,39 @@ Architectural Overview: ------------------------------------------ -The build system is composed of a single build server, and multiple build -clients. Clients run an XMLRPC server to which the build-server delivers -build jobs. The build server runs an XMLRPC server to allow submission of -jobs, and to retrieve basic status information about both clients and the -build system as a whole. +The build system is composed of a single build server, and multiple builders. +Builders run an XMLRPC server to which the build server delivers build jobs. +The build server runs an XMLRPC server to allow submission of jobs, and to +relay basic status information about both builders and the build system as a +whole to users. -The Build Client: +The Builder: -usage: build-client
    -ie : build-client localhost sparc sparcv9 sparcv8 +usage: /usr/bin/plague-builder -c -Currently, build clients are limited to building one job at a time. This -limitation may be removed in the future. They do not queue pending jobs, -but will reject build requests when something is already building. The build -server is expected to queue and manage jobs at this time, and serialize -requests to build clients. This may not be the case in the future. +Currently, builders are limited to building one job at a time, though there is +no restriction on running multiple builders on a single machine. They do not +queue pending jobs, but will reject build requests when something is already +building. The build server is expected to queue and manage jobs at this time, +and serialize requests to builders. main() - `- Creates: XMLRPCBuildClientServer + `- Creates: XMLRPCBuilderServer `- Creates: i386Arch, x86_64Arch, PPCArch, etc (subclasses - of BuildClientMach) + of BuilderMock) -The client creates an XMLRPC server object (XMLRPCBuildClientServer), and -then processes requests in an infinite loop. Every so often (currently -5 seconds) the server allows each build job that is still in process to -update its status and perform work. The XMLRPCBuildClientServer keeps a -list of local build jobs, which are architecture specific, and forwards -requests and commands for each job to that specific job, keyed off a -unique id. +The builder creates an XMLRPC server object (XMLRPCBuilderServer), and +then processes requests in an infinite loop. The build server queries each +client periodically for its status and the ID of the currently building job, if +any. -Each build job (BuildClientMach and its architecture-specific subclasses like + +Each build job (BuilderMock and its architecture-specific subclasses like i386Arch) proceeds through a number of states. Build jobs are periodically -given time to do work (BuildClientMach.process()) by their BuildClientInstance -(from XMLRPCBuildClientServer._process()), which is in turn periodically given +given time to do work (BuilderMock.process()) by the builder controller +(XMLRPCBuilderServer._process()), which is in turn periodically given time by the client's main loop. During their processing time, build jobs check their state, see if any actions have completed, and advance to the next state if needed. Communication with mock and retrieval of status from mock @@ -137,8 +134,8 @@ from talking to the build server. All communication with the build server is done through SSL to ensure the -identity of each party. Both the XMLRPC server and the result file server are -SSL-enabled, and require SSL certificates and keys to operate. See later +identity of each party. Both the XMLRPC server and the builder's file server +are SSL-enabled, and require SSL certificates and keys to operate. See later section in this document on how to configure SSL certificates for your build system. @@ -146,81 +143,72 @@ The Build Server: -usage: build-server +usage: /usr/bin/plague-server The build server runs two threads. The first, the XMLRPC server (XMLRPCBuildMaster class), accepts requests to enqueue jobs for build and stuffs them into an sqlite database which contains all job details. The second thread, the Build Master (BuildMaster class), pulls 'waiting' jobs from the database and builds them. A third top-level object that runs in the same -thread as the Build Master is the BuildClientManager, which keeps track of -build clients (ArchWelders) and their status. +thread as the Build Master is the BuilderManager, which keeps track of +builders and their status. main() - |- Creates: XMLRPCBuildMaster - |- Creates: BuildClientManager - |- `- Creates: BuildClient (one for each remote build client) - |- `- Creates: BuildClientJob (one for each build job + |- Creates: AuthedXMLRPCServer (system users talk to this object) + |- Creates: BuilderManager + |- `- Creates: Builder (one for each remote build client) + |- `- Creates: ArchJob (one for each build job |- on each arch) `- Creates: BuildMaster - `- Creates: BuildJob (one for each build job) + `- Creates: PackageJob (one for each build job) -The BuildClientManager object serves as a central location for all tracking and +The BuilderManager object serves as a central location for all tracking and status information about each build job on each arch. It creates a -BuildClient instance for each remote build client. The BuildClient instance -keeps track of specific jobs building on all architectures on that remote -build client. It also serves as the XMLRPC client of the remote build -client, proxying status information from it. - -BuildJobs must request that the BuildClientManager create a new BuildClientJob -for each build on each architecture the BuildJob needs. If there is an -available build client (since build clients only build one job at a time -across all arches they support), the BuildClientManager will pass the request -to the arch-specific BuildClient instance, which creates the new arch-specific -BuildClientJob, and pass it back through the BuildClientManager to the parent -BuildJob. If there is no available build client for the request, the BuildJob -must periodically re-issue the build request to the BuildClientManager. - -BuildClientManager has a periodic processing routine that is called from the -BuildMaster thread. This processing routine calls the BuildClient.process() -routine on each BuildClient instance, which in turn updates its view of the -remote build client's status. Thus, the BuildClientManager, through each -BuildClient instance, knows the status and currently building job on each -remote build client. +Builder instance for each remote builder. The Builder instance keeps track +of specific jobs building on all architectures on that remote builder. + +PackageJobs must queue requests with the BuilderManager for the architecture +specific build jobs they need. The BuilderManager will wait until a Builder +object is available to build the job, create the new ArchJob on the builder, +and notify the parent PackageJob of its new ArchJob. + +The BuilderManager has a periodic processing routine that is called from the +BuildMaster thread. This processing routine calls the Builder.process() +routine of each Builder instance, which in turn updates its view of the remote +builder's status. Thus, the BuilderManager, through each Builder instance, +knows the status and currently building job on each remote builder. -BuildJobs track a single SRPM build through the entire build system. They are +PackageJobs track a single SRPM build through the entire build system. They are created from the BuildMaster thread whenever the BuildMaster finds a job entry -in the sqlite database with the status of 'waiting'. BuildJobs proceed through +in the sqlite database with the status of 'waiting'. PackageJobs proceed through a number of states: "initialize", "checkout", "make_srpm", "prep", "building", -"finished", "cleanup", "failed", and "needsign". +"finished", "addtorepo", "failed", "killed", and "needsign". Flow goes like this: initialize => checkout checkout => make_srpm make_srpm => prep -prep => building +prep => (queue architecture-specific job requests with the BuilderManager) + building - All build jobs finished or failed? => finished - otherwise => building -finished => cleanup -cleanup +finished - failed jobs? => failed - - otherwise => needsign - -The BuildJob updates its status when it is periodically told to do so by the -BuildManager. At this point, it will advance to the next state, or spawn build -jobs that have not yet started if build clients for those architectures are -now available. It stays in the "building" state until all jobs are first -spawned, and then either completed or failed. - -All communication with build clients is done through SSL to ensure the -identity of each party. When the client requests the SRPM to build, SSL -is used. When the build server retrieves logs and RPMs from the build client, -SSL is also used. This ensures that build clients can be more or less trusted, -or at least that some random build client is not serving you packages that -might contaminate your repository. See later section in this document on how -to configure SSL certificates for your build system. + - otherwise => addtorepo +addtorepo + + => repodone +repodone => needsign + +All communication with builders is done through SSL to ensure the identity of +each party. When the builder requests the SRPM to build, SSL is used. When the +build server retrieves logs and RPMs from the builder, SSL is also used. This +ensures that builders can be more or less trusted, or at least that some random +builder is not serving you packages that might contaminate your repository. See +later section in this document on how to configure SSL certificates for your +build system. Configuring SSL for your Build System From fedora-extras-commits at redhat.com Fri Jul 15 03:57:27 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 14 Jul 2005 23:57:27 -0400 Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.3, 1.4 gaim-meanwhile.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507150357.j6F3vRSu026845@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26824 Modified Files: .cvsignore gaim-meanwhile.spec sources Log Message: Update to new release. Fixes bug #159942 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 18:47:24 -0000 1.3 +++ .cvsignore 15 Jul 2005 03:57:25 -0000 1.4 @@ -1 +1 @@ -gaim-meanwhile-1.2.3.tar.gz +gaim-meanwhile-1.2.4.tar.gz Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-meanwhile.spec 31 May 2005 18:47:24 -0000 1.2 +++ gaim-meanwhile.spec 15 Jul 2005 03:57:25 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Lotus Sametime Community Client plugin for Gaim License: GPL Group: Applications/Internet -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net @@ -39,6 +39,13 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 +- Update to latest upstream release +- Fixes bug 159942 + +* Tue Jul 12 2005 - jwboyer at jdub.homelinux.org 1.2.4-0.cvs +- Build test RPM + * Tue May 31 2005 - jwboyer at jdub.homelinux.org 1.2.3-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 18:47:24 -0000 1.3 +++ sources 15 Jul 2005 03:57:25 -0000 1.4 @@ -1 +1 @@ -161954f7d77c16bed378d91e8376c161 gaim-meanwhile-1.2.3.tar.gz +548fda06471ecaa0a93aabab7c1d6aee gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 03:59:17 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 14 Jul 2005 23:59:17 -0400 Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.3, 1.4 gaim-meanwhile.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507150359.j6F3xHOg026896@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-serv26875 Modified Files: .cvsignore gaim-meanwhile.spec sources Log Message: Update to new release. Fixes bug #159942 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 18:50:58 -0000 1.3 +++ .cvsignore 15 Jul 2005 03:59:14 -0000 1.4 @@ -1 +1 @@ -gaim-meanwhile-1.2.3.tar.gz +gaim-meanwhile-1.2.4.tar.gz Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-meanwhile.spec 31 May 2005 18:50:58 -0000 1.2 +++ gaim-meanwhile.spec 15 Jul 2005 03:59:15 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Lotus Sametime Community Client plugin for Gaim License: GPL Group: Applications/Internet -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net @@ -39,6 +39,13 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 +- Update to latest upstream release +- Fixes bug 159942 + +* Tue Jul 12 2005 - jwboyer at jdub.homelinux.org 1.2.4-0.cvs +- Build test RPM + * Tue May 31 2005 - jwboyer at jdub.homelinux.org 1.2.3-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 18:50:58 -0000 1.3 +++ sources 15 Jul 2005 03:59:15 -0000 1.4 @@ -1 +1 @@ -161954f7d77c16bed378d91e8376c161 gaim-meanwhile-1.2.3.tar.gz +7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 04:00:03 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:00:03 -0400 Subject: rpms/gaim-meanwhile/FC-3 .cvsignore, 1.3, 1.4 gaim-meanwhile.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507150400.j6F4032v026937@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-serv26909 Modified Files: .cvsignore gaim-meanwhile.spec sources Log Message: Update to new release. Fixes bug #159942 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 18:52:38 -0000 1.3 +++ .cvsignore 15 Jul 2005 04:00:01 -0000 1.4 @@ -1 +1 @@ -gaim-meanwhile-1.2.3.tar.gz +gaim-meanwhile.spec Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/gaim-meanwhile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-meanwhile.spec 31 May 2005 18:52:38 -0000 1.2 +++ gaim-meanwhile.spec 15 Jul 2005 04:00:01 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Lotus Sametime Community Client plugin for Gaim License: GPL Group: Applications/Internet -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net @@ -39,6 +39,13 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 +- Update to latest upstream release +- Fixes bug 159942 + +* Tue Jul 12 2005 - jwboyer at jdub.homelinux.org 1.2.4-0.cvs +- Build test RPM + * Tue May 31 2005 - jwboyer at jdub.homelinux.org 1.2.3-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 18:52:38 -0000 1.3 +++ sources 15 Jul 2005 04:00:01 -0000 1.4 @@ -1 +1 @@ -161954f7d77c16bed378d91e8376c161 gaim-meanwhile-1.2.3.tar.gz +7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile.spec From fedora-extras-commits at redhat.com Fri Jul 15 04:01:03 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:01:03 -0400 Subject: common tobuild,1.1919,1.1920 Message-ID: <200507150401.j6F413Kv028061@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1919 retrieving revision 1.1920 diff -u -r1.1919 -r1.1920 --- tobuild 14 Jul 2005 20:02:33 -0000 1.1919 +++ tobuild 15 Jul 2005 04:01:01 -0000 1.1920 @@ -62,3 +62,4 @@ ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-2_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel +jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 04:02:50 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:02:50 -0400 Subject: common tobuild,1.1920,1.1921 Message-ID: <200507150402.j6F42oOZ028138@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28121 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1920 retrieving revision 1.1921 diff -u -r1.1920 -r1.1921 --- tobuild 15 Jul 2005 04:01:01 -0000 1.1920 +++ tobuild 15 Jul 2005 04:02:33 -0000 1.1921 @@ -63,3 +63,4 @@ ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel +jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 15 04:07:51 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:07:51 -0400 Subject: rpms/gaim-meanwhile/FC-3 sources,1.4,1.5 Message-ID: <200507150407.j6F47pj5028230@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-serv28203 Modified Files: sources Log Message: Fixup sources file. Dunno what happened here Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jul 2005 04:00:01 -0000 1.4 +++ sources 15 Jul 2005 04:07:49 -0000 1.5 @@ -1 +1 @@ -7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile.spec +7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 04:08:31 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:08:31 -0400 Subject: common tobuild,1.1921,1.1922 Message-ID: <200507150408.j6F48Vil028292@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28275 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1921 retrieving revision 1.1922 diff -u -r1.1921 -r1.1922 --- tobuild 15 Jul 2005 04:02:33 -0000 1.1921 +++ tobuild 15 Jul 2005 04:08:29 -0000 1.1922 @@ -64,3 +64,4 @@ pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 +jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 06:30:24 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 15 Jul 2005 02:30:24 -0400 Subject: rpms/libcdio/devel .cvsignore, 1.5, 1.6 libcdio.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200507150630.j6F6UOU2030715@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30694 Modified Files: .cvsignore libcdio.spec sources Log Message: * Thu Jul 14 2005 Adrian Reber - 0.75-1 - Updated to 0.75. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Jun 2005 10:27:25 -0000 1.5 +++ .cvsignore 15 Jul 2005 06:30:22 -0000 1.6 @@ -1,2 +1,2 @@ -libcdio-0.74.tar.gz -libcdio-0.74.tar.gz.sig +libcdio-0.75.tar.gz +libcdio-0.75.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcdio.spec 5 Jun 2005 10:49:18 -0000 1.10 +++ libcdio.spec 15 Jul 2005 06:30:22 -0000 1.11 @@ -1,13 +1,13 @@ Name: libcdio -Version: 0.74 -Release: 2%{?dist} +Version: 0.75 +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.74.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.74.tar.gz.sig +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libcddb-devel >= 0.9.4 @@ -93,6 +93,9 @@ %changelog +* Thu Jul 14 2005 Adrian Reber - 0.75-1 +- Updated to 0.75. + * Fri Jun 03 2005 Adrian Reber - 0.74-2 - Updated to 0.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Jun 2005 10:27:25 -0000 1.5 +++ sources 15 Jul 2005 06:30:22 -0000 1.6 @@ -1,2 +1,2 @@ -2b1b03d96a992d171ebf2b13bcdcd866 libcdio-0.74.tar.gz -8dddd44a78d1eda7bdeac0afc30d6ba8 libcdio-0.74.tar.gz.sig +628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz +3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig From oliver at linux-kernel.at Fri Jul 15 07:19:34 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 15 Jul 2005 09:19:34 +0200 Subject: APPROVED: mod_security Message-ID: <42D76386.1090301@linux-kernel.at> mod_security: Security module for the Apache HTTP Server ModSecurity is an open source intrusion detection and prevention engine for web applications. It operates embedded into the web server, acting as a powerful umbrella - shielding web applications from attacks. Maintainer: Michael Fleming Reviewer: Oliver Falk Best, Oliver From fedora-extras-commits at redhat.com Fri Jul 15 07:21:38 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 15 Jul 2005 03:21:38 -0400 Subject: common tobuild,1.1922,1.1923 Message-ID: <200507150721.j6F7LcS8032129@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32112 Modified Files: tobuild Log Message: request build of rpms/mod_security/devel mod_security-1_8_7-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1922 retrieving revision 1.1923 diff -u -r1.1922 -r1.1923 --- tobuild 15 Jul 2005 04:08:29 -0000 1.1922 +++ tobuild 15 Jul 2005 07:21:36 -0000 1.1923 @@ -65,3 +65,4 @@ jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 +mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 08:30:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 15 Jul 2005 04:30:06 -0400 Subject: owners owners.list,1.18,1.19 Message-ID: <200507150830.j6F8U602001694@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1677 Modified Files: owners.list Log Message: added nexuiz and nexuiz-data Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- owners.list 14 Jul 2005 19:56:37 -0000 1.18 +++ owners.list 15 Jul 2005 08:30:04 -0000 1.19 @@ -447,6 +447,8 @@ Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance.|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|nget|A utility for retrieving files using the NNTP protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Jul 15 10:21:58 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 15 Jul 2005 06:21:58 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.23,1.24 Message-ID: <200507151021.j6FALwSw004898@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4881 Modified Files: bittorrent.spec Log Message: * Fri Jul 15 2005 Paul Howarth 4.1.2-6 - provides should be version-release tagged too Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bittorrent.spec 12 Jul 2005 15:33:43 -0000 1.23 +++ bittorrent.spec 15 Jul 2005 10:21:56 -0000 1.24 @@ -4,7 +4,7 @@ Name: bittorrent Version: 4.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -25,7 +25,7 @@ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %endif -Provides: python-khashmir +Provides: python-khashmir = %{version}-%{release} Obsoletes: python-khashmir < %{version}-%{release} Requires(pre): %{_sbindir}/useradd @@ -50,7 +50,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Obsoletes: BitTorrent <= %{version} -Provides: BitTorrent +Provides: BitTorrent = %{version}-%{release} %description gui This package contains the GUI versions of the BitTorrent file transfer @@ -202,6 +202,9 @@ %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog +* Fri Jul 15 2005 Paul Howarth 4.1.2-6 +- provides should be version-release tagged too + * Tue Jul 11 2005 Paul Howarth 4.1.2-5 - move icon to %{_datadir}/icons/hicolor/48x48/apps instead of %{_datadir}/pixmaps and update icon cache on installation if From fedora-extras-commits at redhat.com Fri Jul 15 12:13:01 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 15 Jul 2005 08:13:01 -0400 Subject: rpms/bittorrent/devel bittorrent.spec, 1.24, 1.25 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200507151213.j6FCD1ja007603@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7582 Modified Files: bittorrent.spec .cvsignore sources Log Message: * Fri Jul 15 2005 Paul Howarth 4.1.3-1 - update to 4.1.3 Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bittorrent.spec 15 Jul 2005 10:21:56 -0000 1.24 +++ bittorrent.spec 15 Jul 2005 12:12:58 -0000 1.25 @@ -3,8 +3,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.1.2 -Release: 6%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -202,6 +202,9 @@ %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog +* Fri Jul 15 2005 Paul Howarth 4.1.3-1 +- update to 4.1.3 + * Fri Jul 15 2005 Paul Howarth 4.1.2-6 - provides should be version-release tagged too Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 13 Jun 2005 13:01:12 -0000 1.8 +++ .cvsignore 15 Jul 2005 12:12:58 -0000 1.9 @@ -1 +1 @@ -BitTorrent-4.1.2.tar.gz +BitTorrent-4.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 13 Jun 2005 13:01:12 -0000 1.8 +++ sources 15 Jul 2005 12:12:58 -0000 1.9 @@ -1 +1 @@ -e2a4d97bbfef1e105be5a128732ed3f8 BitTorrent-4.1.2.tar.gz +cd4dff145b5dea3789fa384bb94a4de9 BitTorrent-4.1.3.tar.gz From oliver at linux-kernel.at Fri Jul 15 13:11:39 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 15 Jul 2005 15:11:39 +0200 Subject: APPROVED: pam_abl Message-ID: <42D7B60B.8010508@linux-kernel.at> pam_abl: Pluggable Authentication Module (PAM) for auto blacklisting Provides auto blacklisting of hosts and users responsible for repeated failed authentication attempts. Generally configured so that blacklisted users still see normal login prompts but are guaranteed to fail to authenticate. A command line tool allows to query or purge the databases used by the pam_abl module. Maintainer: Alexander Dalloz Reviewer: Oliver Falk -of From fedora-extras-commits at redhat.com Fri Jul 15 14:20:30 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 15 Jul 2005 10:20:30 -0400 Subject: rpms/gkrellm-freq/devel gkfreq-0.1.1-rmasm.patch, NONE, 1.1 gkrellm-freq.spec, 1.1, 1.2 Message-ID: <200507151420.j6FEKUX1010167@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10147 Modified Files: gkrellm-freq.spec Added Files: gkfreq-0.1.1-rmasm.patch Log Message: Fix build on PPC. gkfreq-0.1.1-rmasm.patch: --- NEW FILE gkfreq-0.1.1-rmasm.patch --- diff -Naupr gkfreq-0.1.1.orig/gkfreq.c gkfreq-0.1.1/gkfreq.c --- gkfreq-0.1.1.orig/gkfreq.c 2005-06-07 18:42:00.000000000 +0200 +++ gkfreq-0.1.1/gkfreq.c 2005-07-15 17:51:51.000000000 +0200 @@ -19,13 +19,6 @@ static GkrellmDecal *decal_text1; static gint style_id; -__inline__ unsigned long long int rdtsc() -{ - unsigned long long int x; - __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x)); - return x; -} - /* FIXED : whatdoineed2do at yahoo.co.uk */ static Index: gkrellm-freq.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gkrellm-freq.spec 13 Jul 2005 07:57:03 -0000 1.1 +++ gkrellm-freq.spec 15 Jul 2005 14:20:27 -0000 1.2 @@ -3,11 +3,12 @@ Summary: CPU frequency display plugin for GKrellM Name: gkrellm-freq Version: 0.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.peakunix.net/gkfreq/ Source: http://www.peakunix.net/downloads/gkfreq-%{version}.tar.gz +Patch: gkfreq-0.1.1-rmasm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gkrellm >= 2.2.0 BuildRequires: gkrellm-devel >= 2.2.0 @@ -19,6 +20,7 @@ %prep %setup -n gkfreq-%{version} +%patch -p1 -b .noasm %build @@ -44,6 +46,10 @@ %changelog +* Fri Jul 15 2005 Matthias Saou 0.1.1-2 +- Include patch to remove unused function containing an asm call that made + build fail on PPC. + * Tue Jul 12 2005 Matthias Saou 0.1.1-1 - Initial RPM release, split out from my old gkrellm-plugins package. From fedora-extras-commits at redhat.com Fri Jul 15 14:21:07 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 15 Jul 2005 10:21:07 -0400 Subject: common tobuild,1.1923,1.1924 Message-ID: <200507151421.j6FEL7es010229@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10212 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1923 retrieving revision 1.1924 diff -u -r1.1923 -r1.1924 --- tobuild 15 Jul 2005 07:21:36 -0000 1.1923 +++ tobuild 15 Jul 2005 14:21:05 -0000 1.1924 @@ -66,3 +66,4 @@ jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel +thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 14:39:47 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 10:39:47 -0400 Subject: rpms/freeciv/devel freeciv.spec,1.10,1.11 Message-ID: <200507151439.j6FEdlii010258@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241 Modified Files: freeciv.spec Log Message: * Fri Jul 15 2005 Brian Pepple - 2.0.3-2 - Bump release. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- freeciv.spec 14 Jul 2005 16:56:29 -0000 1.10 +++ freeciv.spec 15 Jul 2005 14:39:45 -0000 1.11 @@ -1,6 +1,6 @@ Name: freeciv Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -87,7 +87,10 @@ %{_mandir}/man6/civclient.6.gz %changelog -* Thu Jul 14 2005 Brian Pepple - 2.0.3 +* Fri Jul 15 2005 Brian Pepple - 2.0.3-2 +- Bump release. + +* Thu Jul 14 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 From fedora-extras-commits at redhat.com Fri Jul 15 14:42:21 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 10:42:21 -0400 Subject: rpms/freeciv/FC-4 freeciv.spec,1.10,1.11 Message-ID: <200507151442.j6FEgLPS010315@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10298 Modified Files: freeciv.spec Log Message: Add release to change log. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- freeciv.spec 14 Jul 2005 17:00:13 -0000 1.10 +++ freeciv.spec 15 Jul 2005 14:42:18 -0000 1.11 @@ -87,7 +87,7 @@ %{_mandir}/man6/civclient.6.gz %changelog -* Thu Jul 14 2005 Brian Pepple - 2.0.3 +* Thu Jul 14 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 From fedora-extras-commits at redhat.com Fri Jul 15 16:07:24 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 12:07:24 -0400 Subject: common tobuild,1.1924,1.1925 Message-ID: <200507151607.j6FG7sej012759@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12731 Modified Files: tobuild Log Message: request build of rpms/freeciv/devel freeciv-2_0_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1924 retrieving revision 1.1925 diff -u -r1.1924 -r1.1925 --- tobuild 15 Jul 2005 14:21:05 -0000 1.1924 +++ tobuild 15 Jul 2005 16:07:22 -0000 1.1925 @@ -67,3 +67,4 @@ jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel +bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 16:08:15 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 12:08:15 -0400 Subject: common tobuild,1.1925,1.1926 Message-ID: <200507151608.j6FG8FMe012792@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12775 Modified Files: tobuild Log Message: request build of rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1925 retrieving revision 1.1926 diff -u -r1.1925 -r1.1926 --- tobuild 15 Jul 2005 16:07:22 -0000 1.1925 +++ tobuild 15 Jul 2005 16:08:12 -0000 1.1926 @@ -68,3 +68,4 @@ mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel +bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 From jpo at di.uminho.pt Fri Jul 15 17:08:55 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Fri, 15 Jul 2005 18:08:55 +0100 Subject: APPROVED: libdnet Message-ID: <42D7EDA7.5030802@di.uminho.pt> Name : libdnet URL : http://libdnet.sf.net/ Summary : Simple portable interface to lowlevel networking routines Description : libdnet provides a simplified, portable interface to several low-level networking routines, including network address manipulation, kernel arp(4) cache and route(4) table lookup and manipulation, network firewalling (IP filter, ipfw, ipchains, pf, ...), network interface lookup and manipulation, raw IP packet and Ethernet frame, and data transmission. Maintainer: Oliver Falk Reviewer: Jos? pedro Oliveira 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 Fri Jul 15 17:35:01 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 15 Jul 2005 13:35:01 -0400 Subject: devel/sylpheed .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 sylpheed.spec, 1.19, 1.20 Message-ID: <200507151735.j6FHZ1vg014027@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Fri Jul 15 2005 Michael Schwendt - 2.0.0-0.4.beta6 - Update to 2.0.0beta6 (feature freeze). Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Jul 2005 22:05:30 -0000 1.9 +++ .cvsignore 15 Jul 2005 17:34:59 -0000 1.10 @@ -1 +1 @@ -sylpheed-2.0.0beta5.tar.bz2 +sylpheed-2.0.0beta6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Jul 2005 22:05:30 -0000 1.9 +++ sources 15 Jul 2005 17:34:59 -0000 1.10 @@ -1 +1 @@ -4f022a15bda3d01b025d02e3875bf09a sylpheed-2.0.0beta5.tar.bz2 +d1b992d0acf14a40e940ad3c59f20cb8 sylpheed-2.0.0beta6.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sylpheed.spec 10 Jul 2005 22:05:31 -0000 1.19 +++ sylpheed.spec 15 Jul 2005 17:34:59 -0000 1.20 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.4.beta5 +Release: 0.4.beta6 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,7 +16,7 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta5.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta6.tar.bz2 Source1: sylpheed.1 Patch2: sylpheed-default-browser.patch @@ -38,7 +38,7 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta5 +%setup -q -n %{name}-2.0.0beta6 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop @@ -81,6 +81,9 @@ %{_mandir}/man1 %changelog +* Fri Jul 15 2005 Michael Schwendt - 2.0.0-0.4.beta6 +- Update to 2.0.0beta6 (feature freeze). + * Sun Jul 10 2005 Michael Schwendt - 2.0.0-0.4.beta5 - Update to 2.0.0beta5. From fedora-extras-commits at redhat.com Fri Jul 15 17:35:41 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 15 Jul 2005 13:35:41 -0400 Subject: common tobuild,1.1926,1.1927 Message-ID: <200507151735.j6FHZfhr014086@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14069 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_4_beta6 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1926 retrieving revision 1.1927 diff -u -r1.1926 -r1.1927 --- tobuild 15 Jul 2005 16:08:12 -0000 1.1926 +++ tobuild 15 Jul 2005 17:35:39 -0000 1.1927 @@ -69,3 +69,4 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 +mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel From fedora-extras-commits at redhat.com Fri Jul 15 18:07:38 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Fri, 15 Jul 2005 14:07:38 -0400 Subject: web/html/projects/artwork index.php,1.2,1.3 Message-ID: <200507151807.j6FI7cAM015247@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/projects/artwork In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15230 Modified Files: index.php Log Message: Fix typo Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/projects/artwork/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 24 Jun 2005 16:02:16 -0000 1.2 +++ index.php 15 Jul 2005 18:07:36 -0000 1.3 @@ -43,7 +43,7 @@ $project->addMaintainer("Diana Fong","dfong at redhat.com","Artist & Designer"); $project->addMaintainer("John Palmeri","johnp at redhat.com", "Package Maintainer"); $project->addContributor("Owen Taylor","otaylor at redhat.com", "Rendering System Lead"); -$project->addContributor("Brian Clark","bclark at redhat.com", "UI Hitman"); +$project->addContributor("Bryan Clark","bclark at redhat.com", "UI Hitman"); $project->addContributor("Alex Larsson","alexl at redhat.com", "Widgeteer"); /* Screenshots */ From fedora-extras-commits at redhat.com Fri Jul 15 18:16:21 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:16:21 -0400 Subject: rpms/gaim-meanwhile/FC-4 sources,1.4,1.5 Message-ID: <200507151816.j6FIGLG5015329@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-serv15307 Modified Files: sources Log Message: Trying correct sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jul 2005 03:59:15 -0000 1.4 +++ sources 15 Jul 2005 18:16:19 -0000 1.5 @@ -1 +1 @@ -7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz +548fda06471ecaa0a93aabab7c1d6aee gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 18:17:42 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:17:42 -0400 Subject: rpms/gaim-meanwhile/FC-3 .cvsignore,1.4,1.5 sources,1.5,1.6 Message-ID: <200507151817.j6FIHgeS015365@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-serv15346 Modified Files: .cvsignore sources Log Message: Update to correct sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Jul 2005 04:00:01 -0000 1.4 +++ .cvsignore 15 Jul 2005 18:17:40 -0000 1.5 @@ -1 +1 @@ -gaim-meanwhile.spec +gaim-meanwhile-1.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jul 2005 04:07:49 -0000 1.5 +++ sources 15 Jul 2005 18:17:40 -0000 1.6 @@ -1 +1 @@ -7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz +548fda06471ecaa0a93aabab7c1d6aee gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 18:21:09 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 15 Jul 2005 14:21:09 -0400 Subject: common tobuild,1.1927,1.1928 Message-ID: <200507151821.j6FIL9r9015413@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15396 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1927 retrieving revision 1.1928 diff -u -r1.1927 -r1.1928 --- tobuild 15 Jul 2005 17:35:39 -0000 1.1927 +++ tobuild 15 Jul 2005 18:21:07 -0000 1.1928 @@ -70,3 +70,4 @@ bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 18:24:39 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:24:39 -0400 Subject: rpms/gaim-meanwhile/FC-3 gaim-meanwhile.spec,1.3,1.4 Message-ID: <200507151824.j6FIOdG4015498@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-serv15454/FC-3 Modified Files: gaim-meanwhile.spec Log Message: Bump release for new build Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/gaim-meanwhile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-meanwhile.spec 15 Jul 2005 04:00:01 -0000 1.3 +++ gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 @@ -7,7 +7,7 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?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) @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 +- Bump release for rebuild + * Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 - Update to latest upstream release - Fixes bug 159942 From fedora-extras-commits at redhat.com Fri Jul 15 18:24:40 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:24:40 -0400 Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.3,1.4 Message-ID: <200507151824.j6FIOeZu015508@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15454/devel Modified Files: gaim-meanwhile.spec Log Message: Bump release for new build Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-meanwhile.spec 15 Jul 2005 03:57:25 -0000 1.3 +++ gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 @@ -7,7 +7,7 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?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) @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 +- Bump release for rebuild + * Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 - Update to latest upstream release - Fixes bug 159942 From fedora-extras-commits at redhat.com Fri Jul 15 18:24:39 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:24:39 -0400 Subject: rpms/gaim-meanwhile/FC-4 gaim-meanwhile.spec,1.3,1.4 Message-ID: <200507151824.j6FIOdOg015504@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-serv15454/FC-4 Modified Files: gaim-meanwhile.spec Log Message: Bump release for new build Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-meanwhile.spec 15 Jul 2005 03:59:15 -0000 1.3 +++ gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 @@ -7,7 +7,7 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?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) @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 +- Bump release for rebuild + * Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 - Update to latest upstream release - Fixes bug 159942 From fedora-extras-commits at redhat.com Fri Jul 15 18:25:36 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:25:36 -0400 Subject: common tobuild,1.1928,1.1929 Message-ID: <200507151825.j6FIPaqB015572@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15555 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1928 retrieving revision 1.1929 diff -u -r1.1928 -r1.1929 --- tobuild 15 Jul 2005 18:21:07 -0000 1.1928 +++ tobuild 15 Jul 2005 18:25:34 -0000 1.1929 @@ -71,3 +71,4 @@ bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 18:26:27 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:26:27 -0400 Subject: common tobuild,1.1929,1.1930 Message-ID: <200507151826.j6FIQR8R015644@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1929 retrieving revision 1.1930 diff -u -r1.1929 -r1.1930 --- tobuild 15 Jul 2005 18:25:34 -0000 1.1929 +++ tobuild 15 Jul 2005 18:26:25 -0000 1.1930 @@ -72,3 +72,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel +jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 15 18:26:55 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:26:55 -0400 Subject: common tobuild,1.1930,1.1931 Message-ID: <200507151826.j6FIQtdY015706@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15689 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1930 retrieving revision 1.1931 diff -u -r1.1930 -r1.1931 --- tobuild 15 Jul 2005 18:26:25 -0000 1.1930 +++ tobuild 15 Jul 2005 18:26:53 -0000 1.1931 @@ -73,3 +73,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 +jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 18:40:23 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:40:23 -0400 Subject: rpms/barcode/devel barcode.spec,1.3,1.4 Message-ID: <200507151840.j6FIeNoD015827@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15767 Modified Files: barcode.spec Log Message: Switched off threaded make, as it's causing problems when rebuilding the documentation Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 +++ barcode.spec 15 Jul 2005 18:40:21 -0000 1.4 @@ -36,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %install rm -rf %{buildroot} @@ -67,6 +67,10 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 15 2005 Andreas Thienemann 0.98-7 +- Switched off threaded make, as it's causing problems when rebuilding + the documentation + * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 - Added missing BuildRequires for ghostscript and tetex-dvips From fedora-extras-commits at redhat.com Fri Jul 15 18:41:10 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:41:10 -0400 Subject: rpms/barcode/devel barcode.spec,1.4,1.5 Message-ID: <200507151841.j6FIfAhL015882@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15865 Modified Files: barcode.spec Log Message: bumped releasever Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- barcode.spec 15 Jul 2005 18:40:21 -0000 1.4 +++ barcode.spec 15 Jul 2005 18:41:07 -0000 1.5 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 18:41:33 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:41:33 -0400 Subject: common tobuild,1.1931,1.1932 Message-ID: <200507151841.j6FIfXPn015944@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15927 Modified Files: tobuild Log Message: request build of rpms/barcode/devel barcode-0_98-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1931 retrieving revision 1.1932 diff -u -r1.1931 -r1.1932 --- tobuild 15 Jul 2005 18:26:53 -0000 1.1931 +++ tobuild 15 Jul 2005 18:41:31 -0000 1.1932 @@ -74,3 +74,4 @@ jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 +ixs rpms/barcode/devel barcode-0_98-7_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 18:41:55 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:41:55 -0400 Subject: rpms/barcode/FC-4 barcode.spec,1.3,1.4 Message-ID: <200507151841.j6FIftMB015970@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15950 Modified Files: barcode.spec Log Message: Switched off threaded make, as it's causing problems when rebuilding the documentation Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/FC-4/barcode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 +++ barcode.spec 15 Jul 2005 18:41:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -36,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %install rm -rf %{buildroot} @@ -67,6 +67,10 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 15 2005 Andreas Thienemann 0.98-7 +- Switched off threaded make, as it's causing problems when rebuilding + the documentation + * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 - Added missing BuildRequires for ghostscript and tetex-dvips From fedora-extras-commits at redhat.com Fri Jul 15 18:42:18 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:42:18 -0400 Subject: common tobuild,1.1932,1.1933 Message-ID: <200507151842.j6FIgI3O016033@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016 Modified Files: tobuild Log Message: request build of rpms/barcode/FC-4 barcode-0_98-7_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1932 retrieving revision 1.1933 diff -u -r1.1932 -r1.1933 --- tobuild 15 Jul 2005 18:41:31 -0000 1.1932 +++ tobuild 15 Jul 2005 18:42:16 -0000 1.1933 @@ -75,3 +75,4 @@ jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-7_fc5 devel +ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 15 18:42:55 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:42:55 -0400 Subject: rpms/barcode/FC-3 barcode.spec,1.3,1.4 Message-ID: <200507151842.j6FIgtEH016058@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16039 Modified Files: barcode.spec Log Message: Switched off threaded make, as it's causing problems when rebuilding the documentation Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/FC-3/barcode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 +++ barcode.spec 15 Jul 2005 18:42:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -36,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %install rm -rf %{buildroot} @@ -67,6 +67,10 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 15 2005 Andreas Thienemann 0.98-7 +- Switched off threaded make, as it's causing problems when rebuilding + the documentation + * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 - Added missing BuildRequires for ghostscript and tetex-dvips From fedora-extras-commits at redhat.com Fri Jul 15 18:43:19 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:43:19 -0400 Subject: common tobuild,1.1933,1.1934 Message-ID: <200507151843.j6FIhJOp016120@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16103 Modified Files: tobuild Log Message: request build of rpms/barcode/FC-3 barcode-0_98-7_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1933 retrieving revision 1.1934 diff -u -r1.1933 -r1.1934 --- tobuild 15 Jul 2005 18:42:16 -0000 1.1933 +++ tobuild 15 Jul 2005 18:43:17 -0000 1.1934 @@ -76,3 +76,4 @@ jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-7_fc5 devel ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 +ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 18:56:57 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 15 Jul 2005 14:56:57 -0400 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.3, 1.4 perl-Test-MockObject.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507151856.j6FIuv3E016183@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16162 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.00 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Jan 2005 13:17:37 -0000 1.3 +++ .cvsignore 15 Jul 2005 18:56:54 -0000 1.4 @@ -1 +1 @@ -Test-MockObject-0.15.tar.gz +Test-MockObject-1.00.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Test-MockObject.spec 6 Apr 2005 22:13:08 -0000 1.7 +++ perl-Test-MockObject.spec 15 Jul 2005 18:56:54 -0000 1.8 @@ -1,20 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Test-MockObject -Version: 0.15 -Release: 3 - +Version: 1.00 +Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage), perl(Test::Warn) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -59,7 +56,10 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 15 2005 Jose Pedro Oliveira - 1.00-1 +- Update to 1.00. + +* Fri Apr 7 2005 Michael Schwendt - 0:0.15-3 - rebuilt * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Jan 2005 13:17:37 -0000 1.3 +++ sources 15 Jul 2005 18:56:54 -0000 1.4 @@ -1 +1 @@ -22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz +48eb805d465c561de05a758e1b9a1eaa Test-MockObject-1.00.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 21:34:37 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 15 Jul 2005 17:34:37 -0400 Subject: rpms/libifp/devel 10-libifp.rules,1.1,1.2 Message-ID: <200507152134.j6FLYbDv020269@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20252 Modified Files: 10-libifp.rules Log Message: Fixes for the new udev Index: 10-libifp.rules =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/10-libifp.rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 10-libifp.rules 14 Jul 2005 07:24:19 -0000 1.1 +++ 10-libifp.rules 15 Jul 2005 21:34:35 -0000 1.2 @@ -1,2 +1,2 @@ -BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x100[135789]", RUN+="/sbin/libifp-hotplug" -BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x101[01]", RUN+="/sbin/libifp-hotplug" +ACTION=="add", SUBSYSTEM=="usb", SYSFS{idVendor}=="4102", SYSFS{idProduct}=="100[135789]", RUN+="/sbin/libifp-hotplug" +ACTION=="add", SUBSYSTEM=="usb", SYSFS{idVendor}=="4102", SYSFS{idProduct}=="101[01]", RUN+="/sbin/libifp-hotplug" From fedora-extras-commits at redhat.com Sat Jul 16 03:47:01 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Fri, 15 Jul 2005 23:47:01 -0400 Subject: common tobuild,1.1934,1.1935 Message-ID: <200507160347.j6G3l19j027477@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27460 Modified Files: tobuild Log Message: request build of rpms/proj/devel proj-4_4_9-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1934 retrieving revision 1.1935 diff -u -r1.1934 -r1.1935 --- tobuild 15 Jul 2005 18:43:17 -0000 1.1934 +++ tobuild 16 Jul 2005 03:46:58 -0000 1.1935 @@ -77,3 +77,4 @@ ixs rpms/barcode/devel barcode-0_98-7_fc5 devel ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 +smccann rpms/proj/devel proj-4_4_9-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 05:08:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 16 Jul 2005 01:08:28 -0400 Subject: rpms/fish/devel .cvsignore, 1.2, 1.3 fish.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507160508.j6G58SQx029790@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29769 Modified Files: .cvsignore fish.spec sources Log Message: * fish update - Doin' this for Axel as he has no CVS account yet (he asked me to do this). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 +++ .cvsignore 16 Jul 2005 05:08:26 -0000 1.3 @@ -1 +1 @@ -fish-1.11.1.tar.bz2 +fish-1.12.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fish.spec 1 Jul 2005 11:11:11 -0000 1.3 +++ fish.spec 16 Jul 2005 05:08:26 -0000 1.4 @@ -1,17 +1,17 @@ -Summary: A friendly interactive shell -Name: fish +Summary: A friendly interactive shell +Name: fish -Version: 1.11.1 -Release: 10%{?dist} +Version: 1.12.0 +Release: 1%{?dist} -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -65,20 +65,23 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 +* 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 +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way -* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 11:03:18 -0000 1.2 +++ sources 16 Jul 2005 05:08:26 -0000 1.3 @@ -1 +1 @@ -b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 +8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 16 05:08:53 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 16 Jul 2005 01:08:53 -0400 Subject: common tobuild,1.1935,1.1936 Message-ID: <200507160508.j6G58r5N029852@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29835 Modified Files: tobuild Log Message: request build of rpms/fish/devel fish-1_12_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1935 retrieving revision 1.1936 diff -u -r1.1935 -r1.1936 --- tobuild 16 Jul 2005 03:46:58 -0000 1.1935 +++ tobuild 16 Jul 2005 05:08:51 -0000 1.1936 @@ -78,3 +78,4 @@ ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 smccann rpms/proj/devel proj-4_4_9-1_fc5 devel +oliver rpms/fish/devel fish-1_12_0-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 09:13:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:13:07 -0400 Subject: rpms/util-vserver/devel util-vserver.spec,1.6,1.7 Message-ID: <200507160913.j6G9D7qq002626@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2609 Modified Files: util-vserver.spec Log Message: - version 0.30.208 - require the -lib subpackage by -devel - copy GPG keys from /etc/pki/rpm-gpg/ - updated URLs Index: util-vserver.spec =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- util-vserver.spec 19 May 2005 17:03:28 -0000 1.6 +++ util-vserver.spec 16 Jul 2005 09:13:05 -0000 1.7 @@ -22,13 +22,13 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.206 -Release: %release_func 2 +Version: 0.30.208 +Release: %release_func 1 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 -Source1: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2.asc +Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2 +Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -37,7 +37,7 @@ Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables -BuildRequires: gcc-c++ wget +BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel BuildRequires: doxygen tetex-latex Requires(post): %__chattr @@ -58,11 +58,15 @@ %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm apt wget binutils tar e2fsprogs +Requires: rpm wget binutils tar e2fsprogs Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir +%ifarch %ix86 +Requires: apt +%endif + %package sysv Summary: SysV-initscripts for vserver Group: System Environment/Base @@ -88,6 +92,7 @@ Summary: Header-files and libraries needed to develop vserver based applications Group: Development/Libraries Requires: pkgconfig +Requires: %name-lib = %version-%release %description @@ -239,6 +244,7 @@ done } copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-* +copy fedora /etc/pki/rpm-gpg/RPM-GPG-* %preun build @@ -330,8 +336,11 @@ %changelog -* Thu May 19 2005 Enrico Scholz - 0.30.206-2 -- use %%dist instead of %%disttag +* Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 +- version 0.30.208 +- require the -lib subpackage by -devel +- copy GPG keys from /etc/pki/rpm-gpg/ +- updated URLs * Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 - added patches to make yum work in chroot environments From fedora-extras-commits at redhat.com Sat Jul 16 09:13:25 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:13:25 -0400 Subject: rpms/util-vserver/devel sources,1.5,1.6 .cvsignore,1.4,1.5 Message-ID: <200507160913.j6G9DPu6002651@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2632 Modified Files: sources .cvsignore Log Message: version 0.30.208 Index: sources =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Apr 2005 10:17:46 -0000 1.5 +++ sources 16 Jul 2005 09:13:23 -0000 1.6 @@ -1,2 +1,2 @@ -af8b7b8120f736959e144971bd4883d7 util-vserver-0.30.206.tar.bz2 -1794255b5a32d018555786efc23102de util-vserver-0.30.206.tar.bz2.asc +4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 +1a1c1d282e1396d42e4ddb374b7d05e1 util-vserver-0.30.208.tar.bz2.asc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Mar 2005 15:16:17 -0000 1.4 +++ .cvsignore 16 Jul 2005 09:13:23 -0000 1.5 @@ -1,4 +1 @@ -util-vserver*.tar.bz2 -util-vserver*.tar.bz2.asc -i386 -util-vserver*.src.rpm +util-vserver-*.tar.bz2* From fedora-extras-commits at redhat.com Sat Jul 16 09:14:37 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:14:37 -0400 Subject: common tobuild,1.1936,1.1937 Message-ID: <200507160914.j6G9EbjE002718@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2701 Modified Files: tobuild Log Message: request build of rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1936 retrieving revision 1.1937 diff -u -r1.1936 -r1.1937 --- tobuild 16 Jul 2005 05:08:51 -0000 1.1936 +++ tobuild 16 Jul 2005 09:14:35 -0000 1.1937 @@ -79,3 +79,4 @@ ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 smccann rpms/proj/devel proj-4_4_9-1_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel +ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 09:31:40 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:31:40 -0400 Subject: rpms/util-vserver/devel util-vserver.spec,1.7,1.8 Message-ID: <200507160931.j6G9VexB002762@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2745 Modified Files: util-vserver.spec Log Message: fixed typo in URLs Index: util-vserver.spec =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- util-vserver.spec 16 Jul 2005 09:13:05 -0000 1.7 +++ util-vserver.spec 16 Jul 2005 09:31:38 -0000 1.8 @@ -27,8 +27,8 @@ License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2 -Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2.asc +Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2 +Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -336,11 +336,13 @@ %changelog +* Sat Jul 16 2005 Enrico Scholz - 0:0.30.208-2 +- updated URLs + * Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 - version 0.30.208 - require the -lib subpackage by -devel - copy GPG keys from /etc/pki/rpm-gpg/ -- updated URLs * Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 - added patches to make yum work in chroot environments From fedora-extras-commits at redhat.com Sat Jul 16 11:05:56 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 16 Jul 2005 07:05:56 -0400 Subject: common tobuild,1.1937,1.1938 Message-ID: <200507161106.j6GB6cHf005159@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5132 Modified Files: tobuild Log Message: request build of rpms/nexuiz-data/devel nexuiz-data-1_1-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1937 retrieving revision 1.1938 diff -u -r1.1937 -r1.1938 --- tobuild 16 Jul 2005 09:14:35 -0000 1.1937 +++ tobuild 16 Jul 2005 11:05:54 -0000 1.1938 @@ -80,3 +80,4 @@ smccann rpms/proj/devel proj-4_4_9-1_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel +adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel From fedora-extras-commits at redhat.com Sat Jul 16 11:08:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:08:24 -0400 Subject: rpms/id3lib/FC-3 id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.6, 1.7 Message-ID: <200507161108.j6GB8tWG005268@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/FC-3 Modified Files: id3lib.spec Added Files: id3lib-3.8.3-io_helpers-163101.patch Log Message: * Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 - Fix UTF-16 writing bug (bug #163101, upstream #1016290). id3lib-3.8.3-io_helpers-163101.patch: --- NEW FILE id3lib-3.8.3-io_helpers-163101.patch --- diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp --- id3lib-3.8.3-orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 +++ id3lib-3.8.3/src/io_helpers.cpp 2005-07-16 12:47:11.000000000 +0200 @@ -363,9 +363,10 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; writer.writeChars((const unsigned char*) &BOM, 2); + const unsigned char* pdata = (const unsigned char*)data.c_str(); for (size_t i = 0; i < size; i += 2) { - unicode_t ch = (data[i] << 8) | data[i+1]; + unicode_t ch = (pdata[i] << 8) | pdata[i+1]; writer.writeChars((const unsigned char*) &ch, 2); } } Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/id3lib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- id3lib.spec 1 Jul 2005 13:48:09 -0000 1.6 +++ id3lib.spec 16 Jul 2005 11:08:22 -0000 1.7 @@ -1,13 +1,14 @@ Summary: Library for manipulating ID3v1 and ID3v2 tags Name: id3lib Version: 3.8.3 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL Group: System Environment/Libraries URL: http://id3lib.sourceforge.net/ Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +Patch2: id3lib-3.8.3-io_helpers-163101.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen @@ -35,6 +36,7 @@ %setup -q %patch0 -p0 %patch1 -p1 -b .libtool-autofoo +%patch2 -p1 -b .io_helpers-163101 %build @@ -75,6 +77,9 @@ %{_libdir}/libid3.so %changelog +* Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 +- Fix UTF-16 writing bug (bug #163101, upstream #1016290). + * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). From fedora-extras-commits at redhat.com Sat Jul 16 11:08:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:08:25 -0400 Subject: rpms/id3lib/FC-4 id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.9, 1.10 Message-ID: <200507161108.j6GB8tqv005271@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/FC-4 Modified Files: id3lib.spec Added Files: id3lib-3.8.3-io_helpers-163101.patch Log Message: * Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 - Fix UTF-16 writing bug (bug #163101, upstream #1016290). id3lib-3.8.3-io_helpers-163101.patch: --- NEW FILE id3lib-3.8.3-io_helpers-163101.patch --- diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp --- id3lib-3.8.3-orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 +++ id3lib-3.8.3/src/io_helpers.cpp 2005-07-16 12:47:11.000000000 +0200 @@ -363,9 +363,10 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; writer.writeChars((const unsigned char*) &BOM, 2); + const unsigned char* pdata = (const unsigned char*)data.c_str(); for (size_t i = 0; i < size; i += 2) { - unicode_t ch = (data[i] << 8) | data[i+1]; + unicode_t ch = (pdata[i] << 8) | pdata[i+1]; writer.writeChars((const unsigned char*) &ch, 2); } } Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-4/id3lib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- id3lib.spec 30 Jun 2005 15:17:39 -0000 1.9 +++ id3lib.spec 16 Jul 2005 11:08:23 -0000 1.10 @@ -1,13 +1,14 @@ Summary: Library for manipulating ID3v1 and ID3v2 tags Name: id3lib Version: 3.8.3 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL Group: System Environment/Libraries URL: http://id3lib.sourceforge.net/ Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +Patch2: id3lib-3.8.3-io_helpers-163101.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen @@ -35,6 +36,7 @@ %setup -q %patch0 -p0 %patch1 -p1 -b .libtool-autofoo +%patch2 -p1 -b .io_helpers-163101 %build @@ -75,6 +77,9 @@ %{_libdir}/libid3.so %changelog +* Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 +- Fix UTF-16 writing bug (bug #163101, upstream #1016290). + * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). From fedora-extras-commits at redhat.com Sat Jul 16 11:08:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:08:25 -0400 Subject: rpms/id3lib/devel id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.9, 1.10 Message-ID: <200507161108.j6GB8tI8005274@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/devel Modified Files: id3lib.spec Added Files: id3lib-3.8.3-io_helpers-163101.patch Log Message: * Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 - Fix UTF-16 writing bug (bug #163101, upstream #1016290). id3lib-3.8.3-io_helpers-163101.patch: --- NEW FILE id3lib-3.8.3-io_helpers-163101.patch --- diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp --- id3lib-3.8.3-orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 +++ id3lib-3.8.3/src/io_helpers.cpp 2005-07-16 12:47:11.000000000 +0200 @@ -363,9 +363,10 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; writer.writeChars((const unsigned char*) &BOM, 2); + const unsigned char* pdata = (const unsigned char*)data.c_str(); for (size_t i = 0; i < size; i += 2) { - unicode_t ch = (data[i] << 8) | data[i+1]; + unicode_t ch = (pdata[i] << 8) | pdata[i+1]; writer.writeChars((const unsigned char*) &ch, 2); } } Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- id3lib.spec 30 Jun 2005 15:16:27 -0000 1.9 +++ id3lib.spec 16 Jul 2005 11:08:23 -0000 1.10 @@ -1,13 +1,14 @@ Summary: Library for manipulating ID3v1 and ID3v2 tags Name: id3lib Version: 3.8.3 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL Group: System Environment/Libraries URL: http://id3lib.sourceforge.net/ Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +Patch2: id3lib-3.8.3-io_helpers-163101.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen @@ -35,6 +36,7 @@ %setup -q %patch0 -p0 %patch1 -p1 -b .libtool-autofoo +%patch2 -p1 -b .io_helpers-163101 %build @@ -75,6 +77,9 @@ %{_libdir}/libid3.so %changelog +* Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 +- Fix UTF-16 writing bug (bug #163101, upstream #1016290). + * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). From fedora-extras-commits at redhat.com Sat Jul 16 11:10:29 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:10:29 -0400 Subject: common tobuild,1.1938,1.1939 Message-ID: <200507161110.j6GBAVUx005395@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5378 Modified Files: tobuild Log Message: request build of rpms/id3lib/devel id3lib-3_8_3-12_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1938 retrieving revision 1.1939 diff -u -r1.1938 -r1.1939 --- tobuild 16 Jul 2005 11:05:54 -0000 1.1938 +++ tobuild 16 Jul 2005 11:10:27 -0000 1.1939 @@ -81,3 +81,4 @@ oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel +mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 11:11:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:11:03 -0400 Subject: common tobuild,1.1939,1.1940 Message-ID: <200507161111.j6GBB3ME005428@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5411 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1939 retrieving revision 1.1940 diff -u -r1.1939 -r1.1940 --- tobuild 16 Jul 2005 11:10:27 -0000 1.1939 +++ tobuild 16 Jul 2005 11:11:01 -0000 1.1940 @@ -82,3 +82,4 @@ ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel +mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 16 11:11:29 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:11:29 -0400 Subject: common tobuild,1.1940,1.1941 Message-ID: <200507161111.j6GBBT7v005461@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1940 retrieving revision 1.1941 diff -u -r1.1940 -r1.1941 --- tobuild 16 Jul 2005 11:11:01 -0000 1.1940 +++ tobuild 16 Jul 2005 11:11:27 -0000 1.1941 @@ -83,3 +83,4 @@ adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 +mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 16 14:57:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 10:57:38 -0400 Subject: extras-buildsys ChangeLog,1.58,1.59 Message-ID: <200507161457.j6GEvcRD009016@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8987 Modified Files: ChangeLog Log Message: 2005-07-16 Dan Williams * server/PackageJob.py - Include last 20 lines of relevant log file for failed build jobs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- ChangeLog 14 Jul 2005 21:13:20 -0000 1.58 +++ ChangeLog 16 Jul 2005 14:57:36 -0000 1.59 @@ -1,3 +1,8 @@ +2005-07-16 Dan Williams + + * server/PackageJob.py + - Include last 20 lines of relevant log file for failed build jobs + 2005-07-14 Dan Williams * etc/plague-builder.init From fedora-extras-commits at redhat.com Sat Jul 16 14:57:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 10:57:39 -0400 Subject: extras-buildsys/server PackageJob.py,1.8,1.9 Message-ID: <200507161457.j6GEvd5n009022@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8987/server Modified Files: PackageJob.py Log Message: 2005-07-16 Dan Williams * server/PackageJob.py - Include last 20 lines of relevant log file for failed build jobs Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PackageJob.py 14 Jul 2005 19:25:22 -0000 1.8 +++ PackageJob.py 16 Jul 2005 14:57:37 -0000 1.9 @@ -58,11 +58,12 @@ return self.args class BuildError(exceptions.Exception): - def __init__(self, args=None): + def __init__(self, msg, arch): exceptions.Exception.__init__(self) - self.args = args + self.msg = msg + self.arch = arch def __str__(self): - return self.args + return self.msg class PackageJobController(threading.Thread): @@ -464,7 +465,9 @@ self._failed() except BuildError, e: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - msg = "%s\n\n Build logs may be found at %s" % (e.args, self._make_log_url()) + msg = "%s\n\n Build logs may be found at %s\n\n" % (e.msg, self._make_log_url()) + logtail = self._get_log_tail(e.arch) + msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) self.email_result(resultstring=msg, subject=subj) # Kill remaining jobs on other arches self._archjobs_lock.acquire() @@ -493,7 +496,7 @@ if job.builder_failed(): msg = "Job failed on arch %s\n" % (job.arch) self._archjobs_lock.release() - raise BuildError(msg) + raise BuildError(msg, job.arch) else: completed_jobs = completed_jobs + 1 self._archjobs_lock.release() @@ -542,9 +545,6 @@ self._set_cur_stage('repodone') self.wake() - def _make_log_url(self, arch=None): - return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release) - def _succeeded(self): self._set_cur_stage('needsign') resultstring = """ %s (%s): Build on target %s succeeded. @@ -554,6 +554,53 @@ self.email_result(resultstring) self.bm.notify_job_done(self) + def _make_log_url(self, arch=None): + return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release) + + def _get_log_tail(self, arch): + """ Returns the last 20 lines of the most relevant log file """ + + pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release) + log_dir = os.path.join(config_opts['server_work_dir'], self.target, pkg_dir, arch) + final_log = None + build_log = "%s/%s" % (log_dir, "build.log") + root_log = "%s/%s" % (log_dir, "root.log") + builder_log = "%s/%s" % (log_dir, "builder.log") + + # Try the most relevant log file first + if os.path.exists(build_log) and os.path.getsize(build_log) > 0: + final_log = build_log + elif os.path.exists(root_log) and os.path.getsize(root_log) > 0: + final_log = root_log + elif os.path.exists(builder_log) and os.path.getsize(builder_log) > 0: + final_log = builder_log + + if not final_log: + return "" + + seek_pos = os.path.getsize(final_log) - 4096 + f = open(final_log, "r", 4096); + if seek_pos > 0: + f.seek(seek_pos) + try: + # throw away the rest of the line + t = f.next() + except: + pass + lines = [] + # Grab the last 20 lines from the file + while True: + try: + line = f.next() + except StopIteration: + break + lines.append(line) + if len(lines) > 20: # only want last 20 lines + del lines[0] + + f.close() + return "".join(lines) + def email_result(self, resultstring, subject=None): """send 'resultstring' to self.email from self.email_from""" From fedora-extras-commits at redhat.com Sat Jul 16 15:47:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 11:47:44 -0400 Subject: extras-buildsys ChangeLog,1.59,1.60 Message-ID: <200507161548.j6GFmE1I010230@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10181 Modified Files: ChangeLog Log Message: 2005-07-16 Dan Williams * builder/builder.py server/Builder.py server/BuilderManager.py - Make the builder aware of what mock targets & arches it can actually build, and expose that information to the build server - On the server, make sure that we ask the builder to only build for arches that it supports for the target we request (This makes noarch jobs work correctly everywhere) Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ChangeLog 16 Jul 2005 14:57:36 -0000 1.59 +++ ChangeLog 16 Jul 2005 15:47:42 -0000 1.60 @@ -1,5 +1,16 @@ 2005-07-16 Dan Williams + * builder/builder.py + server/Builder.py + server/BuilderManager.py + - Make the builder aware of what mock targets & arches it can actually + build, and expose that information to the build server + - On the server, make sure that we ask the builder to only build for + arches that it supports for the target we request + (This makes noarch jobs work correctly everywhere) + +2005-07-16 Dan Williams + * server/PackageJob.py - Include last 20 lines of relevant log file for failed build jobs From fedora-extras-commits at redhat.com Sat Jul 16 15:47:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 11:47:44 -0400 Subject: extras-buildsys/builder builder.py,1.16,1.17 Message-ID: <200507161548.j6GFmFdY010233@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10181/builder Modified Files: builder.py Log Message: 2005-07-16 Dan Williams * builder/builder.py server/Builder.py server/BuilderManager.py - Make the builder aware of what mock targets & arches it can actually build, and expose that information to the build server - On the server, make sure that we ask the builder to only build for arches that it supports for the target we request (This makes noarch jobs work correctly everywhere) Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- builder.py 14 Jul 2005 21:13:20 -0000 1.16 +++ builder.py 16 Jul 2005 15:47:42 -0000 1.17 @@ -452,25 +452,25 @@ def getArchBuilder(uniqid, target, buildarch, srpm_url, localarches): """hand it an arch it hands you back the builder instance you need""" - if not builder_dict.has_key(buildarch): - # raise an exception here bitching about no place to build for that arch - pass + if buildarch != 'noarch' and not builder_dict.has_key(buildarch): + return None - if buildarch == 'noarch': - if len(localarches) > 0: - builder = builder_dict[localarches[0]] + builder = None + if buildarch == 'noarch' and len(localarches) > 0: + builder = builder_dict[localarches[0]] else: if buildarch in localarches: builder = builder_dict[buildarch] - - bcp = builder(uniqid, target, buildarch, srpm_url) - return bcp + + if builder: + return builder(uniqid, target, buildarch, srpm_url) + return None class XMLRPCBuilderServer: - def __init__(self, localarches): + def __init__(self, target_arch_dict): self.ids = {} # unique id => awclass instance - self.localarches = localarches + self.target_arch_dict = target_arch_dict self.cur_job = 0 def log(self, string): @@ -486,19 +486,26 @@ jobid = uniqid self.cur_job = jobid # Update current job + def _get_uniqid(self, target, arch, srpm_url): + check = '%d %s %s %s' % (time.time(), target, arch, srpm_url) + sum = sha.new() + sum.update(check) + return sum.hexdigest() + def start(self, target, arch, srpm_url): + # Sanity check the request if self.cur_job != 0: self.log("Tried to build '%s' when already buiding something" % srpm_url) return 0 + if not self.target_arch_dict.has_key(target) or len(self.target_arch_dict[target]) == 0: + self.log("Tried to build '%s' on target %s which isn't supported" % (srpm_url, target)) + return 0 + if arch != 'noarch' and not arch in self.target_arch_dict[target]: + self.log("Tried to build '%s' on target %s which doesn't support arch %s" % (srpm_url, target, arch)) + return 0 - cur_time = time.time() - check = '%d %s %s %s' % (cur_time, target, arch, srpm_url) - sum = sha.new() - sum.update(check) - uniqid = sum.hexdigest() - if target == 'devel': - target = 'development' - job = getArchBuilder(uniqid, target, arch, srpm_url, self.localarches) + uniqid = self._get_uniqid(target, arch, srpm_url) + job = getArchBuilder(uniqid, target, arch, srpm_url, self.target_arch_dict[target]) if job != None: self.ids[uniqid] = job job.start() @@ -537,8 +544,8 @@ status = 'idle' return (self.cur_job, status) - def supported_arches(self): - return self.localarches + def supported_target_arches(self): + return self.target_arch_dict def drop_privs(): @@ -595,6 +602,31 @@ return 0 +def read_mock_configs(allowed_arches): + MOCK_CONFIG_DIR = "/etc/mock/" + tmp_list = os.listdir(MOCK_CONFIG_DIR) + target_arches = {} + for f in tmp_list: + if not f.endswith(".cfg"): + continue + try: + t = f.index("-") + except ValueError: + continue + cfg_name = f[:len(f)-4] + try: + (distro, target, arch, repo) = cfg_name.split('-') + except ValueError: + print "Unrecognized config %s, ignoring." % cfg_name + continue + if distro == config_opts['distro_name'] and repo == config_opts['repo_name']: + if arch in allowed_arches: + if not target_arches.has_key(target): + target_arches[target] = [] + target_arches[target].append(arch) + return target_arches + + if __name__ == '__main__': state={'opts': True, 'host': None, 'archs': [], 'daemon': False, 'pidfile': None, 'logfile': None} @@ -619,14 +651,9 @@ help="location of the builder config file") (opts, args) = parser.parse_args() - if not opts.configfile: - print "Must specify the config file." + if not opts.configfile or not os.path.exists(opts.configfile): + print "Must specify a valid config file." sys.exit(1) - - if not os.path.exists(opts.configfile): - print "Could not find the config file %s" % opts.configfile - sys.exit(1) - if not os.access(opts.configfile, os.R_OK): print "Could not read the config file %s" % opts.configfile sys.exit(1) @@ -642,6 +669,16 @@ print "Arch '%s' must be one of [ %s ]" % (arch, archlist) sys.exit(1) + for arch in config_opts['arches']: + if not arch in builder_dict.keys(): + print "Arch '%s' specified in the config file is not supported." % arch + sys.exit(1) + + target_arch_dict = read_mock_configs(config_opts['arches']) + if len(target_arch_dict) == 0: + print "No mock configuration files were found. Exiting." + sys.exit(1) + if opts.daemon: ret=daemonize.createDaemon() if ret: @@ -702,7 +739,7 @@ print "Error: couldn't bind to address '%s:%s'. Is the builder already running?" % (config_opts['hostname'], xmlrpc_port) os._exit(1) - bcs = XMLRPCBuilderServer(config_opts['arches']) + bcs = XMLRPCBuilderServer(target_arch_dict) xmlserver.register_instance(bcs) last_time = time.time() From fedora-extras-commits at redhat.com Sat Jul 16 15:47:45 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 11:47:45 -0400 Subject: extras-buildsys/server Builder.py, 1.6, 1.7 BuilderManager.py, 1.4, 1.5 CONFIG.py, 1.18, 1.19 Message-ID: <200507161548.j6GFmFYo010235@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10181/server Modified Files: Builder.py BuilderManager.py CONFIG.py Log Message: 2005-07-16 Dan Williams * builder/builder.py server/Builder.py server/BuilderManager.py - Make the builder aware of what mock targets & arches it can actually build, and expose that information to the build server - On the server, make sure that we ask the builder to only build for arches that it supports for the target we request (This makes noarch jobs work correctly everywhere) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Builder.py 14 Jul 2005 19:12:04 -0000 1.6 +++ Builder.py 16 Jul 2005 15:47:43 -0000 1.7 @@ -56,16 +56,18 @@ self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._server_lock = threading.Lock() self._unavail_count = 0 - self._arches = [] + self._target_arches = [] builder_xmlrpc_lock.acquire() try: - self._arches = self._server.supported_arches() + self._target_arches = self._server.supported_target_arches() + for target in self._target_arches.keys(): + self._target_arches[target].append('noarch') except socket.error: builder_xmlrpc_lock.release() raise RuntimeError builder_xmlrpc_lock.release() + self._alive = True - self._arches.append('noarch') self._stop = False self._prepping_jobs = False @@ -87,12 +89,18 @@ def xmlrpc_lock_release(self): builder_xmlrpc_lock.release() - def arches(self): - return self._arches - - def can_build_arch(self, arch): - if arch in self._arches: - return True + def arches(self, target): + arches = None + try: + arches = self._target_arches[target] + except: + pass + return arches + + def can_build_arch_on_target(self, arch, target): + if self._target_arches.has_key(target) and len(self._target_arches[target]) > 0: + if arch in self._target_arches[target]: + return True return False def address(self): @@ -105,14 +113,18 @@ return self._alive def start_job(self, par_job, target, arch, srpm_url): - if not arch in self._arches or not self.available(): + if not self.available(): + raise RuntimeError + if not self._target_arches.has_key(target) or len(self._target_arches[target]) == 0: + raise RuntimeError + if not arch in self._target_arches[target]: raise RuntimeError builder_xmlrpc_lock.acquire() self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) - except (socket.error, xmlrpclib.ProtocolError): + except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() builder_xmlrpc_lock.release() @@ -200,7 +212,12 @@ def to_dict(self): client_dict = {} client_dict['address'] = self._address - client_dict['arches'] = self._arches + arches = [] + for target in self._target_arches.keys(): + for arch in self._target_arches[target]: + if not arch in arches: + arches.append(arch) + client_dict['arches'] = arches if self._cur_jobid: client_dict['status'] = 'building' else: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BuilderManager.py 11 Jul 2005 20:13:37 -0000 1.4 +++ BuilderManager.py 16 Jul 2005 15:47:43 -0000 1.5 @@ -146,7 +146,7 @@ continue # Find a free builder for this request for builder in self.running_builders: - if builder.available() and builder.can_build_arch(req['arch']): + if builder.available() and builder.can_build_arch_on_target(req['arch'], req['target']): try: job = builder.start_job(parent, req['target'], req['arch'], req['srpm_url']) except RuntimeError: Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- CONFIG.py 12 Jul 2005 20:12:32 -0000 1.18 +++ CONFIG.py 16 Jul 2005 15:47:43 -0000 1.19 @@ -55,7 +55,7 @@ # Further architectures on a per-package basis are configured in each target's # package file. See the config option 'addl_package_arches_dir'. # -config_opts['targets'] = { 'devel' : ['i386'] } +config_opts['targets'] = { 'development' : ['i386'] } # If you're using CVS building, sometimes the CVS directory layout won't match From fedora-extras-commits at redhat.com Sat Jul 16 16:42:17 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 12:42:17 -0400 Subject: extras-buildsys/builder builder.py,1.17,1.18 Message-ID: <200507161642.j6GGgH4O011445@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11425/builder Modified Files: builder.py Log Message: Pass the buildarch to mock so we actually build non-standard arches like i586/sparcv9/etc Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- builder.py 16 Jul 2005 15:47:42 -0000 1.17 +++ builder.py 16 Jul 2005 16:42:15 -0000 1.18 @@ -154,9 +154,9 @@ os.makedirs(self._result_dir) if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) - cmd = '%s %s -r %s --resultdir=%s --statedir=%s --uniqueext=%s %s' % (self.arch_command, - config_opts['builder_cmd'], self.buildroot, - self._result_dir, self._state_dir, self._uniqid, self._srpm_path) + mock_args = "-r %s --arch %s --resultdir=%s --statedir=%s --uniqueext=%s %s" % (self.buildroot, + self.buildarch, self._result_dir, self._state_dir, self._uniqid, self._srpm_path) + cmd = '%s %s %s' % (self.arch_command, config_opts['builder_cmd'], mock_args) self.log(" %s\n" % cmd) self._pobj = popen2.Popen4(cmd=cmd, bufsize=1024) fcntl.fcntl(self._pobj.fromchild.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) From fedora-extras-commits at redhat.com Sat Jul 16 16:47:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 12:47:39 -0400 Subject: extras-buildsys pyOpenSSL-threadsafe.patch,NONE,1.1 Message-ID: <200507161647.j6GGldhD011501@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11483 Added Files: pyOpenSSL-threadsafe.patch Log Message: Add pyOpenSSL patch for threadsafety, pretty much required for plague pyOpenSSL-threadsafe.patch: --- NEW FILE pyOpenSSL-threadsafe.patch --- --- pyOpenSSL-0.6/src/ssl/context.c.threadsafe 2004-08-06 06:24:38.000000000 -0400 +++ pyOpenSSL-0.6/src/ssl/context.c 2005-07-12 22:30:02.000000000 -0400 @@ -53,39 +53,33 @@ static int global_passphrase_callback(char *buf, int maxlen, int verify, void *arg) { - int len; + int len = 0; char *str; PyObject *argv, *ret = NULL; ssl_ContextObj *ctx = (ssl_ContextObj *)arg; + if (!ctx->tstate) + fprintf (stderr, "ERROR: ctx->tstate == NULL!\n"); + MY_END_ALLOW_THREADS(ctx->tstate); + /* The Python callback is called with a (maxlen,verify,userdata) tuple */ argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata); - if (ctx->tstate != NULL) - { - /* We need to get back our thread state before calling the callback */ - MY_END_ALLOW_THREADS(ctx->tstate); - ret = PyEval_CallObject(ctx->passphrase_callback, argv); - MY_BEGIN_ALLOW_THREADS(ctx->tstate); - } - else - { - ret = PyEval_CallObject(ctx->passphrase_callback, argv); - } + ret = PyEval_CallObject(ctx->passphrase_callback, argv); Py_DECREF(argv); if (ret == NULL) - return 0; + goto out; if (!PyObject_IsTrue(ret)) { Py_DECREF(ret); - return 0; + goto out; } if (!PyString_Check(ret)) { Py_DECREF(ret); - return 0; + goto out; } len = PyString_Size(ret); @@ -96,6 +90,8 @@ strncpy(buf, str, len); Py_XDECREF(ret); +out: + MY_BEGIN_ALLOW_THREADS(ctx->tstate); return len; } @@ -115,43 +111,39 @@ SSL *ssl; ssl_ConnectionObj *conn; crypto_X509Obj *cert; - int errnum, errdepth, c_ret; + int errnum, errdepth, c_ret = 0; - cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0); errnum = X509_STORE_CTX_get_error(x509_ctx); errdepth = X509_STORE_CTX_get_error_depth(x509_ctx); ssl = (SSL *)X509_STORE_CTX_get_app_data(x509_ctx); conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl); + if (!conn->tstate) + fprintf (stderr, "ERROR: ctx->tstate == NULL!\n"); + MY_END_ALLOW_THREADS(conn->tstate); + + cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0); + argv = Py_BuildValue("(OOiii)", (PyObject *)conn, (PyObject *)cert, errnum, errdepth, ok); Py_DECREF(cert); - if (conn->tstate != NULL) - { - /* We need to get back our thread state before calling the callback */ - MY_END_ALLOW_THREADS(conn->tstate); - ret = PyEval_CallObject(conn->context->verify_callback, argv); - MY_BEGIN_ALLOW_THREADS(conn->tstate); - } - else - { - ret = PyEval_CallObject(conn->context->verify_callback, argv); - } + ret = PyEval_CallObject(conn->context->verify_callback, argv); Py_DECREF(argv); - if (ret == NULL) - return 0; - - if (PyObject_IsTrue(ret)) + if (ret != NULL) { - X509_STORE_CTX_set_error(x509_ctx, X509_V_OK); - c_ret = 1; - } - else - c_ret = 0; + if (PyObject_IsTrue(ret)) + { + X509_STORE_CTX_set_error(x509_ctx, X509_V_OK); + c_ret = 1; + } + else + c_ret = 0; - Py_DECREF(ret); + Py_DECREF(ret); + } + MY_BEGIN_ALLOW_THREADS(conn->tstate); return c_ret; } @@ -169,28 +161,19 @@ ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl); PyObject *argv, *ret; + if (!conn->tstate) + fprintf (stderr, "ERROR: ctx->tstate == NULL!\n"); + MY_END_ALLOW_THREADS(conn->tstate); + argv = Py_BuildValue("(Oii)", (PyObject *)conn, where, _ret); - if (conn->tstate != NULL) - { - /* We need to get back our thread state before calling the callback */ - MY_END_ALLOW_THREADS(conn->tstate); - ret = PyEval_CallObject(conn->context->info_callback, argv); - if (ret == NULL) - PyErr_Clear(); - else - Py_DECREF(ret); - MY_BEGIN_ALLOW_THREADS(conn->tstate); - } + ret = PyEval_CallObject(conn->context->info_callback, argv); + if (ret == NULL) + PyErr_Clear(); else - { - ret = PyEval_CallObject(conn->context->info_callback, argv); - if (ret == NULL) - PyErr_Clear(); - else - Py_DECREF(ret); - } + Py_DECREF(ret); Py_DECREF(argv); + MY_BEGIN_ALLOW_THREADS(conn->tstate); return; } @@ -393,6 +376,8 @@ if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype)) return NULL; + if (self->tstate) + fprintf (stderr, "ERROR: ctx->tstate != NULL!\n"); MY_BEGIN_ALLOW_THREADS(self->tstate); ret = SSL_CTX_use_PrivateKey_file(self->ctx, keyfile, filetype); MY_END_ALLOW_THREADS(self->tstate); --- pyOpenSSL-0.6/src/crypto/crypto.c.threadsafe 2004-08-09 10:56:05.000000000 -0400 +++ pyOpenSSL-0.6/src/crypto/crypto.c 2005-07-12 22:29:32.000000000 -0400 @@ -668,6 +668,72 @@ { NULL, NULL } }; + +#ifdef WITH_THREAD + +#define MUTEX_TYPE pthread_mutex_t +#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL) +#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x)) +#define MUTEX_LOCK(x) pthread_mutex_lock(&(x)) +#define MUTEX_UNLOCK(x) pthread_mutex_unlock(&(x)) +#define THREAD_ID pthread_self() + +void handle_error(const char *file, int lineno, const char *msg) +{ + fprintf(stderr, "** %s:%i %s\n", file, lineno, msg); + ERR_print_errors_fp(stderr); +} + + +/* This array will store all of the mutexes available to OpenSSL. */ +static MUTEX_TYPE *mutex_buf = NULL; + + +static void locking_function(int mode, int n, const char * file, int line) +{ + if (mode & CRYPTO_LOCK) + MUTEX_LOCK(mutex_buf[n]); + else + MUTEX_UNLOCK(mutex_buf[n]); +} + +static unsigned long id_function(void) +{ + return ((unsigned long)THREAD_ID); +} + +int init_openssl_threads(void) +{ + int i; + + mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks() * sizeof(MUTEX_TYPE)); + if (!mutex_buf) + return 0; + for (i = 0; i < CRYPTO_num_locks(); i++) + MUTEX_SETUP(mutex_buf[i]); + CRYPTO_set_id_callback(id_function); + CRYPTO_set_locking_callback(locking_function); + return 1; +} + +int deinit_openssl_threads(void) +{ + int i; + + if (!mutex_buf) + return 0; + CRYPTO_set_id_callback(NULL); + CRYPTO_set_locking_callback(NULL); + for (i = 0; i < CRYPTO_num_locks(); i++) + MUTEX_CLEANUP(mutex_buf[i]); + free(mutex_buf); + mutex_buf = NULL; + return 1; +} + +#endif + + /* * Initialize crypto sub module * @@ -713,6 +779,10 @@ PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA); dict = PyModule_GetDict(module); +#ifdef WITH_THREAD + if (!init_openssl_threads()) + goto error; +#endif if (!init_crypto_x509(dict)) goto error; if (!init_crypto_x509name(dict)) From fedora-extras-commits at redhat.com Sat Jul 16 16:48:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 12:48:07 -0400 Subject: extras-buildsys plague.spec,1.17,1.18 Message-ID: <200507161648.j6GGm7BS011524@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11507 Modified Files: plague.spec Log Message: Fix up specfile, new version Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- plague.spec 14 Jul 2005 21:49:47 -0000 1.17 +++ plague.spec 16 Jul 2005 16:48:05 -0000 1.18 @@ -2,7 +2,7 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.1 +Version: 0.2 Release: 1 License: GPL Group: Development/Tools @@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-sqlite, pyOpenSSL, createrepo Requires: %{name}-common = %{version}-%{release} -Requires: lighttpd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -32,7 +31,7 @@ %package builder -Summary: Build client daemon for Plague builder slaves +Summary: Builder daemon for Plague builder slaves Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1 @@ -43,15 +42,13 @@ Requires(preun): /sbin/service %description builder -The Plague build client does the actual RPM package building on slave -machines. +The Plague builder does the actual RPM package building on slave machines. %package client Summary: Package queueing client for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: pyOpenSSL -Requires: lighttpd %description client Client program for enqueueing package builds and interrogating the build system. @@ -124,7 +121,7 @@ %files common %defattr(-, root, root) -%{_libdir}/python?.?/site-packages/plague/*.py* +/usr/lib/python?.?/site-packages/plague/*.py* %files builder %defattr(-, root, root) @@ -145,5 +142,10 @@ %changelog +* Sat Jul 16 2005 Dan Williams +- Bump version to 0.2 +- Grab python files from /usr/lib, not %{_libdir} until the + multiarch issues get worked out + * Sun Jun 26 2005 Dan Williams - first version/packaging From fedora-extras-commits at redhat.com Sat Jul 16 16:49:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 16 Jul 2005 12:49:53 -0400 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.10,1.11 Message-ID: <200507161649.j6GGnrDw011552@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11535 Modified Files: xemacs-sumo.spec Log Message: Reformat specfile. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xemacs-sumo.spec 13 Jul 2005 20:03:28 -0000 1.10 +++ xemacs-sumo.spec 16 Jul 2005 16:49:51 -0000 1.11 @@ -1,83 +1,82 @@ -%define sumo_ver 2005-05-05 +%define sumo 2005-05-05 +%define pkgdir %{_datadir}/xemacs -Summary: XEmacs Lisp packages -Name: xemacs-sumo -Version: %(echo %{sumo_ver} | tr -d -) -Release: 7 -License: GPL -Group: Applications/Editors -Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2 -Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2 -Source2: %{name}-w3.css -Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz -Source10: Emacs.ad.ja_JP.eucJP -Source11: Emacs.ad.ko_KR.eucKR -Source12: Emacs.ad.zh_CN.GB2312 -Source13: Emacs.ad.zh_TW.Big5 -Source14: Emacs.ad.ja_JP.UTF-8 -Source15: Emacs.ad.ko_KR.UTF-8 -Source16: Emacs.ad.zh_CN.UTF-8 -Source17: Emacs.ad.zh_TW.UTF-8 -URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: xemacs-nox perl /sbin/install-info -Requires: xemacs-common -Conflicts: xemacs < 21.4.12-12 -BuildArch: noarch -Provides: ruby-mode-xemacs -Obsoletes: ruby-mode-xemacs tm -# Provides/Obsoletes for upgradeability from the latest FC version, needed -# until (if?) there will be a separate apel package for XEmacs again. -Provides: apel-xemacs = 10.2 -Obsoletes: apel-xemacs < 10.6-6 -Patch0: %{name}-jde-equal.patch -Patch1: %{name}-sql-abbrev.patch -Patch6: auctex-texsite-jlatex-detect-69129.patch -Patch7: auctex-texjp-platex.patch -Patch8: egg-wnn-host-unix-79826.patch -Patch11: browse-url-htmlview-84262.patch -Patch12: psgml-browsers-84262.patch -Patch13: jde-ug-rel-links.patch -Patch14: jde-ug-section-links-89499.patch -Patch15: avoid-catch-error-65346.patch +Name: xemacs-sumo +Version: %(echo %{sumo} | tr -d -) +Release: 7 +Summary: XEmacs lisp packages + +Group: Applications/Editors +License: GPL +URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball +Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2 +Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2 +Source2: %{name}-w3.css +Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz +Source10: Emacs.ad.ja_JP.eucJP +Source11: Emacs.ad.ko_KR.eucKR +Source12: Emacs.ad.zh_CN.GB2312 +Source13: Emacs.ad.zh_TW.Big5 +Source14: Emacs.ad.ja_JP.UTF-8 +Source15: Emacs.ad.ko_KR.UTF-8 +Source16: Emacs.ad.zh_CN.UTF-8 +Source17: Emacs.ad.zh_TW.UTF-8 +Patch0: %{name}-jde-equal.patch +Patch1: %{name}-sql-abbrev.patch +Patch6: auctex-texsite-jlatex-detect-69129.patch +Patch7: auctex-texjp-platex.patch +Patch8: egg-wnn-host-unix-79826.patch +Patch11: browse-url-htmlview-84262.patch +Patch12: psgml-browsers-84262.patch +Patch13: jde-ug-rel-links.patch +Patch14: jde-ug-section-links-89499.patch +Patch15: avoid-catch-error-65346.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: xemacs-nox +BuildRequires: perl +BuildRequires: /sbin/install-info +Requires: xemacs-common +Provides: apel-xemacs = 10.2 +Provides: ruby-mode-xemacs +Obsoletes: apel-xemacs < 10.6-6 +Obsoletes: ruby-mode-xemacs +Obsoletes: tm +Conflicts: xemacs < 21.4.12-12 %description -XEmacs (like GNU Emacs) is a self-documenting, customizable, -extensible, real-time display editor. XEmacs is self-documenting -because at any time you can type control-h to find out what your -options are or find out what a command does. XEmacs is customizable -because you can change the definitions of XEmacs commands. XEmacs is -extensible because you can write entirely new commands-programs in the -Lisp language to be run by Emacs' own Lisp interpreter. XEmacs -includes a real-time display, which means that the text being edited -is visible on the screen and is updated very frequently (usually after -every character or pair of characters) as you type. - -The XEmacs Sumo packages contain a large collection of useful -Lisp packages for XEmacs including mailreaders, programming modes -and utilities, and mule related packages. - -%package el -Summary: The .el source files for the XEmacs Sumo packages. -Group: Applications/Editors -Requires: xemacs-sumo = %{version} -Conflicts: xemacs-el < 21.4.12-12 - -%description el -xemacs-sumo-el is not needed to run XEmacs. You only need to install it if -you are planning to incorporate some Lisp programming into your XEmacs -experience. - -%package info -Summary: Information files for XEmacs. -Group: Applications/Editors -Conflicts: xemacs-info < 21.4.12-12 - -%description info -This package contains optional info files that are distributed -with the XEmacs Sumo packages. +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +The XEmacs Sumo packages contain a large collection of useful lisp +packages for XEmacs including mailreaders, programming modes and +utilities, and packages related to using XEmacs in multi-lingual +environments. + +%package el +Summary: Emacs lisp source files for the XEmacs Sumo packages +Group: Development/Libraries +Requires: xemacs-sumo = %{version} +Conflicts: xemacs-el < 21.4.12-12 + +%description el +This package is not needed to run XEmacs; it contains the lisp source +files for the XEmacs Sumo packages, mainly of interest when developing +or debugging the packages. + +%package info +Summary: XEmacs packages documentation in GNU texinfo format +Group: Documentation +Conflicts: xemacs-info < 21.4.12-12 + +%description info +This package contains optional documentation for the XEmacs Sumo +packages in GNU texinfo format -%define pkgdir %{_datadir}/xemacs %prep %setup -q -c -a1 @@ -120,78 +119,84 @@ %build -%define _xemacs_batch xemacs-nox -batch -vanilla +export xemacs_batch="xemacs-nox -batch -vanilla" # mew is provided by mew-xemacs, and skk by ddskk-xemacs -%_xemacs_batch -l package-admin -eval \ +$xemacs_batch -l package-admin -eval \ "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" rmdir xemacs-packages/{etc,lisp,man}/mew -%_xemacs_batch -l package-admin -eval \ +$xemacs_batch -l package-admin -eval \ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk export EMACSPACKAGEPATH=`pwd` -%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ +$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* -%_xemacs_batch -f batch-byte-recompile-directory \ +$xemacs_batch -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp %install -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT -# install packages in buildroot -mkdir -p %buildroot%{pkgdir} -cp -rp xemacs-packages mule-packages %buildroot%{pkgdir} - -( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults - mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5 - iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs - iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs - iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs - mv de de_DE - mv fr fr_FR - mv ro ro_RO - install -m 644 %SOURCE10 ja_JP.eucJP/Emacs - install -m 644 %SOURCE11 ko_KR.eucKR/Emacs - install -m 644 %SOURCE12 zh_CN.GB2312/Emacs - install -m 644 %SOURCE13 zh_TW.Big5/Emacs - install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs - install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs - install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs - install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs -## don't seem to appear in manifest -# ln -s ja_JP.eucJP ja_JP -# ln -s ko_KR.eucKR ko_KR -# ln -s zh_CN.GB2312 zh_CN -# ln -s zh_TW.Big5 zh_TW -) +mkdir -p $RPM_BUILD_ROOT%{pkgdir} +cp -rp xemacs-packages mule-packages $RPM_BUILD_ROOT%{pkgdir} -# Make sure nothing is 0400 -chmod -R a+rX %buildroot/usr +cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults +mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \ + ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5 +iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs +iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs +iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs +mv de de_DE +mv fr fr_FR +mv ro ro_RO +install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs +install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs +install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs +install -pm 644 %{SOURCE13} zh_TW.Big5/Emacs +install -pm 644 %{SOURCE14} ja_JP.UTF-8/Emacs +install -pm 644 %{SOURCE15} ko_KR.UTF-8/Emacs +install -pm 644 %{SOURCE16} zh_CN.UTF-8/Emacs +install -pm 644 %{SOURCE17} zh_TW.UTF-8/Emacs +# these don't seem to appear in manifest +#ln -s ja_JP.eucJP ja_JP +#ln -s ko_KR.eucKR ko_KR +#ln -s zh_CN.GB2312 zh_CN +#ln -s zh_TW.Big5 zh_TW +cd - + +# make sure nothing is 0400 +chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} # info docs: pre-generate "dir"s and compress files -for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do +for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do /sbin/install-info $file `dirname $file`/dir done -find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9 +find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9 # separate files rm -f *.files base-files el-files info-files -echo "%defattr(-,root,root)" > base-files -echo "%defattr(-,root,root)" > el-files -echo "%defattr(-,root,root)" > info-files - -find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \) +echo "%%defattr(-,root,root,-)" > base-files +echo "%%defattr(-,root,root,-)" > el-files +echo "%%defattr(-,root,root,-)" > info-files + +find $RPM_BUILD_ROOT%{pkgdir}/* \ + \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \ + \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ + \( -type d -name info -fprint info.files -prune \) -o \ + \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \ + \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ + -fprint base-el-not-bytecomped.files \) \) -perl -pi -e "s|%buildroot||" *.files +perl -pi -e "s|$RPM_BUILD_ROOT||" *.files cat base-*.files dir.files >> base-files -cat el-*.files dir.files >> el-files -cat info.files >> info-files +cat el-*.files dir.files >> el-files +cat info.files >> info-files %clean -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT %files -f base-files @@ -204,6 +209,7 @@ %changelog * Wed Jul 13 2005 Ville Skytt?? - 20050505-7 - Remove mew and skk, they're in separate packages again (#162952). +- Reformat specfile. * Thu Jun 2 2005 Ville Skytt?? - 20050505-6 - Make sure we're using files included in this package From fedora-extras-commits at redhat.com Sun Jul 17 11:45:06 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:06 -0400 Subject: rpms/libdnet - New directory Message-ID: <200507171145.j6HBj6eI005648@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5624/libdnet Log Message: Directory /cvs/extras/rpms/libdnet added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 11:45:06 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:06 -0400 Subject: rpms/libdnet/devel - New directory Message-ID: <200507171145.j6HBj60W005653@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5624/libdnet/devel Log Message: Directory /cvs/extras/rpms/libdnet/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 11:45:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:20 -0400 Subject: rpms/libdnet Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507171145.j6HBjKCB005696@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5669 Added Files: Makefile import.log Log Message: Setup of module libdnet --- NEW FILE Makefile --- # Top level Makefile for module libdnet all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 17 11:45:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:20 -0400 Subject: rpms/libdnet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507171145.j6HBjKW5005701@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5669/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libdnet --- NEW 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 Jul 17 11:45:52 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:52 -0400 Subject: rpms/libdnet import.log,1.1,1.2 Message-ID: <200507171145.j6HBjq4l005764@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5733 Modified Files: import.log Log Message: auto-import libdnet-1.10-2 on branch devel from libdnet-1.10-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libdnet/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jul 2005 11:45:18 -0000 1.1 +++ import.log 17 Jul 2005 11:45:50 -0000 1.2 @@ -0,0 +1 @@ +libdnet-1_10-2:HEAD:libdnet-1.10-2.src.rpm:1121600742 From fedora-extras-commits at redhat.com Sun Jul 17 11:45:52 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:52 -0400 Subject: rpms/libdnet/devel libdnet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507171145.j6HBjqvC005771@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5733/devel Modified Files: .cvsignore sources Added Files: libdnet.spec Log Message: auto-import libdnet-1.10-2 on branch devel from libdnet-1.10-2.src.rpm --- NEW FILE libdnet.spec --- Summary: Simple portable interface to lowlevel networking routines Name: libdnet Version: 1.10 Release: 2%{?dist} License: BSD-like Group: System Environment/Libraries URL: http://libdnet.sf.net/ Source: http://dl.sf.net/libdnet/libdnet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description libdnet provides a simplified, portable interface to several low-level networking routines, including network address manipulation, kernel arp(4) cache and route(4) table lookup and manipulation, network firewalling (IP filter, ipfw, ipchains, pf, ...), network interface lookup and manipulation, raw IP packet and Ethernet frame, and data transmission. %package devel Summary: Header files for libdnet library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary}. %package progs Summary: Sample applications to use with libdnet Group: Applications/Internet Requires: %{name} = %{version}-%{release} %description progs %{summary}. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} make install DESTDIR=%{buildroot} %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE README THANKS TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/*.so %{_libdir}/*.a %exclude %{_libdir}/*.la %{_includedir}/* %{_mandir}/man3/*.3* %files progs %defattr(-,root,root,-) %{_sbindir}/* %{_mandir}/man8/*.8* %changelog * Thu Jul 14 2005 Oliver Falk - 1.10-2 - Integrate Jos?'s patch after reviewing the pkg. * Fri Jul 08 2005 Oliver Falk - 1.10-1 - Build for FE Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdnet/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2005 11:45:18 -0000 1.1 +++ .cvsignore 17 Jul 2005 11:45:50 -0000 1.2 @@ -0,0 +1 @@ +libdnet-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdnet/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2005 11:45:18 -0000 1.1 +++ sources 17 Jul 2005 11:45:50 -0000 1.2 @@ -0,0 +1 @@ +416b765e9d9961501ac85e9a366fd219 libdnet-1.10.tar.gz From fedora-extras-commits at redhat.com Sun Jul 17 11:48:36 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:48:36 -0400 Subject: owners owners.list,1.19,1.20 Message-ID: <200507171148.j6HBmaQI005840@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5823 Modified Files: owners.list Log Message: * Add libdnet Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- owners.list 15 Jul 2005 08:30:04 -0000 1.19 +++ owners.list 17 Jul 2005 11:48:34 -0000 1.20 @@ -337,6 +337,7 @@ Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|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|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Jul 17 11:49:37 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:49:37 -0400 Subject: common tobuild,1.1941,1.1942 Message-ID: <200507171149.j6HBnbNc005902@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5885 Modified Files: tobuild Log Message: request build of rpms/libdnet/devel libdnet-1_10-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1941 retrieving revision 1.1942 diff -u -r1.1941 -r1.1942 --- tobuild 16 Jul 2005 11:11:27 -0000 1.1941 +++ tobuild 17 Jul 2005 11:49:35 -0000 1.1942 @@ -84,3 +84,4 @@ mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 +oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 17 11:50:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:50:45 -0400 Subject: common tobuild,1.1942,1.1943 Message-ID: <200507171150.j6HBojba005969@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5952 Modified Files: tobuild Log Message: request build of rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1942 retrieving revision 1.1943 diff -u -r1.1942 -r1.1943 --- tobuild 17 Jul 2005 11:49:35 -0000 1.1942 +++ tobuild 17 Jul 2005 11:50:43 -0000 1.1943 @@ -85,3 +85,4 @@ mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel +oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 17 11:51:07 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:51:07 -0400 Subject: common tobuild,1.1943,1.1944 Message-ID: <200507171151.j6HBp7Pg006031@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014 Modified Files: tobuild Log Message: request build of rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1943 retrieving revision 1.1944 diff -u -r1.1943 -r1.1944 --- tobuild 17 Jul 2005 11:50:43 -0000 1.1943 +++ tobuild 17 Jul 2005 11:51:05 -0000 1.1944 @@ -86,3 +86,4 @@ mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 +oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 17 13:11:36 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:11:36 -0400 Subject: rpms/nautilus-open-terminal - New directory Message-ID: <200507171311.j6HDBaxq008424@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/nautilus-open-terminal Log Message: Directory /cvs/extras/rpms/nautilus-open-terminal added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 13:11:37 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:11:37 -0400 Subject: rpms/nautilus-open-terminal/devel - New directory Message-ID: <200507171311.j6HDBb6J008429@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/nautilus-open-terminal/devel Log Message: Directory /cvs/extras/rpms/nautilus-open-terminal/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 13:12:03 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:03 -0400 Subject: rpms/nautilus-open-terminal Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507171312.j6HDC3IB008478@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8445 Added Files: Makefile import.log Log Message: Setup of module nautilus-open-terminal --- NEW FILE Makefile --- # Top level Makefile for module nautilus-open-terminal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 17 13:12:04 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:04 -0400 Subject: rpms/nautilus-open-terminal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507171312.j6HDC4u7008483@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8445/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nautilus-open-terminal --- NEW 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 Jul 17 13:12:31 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:31 -0400 Subject: rpms/nautilus-open-terminal import.log,1.1,1.2 Message-ID: <200507171312.j6HDCVhK008545@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8514 Modified Files: import.log Log Message: auto-import nautilus-open-terminal-0.4-4 on branch devel from nautilus-open-terminal-0.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jul 2005 13:12:01 -0000 1.1 +++ import.log 17 Jul 2005 13:12:29 -0000 1.2 @@ -0,0 +1 @@ +nautilus-open-terminal-0_4-4:HEAD:nautilus-open-terminal-0.4-4.src.rpm:1121605967 From fedora-extras-commits at redhat.com Sun Jul 17 13:12:31 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:31 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507171312.j6HDCVaq008552@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8514/devel Modified Files: .cvsignore sources Added Files: nautilus-open-terminal.spec Log Message: auto-import nautilus-open-terminal-0.4-4 on branch devel from nautilus-open-terminal-0.4-4.src.rpm --- NEW FILE nautilus-open-terminal.spec --- Name: nautilus-open-terminal Version: 0.4 Release: 4%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops License: GPL URL: http://manny.cluecoder.org/packages/nautilus-open-terminal/ Source0: http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel # need extensions BuildRequires: nautilus >= 2.5.4 %description The nautilus-open-terminal extension provides a right-click "Open Terminal" option for nautilus users who prefer that option. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.{l,}a %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO #%{_datadir}/locale/*/*/* %{_libdir}/nautilus/extensions-1.0/*.so* %changelog * Fri Jul 15 2005 Paul W. Frields - 0.4-4 - Use find_lang and scriptlets per official guidelines * Thu Jul 14 2005 Paul W. Frields - 0.4-3 - Remove .a and .la devel files from build * Thu Jul 14 2005 Paul W. Frields - 0.4-2 - Use dist tag and update BuildRequires * Wed Jul 13 2005 Paul W. Frields - 0.4-1 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2005 13:12:02 -0000 1.1 +++ .cvsignore 17 Jul 2005 13:12:29 -0000 1.2 @@ -0,0 +1 @@ +nautilus-open-terminal-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2005 13:12:02 -0000 1.1 +++ sources 17 Jul 2005 13:12:29 -0000 1.2 @@ -0,0 +1 @@ +931a50e602f60340a5ed369f50146f36 nautilus-open-terminal-0.4.tar.gz From fedora-extras-commits at redhat.com Sun Jul 17 13:27:30 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:27:30 -0400 Subject: owners owners.list,1.20,1.21 Message-ID: <200507171327.j6HDRU90008661@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644 Modified Files: owners.list Log Message: Add nautilus-open-terminal Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- owners.list 17 Jul 2005 11:48:34 -0000 1.20 +++ owners.list 17 Jul 2005 13:27:28 -0000 1.21 @@ -438,6 +438,7 @@ Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com 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|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|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org| From stickster at gmail.com Sun Jul 17 13:43:14 2005 From: stickster at gmail.com (Paul W. Frields) Date: Sun, 17 Jul 2005 09:43:14 -0400 Subject: APPROVED: nautilus-open-terminal Message-ID: <1121607794.5038.15.camel@localhost.localdomain> The nautilus-open-terminal extension provides a right-click "Open Terminal" option for nautilus users who prefer that option. Reviewer: Tom "spot" Callaway Maintainer: Paul W. Frields -- Paul W. Frields, RHCE http://paul.frields.org/ gpg fingerprint: 3DA6 A0AC 6D58 FEC4 0233 5906 ACDB C937 BD11 3717 Fedora Documentation Project: http://fedora.redhat.com/projects/docs/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Sun Jul 17 14:24:02 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 10:24:02 -0400 Subject: common tobuild,1.1944,1.1945 Message-ID: <200507171424.j6HEO2lk009923@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9906 Modified Files: tobuild Log Message: request build of rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1944 retrieving revision 1.1945 diff -u -r1.1944 -r1.1945 --- tobuild 17 Jul 2005 11:51:05 -0000 1.1944 +++ tobuild 17 Jul 2005 14:24:00 -0000 1.1945 @@ -87,3 +87,4 @@ oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development From tcallawa at redhat.com Sun Jul 17 15:48:30 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Sun, 17 Jul 2005 10:48:30 -0500 Subject: APPROVED: dvb-apps Message-ID: <1121615310.2755.147.camel@localhost.localdomain> Name: dvb-apps Summary: Utility, demo and test applications using the Linux DVB API Reviewer: Tom 'spot' Callaway Maintainer: Ville Skytt? ~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 Sun Jul 17 16:15:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:24 -0400 Subject: rpms/dvb-apps - New directory Message-ID: <200507171615.j6HGFOmB012422@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402/dvb-apps Log Message: Directory /cvs/extras/rpms/dvb-apps added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 16:15:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:24 -0400 Subject: rpms/dvb-apps/devel - New directory Message-ID: <200507171615.j6HGFO9H012427@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402/dvb-apps/devel Log Message: Directory /cvs/extras/rpms/dvb-apps/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 16:15:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:48 -0400 Subject: rpms/dvb-apps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507171615.j6HGFmBA012474@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447 Added Files: Makefile import.log Log Message: Setup of module dvb-apps --- NEW FILE Makefile --- # Top level Makefile for module dvb-apps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 17 16:15:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:49 -0400 Subject: rpms/dvb-apps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507171615.j6HGFnZp012479@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dvb-apps --- NEW 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 Jul 17 16:16:43 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:16:43 -0400 Subject: rpms/dvb-apps import.log,1.1,1.2 Message-ID: <200507171616.j6HGGhKm012560@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526 Modified Files: import.log Log Message: auto-import dvb-apps-1.1.0-0.4 on branch devel from dvb-apps-1.1.0-0.4.src.rpm Initial import. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jul 2005 16:15:46 -0000 1.1 +++ import.log 17 Jul 2005 16:16:41 -0000 1.2 @@ -0,0 +1 @@ +dvb-apps-1_1_0-0_4:HEAD:dvb-apps-1.1.0-0.4.src.rpm:1121616991 From fedora-extras-commits at redhat.com Sun Jul 17 16:16:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:16:44 -0400 Subject: rpms/dvb-apps/devel dvb-apps-fi-htv-scan, NONE, 1.1 dvb-apps-optflags.patch, NONE, 1.1 dvb-apps-paths.patch, NONE, 1.1 dvb-apps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507171616.j6HGGiC5012568@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526/devel Modified Files: .cvsignore sources Added Files: dvb-apps-fi-htv-scan dvb-apps-optflags.patch dvb-apps-paths.patch dvb-apps.spec Log Message: auto-import dvb-apps-1.1.0-0.4 on branch devel from dvb-apps-1.1.0-0.4.src.rpm Initial import. --- NEW FILE dvb-apps-fi-htv-scan --- # HTV (Finland / Helsinki) # freq sr fec mod C 283000000 5900000 NONE QAM128 dvb-apps-optflags.patch: --- NEW FILE dvb-apps-optflags.patch --- diff -Naru linuxtv-dvb-apps-1.1.0.orig/test/Makefile linuxtv-dvb-apps-1.1.0/test/Makefile --- linuxtv-dvb-apps-1.1.0.orig/test/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/test/Makefile 2004-10-04 23:32:18.377000638 +0300 @@ -1,7 +1,7 @@ # Makefile for Linux DVB API Version 3 test programs CC = gcc -CFLAGS = -g -O2 -W -Wall -I../include +CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -I../include TARGETS = \ diseqc \ diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile 2004-10-04 23:32:10.787375858 +0300 @@ -1,5 +1,5 @@ CC = gcc -CFLAGS = -g -Wall -O2 +CFLAGS = $(RPM_OPT_FLAGS) -Wall all: av7110_loadkeys evtest diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile 2004-10-04 23:31:58.835116342 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -g -O2 -MD -Wall -I. -I../../include +CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include LFLAGS = OBJS = dvbdate.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile 2004-10-04 23:31:48.830247341 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -g -O2 -MD -Wall -I. -I../../include +CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include LFLAGS = OBJS = dvbnet.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile 2004-01-19 19:10:16.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile 2004-10-04 23:31:37.418818469 +0300 @@ -1,6 +1,6 @@ dvbtraffic: dvbtraffic.c - gcc -MD -g -O2 -Wall -I../../include $< -o $@ + $(CC) -MD -Wall $(RPM_OPT_FLAGS) -I../../include $< -o $@ clean: rm -f *.o *.d dvbtraffic diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile linuxtv-dvb-apps-1.1.0/util/lib/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/lib/Makefile 2004-10-04 23:31:08.152976759 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -MD -g -Wall -O2 -I../../include -I. +CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I. LFLAGS = -g -Wall OBJS = lnb.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile linuxtv-dvb-apps-1.1.0/util/scan/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/scan/Makefile 2004-10-04 23:30:50.443518484 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib +CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib LFLAGS = -g -Wall OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o ../lib/lnb.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile linuxtv-dvb-apps-1.1.0/util/szap/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/szap/Makefile 2004-10-04 23:32:41.668711208 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib -LFLAGS = -Wall -g -O2 +CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +LFLAGS = -Wall $(RPM_OPT_FLAGS) RM = rm -f TARGETS = szap tzap czap femon diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile 2004-01-22 00:13:45.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile 2004-10-04 23:30:34.373547057 +0300 @@ -1,6 +1,6 @@ CC = gcc RM = rm -f -CFLAGS = -g -Wall -O2 +CFLAGS = -Wall $(RPM_OPT_FLAGS) LFLAGS = -g -Wall LDFLAGS = -lusb dvb-apps-paths.patch: --- NEW FILE dvb-apps-paths.patch --- diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README --- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README 2004-10-05 00:12:40.031659603 +0300 @@ -7,3 +7,3 @@ - # ./av7110_loadkeys [-i|--invert] [-a|--address ] keymapname.(rc5|rcmm) > /proc/av7110_ir + # av7110_loadkeys [-i|--invert] [-a|--address ] keymapname.(rc5|rcmm) > /proc/av7110_ir @@ -17,6 +17,6 @@ Listen to *any* IR transmitter with uses the RC5 protocol: -# ./av7110_loadkeys hauppauge.rc5 > /proc/av7110_ir +# av7110_loadkeys /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir Listen to RC5 transmitter with address 2: -# ./av7110_loadkeys -a 2 hauppauge.rc5 > /proc/av7110_ir +# av7110_loadkeys -a 2 /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir @@ -25,5 +25,5 @@ -Now you can test your hardware setup using evtest +Now you can test your hardware setup using av7110_evtest - # ./evtest /dev/input/eventX + # av7110_evtest /dev/input/eventX diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl --- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl 2004-10-05 00:12:32.412917780 +0300 @@ -14,3 +14,3 @@ - $DEV_NAME = `./dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`; + $DEV_NAME = `dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`; chop($DEV_NAME); diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh --- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh 2004-10-05 00:13:40.047815421 +0300 @@ -6,3 +6,3 @@ -./dvbnet -p $PID +dvbnet -p $PID diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/scan/README linuxtv-dvb-apps-1.1.0/util/scan/README --- linuxtv-dvb-apps-1.1.0.orig/util/scan/README 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/scan/README 2004-10-05 00:12:40.032659359 +0300 @@ -9,8 +9,9 @@ -Basic usage: ./scan dvb-s/Astra-19.2E | tee mychannels.conf +Basic usage: +scandvb /usr/share/dvb-apps/dvb-s/Astra-19.2E | tee mychannels.conf If you want it to check a specific frequency, tune to that frequency -(e.g. using szap/tzap/czap) and then use './scan -c'. +(e.g. using szap/tzap/czap) and then use 'scandvb -c'. -For more scan options see ./scan -h. +For more scandvb options see 'scandvb -h'. diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/szap/README linuxtv-dvb-apps-1.1.0/util/szap/README --- linuxtv-dvb-apps-1.1.0.orig/util/szap/README 2004-01-25 21:23:39.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/szap/README 2004-10-05 00:12:40.033659116 +0300 @@ -7,3 +7,3 @@ -$ ./szap -c channels.conf-dvbs-astra n24 +$ szap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbs-astra n24 @@ -11,3 +11,3 @@ -$ ./czap -c channels.conf-dvbc-berlin Arte +$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbc-berlin Arte @@ -15,3 +15,3 @@ -$ ./czap -c channels.conf-dvbt-berlin phoenix +$ tzap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix @@ -21,3 +21,3 @@ -$ ./czap -c channels.conf-dvbt-berlin phoenix -r +$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix -r [keep it running in one console] --- NEW FILE dvb-apps.spec --- Name: dvb-apps Version: 1.1.0 Release: 0.4 Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia License: GPL URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2 Source1: %{name}-fi-htv-scan Patch0: %{name}-optflags.patch Patch1: %{name}-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. %prep %setup -q -n linuxtv-%{name}-%{version} %patch0 -p1 %patch1 -p1 cd util install -pm 644 %{SOURCE1} scan/dvb-c/fi-htv install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys install -pm 644 scan/README ../README.scandvb install -pm 644 szap/README ../README.szap install -pm 644 ttusb_dec_reset/README ../README.ttusb_dec_reset chmod 644 dvbnet/net_start.* cd .. rm -rf include %build make CC="%{__cc}" # %{?_smp_mflags} make %{?_smp_mflags} CC="%{__cc}" -C util/ttusb_dec_reset %install rm -rf $RPM_BUILD_ROOT cd util install -dm 755 $RPM_BUILD_ROOT%{_bindir} install -pm 755 av7110_loadkeys/av7110_loadkeys $RPM_BUILD_ROOT%{_bindir} install -pm 755 av7110_loadkeys/evtest $RPM_BUILD_ROOT%{_bindir}/av7110_evtest install -pm 755 dvbdate/dvbdate $RPM_BUILD_ROOT%{_bindir} install -pm 755 dvbnet/dvbnet $RPM_BUILD_ROOT%{_bindir} install -pm 755 dvbtraffic/dvbtraffic $RPM_BUILD_ROOT%{_bindir} install -pm 755 scan/scan $RPM_BUILD_ROOT%{_bindir}/scandvb install -pm 755 szap/?zap $RPM_BUILD_ROOT%{_bindir} install -pm 755 szap/femon $RPM_BUILD_ROOT%{_bindir} install -pm 755 ttusb_dec_reset/ttusb_dec_reset $RPM_BUILD_ROOT%{_bindir} install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pR scan/dvb-? $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 av7110_loadkeys/*.rc5 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 av7110_loadkeys/*.rcmm $RPM_BUILD_ROOT%{_datadir}/%{name} cd .. %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb* %{_bindir}/* %{_datadir}/dvb-apps/ %changelog * Thu Jun 30 2005 Ville Skytt?? - 1.1.0-0.4 - Update URL. * Sun May 29 2005 Ville Skytt?? - 1.1.0-0.3 - Rebuild for FC4. * Wed Apr 20 2005 Ville Skytt?? - 1.1.0-0.2 - Switch to recent glibc-kernheaders which includes userspace DVB headers. * Sun Dec 26 2004 Ville Skytt?? - 0:1.1.0-0.1 - Remove unnecessary Epochs. * Mon Oct 4 2004 Ville Skytt?? - 0:1.1.0-0.scop.1 - First build, loosely based on Mandrake's 1.1.0-4mdk. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2005 16:15:46 -0000 1.1 +++ .cvsignore 17 Jul 2005 16:16:42 -0000 1.2 @@ -0,0 +1 @@ +linuxtv-dvb-apps-1.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2005 16:15:46 -0000 1.1 +++ sources 17 Jul 2005 16:16:42 -0000 1.2 @@ -0,0 +1 @@ +987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 17 16:24:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:24:45 -0400 Subject: rpms/dvb-apps/devel .cvsignore, 1.2, 1.3 dvb-apps.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507171624.j6HGOj91012653@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12632 Modified Files: .cvsignore dvb-apps.spec sources Log Message: Include a copy of the GPL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2005 16:16:42 -0000 1.2 +++ .cvsignore 17 Jul 2005 16:24:42 -0000 1.3 @@ -1 +1,2 @@ linuxtv-dvb-apps-1.1.0.tar.bz2 +COPYING Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps.spec 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps.spec 17 Jul 2005 16:24:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.0 -Release: 0.4 +Release: 1%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2 Source1: %{name}-fi-htv-scan +Source2: http://www.gnu.org/licenses/COPYING Patch0: %{name}-optflags.patch Patch1: %{name}-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +33,7 @@ chmod 644 dvbnet/net_start.* cd .. rm -rf include +install -pm 644 %{SOURCE2} COPYING %build @@ -65,12 +67,15 @@ %files %defattr(-,root,root,-) -%doc README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb* +%doc COPYING README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb* %{_bindir}/* %{_datadir}/dvb-apps/ %changelog +* Sun Jul 17 2005 Ville Skytt?? - 1.1.0-1 +- Include a copy of the GPL. + * Thu Jun 30 2005 Ville Skytt?? - 1.1.0-0.4 - Update URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2005 16:16:42 -0000 1.2 +++ sources 17 Jul 2005 16:24:42 -0000 1.3 @@ -1 +1,2 @@ 987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Sun Jul 17 16:29:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:29:04 -0400 Subject: owners owners.list,1.21,1.22 Message-ID: <200507171629.j6HGT4u7012715@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12698 Modified Files: owners.list Log Message: Add dvb-apps. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- owners.list 17 Jul 2005 13:27:28 -0000 1.21 +++ owners.list 17 Jul 2005 16:29:02 -0000 1.22 @@ -122,6 +122,7 @@ Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org| +Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Jul 17 16:37:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:37:59 -0400 Subject: rpms/xemacs-sumo/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs-sumo.spec, 1.11, 1.12 xemacs-sumo-jde-equal.patch, 1.1, NONE xemacs-sumo-sql-abbrev.patch, 1.1, NONE xemacs-sumo-w3.css, 1.1, NONE Message-ID: <200507171637.j6HGbxZe012752@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12731 Modified Files: .cvsignore sources xemacs-sumo.spec Removed Files: xemacs-sumo-jde-equal.patch xemacs-sumo-sql-abbrev.patch xemacs-sumo-w3.css Log Message: * Sat Jul 16 2005 Ville Skytt?? - 20050715-1 - 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file permissions fixed upstream. - Use sed instead of perl for in-place edits during build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jun 2005 21:00:01 -0000 1.5 +++ .cvsignore 17 Jul 2005 16:37:57 -0000 1.6 @@ -1,3 +1,2 @@ -xemacs-mule-sumo-2005-05-05.tar.bz2 -xemacs-sumo-2005-05-05.tar.bz2 -cc-mode-1.45-pkg.tar.gz +xemacs-mule-sumo-2005-07-15.tar.bz2 +xemacs-sumo-2005-07-15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jun 2005 21:00:01 -0000 1.5 +++ sources 17 Jul 2005 16:37:57 -0000 1.6 @@ -1,3 +1,2 @@ -561bac71479bc400173c21c854c37beb xemacs-mule-sumo-2005-05-05.tar.bz2 -f98700b3db3ce279fe2c4234806f7dfa xemacs-sumo-2005-05-05.tar.bz2 -e1a2e251e57f29ce6e082181c13c7f04 cc-mode-1.45-pkg.tar.gz +016362256e4de4b150d6c2f8d686dd3f xemacs-mule-sumo-2005-07-15.tar.bz2 +28b92fa2e0bcd0c8e81fd6286d37af30 xemacs-sumo-2005-07-15.tar.bz2 Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xemacs-sumo.spec 16 Jul 2005 16:49:51 -0000 1.11 +++ xemacs-sumo.spec 17 Jul 2005 16:37:57 -0000 1.12 @@ -1,9 +1,9 @@ -%define sumo 2005-05-05 +%define sumo 2005-07-15 %define pkgdir %{_datadir}/xemacs Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 7 +Release: 1 Summary: XEmacs lisp packages Group: Applications/Editors @@ -11,8 +11,6 @@ URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2 Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2 -Source2: %{name}-w3.css -Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -21,8 +19,6 @@ Source15: Emacs.ad.ko_KR.UTF-8 Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 -Patch0: %{name}-jde-equal.patch -Patch1: %{name}-sql-abbrev.patch Patch6: auctex-texsite-jlatex-detect-69129.patch Patch7: auctex-texjp-platex.patch Patch8: egg-wnn-host-unix-79826.patch @@ -35,7 +31,7 @@ BuildArch: noarch BuildRequires: xemacs-nox -BuildRequires: perl +BuildRequires: sed >= 3.95 BuildRequires: /sbin/install-info Requires: xemacs-common Provides: apel-xemacs = 10.2 @@ -80,11 +76,6 @@ %prep %setup -q -c -a1 -%{__tar} zx -C xemacs-packages -f %{SOURCE3} -# fix font-lock warnings in JDE -%patch0 -p0 -# fix abbrev error when loading sql-mode -%patch1 -p0 # fix jlatex autodetection %patch6 -p0 # use ptex rather jtex by default for Japanese @@ -102,18 +93,9 @@ # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 -rm xemacs-packages/etc/w3/stylesheet -install -pm 644 %{SOURCE2} xemacs-packages/etc/w3/stylesheet - -perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \ +sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl} -chmod +x \ - xemacs-packages/etc/bbdb/*.pl \ - xemacs-packages/etc/erc/servers.pl \ - xemacs-packages/etc/ess/config.guess \ - xemacs-packages/etc/idlwave/idlwave_catalog - # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* @@ -166,9 +148,6 @@ #ln -s zh_TW.Big5 zh_TW cd - -# make sure nothing is 0400 -chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} - # info docs: pre-generate "dir"s and compress files for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do /sbin/install-info $file `dirname $file`/dir @@ -189,7 +168,7 @@ \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ -fprint base-el-not-bytecomped.files \) \) -perl -pi -e "s|$RPM_BUILD_ROOT||" *.files +sed -i -e "s|$RPM_BUILD_ROOT||" *.files cat base-*.files dir.files >> base-files cat el-*.files dir.files >> el-files cat info.files >> info-files @@ -207,6 +186,11 @@ %changelog +* Sat Jul 16 2005 Ville Skytt?? - 20050715-1 +- 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file + permissions fixed upstream. +- Use sed instead of perl for in-place edits during build. + * Wed Jul 13 2005 Ville Skytt?? - 20050505-7 - Remove mew and skk, they're in separate packages again (#162952). - Reformat specfile. --- xemacs-sumo-jde-equal.patch DELETED --- --- xemacs-sumo-sql-abbrev.patch DELETED --- --- xemacs-sumo-w3.css DELETED --- From fedora-extras-commits at redhat.com Sun Jul 17 18:00:58 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 14:00:58 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.1, 1.2 Message-ID: <200507171800.j6HI0wMH014033@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14016 Modified Files: nautilus-open-terminal.spec Log Message: Add libtoolize to fix multilib problem (#163463) Index: nautilus-open-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nautilus-open-terminal.spec 17 Jul 2005 13:12:29 -0000 1.1 +++ nautilus-open-terminal.spec 17 Jul 2005 18:00:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: nautilus-open-terminal Version: 0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel +BuildRequires: libtool automake autoconf # need extensions BuildRequires: nautilus >= 2.5.4 @@ -23,6 +24,7 @@ %build +libtoolize --force --copy && aclocal && autoconf %configure make %{?_smp_mflags} @@ -42,10 +44,12 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO -#%{_datadir}/locale/*/*/* %{_libdir}/nautilus/extensions-1.0/*.so* %changelog +* Sun Jul 17 2005 Paul W. Frields - 0.4-5 +- Add libtoolize to fix multilib problem (#163463) + * Fri Jul 15 2005 Paul W. Frields - 0.4-4 - Use find_lang and scriptlets per official guidelines From fedora-extras-commits at redhat.com Sun Jul 17 20:30:32 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Sun, 17 Jul 2005 16:30:32 -0400 Subject: common tobuild,1.1945,1.1946 Message-ID: <200507172030.j6HKUWAS017625@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17608 Modified Files: tobuild Log Message: request build of rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1945 retrieving revision 1.1946 diff -u -r1.1945 -r1.1946 --- tobuild 17 Jul 2005 14:24:00 -0000 1.1945 +++ tobuild 17 Jul 2005 20:30:30 -0000 1.1946 @@ -88,3 +88,4 @@ oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development +byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 From fedora-extras-commits at redhat.com Mon Jul 18 08:13:24 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 18 Jul 2005 04:13:24 -0400 Subject: fedora-security/audit fc4,1.23,1.24 Message-ID: <200507180813.j6I8DsoR000799@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv782 Modified Files: fc4 Log Message: Deal with the updates from this weekend Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fc4 14 Jul 2005 09:13:59 -0000 1.23 +++ fc4 18 Jul 2005 08:13:10 -0000 1.24 @@ -34,7 +34,7 @@ 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] 2005-1768 version (kernel, fixed 2.6.6) -2005-1765 ** kernel +2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] @@ -48,7 +48,7 @@ 2005-1937 VULNERABLE (mozilla) 2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411] 2005-1831 ignore (sudo) unsubstantiated report -2005-1763 ** probably vulnerable kernel +2005-1763 version (kernel) [since FEDORA-2005-510] 2005-1769 ** squirrelmail 2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483] 2005-1760 ** probably vulnerable sysreport @@ -333,6 +333,9 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) +2004-2228 version (firefox, fixed 1.0) +2004-2227 version (firefox, fixed 1.0) +2004-2225 version (firefox, fixed 0.10.1) 2004-2154 version (cups, fixed 1.2.21rc1) 2004-2149 version (mysql, fixed 4.1.5) 2004-2136 ignore (dm-crypt) design From fedora-extras-commits at redhat.com Mon Jul 18 09:18:39 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:18:39 -0400 Subject: rpms/lighttpd/FC-4 .cvsignore, 1.3, 1.4 lighttpd.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507180918.j6I9IdXj002087@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2030/FC-4 Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.3.15 (mostly bugfix release). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2005 09:15:23 -0000 1.3 +++ .cvsignore 18 Jul 2005 09:18:37 -0000 1.4 @@ -1 +1 @@ -lighttpd-1.3.13.tar.gz +lighttpd-1.3.15.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-4/lighttpd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lighttpd.spec 22 May 2005 23:50:13 -0000 1.6 +++ lighttpd.spec 18 Jul 2005 09:18:37 -0000 1.7 @@ -2,8 +2,8 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.3.13 -Release: 5 +Version: 1.3.15 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ %{?_with_ldap:BuildRequires: openldap-devel} %description @@ -78,26 +78,26 @@ libdir="%{buildroot}%{_libdir}/lighttpd" # Install included init script and sysconfig entry -%{__install} -D -m 0755 doc/rc.lighttpd.redhat \ +%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd -%{__install} -D -m 0644 doc/sysconfig.lighttpd \ +%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \ %{buildroot}%{_sysconfdir}/sysconfig/lighttpd # Install (*patched above*) sample config file -%{__install} -D -m 0640 doc/lighttpd.conf \ +%{__install} -D -p -m 0640 doc/lighttpd.conf \ %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf # Install our own logrotate entry -%{__install} -D -m 0644 %{SOURCE1} \ +%{__install} -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd # Install our own php.d ini file -%{__install} -D -m 0644 %{SOURCE2} \ +%{__install} -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini # Install our own default web page and images %{__mkdir_p} %{buildroot}%{webroot} -%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ +%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{buildroot}%{webroot}/ # Install empty log directory to include @@ -162,6 +162,12 @@ %changelog +* Mon Jul 18 2005 Matthias Saou 1.3.15-1 +- Update to 1.3.15. + +* Mon Jun 20 2005 Matthias Saou 1.3.14-1 +- Update to 1.3.14. + * Sun May 22 2005 Jeremy Katz - 1.3.13-5 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2005 09:15:23 -0000 1.3 +++ sources 18 Jul 2005 09:18:37 -0000 1.4 @@ -1 +1 @@ -2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz +e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 09:18:33 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:18:33 -0400 Subject: rpms/lighttpd/devel .cvsignore, 1.4, 1.5 lighttpd.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507180919.j6I9J3RL002095@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2030/devel Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.3.15 (mostly bugfix release). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jun 2005 13:15:51 -0000 1.4 +++ .cvsignore 18 Jul 2005 09:18:31 -0000 1.5 @@ -1 +1 @@ -lighttpd-1.3.14.tar.gz +lighttpd-1.3.15.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lighttpd.spec 20 Jun 2005 13:15:51 -0000 1.7 +++ lighttpd.spec 18 Jul 2005 09:18:31 -0000 1.8 @@ -2,7 +2,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.3.14 +Version: 1.3.15 Release: 1%{?dist} License: BSD Group: System Environment/Daemons @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ %{?_with_ldap:BuildRequires: openldap-devel} %description @@ -78,26 +78,26 @@ libdir="%{buildroot}%{_libdir}/lighttpd" # Install included init script and sysconfig entry -%{__install} -D -m 0755 doc/rc.lighttpd.redhat \ +%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd -%{__install} -D -m 0644 doc/sysconfig.lighttpd \ +%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \ %{buildroot}%{_sysconfdir}/sysconfig/lighttpd # Install (*patched above*) sample config file -%{__install} -D -m 0640 doc/lighttpd.conf \ +%{__install} -D -p -m 0640 doc/lighttpd.conf \ %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf # Install our own logrotate entry -%{__install} -D -m 0644 %{SOURCE1} \ +%{__install} -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd # Install our own php.d ini file -%{__install} -D -m 0644 %{SOURCE2} \ +%{__install} -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini # Install our own default web page and images %{__mkdir_p} %{buildroot}%{webroot} -%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ +%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{buildroot}%{webroot}/ # Install empty log directory to include @@ -162,6 +162,9 @@ %changelog +* Mon Jul 18 2005 Matthias Saou 1.3.15-1 +- Update to 1.3.15. + * Mon Jun 20 2005 Matthias Saou 1.3.14-1 - Update to 1.3.14. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Jun 2005 13:15:51 -0000 1.4 +++ sources 18 Jul 2005 09:18:31 -0000 1.5 @@ -1 +1 @@ -16d9f8c40bcb5638ee452fa23b21e346 lighttpd-1.3.14.tar.gz +e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 09:18:33 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:18:33 -0400 Subject: rpms/lighttpd/FC-3 .cvsignore, 1.3, 1.4 lighttpd.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507180919.j6I9J4Cm002100@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2030/FC-3 Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.3.15 (mostly bugfix release). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2005 09:15:23 -0000 1.3 +++ .cvsignore 18 Jul 2005 09:18:31 -0000 1.4 @@ -1 +1 @@ -lighttpd-1.3.13.tar.gz +lighttpd-1.3.15.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-3/lighttpd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lighttpd.spec 4 Apr 2005 19:31:33 -0000 1.4 +++ lighttpd.spec 18 Jul 2005 09:18:31 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.3.13 -Release: 3 +Version: 1.3.15 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ %{?_with_ldap:BuildRequires: openldap-devel} %description @@ -78,26 +78,26 @@ libdir="%{buildroot}%{_libdir}/lighttpd" # Install included init script and sysconfig entry -%{__install} -D -m 0755 doc/rc.lighttpd.redhat \ +%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd -%{__install} -D -m 0644 doc/sysconfig.lighttpd \ +%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \ %{buildroot}%{_sysconfdir}/sysconfig/lighttpd # Install (*patched above*) sample config file -%{__install} -D -m 0640 doc/lighttpd.conf \ +%{__install} -D -p -m 0640 doc/lighttpd.conf \ %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf # Install our own logrotate entry -%{__install} -D -m 0644 %{SOURCE1} \ +%{__install} -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd # Install our own php.d ini file -%{__install} -D -m 0644 %{SOURCE2} \ +%{__install} -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini # Install our own default web page and images %{__mkdir_p} %{buildroot}%{webroot} -%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ +%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{buildroot}%{webroot}/ # Install empty log directory to include @@ -162,10 +162,22 @@ %changelog -* Mon Apr 4 2005 Matthias Saou 1.3.13-3 +* Mon Jul 18 2005 Matthias Saou 1.3.15-1 +- Update to 1.3.15. + +* Mon Jun 20 2005 Matthias Saou 1.3.14-1 +- Update to 1.3.14. + +* Sun May 22 2005 Jeremy Katz - 1.3.13-5 +- rebuild on all arches + +* Mon Apr 4 2005 Matthias Saou 1.3.13-4 - Change signal sent from the logrotate script from USR1 to HUP, as that's the correct one. +* Fri Apr 1 2005 Michael Schwendt 1.3.13-2 +- Include /etc/lighttpd directory. + * Sun Mar 6 2005 Matthias Saou 1.3.13-1 - Update to 1.3.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2005 09:15:23 -0000 1.3 +++ sources 18 Jul 2005 09:18:31 -0000 1.4 @@ -1 +1 @@ -2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz +e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 09:20:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:20:38 -0400 Subject: common tobuild,1.1946,1.1947 Message-ID: <200507180920.j6I9Kc05002220@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2203 Modified Files: tobuild Log Message: request build of rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1946 retrieving revision 1.1947 diff -u -r1.1946 -r1.1947 --- tobuild 17 Jul 2005 20:30:30 -0000 1.1946 +++ tobuild 18 Jul 2005 09:20:36 -0000 1.1947 @@ -89,3 +89,4 @@ oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 +thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 18 09:21:01 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:21:01 -0400 Subject: common tobuild,1.1947,1.1948 Message-ID: <200507180921.j6I9L1hW002254@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2237 Modified Files: tobuild Log Message: request build of rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1947 retrieving revision 1.1948 diff -u -r1.1947 -r1.1948 --- tobuild 18 Jul 2005 09:20:36 -0000 1.1947 +++ tobuild 18 Jul 2005 09:20:59 -0000 1.1948 @@ -90,3 +90,4 @@ pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel +thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 18 09:22:27 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:22:27 -0400 Subject: common tobuild,1.1948,1.1949 Message-ID: <200507180922.j6I9MRAf002287@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2270 Modified Files: tobuild Log Message: request build of rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1948 retrieving revision 1.1949 diff -u -r1.1948 -r1.1949 --- tobuild 18 Jul 2005 09:20:59 -0000 1.1948 +++ tobuild 18 Jul 2005 09:22:25 -0000 1.1949 @@ -91,3 +91,4 @@ byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 +thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 18 12:00:16 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Mon, 18 Jul 2005 08:00:16 -0400 Subject: common tobuild,1.1949,1.1950 Message-ID: <200507181200.j6IC0G8f005362@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5341 Modified Files: tobuild Log Message: request build of rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1949 retrieving revision 1.1950 diff -u -r1.1949 -r1.1950 --- tobuild 18 Jul 2005 09:22:25 -0000 1.1949 +++ tobuild 18 Jul 2005 12:00:14 -0000 1.1950 @@ -92,3 +92,4 @@ thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 development From fedora-extras-commits at redhat.com Mon Jul 18 12:09:55 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Mon, 18 Jul 2005 08:09:55 -0400 Subject: common tobuild,1.1950,1.1951 Message-ID: <200507181209.j6IC9t7u006570@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6553 Modified Files: tobuild Log Message: Remove superfluous request and fix status Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1950 retrieving revision 1.1951 diff -u -r1.1950 -r1.1951 --- tobuild 18 Jul 2005 12:00:14 -0000 1.1950 +++ tobuild 18 Jul 2005 12:09:53 -0000 1.1951 @@ -87,9 +87,8 @@ oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 -pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 -pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 development +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 18 15:31:24 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Mon, 18 Jul 2005 11:31:24 -0400 Subject: web/html/download/mirrors fedora-core-4, 1.2, 1.3 fedora-core-4.yu, 1.1, 1.2 updates-released-fc4, 1.2, 1.3 updates-released-fc4.yu, 1.1, 1.2 updates-testing-fc4, 1.2, 1.3 updates-testing-fc4.yu, 1.1, 1.2 Message-ID: <200507181531.j6IFVO56010384@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download/mirrors In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10357 Modified Files: fedora-core-4 fedora-core-4.yu updates-released-fc4 updates-released-fc4.yu updates-testing-fc4 updates-testing-fc4.yu Log Message: Updated link to mirror2.etf.bg.ac.yu content (typo) Index: fedora-core-4 =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/fedora-core-4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-core-4 13 Jun 2005 06:23:47 -0000 1.2 +++ fedora-core-4 18 Jul 2005 15:31:21 -0000 1.3 @@ -52,7 +52,7 @@ http://ftp.lug.ro/fedora/linux/core/4/$ARCH/os/ http://ftp.chg.ru/pub/Linux/fedora/core/4/$ARCH/os/ http://mirror.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ -http://mirror2etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ http://ftp.upjs.sk/pub/linux/fedora/linux/core/4/$ARCH/os/ http://mirrors.bevc.net/fedora/4/$ARCH/os/ http://ftp.udl.es/pub/fedora/linux/core/4/$ARCH/os/ Index: fedora-core-4.yu =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/fedora-core-4.yu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-core-4.yu 13 Jun 2005 06:23:47 -0000 1.1 +++ fedora-core-4.yu 18 Jul 2005 15:31:21 -0000 1.2 @@ -1,2 +1,2 @@ http://mirror.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ -http://mirror2etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ Index: updates-released-fc4 =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-released-fc4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- updates-released-fc4 13 Jun 2005 06:23:47 -0000 1.2 +++ updates-released-fc4 18 Jul 2005 15:31:21 -0000 1.3 @@ -52,7 +52,7 @@ http://ftp.lug.ro/fedora/linux/core/updates/4/$ARCH/ http://ftp.chg.ru/pub/Linux/fedora/core/updates/4/$ARCH/ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ http://ftp.upjs.sk/pub/linux/fedora/linux/core/updates/4/$ARCH/ http://mirrors.bevc.net/fedora/updates/4/$ARCH/ http://ftp.udl.es/pub/fedora/linux/core/updates/4/$ARCH/ Index: updates-released-fc4.yu =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-released-fc4.yu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- updates-released-fc4.yu 13 Jun 2005 06:23:47 -0000 1.1 +++ updates-released-fc4.yu 18 Jul 2005 15:31:21 -0000 1.2 @@ -1,2 +1,2 @@ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ Index: updates-testing-fc4 =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-testing-fc4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- updates-testing-fc4 13 Jun 2005 06:23:47 -0000 1.2 +++ updates-testing-fc4 18 Jul 2005 15:31:21 -0000 1.3 @@ -52,7 +52,7 @@ http://ftp.lug.ro/fedora/linux/core/updates/testing/4/$ARCH/ http://ftp.chg.ru/pub/Linux/fedora/core/updates/testing/4/$ARCH/ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ http://ftp.upjs.sk/pub/linux/fedora/linux/core/updates/testing/4/$ARCH/ http://mirrors.bevc.net/fedora/updates/testing/4/$ARCH/ http://ftp.udl.es/pub/fedora/linux/core/updates/testing/4/$ARCH/ Index: updates-testing-fc4.yu =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-testing-fc4.yu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- updates-testing-fc4.yu 13 Jun 2005 06:23:47 -0000 1.1 +++ updates-testing-fc4.yu 18 Jul 2005 15:31:21 -0000 1.2 @@ -1,2 +1,2 @@ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ From fedora-extras-commits at redhat.com Mon Jul 18 15:37:09 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Mon, 18 Jul 2005 11:37:09 -0400 Subject: web/html/download mirrors.php,1.24,1.25 Message-ID: <200507181537.j6IFb9mB010419@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10402 Modified Files: mirrors.php Log Message: Added new mirror mirror.imagi.net Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mirrors.php 14 Jul 2005 20:54:34 -0000 1.24 +++ mirrors.php 18 Jul 2005 15:37:07 -0000 1.25 @@ -121,6 +121,7 @@
  • ftp://mirrors.csumb.edu/fedora/updates/ (Updates only)
  • ftp://ftp.applios.net/pub/fedora/linux/core
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
    • +
  • ftp://mirrors.imagi.net/fedora/core/
  • Canada From fedora-extras-commits at redhat.com Mon Jul 18 17:24:41 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:41 -0400 Subject: extras-buildsys/server ArchJob.py,1.5,1.6 Message-ID: <200507181724.j6IHOfS6013196@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131/server Modified Files: ArchJob.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ArchJob.py 11 Jul 2005 00:30:36 -0000 1.5 +++ ArchJob.py 18 Jul 2005 17:24:39 -0000 1.6 @@ -221,9 +221,15 @@ """ Return a list of base filenames we got from the builder """ files = [] for url in self.downloads.keys(): - fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) - if fname and self.downloads[url] == 3: - files.append(fname) + try: + fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) + if self.downloads[url] == 3: + files.append(fname) + except FileDownloader.FileNameError, 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.arch, e, url) + pass return files def set_download_status(self, url, status): From fedora-extras-commits at redhat.com Mon Jul 18 17:24:41 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:41 -0400 Subject: extras-buildsys/common FileDownloader.py,1.11,1.12 Message-ID: <200507181724.j6IHOfww013190@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131/common Modified Files: FileDownloader.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- FileDownloader.py 6 Jul 2005 21:20:55 -0000 1.11 +++ FileDownloader.py 18 Jul 2005 17:24:38 -0000 1.12 @@ -22,6 +22,15 @@ import HTTPSURLopener import OpenSSL import CommonErrors +import exceptions + + +class FileNameError(exceptions.Exception): + def __init__(self, args=None): + exceptions.Exception.__init__(self) + self.args = args + def __str__(self): + return self.args def get_base_filename_from_url(url, legal_exts): @@ -42,12 +51,12 @@ # If after 5 iterations of unquoting, the strings still aren't the same, # something is wrong. if (count == 0) and (unquoted != last_unquoted): - return None + raise FileNameError("URL quoting level too deep.") # Try to grab the filename off the end of the URL index = url.rfind('/') if index is -1: - return None + raise FileNameError("No separator in URL.") filename = url[index+1:] # Only accept certain file extensions @@ -58,15 +67,15 @@ break if not ext_ok: - return None + raise FileNameError("Extension was not allowed.") # FIXME: what other validation can we do here? for c in filename: # For now, legal characters are '_-.' plus alphanumeric - if (c == '_') or (c == '-') or (c == '.') or c.isalnum(): + if (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): pass else: - return None + raise FileNameError("Illegal character '%s' encountered." % c) return filename @@ -78,9 +87,11 @@ self._cb_data = cb_data self._url = url self._target_dir = target_dir - self._filename = get_base_filename_from_url(self._url, legal_exts) - if not self._filename: - print "Couldn't get base filename from url!! target_dir=%s, url=%s" % (target_dir, url) + 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) + if certs and len(certs) > 0: self._opener = HTTPSURLopener.HTTPSURLopener(certs) else: From fedora-extras-commits at redhat.com Mon Jul 18 17:24:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:25 -0400 Subject: extras-buildsys ChangeLog,1.60,1.61 Message-ID: <200507181724.j6IHOvBg013199@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 16 Jul 2005 15:47:42 -0000 1.60 +++ ChangeLog 18 Jul 2005 17:24:23 -0000 1.61 @@ -1,3 +1,11 @@ +2005-07-18 Dan Williams + + * builder/builder.py + common/FileDownloader.py + server/ArchJob.py + - Allow '+' character in RPM names + - Clean up file name handling in URLs + 2005-07-16 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Mon Jul 18 17:24:30 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:30 -0400 Subject: extras-buildsys/builder builder.py,1.18,1.19 Message-ID: <200507181725.j6IHP0Lc013200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131/builder Modified Files: builder.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- builder.py 16 Jul 2005 16:42:15 -0000 1.18 +++ builder.py 18 Jul 2005 17:24:28 -0000 1.19 @@ -93,11 +93,12 @@ Architecture: %s SRPM: %s\n\n""" % (time.asctime(time.gmtime()), self._target, self._uniqid, self.buildarch, srpm_url)) - srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm']) - if not srpm_filename: + 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 in __init__, couldn't extract SRPM filename.\n") + self.log("Failed to extract SRPM filename. Error: '%s' URL: %s\n" % (e, srpm_url)) else: self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename) From fedora-extras-commits at redhat.com Mon Jul 18 17:31:55 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Mon, 18 Jul 2005 13:31:55 -0400 Subject: web/html/download mirrors.php,1.25,1.26 Message-ID: <200507181731.j6IHVtbq013232@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13215 Modified Files: mirrors.php Log Message: Added new mirror link for ftp.uib.no Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mirrors.php 18 Jul 2005 15:37:07 -0000 1.25 +++ mirrors.php 18 Jul 2005 17:31:53 -0000 1.26 @@ -333,6 +333,7 @@
  • Norway
  • Portugal From fedora-extras-commits at redhat.com Mon Jul 18 19:07:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 15:07:49 -0400 Subject: extras-buildsys ChangeLog,1.61,1.62 Message-ID: <200507181907.j6IJ7npN015719@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15689 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * server/PackageJob.py server/BuilderManager.py - Restart orphaned archjobs immediately rather than sticking them at the back of the build queue Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ChangeLog 18 Jul 2005 17:24:23 -0000 1.61 +++ ChangeLog 18 Jul 2005 19:07:47 -0000 1.62 @@ -1,5 +1,12 @@ 2005-07-18 Dan Williams + * server/PackageJob.py + server/BuilderManager.py + - Restart orphaned archjobs immediately rather than + sticking them at the back of the build queue + +2005-07-18 Dan Williams + * builder/builder.py common/FileDownloader.py server/ArchJob.py From fedora-extras-commits at redhat.com Mon Jul 18 19:07:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 15:07:50 -0400 Subject: extras-buildsys/server BuilderManager.py, 1.5, 1.6 PackageJob.py, 1.9, 1.10 Message-ID: <200507181907.j6IJ7owD015726@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15689/server Modified Files: BuilderManager.py PackageJob.py Log Message: 2005-07-18 Dan Williams * server/PackageJob.py server/BuilderManager.py - Restart orphaned archjobs immediately rather than sticking them at the back of the build queue Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BuilderManager.py 16 Jul 2005 15:47:43 -0000 1.5 +++ BuilderManager.py 18 Jul 2005 19:07:48 -0000 1.6 @@ -168,7 +168,7 @@ if len(self._queue) > 0: time.sleep(0.25) - def request_arch_job(self, par_job, target, arch, srpm_url): + def request_arch_job(self, par_job, target, arch, srpm_url, orphaned): req = {} req['parent'] = par_job req['target'] = target @@ -176,7 +176,11 @@ req['srpm_url'] = srpm_url self._queue_lock.acquire() - self._queue.append(req) + if orphaned: + # insert orphaned requests at the front of the queue + self._queue.insert(0, req) + else: + self._queue.append(req) self._queue_lock.release() def any_prepping_builders(self): Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- PackageJob.py 16 Jul 2005 14:57:37 -0000 1.9 +++ PackageJob.py 18 Jul 2005 19:07:48 -0000 1.10 @@ -372,7 +372,7 @@ self._request_arch_jobs() - def _request_one_arch_job(self, arch): + def _request_one_arch_job(self, arch, orphaned): # Construct SPRM URL srpm_http_base = self.srpm_http_path[len(self.http_dir):] if config_opts['ssl_builders'] == True: @@ -380,7 +380,7 @@ else: method = "http://" srpm_url = method + self.hostname + ":8886/" + srpm_http_base - self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url) + self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url, orphaned) def _request_arch_jobs(self): # Queue requests for build jobs @@ -388,7 +388,7 @@ for arch in self.archjobs.keys(): if self.archjobs[arch]: continue - self._request_one_arch_job(arch) + self._request_one_arch_job(arch, False) self._archjobs_lock.release() def add_arch_job(self, job): @@ -412,7 +412,7 @@ self._archjobs_lock.acquire() print "%s (%s/%s): Builder disappeared. Requeuing arch..." % (self.uid, self.package, job.arch) self.archjobs[job.arch] = None - self._request_one_arch_job(job.arch) + self._request_one_arch_job(job.arch, True) self._archjobs_lock.release() def is_done(self): From fedora-extras-commits at redhat.com Mon Jul 18 19:58:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 18 Jul 2005 15:58:48 -0400 Subject: rpms/bash-completion/FC-4 bash-completion-documents.patch, NONE, 1.1 bash-completion-players.patch, NONE, 1.1 bash-completion-tarballs.patch, NONE, 1.1 bash-completion.spec, 1.8, 1.9 Message-ID: <200507181958.j6IJwmhr015895@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15858/FC-4 Modified Files: bash-completion.spec Added Files: bash-completion-documents.patch bash-completion-players.patch bash-completion-tarballs.patch Log Message: - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). - Add/fix support for some multimedia formats and players. - Fix tarball completion. bash-completion-documents.patch: --- NEW FILE bash-completion-documents.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-18 18:53:12.000000000 +0300 @@ -89,3 +89,3 @@ complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype -complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf +complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf evince complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf @@ -108,5 +108,8 @@ complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya -complete -f -X '!*.@(sxw|stw|sxg|doc|dot|rtf|txt|htm|html|odt|ott)' oowriter +complete -f -X '!*.@(sxw|stw|sxg|sgl|doc|dot|rtf|txt|htm|html|odt|ott|odm)' oowriter complete -f -X '!*.@(sxi|sti|pps|ppt|pot|odp|otp)' ooimpress complete -f -X '!*.@(sxc|stc|xls|xlw|xlt|csv|ods|ots)' oocalc +complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw +complete -f -X '!*.@(sxm|smf|mml|odf)' oomath +complete -f -X '!*.odb' oobase complete -f -X '!*.rpm' rpm2cpio bash-completion-players.patch: --- NEW FILE bash-completion-players.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -91,8 +91,8 @@ complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf complete -f -X '!*.texi*' makeinfo texi2html complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi -complete -f -X '!*.@(mp3|MP3|m3u)' mpg123 mpg321 -complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine +complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay +complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine aaxine fbxine kaffeine complete -f -X '!*.@(avi|asf|wmv)' aviplay complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim @@ -5687,7 +5687,7 @@ return 0 } -complete $filenames -F _mplayer mplayer mencoder gmplayer +complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer } # KDE dcop completion bash-completion-tarballs.patch: --- NEW FILE bash-completion-tarballs.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -77,7 +77,7 @@ # Do NOT break these over multiple lines. # # START exclude -- do NOT remove this line -complete -f -X '!*.?(t)bz2' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep +complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw)' unzip zipinfo complete -f -X '*.Z' compress znew complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcmp zdiff zcat zegrep zfgrep zgrep zless zmore @@ -101,7 +101,7 @@ complete -f -X '!*.fig' xfig complete -f -X '!*.@(mid?(i))' playmidi complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity -complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview +complete -f -X '*.@(o|so|so.!(conf)|a|t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme @@ -2791,16 +2791,16 @@ return 0 ;; +([^IZzjy])f) - ext='t?(ar?(.))@(gz|Z|bz?(2))' - regex='t\(ar?(\.)\)\(gz\|Z\|bz2\?\)' + ext='t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))' + regex='t\(ar\(\.\(Z\|gz\|bz2\?\)\)\?\|gz\|bz2\?\)' ;; *[Zz]*f) ext='t?(ar.)@(gz|Z)' - regex='t\(ar\.\)\(gz\|Z\)' + regex='t\(ar\.\)\?\(gz\|Z\)' ;; *[Ijy]*f) ext='t?(ar.)bz?(2)' - regex='t\(ar\.\)bz2\?' + regex='t\(ar\.\)\?bz2\?' ;; *) _filedir @@ -2814,7 +2814,7 @@ # # get name of tar file from command line tar=$( echo "$COMP_LINE" | \ - sed -e 's|^.* \([^ ]*'$regex'\) .*$|\1|' ) + sed -e 's/^.* \([^ ]*'$regex'\) .*$/\1/' ) # devise how to untar and list it untar=t${COMP_WORDS[1]//[^Izjyf]/} Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 +++ bash-completion.spec 18 Jul 2005 19:58:46 -0000 1.9 @@ -1,6 +1,6 @@ Name: bash-completion Version: 20050712 -Release: 1%{?dist} +Release: 1 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -8,10 +8,13 @@ URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile +Patch0: %{name}-tarballs.patch +Patch1: %{name}-players.patch +Patch2: %{name}-documents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: bash >= 0:2.05-12 +Requires: bash >= 2.05-12 %description bash-completion is a collection of shell functions that take advantage @@ -20,6 +23,9 @@ %prep %setup -q -n bash_completion +%patch0 +%patch1 +%patch2 %build @@ -127,8 +133,11 @@ %changelog -* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +* Mon Jul 18 2005 Ville Skytt?? - 20050712-1 - 20050712. +- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). +- Add/fix support for some multimedia formats and players. +- Fix tarball completion. * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. From fedora-extras-commits at redhat.com Mon Jul 18 19:58:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 18 Jul 2005 15:58:49 -0400 Subject: rpms/bash-completion/devel bash-completion-documents.patch, NONE, 1.1 bash-completion-players.patch, NONE, 1.1 bash-completion-tarballs.patch, NONE, 1.1 bash-completion.spec, 1.8, 1.9 Message-ID: <200507181958.j6IJwn5D015905@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15858/devel Modified Files: bash-completion.spec Added Files: bash-completion-documents.patch bash-completion-players.patch bash-completion-tarballs.patch Log Message: - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). - Add/fix support for some multimedia formats and players. - Fix tarball completion. bash-completion-documents.patch: --- NEW FILE bash-completion-documents.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-18 18:53:12.000000000 +0300 @@ -89,3 +89,3 @@ complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype -complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf +complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf evince complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf @@ -108,5 +108,8 @@ complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya -complete -f -X '!*.@(sxw|stw|sxg|doc|dot|rtf|txt|htm|html|odt|ott)' oowriter +complete -f -X '!*.@(sxw|stw|sxg|sgl|doc|dot|rtf|txt|htm|html|odt|ott|odm)' oowriter complete -f -X '!*.@(sxi|sti|pps|ppt|pot|odp|otp)' ooimpress complete -f -X '!*.@(sxc|stc|xls|xlw|xlt|csv|ods|ots)' oocalc +complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw +complete -f -X '!*.@(sxm|smf|mml|odf)' oomath +complete -f -X '!*.odb' oobase complete -f -X '!*.rpm' rpm2cpio bash-completion-players.patch: --- NEW FILE bash-completion-players.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -91,8 +91,8 @@ complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf complete -f -X '!*.texi*' makeinfo texi2html complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi -complete -f -X '!*.@(mp3|MP3|m3u)' mpg123 mpg321 -complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine +complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay +complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine aaxine fbxine kaffeine complete -f -X '!*.@(avi|asf|wmv)' aviplay complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim @@ -5687,7 +5687,7 @@ return 0 } -complete $filenames -F _mplayer mplayer mencoder gmplayer +complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer } # KDE dcop completion bash-completion-tarballs.patch: --- NEW FILE bash-completion-tarballs.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -77,7 +77,7 @@ # Do NOT break these over multiple lines. # # START exclude -- do NOT remove this line -complete -f -X '!*.?(t)bz2' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep +complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw)' unzip zipinfo complete -f -X '*.Z' compress znew complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcmp zdiff zcat zegrep zfgrep zgrep zless zmore @@ -101,7 +101,7 @@ complete -f -X '!*.fig' xfig complete -f -X '!*.@(mid?(i))' playmidi complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity -complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview +complete -f -X '*.@(o|so|so.!(conf)|a|t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme @@ -2791,16 +2791,16 @@ return 0 ;; +([^IZzjy])f) - ext='t?(ar?(.))@(gz|Z|bz?(2))' - regex='t\(ar?(\.)\)\(gz\|Z\|bz2\?\)' + ext='t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))' + regex='t\(ar\(\.\(Z\|gz\|bz2\?\)\)\?\|gz\|bz2\?\)' ;; *[Zz]*f) ext='t?(ar.)@(gz|Z)' - regex='t\(ar\.\)\(gz\|Z\)' + regex='t\(ar\.\)\?\(gz\|Z\)' ;; *[Ijy]*f) ext='t?(ar.)bz?(2)' - regex='t\(ar\.\)bz2\?' + regex='t\(ar\.\)\?bz2\?' ;; *) _filedir @@ -2814,7 +2814,7 @@ # # get name of tar file from command line tar=$( echo "$COMP_LINE" | \ - sed -e 's|^.* \([^ ]*'$regex'\) .*$|\1|' ) + sed -e 's/^.* \([^ ]*'$regex'\) .*$/\1/' ) # devise how to untar and list it untar=t${COMP_WORDS[1]//[^Izjyf]/} Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 +++ bash-completion.spec 18 Jul 2005 19:58:47 -0000 1.9 @@ -1,6 +1,6 @@ Name: bash-completion Version: 20050712 -Release: 1%{?dist} +Release: 1 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -8,10 +8,13 @@ URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile +Patch0: %{name}-tarballs.patch +Patch1: %{name}-players.patch +Patch2: %{name}-documents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: bash >= 0:2.05-12 +Requires: bash >= 2.05-12 %description bash-completion is a collection of shell functions that take advantage @@ -20,6 +23,9 @@ %prep %setup -q -n bash_completion +%patch0 +%patch1 +%patch2 %build @@ -127,8 +133,11 @@ %changelog -* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +* Mon Jul 18 2005 Ville Skytt?? - 20050712-1 - 20050712. +- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). +- Add/fix support for some multimedia formats and players. +- Fix tarball completion. * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. From fedora-extras-commits at redhat.com Mon Jul 18 21:11:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:11:28 -0400 Subject: extras-buildsys ChangeLog,1.62,1.63 Message-ID: <200507182111.j6ILBS2q018476@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18434 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job * server/BuildMaster.py server/Repo.py - Clear repo additions array after each repo update, fixes problem where jobs would switch back from 'needsign' -> 'repodone' after the job was already complete Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ChangeLog 18 Jul 2005 19:07:47 -0000 1.62 +++ ChangeLog 18 Jul 2005 21:11:26 -0000 1.63 @@ -1,5 +1,17 @@ 2005-07-18 Dan Williams + * builder/builder.py + - Don't start a cleanup over top of another cleanup + when we're told to kill the job + + * server/BuildMaster.py + server/Repo.py + - Clear repo additions array after each repo update, fixes problem + where jobs would switch back from 'needsign' -> 'repodone' after + the job was already complete + +2005-07-18 Dan Williams + * server/PackageJob.py server/BuilderManager.py - Restart orphaned archjobs immediately rather than From fedora-extras-commits at redhat.com Mon Jul 18 21:11:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:11:29 -0400 Subject: extras-buildsys/server BuildMaster.py,1.16,1.17 Repo.py,1.10,1.11 Message-ID: <200507182111.j6ILBTe8018487@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18434/server Modified Files: BuildMaster.py Repo.py Log Message: 2005-07-18 Dan Williams * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job * server/BuildMaster.py server/Repo.py - Clear repo additions array after each repo update, fixes problem where jobs would switch back from 'needsign' -> 'repodone' after the job was already complete Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- BuildMaster.py 14 Jul 2005 19:12:04 -0000 1.16 +++ BuildMaster.py 18 Jul 2005 21:11:27 -0000 1.17 @@ -212,8 +212,16 @@ for job in self._done_queue: curstage = job.get_cur_stage() - self._write_job_status_to_db(job.get_uid(), curstage) - print "%s (%s): Job finished." % (job.get_uid(), job.package) + uid = job.get_uid() + self._write_job_status_to_db(uid, curstage) + + # If there are any status updates in the queue for this job, remove them + self._status_updates_lock.acquire() + if self._status_updates.has_key(uid): + del self._status_updates[uid] + self._status_updates_lock.release() + + print "%s (%s): Job finished." % (uid, job.package) self._building_jobs_lock.acquire() self._building_jobs.remove(job) self._building_jobs_lock.release() Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Repo.py 11 Jul 2005 20:13:37 -0000 1.10 +++ Repo.py 18 Jul 2005 21:11:27 -0000 1.11 @@ -85,9 +85,11 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() + self._repo_additions = [] + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: - print "Error: createrepo failed with exit status %d!" % s + print "Error: createrepo failed with exit status %d! Output: '%s'" % (s, o) def run(self): From fedora-extras-commits at redhat.com Mon Jul 18 21:11:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:11:28 -0400 Subject: extras-buildsys/builder builder.py,1.19,1.20 Message-ID: <200507182111.j6ILBSLb018482@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18434/builder Modified Files: builder.py Log Message: 2005-07-18 Dan Williams * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job * server/BuildMaster.py server/Repo.py - Clear repo additions array after each repo update, fixes problem where jobs would switch back from 'needsign' -> 'repodone' after the job was already complete Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- builder.py 18 Jul 2005 17:24:28 -0000 1.19 +++ builder.py 18 Jul 2005 21:11:26 -0000 1.20 @@ -103,16 +103,25 @@ self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename) def die(self, sig=15): - if self._pobj and self._pobj.pid: # Can't kill the package download from build server + # Do nothing if we've already been killed + if self._done_status == 'killed': + return + + self.log("Killing build process...\n") + # Don't try to kill a running cleanup process + if self._status != 'cleanup' and self._pobj and self._pobj.pid: try: - self.log("Killing build process...\n") os.kill(self._pobj.pid, sig) except OSError, e: self.log("Couldn't kill process %d: %s\n" % (self._pobj.pid, e)) self.log("Killed.\n"); self._done_status = 'killed' - self._cleanup() + + # Don't start cleanup over top of an existing cleanup process + if self._status != 'cleanup': + self._cleanup() + return True def log(self, string): @@ -344,7 +353,6 @@ elif self._status == 'cleanup': exit_status = self._pobj.poll() if exit_status >= 0: - print "mock clean done" # We ignore mock errors when cleaning the buildroot self._status = self._done_status # FIXME: remove the last dir off the end of 'rootdir' here to get From fedora-extras-commits at redhat.com Mon Jul 18 21:26:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:26 -0400 Subject: extras-buildsys ChangeLog,1.63,1.64 Message-ID: <200507182126.j6ILQuAb018597@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ChangeLog 18 Jul 2005 21:11:26 -0000 1.63 +++ ChangeLog 18 Jul 2005 21:26:24 -0000 1.64 @@ -1,5 +1,14 @@ 2005-07-18 Dan Williams + * builder/builder.py + common/ArchUtils.py + server/PackageJob.py + - Allow the server and builder to actually build "sub" arches + like i486/sparcv9/etc, which broke after the the builder + changes on 2005-07-16 + +2005-07-18 Dan Williams + * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job From fedora-extras-commits at redhat.com Mon Jul 18 21:26:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:26 -0400 Subject: extras-buildsys/builder builder.py,1.20,1.21 Message-ID: <200507182127.j6ILQvlA018600@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535/builder Modified Files: builder.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- builder.py 18 Jul 2005 21:11:26 -0000 1.20 +++ builder.py 18 Jul 2005 21:26:24 -0000 1.21 @@ -30,6 +30,7 @@ import fcntl import urllib import errno +from plague import ArchUtils from plague import FileDownloader from plague import AuthedXMLRPCServer from plague import lighttpdManager @@ -629,10 +630,21 @@ print "Unrecognized config %s, ignoring." % cfg_name continue if distro == config_opts['distro_name'] and repo == config_opts['repo_name']: + # 'arch' is by definition the "master" arch, ie i386 or x86_64, + # not i486/i586/ia32e/etc. We want to add on the "sub" arches + # that this builder supports to its list of arches it can build + # for this target if arch in allowed_arches: if not target_arches.has_key(target): target_arches[target] = [] target_arches[target].append(arch) + + # Add applicable "sub" arches, like i486, sparcv9, etc + for sub_arch in allowed_arches: + if ArchUtils.sub_arches.has_key(sub_arch) and ArchUtils.sub_arches[sub_arch] == arch: + if not sub_arch in target_arches[target]: + target_arches[target].append(sub_arch) + return target_arches From fedora-extras-commits at redhat.com Mon Jul 18 21:26:32 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:32 -0400 Subject: extras-buildsys/common Makefile,1.6,1.7 Message-ID: <200507182127.j6ILR2ln018603@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535/common Modified Files: Makefile Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 10 Jul 2005 06:30:16 -0000 1.6 +++ Makefile 18 Jul 2005 21:26:30 -0000 1.7 @@ -8,13 +8,14 @@ PYMODULEDIR=$(DESTDIR)$(LIBDIR)/python$(PYVERSION)/site-packages/$(PKGNAME) FILES = \ + ArchUtils.py \ CommonErrors.py \ FileDownloader.py \ HTTPSURLopener.py \ HTTPServer.py \ AuthedXMLRPCServer.py \ SSLCommon.py \ - SSLConnection.py \ + SSLConnection.py \ XMLRPCServerProxy.py \ lighttpdManager.py \ daemonize.py \ From fedora-extras-commits at redhat.com Mon Jul 18 21:26:32 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:32 -0400 Subject: extras-buildsys/server PackageJob.py,1.10,1.11 Message-ID: <200507182127.j6ILR220018606@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535/server Modified Files: PackageJob.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PackageJob.py 18 Jul 2005 19:07:48 -0000 1.10 +++ PackageJob.py 18 Jul 2005 21:26:30 -0000 1.11 @@ -1,4 +1,4 @@ - # This program is free software; you can redistribute it and/or modify +# 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. @@ -34,6 +34,7 @@ import socket import BuilderManager import ArchJob +from plague import ArchUtils # Load in the config execfile("/etc/plague/server/CONFIG.py") @@ -147,23 +148,6 @@ return self.uid def arch_handling(self, hdr): - # Associate sub-architectures with their "master" architecture. - # This is only used to determine which arches to build on by default, - # so that if we have an Additional Package Arches file that specifies - # 'sparcv9' for a package that we don't try to build sparcv9 for that - # package unless 'sparc' is listed in our 'targets' config option. - sub_arches = { - 'athlon' : 'i386', - 'i686' : 'i386', - 'i586' : 'i386', - 'i486' : 'i386', - 'amd64' : 'x86_64', - 'ia32e' : 'x86_64', - 'ppc32' : 'ppc', - 'sparcv8' : 'sparc', - 'sparcv9' : 'sparc' - } - # Grab additional build arches out of the Additional Package # Arches file apa_file_name = self.target + "addl-arches" @@ -195,8 +179,12 @@ # Remove arches we don't support from addl_arches for arch in addl_arches: - if sub_arches.has_key(arch): - master_addl_arch = sub_arches[arch] + # arch_utils is only used to determine which arches to build on by default, + # so that if we have an Additional Package Arches file that specifies + # 'sparcv9' for a package that we don't try to build sparcv9 for that + # package unless 'sparc' is also listed in our 'targets' config option. + if ArchUtils.sub_arches.has_key(arch): + master_addl_arch = ArchUtils.sub_arches[arch] if master_addl_arch not in buildable_arches: if master_addl_arch not in opt_arches: addl_arches.remove(arch) From fedora-extras-commits at redhat.com Mon Jul 18 23:40:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 19:40:34 -0400 Subject: extras-buildsys/common ArchUtils.py,NONE,1.1 Message-ID: <200507182340.j6INeYaB021144@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21128/common Added Files: ArchUtils.py Log Message: Oops, add missing file --- NEW FILE ArchUtils.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. # Associate sub-architectures with their "master" architecture. sub_arches = { 'athlon' : 'i386', 'i686' : 'i386', 'i586' : 'i386', 'i486' : 'i386', 'amd64' : 'x86_64', 'ia32e' : 'x86_64', 'ppc32' : 'ppc', 'sparcv8' : 'sparc', 'sparcv9' : 'sparc' } From tcallawa at redhat.com Mon Jul 18 23:46:10 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 18 Jul 2005 18:46:10 -0500 Subject: APPROVED: monotone Message-ID: <1121730370.32518.53.camel@localhost.localdomain> Name: monotone Summary: A free, distributed version control system Description: monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping branches and extensible metadata, exchanges work over plain network protocols, performs history-sensitive merging, and delegates trust functions to client-side RSA certificates. Maintainer: Roland McGrath Reviewer: Tom 'spot' Callaway ~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 Mon Jul 18 23:50:38 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:38 -0400 Subject: rpms/monotone - New directory Message-ID: <200507182350.j6INoc0h021218@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198/monotone Log Message: Directory /cvs/extras/rpms/monotone added to the repository From fedora-extras-commits at redhat.com Mon Jul 18 23:50:38 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:38 -0400 Subject: rpms/monotone/devel - New directory Message-ID: <200507182350.j6INocCp021223@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198/monotone/devel Log Message: Directory /cvs/extras/rpms/monotone/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 18 23:50:57 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:57 -0400 Subject: rpms/monotone Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507182350.j6INov92021270@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21243 Added Files: Makefile import.log Log Message: Setup of module monotone --- NEW FILE Makefile --- # Top level Makefile for module monotone all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 18 23:50:58 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:58 -0400 Subject: rpms/monotone/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507182350.j6INow2o021275@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21243/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module monotone --- NEW 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 Jul 18 23:53:11 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:53:11 -0400 Subject: rpms/monotone import.log,1.1,1.2 Message-ID: <200507182353.j6INrBDK021338@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21307 Modified Files: import.log Log Message: auto-import monotone-0.21-1.fc5 on branch devel from monotone-0.21-1.fc5.src.rpm New package monotone, starting with upstream version 0.21 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/monotone/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Jul 2005 23:50:55 -0000 1.1 +++ import.log 18 Jul 2005 23:53:09 -0000 1.2 @@ -0,0 +1 @@ +monotone-0_21-1_fc5:HEAD:monotone-0.21-1.fc5.src.rpm:1121730782 From fedora-extras-commits at redhat.com Mon Jul 18 23:53:11 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:53:11 -0400 Subject: rpms/monotone/devel monotone.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507182353.j6INrB6o021345@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21307/devel Modified Files: .cvsignore sources Added Files: monotone.spec Log Message: auto-import monotone-0.21-1.fc5 on branch devel from monotone-0.21-1.fc5.src.rpm New package monotone, starting with upstream version 0.21 --- NEW FILE monotone.spec --- Name: monotone Version: 0.21 Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools License: GPL URL: http://www.venge.net/monotone/ Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.32.0 BuildRequires: lua %if 1 %define bundled_sqlite yes %else # in fact, monotone has a locally-hacked 3.2.2, so we can't replace it BuildRequires: sqlite-devel >= 3.2.2 %define bundled_sqlite no %endif BuildRequires: emacs Requires(post): /sbin/install-info Requires(postun): /sbin/install-info %description monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping branches and extensible metadata, exchanges work over plain network protocols, performs history-sensitive merging, and delegates trust functions to client-side RSA certificates. %prep %setup -q %build %configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite} make %{?_smp_mflags} %check make %{?_smp_mflags} check %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -f %{buildroot}/%{_infodir}/dir lispdir=%{buildroot}/%{_datadir}/emacs/site-lisp mkdir -p ${lispdir} %{__install} -c -m 0444 contrib/monotone.el ${lispdir}/monotone.el emacs -batch -f batch-byte-compile ${lispdir}/monotone.el %clean rm -rf %{buildroot} %post if [ $1 -eq 1 ] then /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %postun if [ $1 -eq 0 ] then /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE %doc monotone.html %{_bindir}/monotone %{_infodir}/monotone.info* %{_mandir}/man1/monotone.1* %{_datadir}/emacs/site-lisp/monotone.el* %changelog * Mon Jul 18 2005 Roland McGrath - 0.21-1 - Updated for 0.21 release. - Install Emacs support. * Thu Jul 7 2005 Roland McGrath - 0.20-0.1 - Updated for 0.20 release. - Added %%check section. - Cannot use FC4 native sqlite3, need newer bundled one. * Mon Apr 18 2005 Jeffrey C. Ollie - 0.18-0.4 - Modified summary so that it doesn't contain the name * Thu Apr 14 2005 Jeffrey C. Ollie - 0.18-0.3 - Modified install-info commands to prevent errors in case of --excludedocs * Wed Apr 13 2005 Jeffrey C. Ollie - 0.18-0.2 - Added post and postun scripts to take care of .info file - Added parallel make flags * Wed Apr 13 2005 Jeffrey C. Ollie - 0.18-0.1 - First version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2005 23:50:55 -0000 1.1 +++ .cvsignore 18 Jul 2005 23:53:09 -0000 1.2 @@ -0,0 +1 @@ +monotone-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2005 23:50:55 -0000 1.1 +++ sources 18 Jul 2005 23:53:09 -0000 1.2 @@ -0,0 +1 @@ +c30c96b97ae56268cac567bd8837b991 monotone-0.21.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 23:58:22 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:58:22 -0400 Subject: common tobuild,1.1951,1.1952 Message-ID: <200507182358.j6INwMuT021412@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21395 Modified Files: tobuild Log Message: request build of rpms/monotone/devel monotone-0_21-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1951 retrieving revision 1.1952 diff -u -r1.1951 -r1.1952 --- tobuild 18 Jul 2005 12:09:53 -0000 1.1951 +++ tobuild 18 Jul 2005 23:58:20 -0000 1.1952 @@ -92,3 +92,4 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel +roland rpms/monotone/devel monotone-0_21-1_fc5 devel From tcallawa at redhat.com Tue Jul 19 00:13:18 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 18 Jul 2005 19:13:18 -0500 Subject: APPROVED: pyxdg & smeg Message-ID: <1121731998.32518.73.camel@localhost.localdomain> Name: pyxdg Summary: PyXDG is a python library to access freedesktop.org standards Name: smeg Summary: Simple menu editor for GNOME Description: Smeg is a menu editor for GNOME that lets you get things done, simply and quickly. Just click and type to edit, add, and delete any menu entry. Maintainer: Sindre Pedersen Bjordal Reviewer: Tom 'spot' Callaway ~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 tcallawa at redhat.com Tue Jul 19 00:28:10 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 18 Jul 2005 19:28:10 -0500 Subject: APPROVED: nco Message-ID: <1121732890.32518.91.camel@localhost.localdomain> Name: nco Summary: A suite of command line programs for manipulating NetCDF/HDF4 files Description: The netCDF Operators, NCO, are a suite of command line programs known as operators. The operators facilitate manipulation and analysis of self-describing data stored in the freely available netCDF and HDF formats (http://www.unidata.ucar.edu/packages/netcdf and http://hdf.ncsa.uiuc.edu, respectively). Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), performs an operation (e.g., averaging, hyperslabbing, or renaming), and outputs a processed netCDF file. Although most users of netCDF and HDF data are involved in scientific research, these data formats, and thus NCO, are generic and are equally useful in fields from agriculture to zoology. The NCO User's Guide illustrates NCO use with examples from the field of climate modeling and analysis. The NCO homepage is http://nco.sourceforge.net/. Maintainer: Ed Hill Reviewer: Tom "spot" Callaway ~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 Tue Jul 19 02:29:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 22:29:49 -0400 Subject: extras-buildsys ChangeLog,1.64,1.65 Message-ID: <200507190230.j6J2UJOT025105@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25058 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * server/UserInterface.py client/client.py - Rework argument handling and passing so that listing jobs is more flexible. Can now list jobs by UID as well. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ChangeLog 18 Jul 2005 21:26:24 -0000 1.64 +++ ChangeLog 19 Jul 2005 02:29:47 -0000 1.65 @@ -1,5 +1,12 @@ 2005-07-18 Dan Williams + * server/UserInterface.py + client/client.py + - Rework argument handling and passing so that listing jobs + is more flexible. Can now list jobs by UID as well. + +2005-07-18 Dan Williams + * builder/builder.py common/ArchUtils.py server/PackageJob.py From fedora-extras-commits at redhat.com Tue Jul 19 02:29:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 22:29:50 -0400 Subject: extras-buildsys/server UserInterface.py,1.19,1.20 Message-ID: <200507190230.j6J2UKF6025111@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25058/server Modified Files: UserInterface.py Log Message: 2005-07-18 Dan Williams * server/UserInterface.py client/client.py - Rework argument handling and passing so that listing jobs is more flexible. Can now list jobs by UID as well. Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- UserInterface.py 14 Jul 2005 19:12:04 -0000 1.19 +++ UserInterface.py 19 Jul 2005 02:29:48 -0000 1.20 @@ -63,6 +63,15 @@ return False return True +def validate_uid(uid_in): + try: + uid = int(uid_in) + except ValueError: + return None + if uid < 0: + return None + return uid + class UserInterface: """ @@ -140,38 +149,54 @@ return (0, "Success: job %s killed." % job.get_uid()) def list_jobs(self, args_dict): - sql = 'SELECT uid, username, package, cvs_tag, target, status FROM jobs' - search = '' - first = True + """ Query job information and return it to the user """ + + sql = 'SELECT uid, username, package, cvs_tag, target, status FROM jobs WHERE ' + sql_args = [] if args_dict.has_key('email') and args_dict['email']: if validate_email(args_dict['email']): - if first: - search = search + " WHERE " - first = False - else: - search = search + " AND " - search = search + 'username LIKE "%%%s%%"' % args_dict['email'] + sql_args.append('username LIKE "%%%s%%"' % args_dict['email']) else: - return (-1, "Error: Invalid query.", [], []) + return (-1, "Error: Invalid email address.", [], []) if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] if PackageJob.is_package_job_stage_valid(status): - if first: - search = search + " WHERE " - first = False - else: - search = search + " AND " - search = search + 'status = "%s"' % status + sql_args.append('status="%s"' % status) else: - return (-1, "Error: Invalid query.", [], []) + return (-1, "Error: Invalid job status.", [], []) - if len(search): - sql = sql + search - if not len(sql): + if args_dict.has_key('uid') and args_dict['uid']: + uid = validate_uid(args_dict['uid']) + if not uid: + return (-1, "Error: Invalid job UID.", [], []) + sql_args.append('uid=%d' % uid) + + if args_dict.has_key('uid_gt') and args_dict['uid_gt']: + uid = validate_uid(args_dict['uid_gt']) + if not uid: + return (-1, "Error: Invalid job UID.", [], []) + sql_args.append('uid>%d' % uid) + + if args_dict.has_key('uid_lt') and args_dict['uid_lt']: + uid = validate_uid(args_dict['uid_lt']) + if not uid: + return (-1, "Error: Invalid job UID.", [], []) + sql_args.append('uid<%d' % uid) + + if not len(sql_args): return (-1, "Error: Invalid query.", [], []) + # Assemble the final SQL statement + i = 1 + for arg in sql_args: + sql = sql + arg + if i < len(sql_args): + sql = sql + " AND " + i = i + 1 + + # Run the query for the job try: dbcx, curs = get_dbcx() except sqlite.DatabaseError, e: @@ -184,6 +209,7 @@ results.append(tempX) jobs = copy.deepcopy(results) + # Mash all returned job UIDs into an SQL query to get all their archjobs uids = '' for result in jobs: if len(uids) == 0: @@ -191,6 +217,7 @@ else: uids = uids + " OR parent_uid=%d" % result[0] + # Get all archjobs for this job archjobs = [] if len(uids) > 0: sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids From fedora-extras-commits at redhat.com Tue Jul 19 02:29:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 22:29:50 -0400 Subject: extras-buildsys/client client.py,1.11,1.12 Message-ID: <200507190230.j6J2UKRL025108@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25058/client Modified Files: client.py Log Message: 2005-07-18 Dan Williams * server/UserInterface.py client/client.py - Rework argument handling and passing so that listing jobs is more flexible. Can now list jobs by UID as well. Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- client.py 10 Jul 2005 04:33:25 -0000 1.11 +++ client.py 19 Jul 2005 02:29:47 -0000 1.12 @@ -89,17 +89,42 @@ print "Package %s enqueued." % package -def list_jobs(server, email, status=None): +def validate_arg(arg): + if arg == 'email' or arg == 'status' or arg == 'uid' or arg == 'uid_gt' or arg == 'uid_lt': + return True + return False + +def list_jobs(server, args): """ - List jobs by email, status, or both. + List jobs by criteria """ - args = {} + # Have to have an even number of options + if int(len(args) / 2.0) != (len(args) / 2.0): + print "Error: invalid options." + return + + query_args = {} + cmd = '' + for arg in args: + if not len(cmd): + if validate_arg(arg): + cmd = arg + else: + print "Error: invalid option '%s'" % arg + return + else: + query_args[cmd] = arg + cmd = '' + + if len(query_args) == 0: + # List all jobs + query_args['uid_gt'] = "0" + + print query_args + try: - args['email'] = email - if status: - args['status'] = status - (e, msg, jobs, archjobs) = server.list_jobs(args) + (e, msg, jobs, archjobs) = server.list_jobs(query_args) except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -270,18 +295,7 @@ except CommandException, e: print e.message elif cmd == 'list': - status = None - if len(sys.argv) == 2: - pass - elif len(sys.argv) == 3: - status = sys.argv[2] - elif len(sys.argv) == 4: - email_addr = sys.argv[2] - status = sys.argv[3] - else: - print "Error: invalid command format" - sys.exit(1) - list_jobs(server, email, status) + list_jobs(server, sys.argv[2:]) elif cmd == 'kill': if len(sys.argv) < 3: print "Error: need a job UID to kill" From fedora-extras-commits at redhat.com Tue Jul 19 03:42:39 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:42:39 -0400 Subject: rpms/apel - New directory Message-ID: <200507190342.j6J3gdLv026410@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26390/apel Log Message: Directory /cvs/extras/rpms/apel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 03:42:40 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:42:40 -0400 Subject: rpms/apel/devel - New directory Message-ID: <200507190342.j6J3geRc026415@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26390/apel/devel Log Message: Directory /cvs/extras/rpms/apel/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 03:43:08 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:43:08 -0400 Subject: rpms/apel Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507190343.j6J3h8i2026462@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26435 Added Files: Makefile import.log Log Message: Setup of module apel --- NEW FILE Makefile --- # Top level Makefile for module apel all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 19 03:43:08 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:43:08 -0400 Subject: rpms/apel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507190343.j6J3h86t026467@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26435/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module apel --- NEW 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 Jul 19 03:44:16 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:44:16 -0400 Subject: rpms/apel import.log,1.1,1.2 Message-ID: <200507190344.j6J3iks8026550@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26509 Modified Files: import.log Log Message: auto-import apel-10.6-6 on branch devel from apel-10.6-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/apel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jul 2005 03:43:06 -0000 1.1 +++ import.log 19 Jul 2005 03:44:14 -0000 1.2 @@ -0,0 +1 @@ +apel-10_6-6:HEAD:apel-10.6-6.src.rpm:1121744640 From fedora-extras-commits at redhat.com Tue Jul 19 03:44:16 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:44:16 -0400 Subject: rpms/apel/devel APEL-CFG.patch, NONE, 1.1 apel-10.4-missing-el.patch, NONE, 1.1 apel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507190344.j6J3iGpV026545@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26509/devel Modified Files: .cvsignore sources Added Files: APEL-CFG.patch apel-10.4-missing-el.patch apel.spec Log Message: auto-import apel-10.6-6 on branch devel from apel-10.6-6.src.rpm APEL-CFG.patch: --- NEW FILE APEL-CFG.patch --- --- apel-10.3/APEL-CFG.org Sat Jun 23 19:25:54 2001 +++ apel-10.3/APEL-CFG Sat Jun 23 19:26:09 2001 @@ -74,8 +74,8 @@ ;; XEmacs 21.0 and later. ;; (setq PACKAGEDIR "/usr/local/lib/xemacs/xemacs-packages") -;; (setq APEL_PREFIX "apel") -;; (setq EMU_PREFIX "emu") +(setq APEL_PREFIX "apel") +(setq EMU_PREFIX "apel") ;; If you want to install all of APEL modules to VERSION_SPECIFIC_LISPDIR, ;; uncomment and edit this. apel-10.4-missing-el.patch: --- NEW FILE apel-10.4-missing-el.patch --- diff -ruN apel-10.4.orig/APEL-ELS apel-10.4/APEL-ELS --- apel-10.4.orig/APEL-ELS 2003-05-14 16:36:24.000000000 +0900 +++ apel-10.4/APEL-ELS 2003-05-14 16:36:53.000000000 +0900 @@ -13,7 +13,7 @@ ;; [obsoleted modules] If you would like to ;; install following, please activate them. - ;; atype file-detect + atype file-detect )) ;;; APEL-ELS ends here --- NEW FILE apel.spec --- %define emacsver 20.7 %define xemacsver 21.4.10-6 %define lispdir %{_datadir}/emacs/site-lisp %define pkgdir %{_datadir}/xemacs/xemacs-packages Name: apel Version: 10.6 Release: 6 License: GPL URL: ftp://ftp.m17n.org/pub/mule/apel/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildArch: noarch Source0: apel-%{version}.tar.gz Patch0: APEL-CFG.patch Patch1: apel-10.4-missing-el.patch Summary: A Portable Emacs Library Group: Applications/Editors Buildrequires: emacs Requires: emacs-common #package xemacs #Summary: A Portable [X]Emacs Library #Group: Applications/Editors #Buildrequires: xemacs #Requires: xemacs-common #Conflicts: xemacs < %{xemacsver} %description APEL stands for "A Portable Emacs Library". It consists of following modules: poe.el - This is an emulation module mainly for basic functions and special forms/macros of latest emacsen. poem.el - This module provides basic functions to write portable MULE programs. pces.el - This module provides portable character encoding scheme (coding-system) features. invisible.el - This modules provides features about invisible region. mcharset.el - This modules provides MIME charset related features. and other some utility modules #description xemacs #APEL stands for "A Portable Emacs Library". This is the #XEmacs version of APEL. You may install apel instead of #this if you use GNU Emacs. %prep %setup -q %patch -p1 -b .cfg %patch1 -p1 -b .missing %build %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make PREFIX=$RPM_BUILD_ROOT%{_prefix} \ LISPDIR=$RPM_BUILD_ROOT%{lispdir} install ## VERSION_SPECIFIC_LISPDIR=$RPM_BUILD_ROOT%{lispdir} \ make clean #make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README.ja README.en ChangeLog %{lispdir}/apel #files xemacs #defattr(-,root,root) #doc README.ja README.en ChangeLog #{pkgdir}/lisp/apel %changelog * Tue Feb 22 2005 Elliot Lee 10.6-6 - Remove xemacs * Wed Oct 6 2004 Akira TAGOH - 10.6-5 - require emacs-common instead of emacs. * Wed Oct 6 2004 Akira TAGOH - 10.6-4 - require xemacs-common instead of xemacs. (#134479) * Mon Sep 27 2004 Akira TAGOH - 10.6-3 - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Jul 07 2003 Akira TAGOH 10.6-1 - New upstream release. * Wed May 14 2003 Akira TAGOH 10.4-4 - apel-10.4-missing-el.patch: contains atype.el and file-detect.el (#90604) * Wed Jan 22 2003 Tim Powers - rebuilt * Fri Jan 3 2003 Jens Petersen 10.4-2 - rebuild * Wed Jan 1 2003 Jens Petersen 10.4-1 - update to 10.4 - resurrect -xemacs subpackage, required by latest xemacs package - install xemacs package under datadir - own xemacs package lisp dir * Wed Dec 11 2002 Tim Powers 10.3-8 - rebuild * Thu Jul 18 2002 Akira TAGOH 10.3-7 - s/Copyright/License/ - add the owned directory. * Fri Jun 21 2002 Tim Powers - automated rebuild * Thu May 23 2002 Tim Powers - automated rebuild * Sun Feb 24 2002 Tim Powers - rebuilt in new environment * Wed Jan 09 2002 Tim Powers - automated rebuild * Sat Jun 23 2001 SATO Satoru - apel-xemacs removed because XEmacs already includes it. - made "emu" modules installed in apel/ subdirectory * Wed Jun 20 2001 SATO Satoru - initial release (separated from semi) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apel/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2005 03:43:06 -0000 1.1 +++ .cvsignore 19 Jul 2005 03:44:14 -0000 1.2 @@ -0,0 +1 @@ +apel-10.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/apel/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2005 03:43:06 -0000 1.1 +++ sources 19 Jul 2005 03:44:14 -0000 1.2 @@ -0,0 +1 @@ +a770333c50a4bb79c0923dee78d5e358 apel-10.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 04:54:06 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 19 Jul 2005 00:54:06 -0400 Subject: rpms/apel/devel .cvsignore,1.2,1.3 apel.spec,1.1,1.2 Message-ID: <200507190454.j6J4s6u6027927@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27908 Modified Files: .cvsignore apel.spec Log Message: * Tue Jul 19 2005 Akira TAGOH - 10.6-7.fc5 - Import into Extras. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2005 03:44:14 -0000 1.2 +++ .cvsignore 19 Jul 2005 04:54:04 -0000 1.3 @@ -1 +1,4 @@ +*.bz2 +*.gz +*.rpm apel-10.6.tar.gz Index: apel.spec =================================================================== RCS file: /cvs/extras/rpms/apel/devel/apel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apel.spec 19 Jul 2005 03:44:14 -0000 1.1 +++ apel.spec 19 Jul 2005 04:54:04 -0000 1.2 @@ -6,7 +6,7 @@ Name: apel Version: 10.6 -Release: 6 +Release: 7%{?dist} License: GPL URL: ftp://ftp.m17n.org/pub/mule/apel/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -20,12 +20,12 @@ Buildrequires: emacs Requires: emacs-common -#package xemacs -#Summary: A Portable [X]Emacs Library -#Group: Applications/Editors -#Buildrequires: xemacs -#Requires: xemacs-common -#Conflicts: xemacs < %{xemacsver} +%package xemacs +Summary: A Portable [X]Emacs Library +Group: Applications/Editors +Buildrequires: xemacs +Requires: xemacs-common +Conflicts: xemacs < %{xemacsver} %description APEL stands for "A Portable Emacs Library". It consists of @@ -45,10 +45,10 @@ and other some utility modules -#description xemacs -#APEL stands for "A Portable Emacs Library". This is the -#XEmacs version of APEL. You may install apel instead of -#this if you use GNU Emacs. +%description xemacs +APEL stands for "A Portable Emacs Library". This is the +XEmacs version of APEL. You may install apel instead of +this if you use GNU Emacs. %prep @@ -68,7 +68,7 @@ make clean -#make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package +make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package %clean @@ -81,13 +81,16 @@ %{lispdir}/apel -#files xemacs -#defattr(-,root,root) -#doc README.ja README.en ChangeLog -#{pkgdir}/lisp/apel +%files xemacs +%defattr(-,root,root) +%doc README.ja README.en ChangeLog +%{pkgdir}/lisp/apel %changelog +* Tue Jul 19 2005 Akira TAGOH - 10.6-7.fc5 +- Import into Extras. + * Tue Feb 22 2005 Elliot Lee 10.6-6 - Remove xemacs From fedora-extras-commits at redhat.com Tue Jul 19 04:55:03 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 19 Jul 2005 00:55:03 -0400 Subject: common tobuild,1.1952,1.1953 Message-ID: <200507190455.j6J4t33t027994@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27977 Modified Files: tobuild Log Message: request build of rpms/apel/devel apel-10_6-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1952 retrieving revision 1.1953 diff -u -r1.1952 -r1.1953 --- tobuild 18 Jul 2005 23:58:20 -0000 1.1952 +++ tobuild 19 Jul 2005 04:55:01 -0000 1.1953 @@ -93,3 +93,4 @@ thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel roland rpms/monotone/devel monotone-0_21-1_fc5 devel +tagoh rpms/apel/devel apel-10_6-7_fc5 devel From roland at redhat.com Mon Jul 18 23:58:31 2005 From: roland at redhat.com (Roland McGrath) Date: Mon, 18 Jul 2005 16:58:31 -0700 (PDT) Subject: APPROVED: monotone In-Reply-To: Tom 'spot' Callaway's message of Monday, 18 July 2005 18:44:45 -0500 <1121730285.32518.50.camel@localhost.localdomain> Message-ID: <20050718235831.251DD2207D3@magilla.sf.frob.com> Tom Callaway approved the package. I'll be the maintainer. monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping branches and extensible metadata, exchanges work over plain network protocols, performs history-sensitive merging, and delegates trust functions to client-side RSA certificates. From fedora-extras-commits at redhat.com Tue Jul 19 10:14:26 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 19 Jul 2005 06:14:26 -0400 Subject: rpms/liboggz/devel .cvsignore, 1.2, 1.3 liboggz.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507191014.j6JAEQ8X003270@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboggz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3249 Modified Files: .cvsignore liboggz.spec sources Log Message: new upstream release; fix spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboggz/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 17:30:07 -0000 1.2 +++ .cvsignore 19 Jul 2005 10:14:24 -0000 1.3 @@ -1 +1 @@ -liboggz-0.9.1.tar.gz +liboggz-0.9.2.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/rpms/liboggz/devel/liboggz.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboggz.spec 16 Jun 2005 19:04:15 -0000 1.2 +++ liboggz.spec 19 Jul 2005 10:14:24 -0000 1.3 @@ -1,16 +1,12 @@ Name: liboggz -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -# fixed in upstream CVS -Patch: liboggz.autotools.patch -# fixed in upstream CVS -Patch1: liboggz.corruption.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -19,12 +15,6 @@ # libtool BuildRequires: gcc-c++ -# since we patch Makefile.am -BuildRequires: libtool -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: pkgconfig - %description Oggz provides a simple programming interface for reading and writing Ogg files and streams. Ogg is an interleaving data container developed by Monty at @@ -47,11 +37,6 @@ %prep %setup -q -n %{name}-%{version} -%patch -p1 -%patch1 -p0 -aclocal -autoconf -automake %build %configure @@ -59,17 +44,17 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall docdir=`pwd`/doxygen +%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -# remove doxygen build stamp; fixed in upstream CVS -rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/doxygen-build.stamp +# not particularly interested in the tex docs, the html version has everything +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}/latex %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -81,19 +66,22 @@ %files devel %defattr(-,root,root) -%doc doxygen/html +%{_includedir}/oggz %{_libdir}/liboggz.so %{_libdir}/liboggz.a %{_libdir}/pkgconfig/oggz.pc -%{_includedir}/oggz +%doc %{_docdir}/%{name}-devel-%{version} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog -* Thu Jun 16 2005 Thomas Vander Stichele -- 0.9.1-3: update for Ville's comments +* Mon Jul 18 2005 Thomas Vander Stichele +- 0.9.2-1 +- new upstream version +- removed patches +- moved devel docs to versioned location * Mon Jun 13 2005 Thomas Vander Stichele - 0.9.1-2: rpmlint cleanup Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboggz/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 17:30:07 -0000 1.2 +++ sources 19 Jul 2005 10:14:24 -0000 1.3 @@ -1 +1 @@ -476ce0b2eb000a0b0e2102d2e8d79580 liboggz-0.9.1.tar.gz +53a0217f4c3d0de1d187e5079c087b22 liboggz-0.9.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 10:15:18 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 19 Jul 2005 06:15:18 -0400 Subject: common tobuild,1.1953,1.1954 Message-ID: <200507191015.j6JAFI8f003334@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3317 Modified Files: tobuild Log Message: request build of rpms/liboggz/devel liboggz-0_9_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1953 retrieving revision 1.1954 diff -u -r1.1953 -r1.1954 --- tobuild 19 Jul 2005 04:55:01 -0000 1.1953 +++ tobuild 19 Jul 2005 10:15:16 -0000 1.1954 @@ -94,3 +94,4 @@ pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel roland rpms/monotone/devel monotone-0_21-1_fc5 devel tagoh rpms/apel/devel apel-10_6-7_fc5 devel +thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 11:20:46 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 19 Jul 2005 07:20:46 -0400 Subject: devel/directfb .cvsignore, 1.2, 1.3 directfb.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507191120.j6JBKk2n004574@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/directfb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4553 Modified Files: .cvsignore directfb.spec sources Log Message: update to new release; put in changes from ville Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/directfb/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Dec 2004 17:36:32 -0000 1.2 +++ .cvsignore 19 Jul 2005 11:20:44 -0000 1.3 @@ -1 +1 @@ -DirectFB-0.9.21.tar.gz +DirectFB-0.9.22.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/devel/directfb/directfb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- directfb.spec 5 Mar 2005 21:10:21 -0000 1.2 +++ directfb.spec 19 Jul 2005 11:20:44 -0000 1.3 @@ -1,10 +1,10 @@ Name: directfb -Version: 0.9.21 -Release: 1 +Version: 0.9.22 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System/Libraries -License: GPL +License: LGPL URL: http://www.directfb.org/ Source: http://www.directfb.org/download/DirectFB/DirectFB-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,6 +14,7 @@ BuildRequires: libjpeg-devel BuildRequires: freetype-devel BuildRequires: SDL-devel +BuildRequires: sysfsutils-devel # libtool BuildRequires: gcc-c++ @@ -34,6 +35,8 @@ Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: zlib-devel %description devel The %{name}-devel package contains the static libraries and header files @@ -44,24 +47,15 @@ %build %configure \ - --with-gfxdrivers=ati128,cle266,i810,mach64,matrox,nsc,nvidia,radeon,tdfx \ - --disable-sse \ -%ifarch athlon i686 - --enable-mmx \ -%else - --disable-mmx \ -%endif - --disable-maintainer-mode \ - --enable-shared \ - --enable-static \ - --enable-fast-install \ - --disable-avifile \ - --disable-debug \ + --disable-maintainer-mode \ + --enable-shared \ + --enable-static \ + --disable-avifile \ + --enable-video4linux2 \ --with-gfxdrivers=\ -ati128,cle266,cyber5k,i810,mach64,matrox,\ +ati128,cle266,cyber5k,i810,i830,mach64,matrox,\ neomagic,nsc,nvidia,radeon,savage,\ tdfx,unichrome -# no kernel support: radeon, i810, neomagic, savage # build errors: sis315 make %{?_smp_mflags} @@ -89,8 +83,12 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} +%dir %{_libdir}/directfb-%{version} +%{_libdir}/directfb-%{version}/*/*.so +%{_libdir}/directfb-%{version}/*/*/*.so + %{_datadir}/%{name}-%{version} + %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo @@ -102,7 +100,7 @@ %files devel %defattr(-,root,root,-) -%doc docs/html/* +%doc docs/html/*.html docs/html/*.png %{_bindir}/directfb-config %{_bindir}/directfb-csource %{_includedir}/directfb @@ -113,11 +111,22 @@ %{_libdir}/pkgconfig/directfb-internal.pc %{_libdir}/pkgconfig/fusion.pc %{_libdir}/libdirectfb.so +%{_libdir}/libdirect.so +%{_libdir}/libfusion.so %{_libdir}/libdirectfb.a %{_libdir}/libdirect.a %{_libdir}/libfusion.a +%{_libdir}/directfb-%{version}/*/*.a +%{_libdir}/directfb-%{version}/*/*/*.a +%{_libdir}/directfb-%{version}/*/*.o +%{_libdir}/directfb-%{version}/*/*/*.o %changelog +* Tue Jul 19 2005 Thomas Vander Stichele +- 0.9.22-1 +- incorporate changes from Ville +- update to new upstream release + * Fri Dec 31 2004 Thomas Vander Stichele - 0.9.21-0.fdr.1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/directfb/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Dec 2004 17:36:32 -0000 1.2 +++ sources 19 Jul 2005 11:20:44 -0000 1.3 @@ -1 +1 @@ -22699a04f2f618b287aa0ae1b06045b5 DirectFB-0.9.21.tar.gz +f52e23f4bb56db0d284d2a78ebc4a586 DirectFB-0.9.22.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:17:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:17:26 -0400 Subject: rpms/perl-GD/FC-3 .cvsignore, 1.4, 1.5 perl-GD.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200507191217.j6JCHQ0U005902@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5853/FC-3 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.25. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2005 15:19:20 -0000 1.4 +++ .cvsignore 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -GD-2.23.tar.gz +GD-2.25.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/perl-GD.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-GD.spec 10 Mar 2005 15:19:20 -0000 1.4 +++ perl-GD.spec 19 Jul 2005 12:17:24 -0000 1.5 @@ -1,14 +1,12 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-GD -Version: 2.23 -Release: 1 +Version: 2.25 +Release: 1%{?dist} Summary: Perl interface to the GD graphics library Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/GD/ -Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz +Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -29,6 +27,7 @@ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* +chmod 755 qd.pl %build @@ -39,8 +38,8 @@ %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 f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -55,15 +54,19 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/ +%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/ %{_bindir}/* %{perl_vendorarch}/auto/GD %{perl_vendorarch}/GD* +%{perl_vendorarch}/qd.pl %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog +* Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 +- Update to 2.25. + * Wed Mar 9 2005 Jose Pedro Oliveira - 2.23-1 - Update to 2.23. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2005 15:19:20 -0000 1.4 +++ sources 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -131a84d37921a18c87e7d994d72165b2 GD-2.23.tar.gz +aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:17:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:17:27 -0400 Subject: rpms/perl-GD/devel .cvsignore, 1.4, 1.5 perl-GD.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200507191217.j6JCHRGP005916@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5853/devel Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.25. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2005 15:19:20 -0000 1.4 +++ .cvsignore 19 Jul 2005 12:17:25 -0000 1.5 @@ -1 +1 @@ -GD-2.23.tar.gz +GD-2.25.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GD.spec 6 Apr 2005 22:12:45 -0000 1.6 +++ perl-GD.spec 19 Jul 2005 12:17:25 -0000 1.7 @@ -1,15 +1,12 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-GD -Version: 2.23 -Release: 2 - +Version: 2.25 +Release: 1%{?dist} Summary: Perl interface to the GD graphics library Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/GD/ -Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz +Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -30,6 +27,7 @@ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* +chmod 755 qd.pl %build @@ -40,8 +38,8 @@ %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 f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -56,16 +54,20 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/ +%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/ %{_bindir}/* %{perl_vendorarch}/auto/GD %{perl_vendorarch}/GD* +%{perl_vendorarch}/qd.pl %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 +- Update to 2.25. + +* Fri Apr 7 2005 Michael Schwendt - 2.23-2 - rebuilt * Wed Mar 9 2005 Jose Pedro Oliveira - 2.23-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2005 15:19:20 -0000 1.4 +++ sources 19 Jul 2005 12:17:25 -0000 1.5 @@ -1 +1 @@ -131a84d37921a18c87e7d994d72165b2 GD-2.23.tar.gz +aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:17:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:17:26 -0400 Subject: rpms/perl-GD/FC-4 .cvsignore, 1.4, 1.5 perl-GD.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200507191217.j6JCHQ8e005910@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5853/FC-4 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.25. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2005 15:19:20 -0000 1.4 +++ .cvsignore 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -GD-2.23.tar.gz +GD-2.25.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GD.spec 6 Apr 2005 22:12:45 -0000 1.6 +++ perl-GD.spec 19 Jul 2005 12:17:24 -0000 1.7 @@ -1,15 +1,12 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-GD -Version: 2.23 -Release: 2 - +Version: 2.25 +Release: 1%{?dist} Summary: Perl interface to the GD graphics library Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/GD/ -Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz +Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -30,6 +27,7 @@ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* +chmod 755 qd.pl %build @@ -40,8 +38,8 @@ %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 f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -56,16 +54,20 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/ +%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/ %{_bindir}/* %{perl_vendorarch}/auto/GD %{perl_vendorarch}/GD* +%{perl_vendorarch}/qd.pl %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 +- Update to 2.25. + +* Fri Apr 7 2005 Michael Schwendt - 2.23-2 - rebuilt * Wed Mar 9 2005 Jose Pedro Oliveira - 2.23-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2005 15:19:20 -0000 1.4 +++ sources 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -131a84d37921a18c87e7d994d72165b2 GD-2.23.tar.gz +aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:18:13 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:18:13 -0400 Subject: common tobuild,1.1954,1.1955 Message-ID: <200507191218.j6JCIDCV005980@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963 Modified Files: tobuild Log Message: request build of rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1954 retrieving revision 1.1955 diff -u -r1.1954 -r1.1955 --- tobuild 19 Jul 2005 10:15:16 -0000 1.1954 +++ tobuild 19 Jul 2005 12:18:10 -0000 1.1955 @@ -95,3 +95,4 @@ roland rpms/monotone/devel monotone-0_21-1_fc5 devel tagoh rpms/apel/devel apel-10_6-7_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel +jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 19 12:18:47 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:18:47 -0400 Subject: common tobuild,1.1955,1.1956 Message-ID: <200507191218.j6JCIlGQ006042@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6025 Modified Files: tobuild Log Message: request build of rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1955 retrieving revision 1.1956 diff -u -r1.1955 -r1.1956 --- tobuild 19 Jul 2005 12:18:10 -0000 1.1955 +++ tobuild 19 Jul 2005 12:18:44 -0000 1.1956 @@ -96,3 +96,4 @@ tagoh rpms/apel/devel apel-10_6-7_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 +jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 19 12:19:21 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:19:21 -0400 Subject: common tobuild,1.1956,1.1957 Message-ID: <200507191219.j6JCJLFS006107@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6090 Modified Files: tobuild Log Message: request build of rpms/perl-GD/devel perl-GD-2_25-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1956 retrieving revision 1.1957 diff -u -r1.1956 -r1.1957 --- tobuild 19 Jul 2005 12:18:44 -0000 1.1956 +++ tobuild 19 Jul 2005 12:19:18 -0000 1.1957 @@ -97,3 +97,4 @@ thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 +jpo rpms/perl-GD/devel perl-GD-2_25-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 16:10:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 19 Jul 2005 12:10:03 -0400 Subject: rpms/perl-IO-Socket-SSL/FC-4 .cvsignore, 1.2, 1.3 perl-IO-Socket-SSL.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507191610.j6JGA3LQ011016@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10981/FC-4 Modified Files: .cvsignore perl-IO-Socket-SSL.spec sources Log Message: * Mon Jul 18 2005 Ville Skytt?? - 0.97-1 - 0.97. - Convert docs to UTF-8, drop some unuseful ones. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2005 11:59:30 -0000 1.2 +++ .cvsignore 19 Jul 2005 16:10:00 -0000 1.3 @@ -1 +1 @@ -IO-Socket-SSL-0.96.tar.gz +IO-Socket-SSL-0.97.tar.gz Index: perl-IO-Socket-SSL.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4/perl-IO-Socket-SSL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Socket-SSL.spec 6 Apr 2005 22:12:45 -0000 1.3 +++ perl-IO-Socket-SSL.spec 19 Jul 2005 16:10:00 -0000 1.4 @@ -1,19 +1,16 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-IO-Socket-SSL -Version: 0.96 -Release: 4 - +Version: 0.97 +Release: 1%{?dist} Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-Socket-SSL/ -Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.96.tar.gz +Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Net::SSLeay) +BuildRequires: perl(Net::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -28,6 +25,9 @@ %prep %setup -q -n IO-Socket-SSL-%{version} +for f in README SSL.pm ; do + iconv -f iso-8859-1 -t utf-8 -o $f{.utf8,} ; mv $f{.utf8,} +done # Avoid running the session tests (spawns servers, requires 3 free ports # and possibly manual configuration). mv t/sessions.t t/sessions.t.not @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -56,13 +56,17 @@ %files %defattr(-,root,root,-) -%doc BUGS Changes README certs docs example patches util -%{perl_vendorlib}/IO +%doc BUGS Changes README docs/ certs/ example/ util/ +%{perl_vendorlib}/IO/ %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Jul 18 2005 Ville Skytt?? - 0.97-1 +- 0.97. +- Convert docs to UTF-8, drop some unuseful ones. + +* Fri Apr 7 2005 Michael Schwendt - 0.96-4 - rebuilt * Tue Oct 12 2004 Ville Skytt?? - 0:0.96-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2005 11:59:30 -0000 1.2 +++ sources 19 Jul 2005 16:10:00 -0000 1.3 @@ -1 +1 @@ -85f84c0810851eb4f540b118c9902b03 IO-Socket-SSL-0.96.tar.gz +34562e9475de132faa0f14ca2be053a5 IO-Socket-SSL-0.97.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 16:10:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 19 Jul 2005 12:10:04 -0400 Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.2, 1.3 perl-IO-Socket-SSL.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507191610.j6JGA4EW011024@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10981/devel Modified Files: .cvsignore perl-IO-Socket-SSL.spec sources Log Message: * Mon Jul 18 2005 Ville Skytt?? - 0.97-1 - 0.97. - Convert docs to UTF-8, drop some unuseful ones. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2005 11:59:30 -0000 1.2 +++ .cvsignore 19 Jul 2005 16:10:02 -0000 1.3 @@ -1 +1 @@ -IO-Socket-SSL-0.96.tar.gz +IO-Socket-SSL-0.97.tar.gz Index: perl-IO-Socket-SSL.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Socket-SSL.spec 6 Apr 2005 22:12:45 -0000 1.3 +++ perl-IO-Socket-SSL.spec 19 Jul 2005 16:10:02 -0000 1.4 @@ -1,19 +1,16 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-IO-Socket-SSL -Version: 0.96 -Release: 4 - +Version: 0.97 +Release: 1%{?dist} Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-Socket-SSL/ -Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.96.tar.gz +Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Net::SSLeay) +BuildRequires: perl(Net::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -28,6 +25,9 @@ %prep %setup -q -n IO-Socket-SSL-%{version} +for f in README SSL.pm ; do + iconv -f iso-8859-1 -t utf-8 -o $f{.utf8,} ; mv $f{.utf8,} +done # Avoid running the session tests (spawns servers, requires 3 free ports # and possibly manual configuration). mv t/sessions.t t/sessions.t.not @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -56,13 +56,17 @@ %files %defattr(-,root,root,-) -%doc BUGS Changes README certs docs example patches util -%{perl_vendorlib}/IO +%doc BUGS Changes README docs/ certs/ example/ util/ +%{perl_vendorlib}/IO/ %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Jul 18 2005 Ville Skytt?? - 0.97-1 +- 0.97. +- Convert docs to UTF-8, drop some unuseful ones. + +* Fri Apr 7 2005 Michael Schwendt - 0.96-4 - rebuilt * Tue Oct 12 2004 Ville Skytt?? - 0:0.96-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2005 11:59:30 -0000 1.2 +++ sources 19 Jul 2005 16:10:02 -0000 1.3 @@ -1 +1 @@ -85f84c0810851eb4f540b118c9902b03 IO-Socket-SSL-0.96.tar.gz +34562e9475de132faa0f14ca2be053a5 IO-Socket-SSL-0.97.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 16:32:19 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 19 Jul 2005 12:32:19 -0400 Subject: common tobuild,1.1957,1.1958 Message-ID: <200507191632.j6JGWJ7t011111@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11094 Modified Files: tobuild Log Message: request build of rpms/libcdio/devel libcdio-0_75-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1957 retrieving revision 1.1958 diff -u -r1.1957 -r1.1958 --- tobuild 19 Jul 2005 12:19:18 -0000 1.1957 +++ tobuild 19 Jul 2005 16:32:17 -0000 1.1958 @@ -98,3 +98,4 @@ jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 jpo rpms/perl-GD/devel perl-GD-2_25-1_fc5 devel +adrian rpms/libcdio/devel libcdio-0_75-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 17:00:54 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:00:54 -0400 Subject: rpms/pam_abl - New directory Message-ID: <200507191700.j6JH0sNM011218@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198/pam_abl Log Message: Directory /cvs/extras/rpms/pam_abl added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:00:55 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:00:55 -0400 Subject: rpms/pam_abl/devel - New directory Message-ID: <200507191700.j6JH0tpU011223@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198/pam_abl/devel Log Message: Directory /cvs/extras/rpms/pam_abl/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:01:39 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:01:39 -0400 Subject: rpms/pam_abl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507191701.j6JH1dk3012338@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324 Added Files: Makefile import.log Log Message: Setup of module pam_abl --- NEW FILE Makefile --- # Top level Makefile for module pam_abl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 19 17:02:09 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:02:09 -0400 Subject: rpms/pam_abl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507191702.j6JH29FC012353@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pam_abl --- NEW 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 Jul 19 17:05:12 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:05:12 -0400 Subject: rpms/pam_abl/devel README.Fedora, NONE, 1.1 pam_abl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507191705.j6JH5CXS012431@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12395/devel Modified Files: .cvsignore sources Added Files: README.Fedora pam_abl.spec Log Message: auto-import pam_abl-0.2.2-2 on branch devel from pam_abl-0.2.2-2.src.rpm --- NEW FILE README.Fedora --- README.Fedora - pam_abl ------------------------------------------------------------------------ Any time changes to the PAM configuration are done by hand, they have to be done with great care to avoid disabling system access by accident. ------------------------------------------------------------------------ To activate the use of pam_abl.so you need to add a PAM rule like auth required /lib/security/$ISA/pam_abl.so config=/etc/security/pam_abl.conf i.e. in /etc/pam.d/system-auth. Doing so please be aware that /etc/pam.d/system-auth is auto-generated and that user changes will be destroyed the next time authconfig is run, thus this step to be redone. You are able to customize the pam_abl.so behaviour by editing /etc/security/pam_abl.conf. For detailed instructions please see index.html and pam_abl.html or the application's page online at http://www.hexten.net/sw/pam_abl/doc/index.html --- NEW FILE pam_abl.spec --- %define reldate 20050110 Name: pam_abl Summary: A Pluggable Authentication Module (PAM) for auto blacklisting Version: 0.2.2 Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.hexten.net/sw/pam_abl/ Source0: http://www.hexten.net/sw/pam_abl/pam_abl-%{reldate}-%{version}.tar.gz Source1: README.Fedora BuildRequires: db4-devel, pam-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Provides auto blacklisting of hosts and users responsible for repeated failed authentication attempts. Generally configured so that blacklisted users still see normal login prompts but are guaranteed to fail to authenticate. A command line tool allows to query or purge the databases used by the pam_abl module. %prep %setup -q -n %{name}-%{reldate}-%{version} # temporary fix for an outdated document instruction sed -i -e '/pam_abl.so$/d' conf/system-auth %build make %{?_smp_mflags} all %install rm -rf %{buildroot} install -D -m 755 pam_abl.so %{buildroot}/%{_lib}/security/pam_abl.so install -D -m 644 conf/pam_abl.conf %{buildroot}%{_sysconfdir}/security/pam_abl.conf install -D -m 755 tools/pam_abl %{buildroot}%{_sbindir}/pam_abl install -d -m 755 %{buildroot}%{_localstatedir}/lib/abl install -m 644 %{SOURCE1} README.Fedora rm -f doc/._pam_abl.html %clean rm -rf %{buildroot} %files %defattr(644,root,root,755) %doc README.Fedora Copyright doc conf %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/security/pam_abl.conf /%{_lib}/security/pam_abl.so %{_sbindir}/pam_abl %{_localstatedir}/lib/abl/ %changelog * Fri Jul 15 2005 Alexander Dalloz - 0.2.2-2 - Defined %{reldate} and made macro usage consistent - pam_abl moved to /usr/sbin. * Wed Jul 13 2005 Alexander Dalloz - 0.2.2-1 - Changes following review: - added %{?dist} tag - set Group to System Environment/Base - set Source0 to be an absolute URL - changed BuildPrereq to be BuildRequires - moved instructions into README.Fedora - dropped release date in tarball name as release number flag - removed outdated instruction in example system-auth doc file. * Sun Jul 11 2005 Alexander Dalloz - 0.2.2-20050110 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pam_abl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2005 17:02:06 -0000 1.1 +++ .cvsignore 19 Jul 2005 17:05:09 -0000 1.2 @@ -0,0 +1 @@ +pam_abl-20050110-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pam_abl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2005 17:02:06 -0000 1.1 +++ sources 19 Jul 2005 17:05:09 -0000 1.2 @@ -0,0 +1 @@ +5c51d8339682e1ebde3c2c7d120e769b pam_abl-20050110-0.2.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 17:04:59 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:04:59 -0400 Subject: rpms/pam_abl import.log,1.1,1.2 Message-ID: <200507191705.j6JH5ei2012434@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12395 Modified Files: import.log Log Message: auto-import pam_abl-0.2.2-2 on branch devel from pam_abl-0.2.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pam_abl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jul 2005 17:01:37 -0000 1.1 +++ import.log 19 Jul 2005 17:04:57 -0000 1.2 @@ -0,0 +1 @@ +pam_abl-0_2_2-2:HEAD:pam_abl-0.2.2-2.src.rpm:1121792665 From fedora-extras-commits at redhat.com Tue Jul 19 17:52:49 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:52:49 -0400 Subject: rpms/nethack - New directory Message-ID: <200507191752.j6JHqnwl012657@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12633/nethack Log Message: Directory /cvs/extras/rpms/nethack added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:52:50 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:52:50 -0400 Subject: rpms/nethack/devel - New directory Message-ID: <200507191752.j6JHqoWF012662@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12633/nethack/devel Log Message: Directory /cvs/extras/rpms/nethack/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:53:06 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:06 -0400 Subject: rpms/nethack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507191753.j6JHr6vq012705@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678 Added Files: Makefile import.log Log Message: Setup of module nethack --- NEW FILE Makefile --- # Top level Makefile for module nethack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 19 17:53:06 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:06 -0400 Subject: rpms/nethack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507191753.j6JHr6Jc012710@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nethack --- NEW 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 Jul 19 17:53:55 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:55 -0400 Subject: rpms/nethack import.log,1.1,1.2 Message-ID: <200507191754.j6JHsQcb012800@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757 Modified Files: import.log Log Message: auto-import nethack-3.4.3-1 on branch devel from nethack-3.4.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nethack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jul 2005 17:53:04 -0000 1.1 +++ import.log 19 Jul 2005 17:53:53 -0000 1.2 @@ -0,0 +1 @@ +nethack-3_4_3-1:HEAD:nethack-3.4.3-1.src.rpm:1121795674 From fedora-extras-commits at redhat.com Tue Jul 19 17:53:56 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:56 -0400 Subject: rpms/nethack/devel nethack-3.4.3-config.patch, NONE, 1.1 nethack-3.4.3-makefile.patch, NONE, 1.1 nethack.desktop, NONE, 1.1 nethack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507191753.j6JHruV7012792@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757/devel Modified Files: .cvsignore sources Added Files: nethack-3.4.3-config.patch nethack-3.4.3-makefile.patch nethack.desktop nethack.spec Log Message: auto-import nethack-3.4.3-1 on branch devel from nethack-3.4.3-1.src.rpm nethack-3.4.3-config.patch: --- NEW FILE nethack-3.4.3-config.patch --- --- include/config.h.orig 2003-12-07 18:39:13.000000000 -0500 +++ include/config.h 2005-06-25 20:21:41.000000000 -0400 @@ -143,10 +143,10 @@ #ifndef WIZARD /* allow for compile-time or Makefile changes */ # ifndef KR1ED -# define WIZARD "wizard" /* the person allowed to use the -D option */ +# define WIZARD "games" /* the person allowed to use the -D option */ # else # define WIZARD -# define WIZARD_NAME "wizard" +# define WIZARD_NAME "games" # endif #endif @@ -169,8 +169,8 @@ #ifdef UNIX /* path and file name extension for compression program */ -#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ -#define COMPRESS_EXTENSION ".Z" /* compress's extension */ +#define COMPRESS "/usr/bin/bzip2" /* Lempel-Ziv compression */ +#define COMPRESS_EXTENSION ".bz2" /* compress's extension */ /* An example of one alternative you might want to use: */ /* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ /* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ @@ -185,7 +185,7 @@ * a tar-like file, thus making a neater installation. See *conf.h * for detailed configuration. */ -/* #define DLB */ /* not supported on all platforms */ +#define DLB /* not supported on all platforms */ /* * Defining INSURANCE slows down level changes, but allows games that @@ -204,7 +204,7 @@ * otherwise it will be the current directory. */ # ifndef HACKDIR -# define HACKDIR "/usr/games/lib/nethackdir" +# define HACKDIR "FEDORA_HACKDIR" # endif /* @@ -214,7 +214,7 @@ * since the user might create files in a directory of his choice. * Of course SECURE is meaningful only if HACKDIR is defined. */ -/* #define SECURE */ /* do setuid(getuid()) after chdir() */ +#define SECURE /* do setuid(getuid()) after chdir() */ /* * If it is desirable to limit the number of people that can play Hack @@ -300,7 +300,7 @@ * functions that have been macroized. */ -/* #define VISION_TABLES */ /* use vision tables generated at compile time */ +#define VISION_TABLES /* use vision tables generated at compile time */ #ifndef VISION_TABLES # ifndef NO_MACRO_CPATH # define MACRO_CPATH /* use clear_path macros instead of functions */ @@ -338,7 +338,7 @@ #endif #define EXP_ON_BOTL /* Show experience on bottom line */ -/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson at ucivax) */ +#define SCORE_ON_BOTL /* added by Gary Erickson (erickson at ucivax) */ /* * Section 5: EXPERIMENTAL STUFF --- include/unixconf.h.orig 2003-12-07 18:39:13.000000000 -0500 +++ include/unixconf.h 2005-06-25 20:23:26.000000000 -0400 @@ -37,7 +37,7 @@ #define NETWORK /* if running on a networked system */ /* e.g. Suns sharing a playground through NFS */ /* #define SUNOS4 */ /* SunOS 4.x */ -/* #define LINUX */ /* Another Unix clone */ +#define LINUX /* Another Unix clone */ /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ /* #define GENIX */ /* Yet Another Unix Clone */ /* #define HISX */ /* Bull Unix for XPS Machines */ @@ -96,13 +96,13 @@ */ /* #define NO_FILE_LINKS */ /* if no hard links */ -/* #define LOCKDIR "/usr/games/lib/nethackdir" */ /* where to put locks */ +#define LOCKDIR "FEDORA_STATEDIR" /* where to put locks */ /* * If you want the static parts of your playground on a read-only file * system, define VAR_PLAYGROUND to be where the variable parts are kept. */ -/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */ +#define VAR_PLAYGROUND "FEDORA_STATEDIR" /* @@ -132,7 +132,7 @@ * "extra output" method is used, but not all systems provide access to * a fine-grained timer. */ -/* #define TIMED_DELAY */ /* usleep() */ +#define TIMED_DELAY /* usleep() */ #endif /* @@ -204,7 +204,7 @@ * You can also include any other strange options your compress needs. * If you have a normal compress, just leave it commented out. */ -/* #define COMPRESS_OPTIONS "-q" */ +#define COMPRESS_OPTIONS "-q9" #endif #define FCMASK 0660 /* file creation mask */ nethack-3.4.3-makefile.patch: --- NEW FILE nethack-3.4.3-makefile.patch --- --- sys/unix/Makefile.src.orig 2005-06-23 14:57:08.000000000 -0400 +++ sys/unix/Makefile.src 2005-06-23 15:03:21.000000000 -0400 @@ -124,8 +124,8 @@ # flags for Linux # compile normally -# CFLAGS = -O2 -fomit-frame-pointer -I../include -# LFLAGS = -L/usr/X11R6/lib +CFLAGS = $(RPM_OPT_FLAGS) -I../include +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 @@ -151,8 +151,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +#CFLAGS = -O -I../include +#LFLAGS = # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LINK line here to get @@ -230,8 +230,8 @@ # WINTTYLIB = -ltermcap # WINTTYLIB = -lcurses # WINTTYLIB = -lcurses16 -# WINTTYLIB = -lncurses -WINTTYLIB = -ltermlib +WINTTYLIB = -lncurses +#WINTTYLIB = -ltermlib # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. --- sys/unix/Makefile.utl.orig 2005-06-24 19:48:16.000000000 -0400 +++ sys/unix/Makefile.utl 2005-06-24 19:49:07.000000000 -0400 @@ -15,7 +15,7 @@ # if you are using gcc as your compiler, # uncomment the CC definition below if it's not in your environment -# CC = gcc +CC = gcc # # For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following: # @@ -72,8 +72,8 @@ # flags for Linux # compile normally -# CFLAGS = -O2 -fomit-frame-pointer -I../include -# LFLAGS = -L/usr/X11R6/lib +CFLAGS = $(RPM_OPT_FLAGS) -I../include +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 @@ -89,8 +89,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +#CFLAGS = -O -I../include +#LFLAGS = LIBS = @@ -101,11 +101,11 @@ # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c. # if, instead of yacc/lex you have bison/flex, comment/uncomment the following. -YACC = yacc -LEX = lex -# YACC = bison -y +#YACC = yacc +#LEX = lex +YACC = bison -y # YACC = byacc -# LEX = flex +LEX = flex # these are the names of the output files from YACC/LEX. Under MS-DOS # and similar systems, they may differ --- NEW FILE nethack.desktop --- [Desktop Entry] Name=NetHack Comment=Nethack is a single player dungeon exploration game Exec=nethack Icon=nethack.xpm Terminal=true Type=Application Encoding=UTF-8 Categories=Application;Game;Strategy;X-Fedora; --- NEW FILE nethack.spec --- %define nhgamedir /usr/games/nethack %define nhdatadir /var/games/nethack Name: nethack Version: 3.4.3 Release: 1 Summary: A rouge-like single player dungeon exploration game Group: Amusements/Games License: NetHack General Public License URL: http://nethack.org Source0: http://dl.sf.net/%{name}/%{name}-343-src.tgz Source2: %{name}.desktop Patch0: %{name}-%{version}-makefile.patch Patch1: %{name}-%{version}-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, bison, flex, desktop-file-utils Obsoletes: nethack-falconseye <= 1.9.4-6.a %description NetHack is a single player dungeon exploration game that runs on a wide variety of computer systems, with a variety of graphical and text interfaces all using the same game engine. Unlike many other Dungeons & Dragons-inspired games, the emphasis in NetHack is on discovering the detail of the dungeon and not simply killing everything in sight - in fact, killing everything in sight is a good way to die quickly. Each game presents a different landscape - the random number generator provides an essentially unlimited number of variations of the dungeon and its denizens to be discovered by the player in one of a number of characters: you can pick your race, your role, and your gender. %prep %setup -q %patch0 -b .makefile %patch1 -b .config (source sys/unix/setup.sh) # Set our paths %{__sed} -i -e "s:^\(HACKDIR=\).*:\1%{nhgamedir}:" sys/unix/nethack.sh %{__sed} -i -e "s:FEDORA_CONFDIR:%{nhgamedir}:" sys/unix/nethack.sh %{__sed} -i -e "s:FEDORA_STATEDIR:%{nhdatadir}:" include/unixconf.h %{__sed} -i -e "s:FEDORA_HACKDIR:%{nhgamedir}:" include/config.h %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \ doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt %build make all %install rm -rf $RPM_BUILD_ROOT %makeinstall \ GAMEDIR=$RPM_BUILD_ROOT%{nhgamedir} \ VARDIR=$RPM_BUILD_ROOT%{nhdatadir} \ SHELLDIR=$RPM_BUILD_ROOT%{_bindir} \ CHOWN=/bin/true \ CHGRP=/bin/true rm -rf $RPM_BUILD_ROOT%{nhgamedir}/save mv $RPM_BUILD_ROOT%{nhgamedir}/recover $RPM_BUILD_ROOT%{_bindir}/nethack-recover chmod +x $RPM_BUILD_ROOT%{nhgamedir}/nethack install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man6 make -C doc MANDIR=$RPM_BUILD_ROOT%{_mandir}/man6 manpages install -D -p -m 0644 win/X11/nh_icon.xpm \ $RPM_BUILD_ROOT%{_datadir}/pixmaps/nethack.xpm desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Game \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/*.txt README dat/license dat/history %doc dat/opthelp dat/wizhelp %{_mandir}/man6/* %{_datadir}/pixmaps/nethack.xpm %{_datadir}/applications/fedora-nethack.desktop %{nhgamedir}/license %{nhgamedir}/nhdat %{_bindir}/nethack %{_bindir}/nethack-recover %defattr(0664,root,games) %config(noreplace) %{nhdatadir}/record %config(noreplace) %{nhdatadir}/perm %config(noreplace) %{nhdatadir}/logfile %attr(0775,root,games) %dir %{nhdatadir} %attr(0775,root,games) %dir %{nhdatadir}/save %attr(2755,root,games) %{nhgamedir}/nethack %changelog * Sun Jul 10 2005 Luke Macken 3.4.3-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nethack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2005 17:53:04 -0000 1.1 +++ .cvsignore 19 Jul 2005 17:53:54 -0000 1.2 @@ -0,0 +1 @@ +nethack-343-src.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nethack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2005 17:53:04 -0000 1.1 +++ sources 19 Jul 2005 17:53:54 -0000 1.2 @@ -0,0 +1 @@ +21479c95990eefe7650df582426457f9 nethack-343-src.tgz From fedora-extras-commits at redhat.com Tue Jul 19 18:07:58 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 19 Jul 2005 14:07:58 -0400 Subject: rpms/kyum/devel .cvsignore, 1.3, 1.4 kyum.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507191807.j6JI7wAS013991@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13960 Modified Files: .cvsignore kyum.spec sources Log Message: Description: New upstream release 0.7.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jul 2005 15:26:10 -0000 1.3 +++ .cvsignore 19 Jul 2005 18:07:56 -0000 1.4 @@ -1 +1 @@ -kyum-0.7.2.tar.gz +kyum-0.7.3.tar.gz Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kyum.spec 14 Jul 2005 14:57:33 -0000 1.6 +++ kyum.spec 19 Jul 2005 18:07:56 -0000 1.7 @@ -1,6 +1,6 @@ Name: kyum -Version: 0.7.2 -Release: 3 +Version: 0.7.3 +Release: 1 Summary: Graphical User Frontend (GUI) for yum @@ -9,7 +9,6 @@ URL: http://kde-apps.org/content/show.php?content=22185 Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch -Patch2: kyum-0.7.2-DlgInfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,7 +28,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -69,6 +67,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Tue Jul 19 2005 Jochen Schmitt 0.7.3-1 +- New upstream release + * Thu Jul 14 2005 Jochen Schmitt 0.7.2-3 - Patch DlgInfo.h to generate proper Makefiles (calling of moc) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jul 2005 15:26:10 -0000 1.3 +++ sources 19 Jul 2005 18:07:56 -0000 1.4 @@ -1 +1 @@ -0c2eb29c22a4a23d3971eb0ce8d79f99 kyum-0.7.2.tar.gz +8f3436ec802306c2d68b8d574af748be kyum-0.7.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 18:45:27 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Tue, 19 Jul 2005 14:45:27 -0400 Subject: common tobuild,1.1958,1.1959 Message-ID: <200507191845.j6JIjRPi014179@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14160 Modified Files: tobuild Log Message: request build of rpms/splint/devel splint-3_1_1-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1958 retrieving revision 1.1959 diff -u -r1.1958 -r1.1959 --- tobuild 19 Jul 2005 16:32:17 -0000 1.1958 +++ tobuild 19 Jul 2005 18:45:25 -0000 1.1959 @@ -99,3 +99,4 @@ jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 jpo rpms/perl-GD/devel perl-GD-2_25-1_fc5 devel adrian rpms/libcdio/devel libcdio-0_75-1_fc5 devel +pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 21:48:47 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 19 Jul 2005 17:48:47 -0400 Subject: fedora-security/audit fc4,1.24,1.25 Message-ID: <200507192148.j6JLmlr9018197@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18180 Modified Files: fc4 Log Message: Add new vsftpd CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fc4 18 Jul 2005 08:13:10 -0000 1.24 +++ fc4 19 Jul 2005 21:48:45 -0000 1.25 @@ -333,6 +333,7 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) +2004-2259 version (vsftpd, fixed 1.2.2) 2004-2228 version (firefox, fixed 1.0) 2004-2227 version (firefox, fixed 1.0) 2004-2225 version (firefox, fixed 0.10.1) From fedora-extras-commits at redhat.com Tue Jul 19 22:59:57 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 19 Jul 2005 18:59:57 -0400 Subject: web/config HOWTO-DOCS,1.1.1.1,1.2 Message-ID: <200507192259.j6JMxvOH019467@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19450 Modified Files: HOWTO-DOCS Log Message: A little tip that catches me now and then. Index: HOWTO-DOCS =================================================================== RCS file: /cvs/fedora/web/config/HOWTO-DOCS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- HOWTO-DOCS 30 Mar 2005 17:47:22 -0000 1.1.1.1 +++ HOWTO-DOCS 19 Jul 2005 22:59:55 -0000 1.2 @@ -9,6 +9,9 @@ cp fedora-docs/documentation-guide/documentation-guide-en/*.html \ project-web/html/participate/documentation-guide/ + You may need to rename the top level file to 'index.html' in order + to generate a properly linked index.php. + 3. Copy any images and stylesheet images over as well. 4. Run the docbookhtml2php.py script to convert the DocBook From fedora-extras-commits at redhat.com Tue Jul 19 23:10:41 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 19 Jul 2005 19:10:41 -0400 Subject: web/html/docs/release-notes/fc4/errata index.php, 1.3, 1.4 ld-txt-fedora-desktop-screenshot.php, 1.2, 1.3 RELEASE-NOTES-ru.php, 1.1, 1.2 Message-ID: <200507192310.j6JNAfSf020864@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/errata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20845 Modified Files: index.php ld-txt-fedora-desktop-screenshot.php RELEASE-NOTES-ru.php Log Message: Moving of legalnotice is an important part of this commit, fixed bz #162475, bz #162219, bz #160369, style and spelling fixes throughout. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/fc4/errata/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 14 Jun 2005 16:04:48 -0000 1.3 +++ index.php 19 Jul 2005 23:10:39 -0000 1.4 @@ -10,10 +10,11 @@

    -Fedora Core 4 Release Notes

    +Fedora Core 4 Release Notes (updated) +

    Copyright ?? 2005 Red Hat, Inc.

    This document is released under the terms of the GNU Free Documentation - License. For more details, read the full legalnotice in Appendix??A, Legalnotice. + License. For more details, read the full legalnotice in Section??2, ???Legalnotice???.

    @@ -22,62 +23,62 @@
    1. Welcome to Fedora Core 4
    1.1. New in Fedora Core 4
    -
    2. Introduction and Technical Release Notes
    -
    3. Hardware Requirements
    +
    2. Legalnotice
    +
    3. Introduction and Technical Release Notes
    +
    4. Hardware Requirements
    -
    3.1. CPU Requirements
    -
    3.2. Hard Disk Space Requirements
    -
    3.3. Memory Requirements
    -
    3.4. PPC Hardware Requirements
    +
    4.1. CPU Requirements
    +
    4.2. Hard Disk Space Requirements
    +
    4.3. Memory Requirements
    +
    4.4. PPC Hardware Requirements
    -
    4. Overview of This Release
    -
    5. Installation-Related Notes
    +
    5. Overview of This Release
    +
    6. Installation-Related Notes
    -
    5.1. PPC Installation Notes
    -
    5.2. Anaconda Notes
    -
    5.3. Installation-Related Issues
    +
    6.1. PPC Installation Notes
    +
    6.2. Anaconda Notes
    +
    6.3. Installation-Related Issues
    -
    6. Package-Specific Notes
    +
    7. Package-Specific Notes
    -
    6.1. Basic Components
    +
    7.1. Basic Components
    -
    6.1.1. Fedora Extras Repository
    -
    6.1.2. Audit Daemon auditd and Log +
    7.1.1. Fedora Extras Repository
    +
    7.1.2. Audit Daemon auditd and Log Files
    -
    6.1.3. LinuxThreads versus NPTL
    -
    6.1.4. Enabling the slocate Database
    -
    6.1.5. Stricter Controls in openssh
    -
    6.1.6. Perl Binary Compat Symlinks
    -
    6.1.7. Server and System Configuration Tools
    -
    6.1.8. Java Package Recommendations
    +
    7.1.3. LinuxThreads versus NPTL
    +
    7.1.4. Enabling the slocate Database
    +
    7.1.5. Stricter Controls in openssh
    +
    7.1.6. Perl Binary Compat Symlinks
    +
    7.1.7. Server and System Configuration Tools
    +
    7.1.8. Java Package Recommendations
    -
    6.2. Core
    +
    7.2. Core
    -
    6.2.1. yum
    -
    6.2.2. +
    7.2.1. yum
    +
    7.2.2. Linux Kernel
    -
    6.2.3. Security
    +
    7.2.3. Security
    -
    6.3. +
    7.3. Development Tools
    -
    6.3.1. GCC Compiler Collection
    -
    6.4. Language Support
    -
    6.4.1. The IIIMF Input System
    -
    6.5. Web Servers
    +
    7.3.1. GCC Compiler Collection
    +
    7.4. Language Support
    +
    7.4.1. The IIIMF Input System
    +
    7.5. Web Servers
    -
    6.5.1. mod_perl
    -
    6.5.2. php
    +
    7.5.1. mod_perl
    +
    7.5.2. php
    -
    6.6. Samba (Windows File System Compatibility)
    -
    6.7. X Window System (Graphics)
    -
    6.7.1. xorg-x11
    +
    7.6. Samba (Windows File System Compatibility)
    +
    7.7. X Window System (Graphics)
    +
    7.7.1. xorg-x11
    -
    7. Packages Movement
    -
    7.1. Packages Moved to Fedora Extras
    -
    8. An Overview of the Fedora Project
    -
    A. Legalnotice
    +
    8. Packages Movement
    +
    8.1. Packages Moved to Fedora Extras
    +
    9. An Overview of the Fedora Project
    @@ -115,7 +116,7 @@ Section??1.1, ???New in Fedora Core 4???

  • - Section??2, ???Introduction and Technical Release Notes??? ??? Technical release notes + Section??3, ???Introduction and Technical Release Notes??? ??? Technical release notes

  • Help and Support (http://fedora.redhat.com/participate/communicate/) @@ -150,8 +151,8 @@

    -
    -
    [D] +
    +
    [D]

    Example??1.??New desktop featuring Clearlooks and Evince

    @@ -187,7 +188,7 @@

  • - Support for PowerPC (PPC) Architecture ??? Refer to Section??3.4, ???PPC Hardware Requirements??? and Section??5.1, ???PPC Installation Notes???. + Support for PowerPC (PPC) Architecture ??? Refer to Section??4.4, ???PPC Hardware Requirements??? and Section??6.1, ???PPC Installation Notes???.

  • Improved Security ??? SELinux is a security architecture @@ -195,7 +196,7 @@ mandatory security controls. The default targeted policy has been improved to cover 80 additional daemons. You can read more in the technical release notes - Section??4, ???Overview of This Release???. + Section??5, ???Overview of This Release???.

  • Integrated Clustering Technology ??? Global File System @@ -226,7 +227,71 @@

    -2.??Introduction and Technical Release Notes

    +2.??Legalnotice
    +
    + +

    + 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. +

    +

    + RELEASE-NOTES-FC4 (2005-07-19-T16:20-0700) +

    +

    + 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. +

    + +
    +
    +

    +3.??Introduction and Technical Release Notes

    @@ -251,7 +316,7 @@

    - For more information, refer to Section??4, ???Overview of This Release???. + For more information, refer to Section??5, ???Overview of This Release???.

    Additional important information about this release may be made @@ -271,7 +336,7 @@

    -3.??Hardware Requirements

    +4.??Hardware Requirements

    @@ -292,7 +357,7 @@

    -3.1.??CPU Requirements

    +4.1.??CPU Requirements

    This section lists the CPU specifications required by Fedora Core @@ -336,7 +401,7 @@

    -3.2.??Hard Disk Space Requirements

    +4.2.??Hard Disk Space Requirements

    This section lists the disk space required to install Fedora Core @@ -399,7 +464,7 @@

    -3.3.??Memory Requirements

    +4.3.??Memory Requirements

    This section lists the memory required to install Fedora Core @@ -430,7 +495,7 @@

    -3.4.??PPC Hardware Requirements

    +4.4.??PPC Hardware Requirements

    @@ -466,7 +531,7 @@

    -4.??Overview of This Release

    +5.??Overview of This Release

    @@ -805,7 +870,7 @@

    -5.??Installation-Related Notes

    +6.??Installation-Related Notes

    @@ -844,7 +909,7 @@

    -5.1.??PPC Installation Notes

    +6.1.??PPC Installation Notes

    @@ -882,7 +947,7 @@

    -5.2.??Anaconda Notes

    +6.2.??Anaconda Notes
      @@ -945,7 +1010,7 @@

      -5.3.??Installation-Related Issues

      +6.3.??Installation-Related Issues
      @@ -1045,7 +1110,7 @@

      -6.??Package-Specific Notes

      +7.??Package-Specific Notes

    @@ -1057,7 +1122,7 @@

    -6.1.??Basic Components

    +7.1.??Basic Components

    @@ -1067,7 +1132,7 @@

    -6.1.1.??Fedora Extras Repository

    +7.1.1.??Fedora Extras Repository

    @@ -1100,7 +1165,7 @@

    -6.1.2.??Audit Daemon auditd and Log +7.1.2.??Audit Daemon auditd and Log Files

    @@ -1138,7 +1203,7 @@

    -6.1.3.??LinuxThreads versus NPTL

    +7.1.3.??LinuxThreads versus NPTL

    @@ -1209,7 +1274,7 @@

    -6.1.4.??Enabling the slocate Database

    +7.1.4.??Enabling the slocate Database

    @@ -1223,7 +1288,7 @@

    -6.1.5.??Stricter Controls in openssh

    +7.1.5.??Stricter Controls in openssh

    @@ -1272,7 +1337,7 @@

    -6.1.6.??Perl Binary Compat Symlinks

    +7.1.6.??Perl Binary Compat Symlinks

    @@ -1287,7 +1352,7 @@

    -6.1.7.??Server and System Configuration Tools

    +7.1.7.??Server and System Configuration Tools

    @@ -1297,7 +1362,7 @@

    -6.1.7.1.??system-config-lvm
    +7.1.7.1.??system-config-lvm

    @@ -1309,7 +1374,7 @@

    -6.1.8.??Java Package Recommendations

    +7.1.8.??Java Package Recommendations

    @@ -1330,7 +1395,7 @@

    -6.2.??Core

    +7.2.??Core

    @@ -1340,7 +1405,7 @@

    -6.2.1.??yum

    +7.2.1.??yum

    @@ -1354,7 +1419,7 @@

    -6.2.2.?? +7.2.2.?? Linux Kernel

    @@ -1362,7 +1427,7 @@
    -6.2.2.1.??Version
    +7.2.2.1.??Version

    @@ -1370,7 +1435,7 @@ additional patches for improvements, bug fixes, or additional features. For this reason, the Fedora Core kernel may not be line-for-line equivalent to the so-called vanilla kernel from the - kernel.org + kernel.org web site.

    @@ -1383,7 +1448,7 @@

    -6.2.2.2.??Kernel Flavors
    +7.2.2.2.??Kernel Flavors

    @@ -1393,12 +1458,12 @@

  • Native kernel, in both uniprocessor and SMP - varieties. + varieties.

    Configured sources are available in the - kernel-devel-<version>.<arch>.rpm - package. + kernel-devel-<version>.<arch>.rpm + package.

  • @@ -1407,19 +1472,19 @@

    Configured sources are available in the - kernel-xen0-devel-<version>.<arch>.rpm - package. + kernel-xen0-devel-<version>.<arch>.rpm + package.

    • Sources for both kernel flavors may be installed at the same time. The files will be installed into the - /usr/src/kernels/<version>[-xen0]-<arch>/ + /usr/src/kernels/<version>[-xen0]-<arch>/ tree. Use the command: 

    -rpm -Uvh kernel-devel[-xen0]-<version>.<arch>.rpm 
+rpm -Uvh kernel-devel[-xen0]-<version>.<arch>.rpm

    as appropriate. @@ -1432,11 +1497,11 @@

    Many of the tutorials, examples, and textbooks about Linux - kernel development assume the kernel sources are installed under - the /usr/src/linux directory. If you make a - symbolic link, as shown below, you should be able to use those - learning materials with the Fedora Core packages. Install the - appropriate kernel sources, as shown earlier, and then: + kernel development assume the kernel sources are installed under + the /usr/src/linux directory. If you make a + symbolic link, as shown below, you should be able to use those + learning materials with the Fedora Core packages. Install the + appropriate kernel sources, as shown earlier, and then: 

     ln -s /usr/src/kernels/kernel-<all-the-rest> /usr/src/linux
@@ -1447,7 +1512,7 @@
 
    
 
    
 
    
-6.2.2.3.??
+7.2.2.3.??
       Preparing for Kernel Development
     
    
 
    
@@ -1456,7 +1521,7 @@
       Fedora Core 4 does not include the
       kernel-source package provided by older
       versions. Instead, configured sources are available as described
-      in Section??6.2.2.2, ???Kernel Flavors???. Users that require access to Fedora Core
+      in Section??7.2.2.2, ???Kernel Flavors???. Users that require access to Fedora Core
       original kernel sources can find them in the
       kernel .src.rpm package.
       To create an exploded source tree from this file, perform the
@@ -1469,12 +1534,12 @@
 
 
 
    
-	To simplify the following directions, we have assumed that you
-	want to configure the kernel sources to match your
-	currently-running kernel. In the steps below, you must
-	understand that the phrase
-	<version> refers to the kernel
-	version shown by this command:
+  To simplify the following directions, we have assumed that you
+  want to configure the kernel sources to match your
+  currently-running kernel. In the steps below, you must
+  understand that the phrase
+  <version> refers to the kernel
+  version shown by this command:
       
    
 
     uname -r
@@ -1486,14 +1551,14 @@
 
  • 
 
    
           Obtain the
-	  kernel-<version>.src.rpm 
-	  file from one of the following sources:
+    kernel-<version>.src.rpm
+    file from one of the following sources:
         
    
 
      
 
    • 
-	      The SRPMS directory on the
-	      appropriate SRPMS
-	      CD iso image.
+        The SRPMS directory on the
+        appropriate SRPMS
+        CD iso image.
               
      • 
 
    • 
               The FTP site where you got the kernel package.
@@ -1511,16 +1576,16 @@
 
    • 
 
      
           Install
-	  kernel-<version>.src.rpm 
-	  using the command:
+    kernel-<version>.src.rpm
+    using the command:
         
      
 
       rpm -Uvh kernel-<version>.src.rpm
 
      
 
      
           This writes the RPM contents into
-	  /usr/src/redhat/SOURCES and
-	  /usr/src/redhat/SPECS.
+    /usr/src/redhat/SOURCES and
+    /usr/src/redhat/SPECS.
         
      
 
      • 
 
    • 
@@ -1529,16 +1594,16 @@
         
      
 
       cd /usr/src/redhat/SPECS
-rpmbuild -bp --target $(arch) kernel.spec
+rpmbuild -bp --target $(arch) kernel-2.6.spec
 
      
 
      
           The kernel source tree will be located in the
-	  /usr/src/redhat/BUILD/kernel-<version> 
-	  directory. It is common practice to move the resulting
-	  linux-<version> 
-	  directory to the /usr/src tree; while not
-	  strictly necessary, we suggest that you do this to match the
-	  generally-available documentation.
+    /usr/src/redhat/BUILD/kernel-<version>
+    directory. It is common practice to move the resulting
+    linux-<version>
+    directory to the /usr/src tree; while not
+    strictly necessary, we suggest that you do this to match the
+    generally-available documentation.
         
      
 
       cd /usr/src/redhat/BUILD/kernel-<version> /usr/src/
@@ -1551,16 +1616,39 @@
 
    • 
 
      
           The configurations for the specific kernels shipped in
-	  Fedora Core 4 are in the configs/
-	  directory. For example, the i686 SMP configuration file is
-	  named
-	  configs/kernel-<version>-i686-smp.config. 
-	  Issue the following command to place the desired configuration
-	  file in the proper place for building:
+    Fedora Core 4 are in the configs/
+    directory. For example, the i686 SMP configuration file is
+    named
+    configs/kernel-<version>-i686-smp.config.
+    Issue the following command to place the desired configuration
+    file in the proper place for building:
         
      
 
       cp configs/<desired-config-file> .config
 
      
+
      
+          You can also find the .config file that matches your current kernel configuration in the /lib/modules/<version>/build/.config file.
+        
      
+
      • 
+
    • 
+
      
+          Every kernel gets a name based on its version number.
+          This is the value the uname -r command displays.
+          The kernel name is defined by the first four lines of the kernel Makefile.
+          To protect the innocent, the Makefile has been changed to generate a kernel with a different name from that of the running kernel.
+          Before a module can be accepted by the running kernel, that
+          module must have been compiled for a kernel with the correct
+          name.  To do this, you must edit the kernel Makefile
+        
      
+
      
+          For example, if the uname -r returns the string 2.6.11-1.234_FC4, change the EXTRAVERSION definition from this:
+        
      
+
      EXTRAVERSION = -prep
      
+
      to this:
      
+
      EXTRAVERSION = -1.234_FC4
      
+
      
+          that is, substitute everything from the final dash onward.
+        
      
 
      • 
 
    • 
 
      
@@ -1579,7 +1667,7 @@
 
      
 
      
 
      
-6.2.2.4.??Building Only Kernel Modules
      
+7.2.2.4.??Building Only Kernel Modules
      
 
      
 
    
 
    
@@ -1609,7 +1697,7 @@
 
    
 
    
 
    
-6.2.2.5.??Userspace Dependancies on the Kernel
    
+7.2.2.5.??User Space Dependencies on the Kernel
    
 
    
 
    • 
 
    
@@ -1618,22 +1706,22 @@
       utilities, such as management daemons. Consequently, to remove
       such a kernel, perhaps after an update, you
       cannot simply use the rpm -e
-	kernel-<version>
-      command as in earlier distributions because these userspace
+  kernel-<version>
+      command as in earlier distributions because these user space
       packages depend on the kernel package. You may either list both
-      the kernel package and its userspace dependant packages on the
+      the kernel package and its user space dependent packages on the
       rpm -e command, or you may wish to use the
       yum remove
-	kernel-<version>
+  kernel-<version>
       command instead since yum automatically removes
-      dependant packages if necesssary.
+      dependent packages if necessary.
     
    
 
    
 
 
    
 
    
 
    
-6.2.3.??Security
    
+7.2.3.??Security
    
 
    
 
 
    
@@ -1642,7 +1730,7 @@
 
    
 
    
 
    
-6.2.3.1.??Digital Certificates Consolidated
    
+7.2.3.1.??Digital Certificates Consolidated
    
 
    
 
 
    
@@ -1660,7 +1748,7 @@
       automatically installed in /etc/pki/dovecot/.
     
    
 
    
-      For information about SELinux, refer to Section??4, ???Overview of This Release???.
+      For information about SELinux, refer to Section??5, ???Overview of This Release???.
     
    
 
 
@@ -1668,7 +1756,7 @@
 
    
 
    
 
    
-6.3.??
+7.3.??
     Development Tools
   
    
 
    
@@ -1676,7 +1764,7 @@
 
    
 
    
 
    
-6.3.1.??GCC Compiler Collection
    
+7.3.1.??GCC Compiler Collection
    
 
    
 
    
 
    
@@ -1811,7 +1899,7 @@
 
    
 
    
 
    
-6.4.??Language Support
    
+7.4.??Language Support
    
 
    
 
    
 
    
@@ -1821,7 +1909,7 @@
 
    
 
    
 
    
-6.4.1.??The IIIMF Input System
    
+7.4.1.??The IIIMF Input System
    
 
    
 
 
    
@@ -1912,7 +2000,7 @@
 
    
 
    
 
    
-6.5.??Web Servers
    
+7.5.??Web Servers
    
 
    
 
 
    
@@ -1922,7 +2010,7 @@
 
    
 
    
 
    
-6.5.1.??mod_perl
    
+7.5.1.??mod_perl
    
 
    
 
 
    
@@ -1938,7 +2026,7 @@
 
    
 
    
 
    
-6.5.2.??php
    
+7.5.2.??php
    
 
    
 
 
    
@@ -1989,7 +2077,7 @@
 
    
 
    
 
    
-6.6.??Samba (Windows File System Compatibility)
    
+7.6.??Samba (Windows File System Compatibility)
    
 
    
 
 
    
@@ -2036,7 +2124,7 @@
 
    
 
    
 
    
-6.7.??X Window System (Graphics)
    
+7.7.??X Window System (Graphics)
    
 
    
 
 
    
@@ -2046,7 +2134,7 @@
 
    
 
    
 
    
-6.7.1.??xorg-x11
    
+7.7.1.??xorg-x11
    
 
    
 
 
    
@@ -2112,7 +2200,7 @@
       the core X font subsystem.  At the present time, applications
       using the Qt 3 or GTK 2 toolkits (which would include KDE and
       GNOME applications) use the fontconfig and Xft font subsystem;
-      most everything else uses the core X fonts.
+      almost everything else uses the core X fonts.
     
    
 
    
       In the future, Fedora Core may support only fontconfig/Xft in
@@ -2130,10 +2218,9 @@
       
    
 
 
    
-      If you wish to add new fonts to your Fedora Core 4
-      system, you must be aware that the steps necessary depend on which
-      font subsystem is to use the new fonts.  For the core X font
-      subsystem, you must:
+      The steps to add new fonts to Fedora Core 4 depend on the
+      fonts subsystem this is going to use the new fonts.  For the core X
+      font subsystem:
     
    
 
      
 
    1. 
@@ -2236,13 +2323,13 @@
 
      
 
      
 
      
-7.??Packages Movement
      
+8.??Packages Movement
      
 
      
 
    
 
    
 
    
 
    
-7.1.??Packages Moved to Fedora Extras
    
+8.1.??Packages Moved to Fedora Extras
    
 
    
 
 
    
@@ -2407,7 +2494,7 @@
 
    
 
    
 
    
-8.??An Overview of the Fedora Project
    
+9.??An Overview of the Fedora Project
    
 
    
 
 
    
@@ -2502,67 +2589,6 @@
       
    
 
 
-
    
-
    
-A.??Legalnotice
    
-
    
-    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.
-    
    
-
    
-    RELEASE-NOTES-FC4 (2005-05-30-T16:20-0700)
-  
    
-
    
-    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.
-  
    
-
    
 
 
 
 
    
 
    
-
    
+
    
 
    
-[D]
    
+[D]
    
 
    
 
    ?????? 1. ????? ??????? ????, ?????????????? Clearlooks ? Evince
    
 
    
@@ -149,7 +149,7 @@
 	      Evince (http://www.gnome.org/projects/evince/) — ???????? ????????? ??????????, ?????????????? ????????? ????????, ? ??? ????? pdf, postscript ? ?????? ??????.  Evince ???????? ????? ????????? ??????? ????????? ?????????? ????? ??????? ???????????.
 	    
    
 
  • 
-	      OpenOffice.org 2.0 (http://www.openoffice.org/product2/index.html) — ????? ??????? ??????????.  ? ????????? ?????? ???????? ????????? ??????????????????, ??? ? ?????????? ????????????? ? Microsoft Office, ? ????????? ?????????????? ????????? ???????? ??????????? Impress, ? ?????????? ????????? ??????? OpenDocument. ??? ?????? ????? ???????? Base — ????????? ??????????????? ??????? ?????????? ?????? ??????. ????????????? ?????? ????? ???????????? ????? ????? ?? ???????? http://marketing.openoffice.org/2.0/featureguide.html.
    • 
+	      OpenOffice.org 2.0 (http://www.openoffice.org/product2/index.php) — ????? ??????? ??????????.  ? ????????? ?????? ???????? ????????? ??????????????????, ??? ? ?????????? ????????????? ? Microsoft Office, ? ????????? ?????????????? ????????? ???????? ??????????? Impress, ? ?????????? ????????? ??????? OpenDocument. ??? ?????? ????? ???????? Base — ????????? ??????????????? ??????? ?????????? ?????? ??????. ????????????? ?????? ????? ???????????? ????? ????? ?? ???????? http://marketing.openoffice.org/2.0/featureguide.html.
    
 
  • 
 	      Eclipse 3.1 — ???????? ? ??????????? ????????? ?????????? ??, ?????????????? ????? ??????????????? ????? ?????????? (is an Integrated Development Environment, IDE), ??????? ??? ???????????????? ?? ????? ?????. 
 	    
    • 



From fedora-extras-commits at redhat.com  Wed Jul 20 00:44:04 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 19 Jul 2005 20:44:04 -0400
Subject: rpms/apel/devel apel.spec,1.2,1.3
Message-ID: <200507200044.j6K0i4X0022428@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	apel.spec 
Log Message:
* Wed Jul 20 2005 Akira TAGOH  - 10.6-8.fc5
- Disabled apel-xemacs package to avoid a chicken-egg problem.


Index: apel.spec
===================================================================
RCS file: /cvs/extras/rpms/apel/devel/apel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apel.spec	19 Jul 2005 04:54:04 -0000	1.2
+++ apel.spec	20 Jul 2005 00:44:02 -0000	1.3
@@ -1,12 +1,10 @@
 %define emacsver	20.7
-%define xemacsver	21.4.10-6
 
 %define	lispdir	%{_datadir}/emacs/site-lisp
-%define	pkgdir	%{_datadir}/xemacs/xemacs-packages
 
 Name:		apel
 Version:	10.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License:	GPL
 URL:		ftp://ftp.m17n.org/pub/mule/apel/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -20,13 +18,6 @@
 Buildrequires:  emacs
 Requires:	emacs-common
 
-%package xemacs
-Summary: A Portable [X]Emacs Library
-Group:  Applications/Editors
-Buildrequires: xemacs
-Requires: xemacs-common
-Conflicts: xemacs < %{xemacsver}
-
 %description
 APEL stands for "A Portable Emacs Library". It consists of
 following modules:
@@ -45,12 +36,6 @@
 and other some utility modules
 
 
-%description xemacs
-APEL stands for "A Portable Emacs Library". This is the 
-XEmacs version of APEL. You may install apel instead of 
-this if you use GNU Emacs.
-
-
 %prep
 %setup -q
 %patch -p1 -b .cfg
@@ -68,8 +53,6 @@
 
 make clean
 
-make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package
-
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -81,13 +64,10 @@
 %{lispdir}/apel
 
 
-%files xemacs
-%defattr(-,root,root)
-%doc README.ja README.en ChangeLog
-%{pkgdir}/lisp/apel
-
- 
 %changelog
+* Wed Jul 20 2005 Akira TAGOH  - 10.6-8.fc5
+- Disabled apel-xemacs package to avoid a chicken-egg problem.
+
 * Tue Jul 19 2005 Akira TAGOH  - 10.6-7.fc5
 - Import into Extras.
 



From fedora-extras-commits at redhat.com  Wed Jul 20 00:47:58 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 19 Jul 2005 20:47:58 -0400
Subject: common tobuild,1.1959,1.1960
Message-ID: <200507200047.j6K0lwdY022492@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22475

Modified Files:
	tobuild 
Log Message:
request build of rpms/apel/devel apel-10_6-8_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -r1.1959 -r1.1960
--- tobuild	19 Jul 2005 18:45:25 -0000	1.1959
+++ tobuild	20 Jul 2005 00:47:56 -0000	1.1960
@@ -100,3 +100,4 @@
 jpo	rpms/perl-GD/devel	perl-GD-2_25-1_fc5	devel
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
+tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel



From fedora-extras-commits at redhat.com  Wed Jul 20 08:28:13 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 20 Jul 2005 04:28:13 -0400
Subject: fedora-security/audit fc4,1.25,1.26
Message-ID: <200507200828.j6K8SD87000387@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv370

Modified Files:
	fc4 
Log Message:
Add Kate issue CAN-2005-1920



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fc4	19 Jul 2005 21:48:45 -0000	1.25
+++ fc4	20 Jul 2005 08:28:11 -0000	1.26
@@ -32,6 +32,7 @@
 2005-1937 VULNERABLE (firefox, fixed 1.0.5)
 2005-1937 VULNERABLE (mozilla, fixed 1.7.9)
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
+2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
 2005-1768 version (kernel, fixed 2.6.6)
 2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]



From fedora-extras-commits at redhat.com  Wed Jul 20 09:18:31 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:31 -0400
Subject: rpms/koffice - New directory
Message-ID: <200507200918.j6K9IV2r001660@cvs-int.fedora.redhat.com>

Author: than

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 09:18:31 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:31 -0400
Subject: rpms/koffice/devel - New directory
Message-ID: <200507200918.j6K9IVWh001665@cvs-int.fedora.redhat.com>

Author: than

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 09:18:48 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:48 -0400
Subject: rpms/koffice Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507200918.j6K9ImDe001708@cvs-int.fedora.redhat.com>

Author: than

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 20 09:18:48 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:48 -0400
Subject: rpms/koffice/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507200918.j6K9ImKH001713@cvs-int.fedora.redhat.com>

Author: than

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

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


--- NEW 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 Jul 20 09:21:52 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:21:52 -0400
Subject: rpms/koffice import.log,1.1,1.2
Message-ID: <200507200922.j6K9MMLG001844@cvs-int.fedora.redhat.com>

Author: than

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/koffice/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Jul 2005 09:18:46 -0000	1.1
+++ import.log	20 Jul 2005 09:21:50 -0000	1.2
@@ -0,0 +1 @@
+koffice-1_3_5-3:HEAD:koffice-1.3.5-3.src.rpm:1121851302



From fedora-extras-commits at redhat.com  Wed Jul 20 09:21:52 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:21:52 -0400
Subject: rpms/koffice/devel kde-libtool.patch, NONE,
	1.1 koffice-1.2.94-fPIC.patch, NONE,
	1.1 koffice-1.3-menu.patch, NONE,
	1.1 koffice-1.3.1-rpath.patch, NONE,
	1.1 koffice-1.3.5-immodule.patch, NONE, 1.1 koffice.spec, NONE,
	1.1 koshell.png, NONE, 1.1 post-1.3.5-koffice.diff, NONE,
	1.1 subdirs-koffice, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200507200921.j6K9Lqr9001833@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	.cvsignore sources 
Added Files:
	kde-libtool.patch koffice-1.2.94-fPIC.patch 
	koffice-1.3-menu.patch koffice-1.3.1-rpath.patch 
	koffice-1.3.5-immodule.patch koffice.spec koshell.png 
	post-1.3.5-koffice.diff subdirs-koffice 
Log Message:
auto-import koffice-1.3.5-3 on branch devel from koffice-1.3.5-3.src.rpm

kde-libtool.patch:

--- NEW FILE kde-libtool.patch ---
--- kdelibs-3.1/admin/ltmain.sh.orig	2003-02-20 17:52:07.000000000 -0500
+++ kdelibs-3.1/admin/ltmain.sh	2003-02-20 18:30:32.000000000 -0500
@@ -4459,6 +4459,14 @@
 	  case $host,$output,$installed,$module,$dlname in
 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
+	  newdeplib=""
+	  for j in $dependency_libs ; do
+	    if echo $j | grep "gcc-lib" >& /dev/null ; then
+	       continue
+	    fi
+	    newdeplib="$newdeplib $j"
+	  done
+	  dependency_libs="$newdeplib"
 	  $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP

koffice-1.2.94-fPIC.patch:

--- NEW FILE koffice-1.2.94-fPIC.patch ---
--- koffice-1.2.94/lib/kotext/kohyphen/Makefile.am.orig	2003-11-26 08:35:33.000000000 -0500
+++ koffice-1.2.94/lib/kotext/kohyphen/Makefile.am	2003-11-26 09:39:42.000000000 -0500
@@ -1,5 +1,6 @@
 INCLUDES = $(KOFFICECORE_INCLUDES) $(KOFFICEUI_INCLUDES) $(all_includes)
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+DEFS = -DHAVE_CONFIG_H -fPIC
 
 METASOURCES = AUTO
 
--- koffice-1.2.94/filters/kword/pdf/xpdf/goo/Makefile.am.orig	2003-11-26 11:29:36.000000000 -0500
+++ koffice-1.2.94/filters/kword/pdf/xpdf/goo/Makefile.am	2003-11-26 11:31:19.000000000 -0500
@@ -1,6 +1,8 @@
 
 INCLUDES= -I$(srcdir)
 
+DEFS = -DHAVE_CONFIG_H -fPIC
+
 noinst_LTLIBRARIES = libgoo.la
 
 libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gmempp.cc gfile.cc \
--- koffice-1.2.94/karbon/render/xrgbrender/Makefile.am.orig	2003-11-26 10:44:03.000000000 -0500
+++ koffice-1.2.94/karbon/render/xrgbrender/Makefile.am	2003-11-26 10:45:40.000000000 -0500
@@ -1,5 +1,7 @@
 INCLUDES = $(all_includes)
 
+DEFS = -DHAVE_CONFIG_H -fPIC
+
 noinst_LTLIBRARIES = libkarbonxrgbrender.la
 
 libkarbonxrgbrender_la_SOURCES = gdk-pixbuf-xlib.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlibrgb.c
--- koffice-1.2.94/karbon/render/Makefile.am.orig	2003-11-26 10:29:42.000000000 -0500
+++ koffice-1.2.94/karbon/render/Makefile.am	2003-11-26 10:29:59.000000000 -0500
@@ -1,5 +1,7 @@
 SUBDIRS = xrgbrender
 
+DEFS = -DHAVE_CONFIG_H -fPIC
+
 INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/xrgbrender \

koffice-1.3-menu.patch:

--- NEW FILE koffice-1.3-menu.patch ---
--- koffice-1.3/kformula/kformula.desktop.orig	2004-05-03 16:32:04.976158569 +0200
+++ koffice-1.3/kformula/kformula.desktop	2004-05-03 16:31:46.370430290 +0200
@@ -73,4 +73,4 @@
 X-KDE-NativeMimeType=application/x-kformula
 X-DCOP-ServiceType=Multi
 DocPath=kformula/index.html
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kword/kword.desktop.orig	2004-05-03 16:46:47.181776614 +0200
+++ koffice-1.3/kword/kword.desktop	2004-05-03 16:46:55.406212995 +0200
@@ -69,4 +69,4 @@
 DocPath=kword/index.html
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kivio/kiviopart/kivio.desktop.orig	2004-05-03 16:32:53.579836094 +0200
+++ koffice-1.3/kivio/kiviopart/kivio.desktop	2004-05-03 16:33:15.257354087 +0200
@@ -50,4 +50,4 @@
 X-KDE-NativeMimeType=application/x-kivio
 DocPath=kivio/index.html
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/koshell/koshell.desktop.orig	2004-05-03 16:33:25.095681446 +0200
+++ koffice-1.3/koshell/koshell.desktop	2004-05-03 16:33:36.724886332 +0200
@@ -107,4 +107,4 @@
 Icon=koshell
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kchart/kchart.desktop.orig	2004-05-03 16:31:05.656212886 +0200
+++ koffice-1.3/kchart/kchart.desktop	2004-05-03 16:31:31.039478120 +0200
@@ -65,4 +65,4 @@
 X-KDE-NativeMimeType=application/x-kchart
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kpresenter/kpresenter.desktop.orig	2004-05-03 16:33:56.384542092 +0200
+++ koffice-1.3/kpresenter/kpresenter.desktop	2004-05-03 16:34:04.554983410 +0200
@@ -72,4 +72,4 @@
 X-DCOP-ServiceType=multi
 DocPath=kpresenter/index.html
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kugar/kudesigner/kudesigner.desktop.orig	2004-05-03 16:35:59.449125628 +0200
+++ koffice-1.3/kugar/kudesigner/kudesigner.desktop	2004-05-03 16:45:51.727576563 +0200
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Type=Application
 Exec=kudesigner %u
-Icon=kudesigner
+Icon=kugar
 DocPath=kugar/index.html
 Terminal=0
 Name=Kugar Designer
@@ -117,5 +117,4 @@
 X-KDE-NativeMimeType=application/x-kudesigner
 X-KDE-Library=libkudesignerpart
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kugar/part/kugar.desktop.orig	2004-05-03 16:46:26.080222642 +0200
+++ koffice-1.3/kugar/part/kugar.desktop	2004-05-03 16:46:35.746560246 +0200
@@ -62,4 +62,4 @@
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,Browser/View
 X-KDE-Library=libkugarpart
 X-KDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kspread/kspread.desktop.orig	2004-05-03 16:34:13.401378491 +0200
+++ koffice-1.3/kspread/kspread.desktop	2004-05-03 16:34:20.582887406 +0200
@@ -67,4 +67,4 @@
 X-DCOP-ServiceType=multi
 DocPath=kspread/index.html
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/karbon/data/karbon.desktop.orig	2004-05-03 16:30:25.152980683 +0200
+++ koffice-1.3/karbon/data/karbon.desktop	2004-05-03 16:30:46.361531438 +0200
@@ -57,4 +57,4 @@
 Icon=karbon
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-NativeMimeType=application/x-karbon
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3.1/tools/kthesaurus/KThesaurus.desktop.menu	2004-05-01 13:10:32.000000000 +0200
+++ koffice-1.3.1/tools/kthesaurus/KThesaurus.desktop	2004-05-13 16:14:49.935630742 +0200
@@ -51,4 +51,6 @@
 GenericName[zh_CN]=????????????
 GenericName[zh_TW]=????????????
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
+NoDisplay=true
+OnlyShowIn=KDE;

koffice-1.3.1-rpath.patch:

--- NEW FILE koffice-1.3.1-rpath.patch ---
--- koffice-1.3.1/filters/xsltfilter/configure.in.in.orig	2004-05-13 15:56:37.102877830 +0200
+++ koffice-1.3.1/filters/xsltfilter/configure.in.in	2004-05-13 16:08:01.800868541 +0200
@@ -55,7 +55,7 @@
 fi
 
 if test ! "$USE_RPATH" = "yes"; then
-    LIBXLST_RPATH=
+    LIBXSLT_RPATH=
     LIBXML_RPATH=
 fi
 

koffice-1.3.5-immodule.patch:

--- NEW FILE koffice-1.3.5-immodule.patch ---
--- koffice-1.3.5/kword/kwtextframeset.cc.orig	2005-02-12 12:31:57.000000000 +0100
+++ koffice-1.3.5/kword/kwtextframeset.cc	2005-02-12 12:59:47.814137014 +0100
@@ -3225,6 +3225,21 @@
     textView()->handleKeyReleaseEvent( e );
 }
 
+void KWTextFrameSetEdit::imStartEvent( QIMEvent* e )
+{
+    textView()->handleImStartEvent( e );
+}
+
+void KWTextFrameSetEdit::imComposeEvent( QIMEvent* e )
+{
+    textView()->handleImComposeEvent( e );
+}
+
+void KWTextFrameSetEdit::imEndEvent( QIMEvent* e )
+{
+    textView()->handleImEndEvent( e );
+}
+
 void KWTextFrameSetEdit::mousePressEvent( QMouseEvent *e, const QPoint &, const KoPoint & dPoint )
 {
     if ( dPoint.x() < 0 || dPoint.y() < 0 )
--- koffice-1.3.5/kword/kwtextframeset.h.orig	2005-02-12 12:32:08.000000000 +0100
+++ koffice-1.3.5/kword/kwtextframeset.h	2005-02-11 17:37:05.000000000 +0100
@@ -360,6 +360,9 @@
     // Events forwarded by the canvas (when being in "edit" mode)
     virtual void keyPressEvent( QKeyEvent * );
     virtual void keyReleaseEvent( QKeyEvent * );
+    virtual void imStartEvent( QIMEvent * );
+    virtual void imComposeEvent( QIMEvent * );
+    virtual void imEndEvent( QIMEvent * );
     virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & );
     virtual void mouseMoveEvent( QMouseEvent *, const QPoint &, const KoPoint & ); // only called if button is pressed
     virtual void mouseReleaseEvent( QMouseEvent *, const QPoint &, const KoPoint & );
--- koffice-1.3.5/kword/kwcanvas.cc.orig	2005-02-12 12:32:28.000000000 +0100
+++ koffice-1.3.5/kword/kwcanvas.cc	2005-02-11 23:27:42.000000000 +0100
@@ -101,6 +101,7 @@
     viewport()->setFocusProxy( this );
     viewport()->setFocusPolicy( WheelFocus );
     setFocus();
+    setInputMethodEnabled( true );
     viewport()->installEventFilter( this );
     installEventFilter( this );
     KCursor::setAutoHideCursor( this, true, true );
@@ -2573,6 +2574,24 @@
                 }
             }
             break;
+        case QEvent::IMStart:
+        {
+            QIMEvent * imev = static_cast(e);
+            m_currentFrameSetEdit->imStartEvent( imev );
+        }
+        break;
+        case QEvent::IMCompose:
+        {
+            QIMEvent * imev = static_cast(e);
+            m_currentFrameSetEdit->imComposeEvent( imev );
+        }
+        break;
+        case QEvent::IMEnd:
+        {
+            QIMEvent * imev = static_cast(e);
+            m_currentFrameSetEdit->imEndEvent( imev );
+        }
+        break;
         default:
             break;
         }
--- koffice-1.3.5/kword/kwframe.h.orig	2005-02-12 12:32:45.000000000 +0100
+++ koffice-1.3.5/kword/kwframe.h	2005-02-11 23:09:46.000000000 +0100
@@ -369,6 +369,9 @@
     // Events forwarded by the canvas (when being in "edit" mode)
     virtual void keyPressEvent( QKeyEvent * ) {}
     virtual void keyReleaseEvent( QKeyEvent * ) {}
+    virtual void imStartEvent( QIMEvent * ) {}
+    virtual void imComposeEvent( QIMEvent * ) {}
+    virtual void imEndEvent( QIMEvent * ) {}
     virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {}
     virtual void mouseMoveEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {} // only called if button is pressed
     virtual void mouseReleaseEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {}
--- koffice-1.3.5/kspread/kspread_canvas.h.orig	2005-02-12 12:33:03.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_canvas.h	2005-02-11 18:48:17.000000000 +0100
@@ -512,6 +512,8 @@
   void processOtherKey(QKeyEvent *event);
   bool processControlArrowKey(QKeyEvent *event);
 
+  void processIMEvent( QIMEvent * event );
+
   void updateChooseRect(const QPoint &newMarker, const QPoint &newAnchor);
 
   /**
--- koffice-1.3.5/kspread/kspread_canvas.cc.orig	2005-02-12 12:33:18.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_canvas.cc	2005-02-12 14:49:49.950569130 +0100
@@ -338,6 +338,7 @@
   installEventFilter( this );
   (void)new KSpreadToolTip( this );
   setAcceptDrops( true );
+  setInputMethodEnabled( true ); // ensure using the InputMethod
 }
 
 KSpreadCanvas::~KSpreadCanvas()
@@ -363,6 +364,15 @@
       keyPressEvent ( keyev );
       return true;
     }
+    break;
+  }
+  case QEvent::IMStart:
+  case QEvent::IMCompose:
+  case QEvent::IMEnd:
+  {
+      QIMEvent * imev = static_cast(e);
+      processIMEvent( imev );
+      break;
   }
   default:
     break;
@@ -2423,6 +2433,31 @@
   cell->setCellText( util_dateFormat(m_pDoc->locale(), date, KSpreadCell::ShortDate) );
 }
 
+void KSpreadCanvas::processIMEvent( QIMEvent * event )
+{
+  m_pDoc->emitBeginOperation( false );
+  if ( !m_pEditor && !m_bChoose )
+  {
+    // Switch to editing mode
+    createEditor( CellEditor );
+    m_pEditor->handleIMEvent( event );
+  }
+  
+  QPoint cursor;
+  
+  if ( m_bChoose )
+  {
+    cursor = selectionInfo()->getChooseCursor();
+    /* if the cursor is unset, pretend we're starting at the regular cursor */
+    if (cursor.x() == 0 || cursor.y() == 0)
+      cursor = selectionInfo()->cursorPosition();
+  }
+  else
+    cursor = selectionInfo()->cursorPosition();
+ 
+  m_pDoc->emitEndOperation( QRect( cursor, cursor ) );
+}
+
 bool KSpreadCanvas::formatKeyPress( QKeyEvent * _ev )
 {
   if (!(_ev->state() & ControlButton ))
--- koffice-1.3.5/kspread/kspread_editors.cc.orig	2005-02-12 12:33:32.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_editors.cc	2005-02-11 18:48:17.000000000 +0100
@@ -249,7 +249,13 @@
     return;
   }
 
-  // Send the key event to the QLineEdit
+  // Send the key event to the KLineEdit
+  QApplication::sendEvent( m_pEdit, _ev );
+}
+
+void KSpreadTextEditor::handleIMEvent( QIMEvent * _ev )
+{
+    // send the IM event to the KLineEdit
   QApplication::sendEvent( m_pEdit, _ev );
 }
 
@@ -288,7 +294,7 @@
 
 bool KSpreadTextEditor::eventFilter( QObject* o, QEvent* e )
 {
-    // Only interested in QLineEdit
+    // Only interested in KLineEdit
     if ( o != m_pEdit )
         return FALSE;
     if ( e->type() == QEvent::FocusOut )
--- koffice-1.3.5/kspread/kspread_editors.h.orig	2005-02-12 12:34:13.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_editors.h	2005-02-11 18:48:17.000000000 +0100
@@ -19,6 +19,7 @@
     KSpreadCell* cell()const { return m_pCell; }
 
     virtual void handleKeyPressEvent( QKeyEvent* _ev ) = 0;
+    virtual void handleIMEvent( QIMEvent * _ev ) = 0;
     virtual void setEditorFont(QFont const & font, bool updateSize) = 0;
     virtual QString text() const = 0;
     virtual void setText(QString text) = 0;
@@ -44,6 +45,7 @@
     ~KSpreadTextEditor();
 
     virtual void handleKeyPressEvent( QKeyEvent* _ev );
+    virtual void handleIMEvent( QIMEvent * _ev );
     virtual void setEditorFont(QFont const & font, bool updateSize);
     virtual QString text() const;
     virtual void setText(QString text);
--- koffice-1.3.5/lib/kotext/kotextview.h.orig	2005-02-12 12:34:27.043854371 +0100
+++ koffice-1.3.5/lib/kotext/kotextview.h	2005-02-11 18:48:17.000000000 +0100
@@ -109,6 +109,9 @@
     void focusOutEvent();
     void handleKeyPressEvent( QKeyEvent * e );
     void handleKeyReleaseEvent( QKeyEvent * e );
+    void handleImStartEvent( QIMEvent * e );
+    void handleImComposeEvent( QIMEvent * e );
+    void handleImEndEvent( QIMEvent * e );
     // iPoint is in Layout Unit pixels
     // return true if we add new parag with "insert direct cursor"
     bool handleMousePressEvent( QMouseEvent* e, const QPoint& iPoint, bool canStartDrag = true, bool insertDirectCursor = false );
--- koffice-1.3.5/lib/kotext/korichtext.cpp.orig	2005-02-12 12:34:40.760827475 +0100
+++ koffice-1.3.5/lib/kotext/korichtext.cpp	2005-02-11 22:31:15.000000000 +0100
@@ -1339,7 +1339,7 @@
     m_pageBreakEnabled = false;
     //minw = 0;
     align = Qt::AlignAuto;
-    nSelections = 1;
+    nSelections = 2;
     addMargs = FALSE;
 
 #if 0
@@ -1380,6 +1380,7 @@
 
     selectionColors[ Standard ] = QApplication::palette().color( QPalette::Active, QColorGroup::Highlight );
     selectionText[ Standard ] = TRUE;
+    selectionText[ InputMethodPreedit ] = FALSE;
     commandHistory = new KoTextDocCommandHistory( 100 );
     tStopWidth = formatCollection()->defaultFormat()->width( 'x' ) * 8;
 }
--- koffice-1.3.5/lib/kotext/kotextdocument.h.orig	2005-02-12 12:34:55.299679135 +0100
+++ koffice-1.3.5/lib/kotext/kotextdocument.h	2005-02-11 18:48:17.000000000 +0100
@@ -49,6 +49,7 @@
 public:
     enum SelectionIds {
 	Standard = 0,
+        InputMethodPreedit = 1,
 	Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to
 	// remove multiple lines with removeSelectedText()
     };
--- koffice-1.3.5/lib/kotext/kotextobject.cc.orig	2005-02-12 12:35:12.340161140 +0100
+++ koffice-1.3.5/lib/kotext/kotextobject.cc	2005-02-11 18:48:17.000000000 +0100
@@ -635,6 +635,7 @@
     textdoc->setSelectionEnd( KoTextDocument::Temp, cursor );
     //kdDebug(32500) << "KoTextObject::insert setting format " << currentFormat << endl;
     textdoc->setFormat( KoTextDocument::Temp, currentFormat, KoTextFormat::Format );
+    textdoc->setFormat( KoTextDocument::InputMethodPreedit, currentFormat, KoTextFormat::Format );
     textdoc->removeSelection( KoTextDocument::Temp );
 
     // Speed optimization: if we only type a char, and it doesn't
@@ -1396,7 +1397,7 @@
     emit ensureCursorVisible();
     emit updateUI( true );
     emit showCursor();
-    if(selectionId==KoTextDocument::Standard)
+    if(selectionId==KoTextDocument::Standard || selectionId==KoTextDocument::InputMethodPreedit)
         selectionChangedNotify();
     if ( createUndoRedo)
         undoRedoInfo.clear();
--- koffice-1.3.5/lib/kotext/kotextparag.cc.orig	2005-02-12 12:35:21.975737334 +0100
+++ koffice-1.3.5/lib/kotext/kotextparag.cc	2005-02-11 18:48:17.000000000 +0100
@@ -772,17 +772,38 @@
 	for ( int j = 0; j < nSels; ++j ) {
 	    if ( start >= selectionStarts[ j ] && start < selectionEnds[ j ] ) {
                 inSelection = true;
-		if ( j == KoTextDocument::Standard )
-		    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, cg.color( QColorGroup::Highlight ) );
-		else
-		    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
-                break;
+                switch (j) {
+                case KoTextDocument::Standard:
+                    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, cg.color( QColorGroup::Highlight ) );
+                    break;
+                case KoTextDocument::InputMethodPreedit:
+                    // no highlight
+                    break;
+                default:
+                    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
+                    break;
+                }
 	    }
 	}
         if ( !inSelection )
             drawSelections = false; // save time in drawParagStringInternal
     }
 
+    // Draw InputMethod Preedit Underline
+    const int nSels = doc ? doc->numSelections() : 1;
+    for ( int j = 0; j < nSels; j++ ) {
+        if ( start >= selectionStarts[ j ] && start < selectionEnds[ j ] ) {
+            if ( j == KoTextDocument::InputMethodPreedit ) {
+                QColor textColor( format->color() );
+                painter.setPen( QPen( textColor ) );
+
+                QPoint p1( startX_pix, lastY_pix + h_pix - 1 );
+                QPoint p2( startX_pix + bw_pix, lastY_pix + h_pix - 1 );
+                painter.drawLine( p1, p2 );
+            }
+        }
+    }
+
     if ( draw_len > 0 )
     {
         int draw_startX_pix = zh->layoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
--- koffice-1.3.5/lib/kotext/kotextview.cc.orig	2005-02-12 12:35:35.814692414 +0100
+++ koffice-1.3.5/lib/kotext/kotextview.cc	2005-02-12 12:54:56.637162921 +0100
@@ -391,6 +391,60 @@
     }
 }
 
+void KoTextView::handleImStartEvent( QIMEvent * e )
+{
+    // nothing to do
+    ;
+}
+
+void KoTextView::handleImComposeEvent( QIMEvent * e )
+{
+    // remove old preedit
+    if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
+        textDocument()->removeSelection( KoTextDocument::Standard );
+    if ( textDocument()->hasSelection( KoTextDocument::InputMethodPreedit ) )
+        textDocument()->removeSelectedText( KoTextDocument::InputMethodPreedit, m_cursor );
+
+    // insert preedit
+    int preeditStartIdx = m_cursor->index();
+    textDocument()->setSelectionStart( KoTextDocument::InputMethodPreedit, m_cursor );
+    textObject()->insert( m_cursor, m_currentFormat, e->text(), false, true, i18n("Insert Text"),
+								  CustomItemsMap(),
+								  KoTextDocument::Standard,
+								  false /* NOT REPAINT CURSOR! */);
+    textDocument()->setSelectionEnd( KoTextDocument::InputMethodPreedit, m_cursor );
+
+    // selection
+    int preeditSelStart = preeditStartIdx + e->cursorPos();
+    int preeditSelEnd   = preeditSelStart + e->selectionLength();
+    m_cursor->setIndex( preeditSelStart );
+    textDocument()->setSelectionStart( KoTextDocument::Standard, m_cursor );
+    m_cursor->setIndex( preeditSelEnd );
+    textDocument()->setSelectionEnd( KoTextDocument::Standard, m_cursor );
+
+    // set cursor pos
+    m_cursor->setIndex( preeditSelStart );
+
+    textObject()->emitUpdateUI( true );
+    textObject()->emitShowCursor();
+    textObject()->selectionChangedNotify();
+}
+
+void KoTextView::handleImEndEvent( QIMEvent * e )
+{
+    // remove old preedit
+    if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
+        textDocument()->removeSelection( KoTextDocument::Standard  );
+    if ( textDocument()->hasSelection( KoTextDocument::InputMethodPreedit ) )
+        textDocument()->removeSelectedText( KoTextDocument::InputMethodPreedit, m_cursor );
+
+    insertText( e->text() );
+
+    textObject()->emitUpdateUI( true );
+    textObject()->emitShowCursor();
+    textObject()->selectionChangedNotify();
+}
+
 void KoTextView::completion()
 {
     doCompletion(m_cursor, m_cursor->parag(),
--- koffice-1.3.5/kpresenter/kprcanvas.cc.orig	2005-02-12 12:35:50.000000000 +0100
+++ koffice-1.3.5/kpresenter/kprcanvas.cc	2005-02-12 14:48:38.848075625 +0100
@@ -151,6 +151,7 @@
     setFocusPolicy( QWidget::StrongFocus );
     setFocus();
     setKeyCompression( true );
+    setInputMethodEnabled( true ); // ensure using the InputMethod
     installEventFilter( this );
     KCursor::setAutoHideCursor( this, true, true );
     m_zoomBeforePresentation=100;
@@ -2381,6 +2382,35 @@
     }
 }
 
+void KPrCanvas::imStartEvent( QIMEvent * e )
+{
+    if ( editNum && m_currentTextObjectView )
+    {
+        if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+            m_currentTextObjectView->imStartEvent( e );
+        else
+            KMessageBox::information(this, i18n("Read-only content cannot be changed. No modifications will be accepted."));
+    }
+}
+
+void KPrCanvas::imComposeEvent( QIMEvent * e )
+{
+    if ( editNum && m_currentTextObjectView )
+    {
+        if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+            m_currentTextObjectView->imComposeEvent( e );
+    }
+}
+
+void KPrCanvas::imEndEvent( QIMEvent * e )
+{
+    if ( editNum && m_currentTextObjectView )
+    {
+        if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+            m_currentTextObjectView->imEndEvent( e );
+    }
+}
+
 void KPrCanvas::resizeEvent( QResizeEvent *e )
 {
     if ( editMode )
--- koffice-1.3.5/kpresenter/kprcanvas.h.orig	2005-02-12 12:36:04.000000000 +0100
+++ koffice-1.3.5/kpresenter/kprcanvas.h	2005-02-11 18:48:17.000000000 +0100
@@ -455,6 +455,9 @@
     virtual void dropEvent( QDropEvent *e );
     virtual void keyPressEvent( QKeyEvent *e );
     virtual void keyReleaseEvent( QKeyEvent *e );
+    virtual void imStartEvent( QIMEvent * e );
+    virtual void imComposeEvent( QIMEvent * e );
+    virtual void imEndEvent( QIMEvent * e );
 
     void eraseEmptySpace( QPainter * painter, const QRegion & emptySpaceRegion, const QBrush & brush ) const;
 
--- koffice-1.3.5/kpresenter/kptextobject.h.orig	2005-02-12 12:36:19.000000000 +0100
+++ koffice-1.3.5/kpresenter/kptextobject.h	2005-02-11 18:48:17.000000000 +0100
@@ -223,8 +223,10 @@
 
     void keyPressEvent( QKeyEvent * );
     void keyReleaseEvent( QKeyEvent * );
+    void imStartEvent( QIMEvent * );
+    void imComposeEvent( QIMEvent * );
+    void imEndEvent( QIMEvent * );
     void mousePressEvent( QMouseEvent *, const QPoint &);
-
     void mouseMoveEvent( QMouseEvent *, const QPoint & );
     void mouseReleaseEvent( QMouseEvent *, const QPoint & );
     void mouseDoubleClickEvent( QMouseEvent *, const QPoint &);
--- koffice-1.3.5/kpresenter/kptextobject.cc.orig	2005-02-12 12:36:32.000000000 +0100
+++ koffice-1.3.5/kpresenter/kptextobject.cc	2005-02-11 18:48:17.000000000 +0100
@@ -1919,6 +1919,21 @@
     handleKeyReleaseEvent(e);
 }
 
+void KPTextView::imStartEvent( QIMEvent *e )
+{
+    handleImStartEvent(e);
+}
+
+void KPTextView::imComposeEvent( QIMEvent *e )
+{
+    handleImComposeEvent(e);
+}
+
+void KPTextView::imEndEvent( QIMEvent *e )
+{
+    handleImEndEvent(e);
+}
+
 void KPTextView::clearSelection()
 {
     if ( textDocument()->hasSelection( KoTextDocument::Standard ) )


--- NEW FILE koffice.spec ---
%define debug 0
%define final 0

%define qt_version 3.3.3
%define kde_version 3.3.0

%define redhatify 1

%define libtool 1

%define buildall 0

Name: koffice
Version: 1.3.5
Release: 3
Epoch: 4
URL: http://koffice.kde.org/
Summary: A set of office applications for KDE.
Group: User Interface/Desktops
License: GPL
BuildRoot: %{_tmppath}/%{name}-buildroot

Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-i18n-%{version}.tar.bz2
Source2: koshell.png
Source3: subdirs-koffice

Patch0: kde-libtool.patch
Patch1: koffice-1.2.94-fPIC.patch
Patch2: koffice-1.3-menu.patch 
Patch3: koffice-1.3.1-rpath.patch
Patch4: koffice-1.3.5-immodule.patch

# security fixes
# kpdf Buffer Overflow Vulnerability, CAN-2005-0064
Patch100: post-1.3.5-koffice.diff

Prereq: kdelibs >= 6:%{kde_version}

Obsoletes: killustrator
Obsoletes: kivio

Requires(post,postun): /sbin/ldconfig
Requires: kdelibs >= 6:%{kde_version}
Requires: kdebase >= 6:%{kde_version}

BuildRequires: kdelibs-devel >= %{kde_version}
BuildRequires: kdebase-devel >= %{kde_version}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: glibc-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: qt-devel >= %{qt_version}
BuildRequires: perl

%package devel
Summary: Development files for KOffice
Group: Development/Libraries
Requires: qt-devel >= 1:%{qt_version}
Requires: %{name} = %{epoch}:%{version}-%{release}

%package i18n
Summary: Internationalization support for koffice
Group: User Interface/Desktops
Requires: %{name} = %{epoch}:%{version}-%{release}

%description
The koffice package contains the KOffice office-type applications for
the K Desktop Environment (KDE) GUI desktop. KOffice contains KWord, a
word processor; KSpread, a spreadsheet; KPresenter, for presentations;
and KChart, a diagram generator.

%description devel
Development files for KOffice. Install koffice-devel if you want to develop
or compile plugins for KOffice.

%description i18n
Koffice is an Open Source, community-developed, multi-platform office
productivity suite.  This package provides Internationalization support
for Koffice.


%prep
%setup -q
%patch0 -p1 -b .libtool
%patch1 -p1 -b .fPIC
%patch2 -p1 -b .menu
%patch3 -p1 -b .rpath
%patch4 -p1 -b .im
%patch100 -p1 -b .CAN-2005-0064

# Workaround for legacy auto* tools
%if %{libtool}
  make -f admin/Makefile.common cvs
%endif

%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNO_DEBUG -DNDEBUG"
export KDEDIR=%{_prefix}
export CFLAGS="$FLAGS"
export CXXFLAGS="$FLAGS"

# koffice
%configure \
%if %{final}
   --enable-final \
%endif
   --disable-rpath \
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir} \
   --includedir=%{_includedir}/kde

make %{?_smp_mflags}

# koffice-i18n
tar jxf %{SOURCE1}
pushd %{name}-i18n-%{version}
%if ! %{buildall}
  rm -rf ar bg bs eo eu fa lt ms mt se sr sq ta th ven vi xh zu
  cp %{SOURCE3} subdirs
%endif
%if %{libtool}
  make -f admin/Makefile.common cvs
%endif
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT -C %{name}-i18n-%{version} install

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/

# Replace absolute symlinks with relative ones
pushd $RPM_BUILD_ROOT%{_docdir}/HTML
for lang in *; do
  if [ -d $lang ]; then
    pushd $lang
    for i in *; do
      if [ -d $i -a -L $i/common ]; then
        rm -f $i/common
        ln -sf ../common $i
      fi
    done
    popd
  fi
done
popd

# conflict with kde-i18n
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/kdgantt*

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc %{_docdir}/HTML/en/*
%{_bindir}/*
%{_libdir}/*.so.??*
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/kde3/*
%{_datadir}/applnk/Office
%{_datadir}/apps/*
%{_datadir}/icons/*/*/*/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/templates

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

%files i18n
%defattr(-,root,root)
%{_datadir}/apps/koffice/autocorrect

%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*

%if %{buildall}
%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
%endif

%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
%lang(da) %doc %{_docdir}/HTML/da/*
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
%lang(de) %doc %{_docdir}/HTML/de/*
%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
%lang(en_GB) %doc %{_docdir}/HTML/en_GB/*

%if %{buildall}
%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
%endif

%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
%lang(es) %doc %{_docdir}/HTML/es/*
%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
%lang(et) %doc %{_docdir}/HTML/et/*

%if %{buildall}
%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
%endif

%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
%lang(fr) %doc %{_docdir}/HTML/fr/*
%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
%lang(it) %doc %{_docdir}/HTML/it/*
%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*

%if %{buildall}
%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
%endif

%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
%lang(pl) %doc %{_docdir}/HTML/pl/*
%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
%lang(pt) %doc %{_docdir}/HTML/pt/*
%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
%lang(ru) %doc %{_docdir}/HTML/ru/*

%if %{buildall}
%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
%endif

%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
%lang(sk) %doc %{_docdir}/HTML/sk/*
%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
%lang(sl) %doc %{_docdir}/HTML/sl/*

%if %{buildall}
%lang(sq) %{_datadir}/locale/sq/LC_MESSAGES/*
%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
%endif

%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
%lang(sv) %doc %{_docdir}/HTML/sv/*

%if %{buildall}
%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
%endif

%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*

%if %{buildall}
%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
%endif

%if %{buildall}
%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
%endif

%if %{buildall}
%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
%lang(xh) %doc %{_docdir}/HTML/xh/*
%endif

%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*

%if %{buildall}
%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/*
%endif

%changelog
* Sat Feb 12 2005 Than Ngo  4:1.3.5-3
- backport from CVS for working with qt-immodule

* Sat Jan 22 2005 Than Ngo  4:1.3.5-2
- Apply patch to fix CAN-2005-0064

* Wed Nov 24 2004 Than Ngo  4:1.3.5-1
- 1.3.5

* Thu Nov 11 2004 Than Ngo  4:1.3.4-3
- rebuilt

* Sun Oct 31 2004 Than Ngo  4:1.3.4-2
- apply better pdf fix

* Wed Oct 27 2004 Than Ngo  4:1.3.4-1
- update to 1.3.4

* Wed Sep 15 2004 Than Ngo  4:1.3.3-1
- update to 1.3.3

* Tue Jul 13 2004 Than Ngo  4:1.3.2-2
- rebuild

* Thu Jul 01 2004 Than Ngo  4:1.3.2-1
- update to 1.3.2

* Mon Jun 21 2004 Than Ngo  4:1.3.1-5
- fix build problem with gcc-3.4

* Fri Jun 18 2004 Than Ngo  4:1.3.1-4
- rebuilt

* Tue Jun 15 2004 Elliot Lee 
- rebuilt

* Thu May 13 2004 Than Ngo  1.3.1-2
- get rid of rpath

* Tue May 04 2004 Than Ngo  1.3.1-1
- update to 1.3.1

* Mon May 03 2004 Than Ngo  1.3-6
- cleanup GNOME/KDE menu, add X-KDE-More in Categories
- add some fixes from CVS stable branch

* Tue Mar 02 2004 Elliot Lee 
- rebuilt

* Wed Feb 25 2004 Than Ngo  4:1.3-5
- add patch files from CVS

* Sat Feb 14 2004 Than Ngo  4:1.3-4
- rebuilt against qt 3.3.0

* Fri Feb 13 2004 Elliot Lee 
- rebuilt

* Mon Jan 26 2004 Tim Powers  4:1.3-2
- rebuild to pick up new ImageMagick deps

* Mon Jan 19 2004 Than Ngo  4:1.3-1
- 1.3 release

* Tue Jan 13 2004 Than Ngo  4:1.2.95-3
- fixed conflict problem with kde-i18n

* Fri Jan 09 2004 Than Ngo  4:1.2.95-2
- add missing zh_CN

* Thu Jan 08 2004 Than Ngo  4:1.2.95-1
- 1.3 rc2

* Wed Nov 26 2003 Than Ngo  4:1.2.94-0.3
- koffice-i18n as subpackage
- fixed fPIC problem on x86_64

* Sat Nov 15 2003 Than Ngo  4:1.2.94-0.2
- get rid of koffice-i18n, make koffice-i18n as separate rpm

* Thu Nov 13 2003 Than Ngo  4:1.2.94-0.1
- 1.3 rc1
- cleanup

* Tue Oct 21 2003 Than Ngo  4:1.2.1-15
- rebuild

* Fri Aug 29 2003 Than Ngo  4:1.2.1-14
- fix build problem with gcc 3.3

* Tue Jul  8 2003 Than Ngo  1.2.1-13
- fixed a bug, which caused koffices apps crash
  in Gnome Desktop (bug #76232,#84678,#86479,#80926,#92044)

* Thu Jun 26 2003 Than Ngo  1.2.1-12
- add patch for checking vsnprintf (Sysoltsev Slawa), bug #89142

* Wed Jun 25 2003 Than Ngo  1.2.1-11
- rebuilt

* Wed Jun 04 2003 Elliot Lee 
- rebuilt

* Wed Jun  4 2003 Than Ngo  1.2.1-9
- fix build with gcc 3.3

* Mon Mar 24 2003 Than Ngo  1.2.1-8
- rebuild against kde 3.1.1

* Mon Feb 24 2003 Elliot Lee 
- rebuilt

* Mon Feb 24 2003 Elliot Lee 
- rebuilt

* Mon Feb 24 2003 Elliot Lee 
- rebuilt

* Thu Feb 20 2003 Than Ngo  1.2.1-4
- get rid of gcc path from dependency_libs
- add requires kdebase, #84678

* Thu Feb 13 2003 Than Ngo  1.2.1-3
- rebuild against new arts

* Mon Jan 27 2003 Than Ngo  1.2.1-2
- fix #81300
- add a patch file, it fixes a crash when closing the "Insert Special Character" dialog,
  and a crash when updating the Table Of Contents
- cleanup specfile

* Wed Jan 22 2003 Tim Powers 
- rebuilt

* Wed Dec 11 2002 Than Ngo  1.2.1-1
- cleanup specfile
- remove a patch file, which is in upstream
- dangling symlinks (bug #78089)
- fPIC issue

* Sun Nov 10 2002 Than Ngo  1.2-2
- fix some build problem

* Mon Oct 14 2002 Than Ngo  1.2-1
- 1.2

* Mon Aug 12 2002 Than Ngo  1.2-0.rc1.3
- Add missing desktop files for servicetype

* Fri Aug  9 2002 Than Ngo  1.2-0.rc1.2
- add desktopfix patch file from Harald Hoyer
- desktop file issues

* Tue Aug  7 2002 Bernhard Rosenkraenzer  1.2-0.rc1.1
- rc1

* Tue Jul 23 2002 Tim Powers  1.2-0.beta2.3
- build using gcc-3.2-0.1

* Tue Jul 09 2002 Than Ngo  1.2-0.beta2.2
- use desktop-file-install

* Tue Apr 16 2002 Bernhard Rosenkraenzer  1.1.1-5
- Change sonames

* Thu Mar 28 2002 Than Ngo  1.1.1-4
- fix conflicts with kdelibs and kde-i18n

* Wed Mar 27 2002 Bernhard Rosenkraenzer  1.1.1-3
- Revert to 1.1.1 branch, 1.2/2.0 won't be out in time.

* Wed Jan  9 2002 Bernhard Rosenkraenzer  1.1.1-2
- Rename kra*** to kopaint

* Fri Dec 14 2001 Bernhard Rosenkraenzer  1.1.1-1
- 1.1.1

* Wed Aug 29 2001 Bernhard Rosenkraenzer  1.1-5
- Rebuild with new kdelibs

* Mon Aug 27 2001 Bernhard Rosenkraenzer  1.1-4
- Merge koffice-i18n into the package

* Thu Aug 23 2001 Bernhard Rosenkraenzer  1.1-3
- Add missing defattr to -devel (#52292)
- Remove dupes from kdeartwork-locolor (Part of #51589)

* Tue Aug 21 2001 Bernhard Rosenkraenzer  1.1-2
- Replace koshell icon (#51439)
- Move include files to the correct directory (/usr/include/kde rather than
  /usr/include)
- restore -devel package (it was lost in 1.1-1 for some reason)
- Don't own standard directories

* Tue Aug 14 2001 Bernhard Rosenkraenzer  1.1-1
- 1.1 final
- Add icon for koshell (#51439)

* Wed Jul 25 2001 Bernhard Rosenkraenzer  1.1-0.cvs20010725.1
- Increase Epoch

* Tue Jul 24 2001 Bernhard Rosenkraenzer  1.1-0.cvs20010724.1
- Don't build kivio on ia64 ATM (compiler bug)

* Tue Feb 20 2001 Than Ngo 
- update 2.1
- fix dangling symlinks

* Fri Feb  2 2001 Bernhard Rosenkraenzer 
- Add ldconfig in %%post and %%postun, replace absolute symlinks
  with relative symlinks (#24878)

* Mon Jan 22 2001 Bernhard Rosenkraenzer 
- Update

* Thu Jan 11 2001 Bernhard Rosenkraenzer 
- Update
- Don't build on sparc and ia64 (Bug #23809)

* Sun Dec  3 2000 Bernhard Rosenkraenzer 
- 2.0.1

* Fri Nov  3 2000 Bernhard Rosenkraenzer 
- Update to KDE_2_0_BRANCH

* Mon Oct 16 2000 Bernhard Rosenkraenzer 
- 2.0 final

* Tue Oct  3 2000 Bernhard Rosenkraenzer 
- 2.0

* Mon Oct  2 2000 Bernhard Rosenkraenzer 
- new CVS
- fix compilation

* Thu Aug 24 2000 Bernhard Rosenkraenzer 
- kill dupes from kdelibs

* Thu Aug 24 2000 Bernhard Rosenkraenzer 
- 1.93

* Sun Aug  6 2000 Bernhard Rosenkraenzer 
- update (fixed compilation with gcc 2.96 in CVS)
- work around compiler bugs on alpha

* Fri Aug  4 2000 Bernhard Rosenkraenzer 
- new snapshot
- move to /usr/lib/kde2

* Thu Jul 27 2000 Bernhard Rosenkraenzer 
- rebuild

* Tue Jul 25 2000 Bernhard Rosenkraenzer 
- new snapshot

* Sun Jul 23 2000 Bernhard Rosenkraenzer 
- new snapshot, new Qt

* Thu Jul 13 2000 Bernhard Rosenkraenzer 
- Don't hardcode Qt version
- obsolete killustrator (powertools 6.x)
- SMPify

* Tue Jul 11 2000 Bernhard Rosenkraenzer 
- use gcc 2.96
- new snapshot

* Mon Jul  3 2000 Bernhard Rosenkraenzer 
- use kernelcc
- new snapshot

* Tue Jun 20 2000 Bernhard Rosenkraenzer 
- new snapshot
- ExcludeArch ia64

* Sat Mar 18 2000 Bernhard Rosenkraenzer 
- new snapshot
- move it to /usr, where it belongs

* Sat Oct 23 1999 Bernhard Rosenkraenzer 
- Initial RPM

post-1.3.5-koffice.diff:

--- NEW FILE post-1.3.5-koffice.diff ---
Index: koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc
===================================================================
RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc	30 Oct 2004 16:35:33 -0000	1.6
+++ koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc	20 Jan 2005 17:36:38 -0000	1.8
@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
 	} else {
 	  keyLength = 5;
 	}
+	if (keyLength < 1) {
+	  keyLength = 1;
+	}
+	if (keyLength > 16) {
+	  keyLength = 16;
+	}
 	permFlags = permissions.getInt();
 	if (encVersion >= 1 && encVersion <= 2 &&
 	    encRevision >= 2 && encRevision <= 3) {


--- NEW FILE subdirs-koffice ---
af
ca
cs
da
de
el
en_GB
es
et
fr
he
hu
it
ja
nl
nb
nn
pl
pt
pt_BR
ru
sk
sl
sv
tr
zh_CN
zh_TW


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jul 2005 09:18:46 -0000	1.1
+++ .cvsignore	20 Jul 2005 09:21:50 -0000	1.2
@@ -0,0 +1,2 @@
+koffice-1.3.5.tar.bz2
+koffice-i18n-1.3.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jul 2005 09:18:46 -0000	1.1
+++ sources	20 Jul 2005 09:21:50 -0000	1.2
@@ -0,0 +1,2 @@
+dbc7e76c86647709a3e74f57c0fcf7f5  koffice-1.3.5.tar.bz2
+7a4af78be2a9e09a148717079f44a7a7  koffice-i18n-1.3.5.tar.bz2



From andreas.bierfert at lowlatency.de  Wed Jul 20 09:39:13 2005
From: andreas.bierfert at lowlatency.de (Andreas Bierfert)
Date: Wed, 20 Jul 2005 11:39:13 +0200
Subject: rpms/koffice - New directory
In-Reply-To: <200507200918.j6K9IV2r001660@cvs-int.fedora.redhat.com>
References: <200507200918.j6K9IV2r001660@cvs-int.fedora.redhat.com>
Message-ID: <42DE1BC1.8060901@lowlatency.de>

Did I miss something about koffice? See
https://www.redhat.com/archives/fedora-extras-list/2005-June/msg01367.html
and the following mails...

- Andreas

Than Ngo" (than) wrote:
> Author: than
> 
> Update of /cvs/extras/rpms/koffice
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1636/koffice
> 
> Log Message:
> Directory /cvs/extras/rpms/koffice added to the repository



From fedora-extras-commits at redhat.com  Wed Jul 20 09:45:56 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 20 Jul 2005 05:45:56 -0400
Subject: fedora-security/audit fc4,1.26,1.27
Message-ID: <200507200945.j6K9ju93001943@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1924

Modified Files:
	fc4 
Log Message:
Get around to dealing with some issues that needed attention.  The only
significant issue left is a Mozilla issue where I can't yet find out what
release fixed the flaw.  Josh opened a bug in bugzilla.mozilla.org for this
but it was dupe'd to a private bug I can't access, so we'll need to wait
to finish this one off.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fc4	20 Jul 2005 08:28:11 -0000	1.26
+++ fc4	20 Jul 2005 09:45:53 -0000	1.27
@@ -24,7 +24,7 @@
 2005-2260 VULNERABLE (firefox, fixed 1.0.5)
 2005-2260 VULNERABLE (mozilla, fixed 1.7.9)
 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
-2005-2114 ** mozilla
+2005-2114 ** mozilla, can't find out when this was fixed upstream
 2005-2096 backport (zlib) [since FEDORA-2005-523]
 2005-2096 backport (rpm) [since FEDORA-2005-565]
 2005-2095 VULNERABLE (squirrelmail)
@@ -40,8 +40,7 @@
 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1761 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
-2005-2069 ** openldap
-2005-2069 ** pam_ldap
+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]
@@ -50,20 +49,21 @@
 2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
 2005-1831 ignore (sudo) unsubstantiated report
 2005-1763 version (kernel) [since FEDORA-2005-510]
-2005-1769 ** squirrelmail
+2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
 2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483]
-2005-1760 ** probably vulnerable sysreport
+2005-1760 VULNERABLE (sysreport)
 2005-1759 VULNERABLE (nmap)
 2005-1759 VULNERABLE (openldap)
 2005-1759 VULNERABLE (php)
-2005-1751 ** nmap
-2005-1751 ** openldap
+2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
+2005-1751 VULNERABLE (openldap, fixed shtool 2.0.2)
+2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
 2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 2005-1740 backport (net-snmp, not fixed)
 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1]
 2005-1705 version (gdb, fixed 6.3)
 2005-1704 version (gdb, fixed 6.3)
-2005-1704 ** (binutils) [since FEDORA-2005-498]
+2005-1704 backport (binutils) ...eadelf-overflows.patch [since FEDORA-2005-498]
 2005-1689 backport (krb5) [since FEDORA-2005-553]
 2005-1686 ignore (gedit, not a vulnerability)
 2005-1636 VULNERABLE (mysql, fixed 4.1.12) minor issue
@@ -975,13 +975,12 @@
 
 older, happened to deal with at same time:
 
-2002-1963 ** kernel
-2002-1976 ** kernel
+2002-1963 version (kernel, not 2.6)
+2002-1976 ignore (ifconfig) "use ip"
 2002-1914 version (dump, fixed 0.4b29)
-2002-1890 ** rhmask
-2002-1850 ** mod_cgi
-2002-1827 ** sendmail
-2002-1814 ** bonobo
+2002-1850 version (mod_cgi, fixed 2.0.41)
+2002-1827 version (sendmail, fixed after 8.12.3)
+2002-1814 ignore (bonobo) not shipped setuid
 2002-1793 version (mod_ssl), also only hp
 2002-1783 version (php, fixed after 4.2.3)
 2002-1765 version (evolution, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Wed Jul 20 12:02:38 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:02:38 -0400
Subject: devel/x3270 x3270.spec,1.5,1.6
Message-ID: <200507201203.j6KC3VPg008417@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8398

Modified Files:
	x3270.spec 
Log Message:
buildrequire xorg-x11-font-utils (160737)


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x3270.spec	27 Apr 2005 13:52:38 -0000	1.5
+++ x3270.spec	20 Jul 2005 12:02:36 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 3
+Release: 4
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -31,7 +31,7 @@
 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
 Group: Applications/Internet
-BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-devel xorg-x11-font-utils
 Requires: %{name} = %{version}
 Prereq: gtk2 >= 2.6
 
@@ -197,6 +197,9 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Wed Jul 20 2005 Karsten Hopp  3.3.4-4
+- buildrequires xorg-x11-font-utils (#160737)
+
 * Wed Apr 27 2005 Jeremy Katz 
 - silence gtk-update-icon-cache in %%post
 



From fedora-extras-commits at redhat.com  Wed Jul 20 12:09:14 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:09:14 -0400
Subject: devel/x3270 x3270.spec,1.6,1.7
Message-ID: <200507201209.j6KC9Enr008481@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8464

Modified Files:
	x3270.spec 
Log Message:
add disttag


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- x3270.spec	20 Jul 2005 12:02:36 -0000	1.6
+++ x3270.spec	20 Jul 2005 12:09:12 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 4
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -199,6 +199,7 @@
 %changelog
 * Wed Jul 20 2005 Karsten Hopp  3.3.4-4
 - buildrequires xorg-x11-font-utils (#160737)
+- add disttag
 
 * Wed Apr 27 2005 Jeremy Katz 
 - silence gtk-update-icon-cache in %%post



From fedora-extras-commits at redhat.com  Wed Jul 20 12:11:14 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:11:14 -0400
Subject: rpms/x3270/FC-4 x3270.spec,1.5,1.6
Message-ID: <200507201211.j6KCBEN9008516@cvs-int.fedora.redhat.com>

Author: karsten

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

Modified Files:
	x3270.spec 
Log Message:
build fixed FC4 package


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/FC-4/x3270.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x3270.spec	27 Apr 2005 13:52:38 -0000	1.5
+++ x3270.spec	20 Jul 2005 12:11:12 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 3
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -31,7 +31,7 @@
 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
 Group: Applications/Internet
-BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-devel xorg-x11-font-utils
 Requires: %{name} = %{version}
 Prereq: gtk2 >= 2.6
 
@@ -197,6 +197,10 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Wed Jul 20 2005 Karsten Hopp  3.3.4-4
+- buildrequires xorg-x11-font-utils (#160737)
+- add disttag
+
 * Wed Apr 27 2005 Jeremy Katz 
 - silence gtk-update-icon-cache in %%post
 



From fedora-extras-commits at redhat.com  Wed Jul 20 12:11:39 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:11:39 -0400
Subject: common tobuild,1.1960,1.1961
Message-ID: <200507201211.j6KCBdUx008578@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8561

Modified Files:
	tobuild 
Log Message:
request build of rpms/x3270/FC-4 x3270-3_3_4-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1960
retrieving revision 1.1961
diff -u -r1.1960 -r1.1961
--- tobuild	20 Jul 2005 00:47:56 -0000	1.1960
+++ tobuild	20 Jul 2005 12:11:37 -0000	1.1961
@@ -101,3 +101,4 @@
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
+karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4



From fedora-extras-commits at redhat.com  Wed Jul 20 12:12:11 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:12:11 -0400
Subject: common tobuild,1.1961,1.1962
Message-ID: <200507201212.j6KCCBJi008641@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8624

Modified Files:
	tobuild 
Log Message:
request build of rpms/x3270/devel x3270-3_3_4-4_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1961
retrieving revision 1.1962
diff -u -r1.1961 -r1.1962
--- tobuild	20 Jul 2005 12:11:37 -0000	1.1961
+++ tobuild	20 Jul 2005 12:12:08 -0000	1.1962
@@ -102,3 +102,4 @@
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
+karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:56 -0400
Subject: extras-buildsys/server UserInterface.py,1.20,1.21 main.py,1.9,1.10
Message-ID: <200507201451.j6KEpuRQ011659@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/server

Modified Files:
	UserInterface.py main.py 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- UserInterface.py	19 Jul 2005 02:29:48 -0000	1.20
+++ UserInterface.py	20 Jul 2005 14:51:53 -0000	1.21
@@ -151,42 +151,42 @@
     def list_jobs(self, args_dict):
         """ Query job information and return it to the user """
 
-        sql = 'SELECT uid, username, package, cvs_tag, target, status FROM jobs WHERE '
+        sql = 'SELECT uid, username, package, cvs_tag, target, time_submitted, status 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'])
             else:
-                return (-1, "Error: Invalid email address.", [], [])
+                return (-1, "Error: Invalid email address.", [])
 
         if args_dict.has_key('status') and args_dict['status']:
             status = args_dict['status']
             if PackageJob.is_package_job_stage_valid(status):
                 sql_args.append('status="%s"' % status)
             else:
-                return (-1, "Error: Invalid job status.", [], [])
+                return (-1, "Error: Invalid job status.", [])
 
         if args_dict.has_key('uid') and args_dict['uid']:
             uid = validate_uid(args_dict['uid'])
-            if not uid:
-                return (-1, "Error: Invalid job UID.", [], [])
+            if uid == None:
+                return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid=%d' % uid)
 
         if args_dict.has_key('uid_gt') and args_dict['uid_gt']:
             uid = validate_uid(args_dict['uid_gt'])
-            if not uid:
-                return (-1, "Error: Invalid job UID.", [], [])
+            if uid == None:
+                return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid>%d' % uid)
 
         if args_dict.has_key('uid_lt') and args_dict['uid_lt']:
             uid = validate_uid(args_dict['uid_lt'])
-            if not uid:
-                return (-1, "Error: Invalid job UID.", [], [])
+            if uid == None:
+                return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid<%d' % uid)
 
         if not len(sql_args):
-            return (-1, "Error: Invalid query.", [], [])
+            return (-1, "Error: Invalid query.", [])
 
         # Assemble the final SQL statement
         i = 1
@@ -200,39 +200,56 @@
         try:
             dbcx, curs = get_dbcx()
         except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.", [], [])
+            return (-1, "Unable to access job database.", [])
         curs.execute(sql)
         data = curs.fetchall()
-        results = []
+        jobs = []
         for row in data:
-            tempX = [ item for item in row ]
-            results.append(tempX)
-        jobs = copy.deepcopy(results)
+            jobrec = {}
+            jobrec['uid'] = row[0]
+            jobrec['username'] = row[1]
+            jobrec['package'] = row[2]
+            jobrec['source'] = row[3]
+            jobrec['target'] = row[4]
+            jobrec['submit_time'] = row[5]
+            jobrec['status'] = row[6]
+            jobrec['archjobs'] = []
+            jobs.append(copy.deepcopy(jobrec))
+
+        print len(jobs)
 
         # Mash all returned job UIDs into an SQL query to get all their archjobs
         uids = ''
-        for result in jobs:
+        for job in jobs:
             if len(uids) == 0:
-                uids = uids + "parent_uid=%d" % result[0]
+                uids = uids + "parent_uid=%d" % job['uid']
             else:
-                uids = uids + " OR parent_uid=%d" % result[0]
+                uids = uids + " OR parent_uid=%d" % job['uid']
 
         # Get all archjobs for this job
-        archjobs = []
         if len(uids) > 0:
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
             data = curs.fetchall()
-            aj_results = []
             for row in data:
-                tempX = [ item for item in row ]
-                aj_results.append(tempX)
-            archjobs = copy.deepcopy(aj_results)
+                ajrec = {}
+                ajrec['jobid'] = row[0]
+                ajrec['parent_uid'] = row[1]
+                ajrec['starttime'] = row[2]
+                ajrec['endtime'] = row[3]
+                ajrec['arch'] = row[4]
+                ajrec['builder_addr'] = row[5]
+                ajrec['status'] = row[6]
+                ajrec['builder_status'] = row[7]
+                for job in jobs:
+                    if job['uid'] == ajrec['parent_uid']:
+                        print "appending"
+                        job['archjobs'].append(copy.deepcopy(ajrec))
 
         del curs
         del dbcx
 
-        return (0, "Success.", jobs, archjobs)
+        return (0, "Success.", jobs)
 
 
     def update_builders(self):


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- main.py	12 Jul 2005 20:12:32 -0000	1.9
+++ main.py	20 Jul 2005 14:51:53 -0000	1.10
@@ -20,7 +20,6 @@
 import os
 import socket
 from plague import AuthedXMLRPCServer
-from plague import lighttpdManager
 from plague import HTTPServer
 from plague import daemonize
 import SimpleXMLRPCServer
@@ -38,8 +37,6 @@
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")
 
-use_lighttpd = False
-
 
 class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer):
     """
@@ -123,22 +120,12 @@
     # SRPM fileserver
     SRPM_SERVER_PORT = 8886
     http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir")
-    if use_lighttpd:
-        http_cnf_file = "/var/tmp/plague-server.conf"
-        if config_opts['ssl_builders']:
-            key_and_cert = config_opts['server_key_and_cert']
-        else:
-            key_and_cert = None
-        srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, SRPM_SERVER_PORT, http_dir, False, key_and_cert)
-    else:
-        if config_opts['ssl_builders']:
-            srpm_server_certs = {}
-            srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert']
-            srpm_server_certs['ca_cert'] = config_opts['ca_cert']
-            srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
-            srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
-        else:
-            srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, None)
+    srpm_server_certs = {}
+    if config_opts['ssl_builders']:
+        srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert']
+        srpm_server_certs['ca_cert'] = config_opts['ca_cert']
+        srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
+    srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
     srpm_server.start()
 
     print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT)



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:49 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:49 -0400
Subject: extras-buildsys ChangeLog,1.65,1.66
Message-ID: <200507201452.j6KEqKZR011671@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592

Modified Files:
	ChangeLog 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	19 Jul 2005 02:29:47 -0000	1.65
+++ ChangeLog	20 Jul 2005 14:51:47 -0000	1.66
@@ -1,3 +1,15 @@
+2005-07-20  Dan Williams 
+
+    * builder/builder.py
+      server/main.py
+        - Don't use lighttpd any more
+        - Fix some issues with non-SSL build systems (Oliver Falk)
+
+    * client/client.py
+      server/UserInterface.py
+        - Return job lists as dicts for easier use
+        - Return archjobs embedded in the job list rather than a separate array
+
 2005-07-18  Dan Williams 
 
     * server/UserInterface.py



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:50 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:50 -0400
Subject: extras-buildsys/client client.py,1.12,1.13
Message-ID: <200507201452.j6KEqKtr011675@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/client

Modified Files:
	client.py 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- client.py	19 Jul 2005 02:29:47 -0000	1.12
+++ client.py	20 Jul 2005 14:51:48 -0000	1.13
@@ -124,7 +124,7 @@
     print query_args
 
     try:
-        (e, msg, jobs, archjobs) = server.list_jobs(query_args)
+        (e, msg, jobs) = server.list_jobs(query_args)
     except socket.error, e:
         print "Error connecting to build server: '%s'" % e
         return
@@ -136,10 +136,9 @@
     else:
         for job in jobs:
             try:
-                print job
-                for archjob in archjobs:
-                    if archjob[1] == job[0]:
-                        print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7])
+                print "%d: %s (%s)  %s   %s" % (job['uid'], job['package'], job['source'], job['username'], job['status'])    
+                for archjob in job['archjobs']:
+                    print "\t%s(%s): %s %s/%s" % (archjob['builder_addr'], archjob['arch'], archjob['jobid'], archjob['status'], archjob['builder_status'])
                 print ''
             except IOError:
                 pass



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:50 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:50 -0400
Subject: extras-buildsys/builder builder.py,1.21,1.22
Message-ID: <200507201452.j6KEqK1M011672@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/builder

Modified Files:
	builder.py 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- builder.py	18 Jul 2005 21:26:24 -0000	1.21
+++ builder.py	20 Jul 2005 14:51:48 -0000	1.22
@@ -33,14 +33,11 @@
 from plague import ArchUtils
 from plague import FileDownloader
 from plague import AuthedXMLRPCServer
-from plague import lighttpdManager
 from plague import HTTPServer
 from plague import daemonize
 from optparse import OptionParser
 
 
-use_lighttpd = False
-
 certs = {}
 
 def get_url_for_file(file_path):
@@ -681,9 +678,10 @@
 
     # Load in the config
     execfile(opts.configfile)
-    certs['key_and_cert'] = config_opts['builder_key_and_cert']
-    certs['ca_cert'] = config_opts['ca_cert']
-    certs['peer_ca_cert'] = config_opts['ca_cert']
+    if config_opts['ssl_buildserver']:
+        certs['key_and_cert'] = config_opts['builder_key_and_cert']
+        certs['ca_cert'] = config_opts['ca_cert']
+        certs['peer_ca_cert'] = config_opts['ca_cert']
 
     for arch in config_opts['arches']:
         if arch not in archlist:
@@ -725,18 +723,7 @@
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
     port = config_opts['fileserver_port']
-    if use_lighttpd:
-        http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid()
-        if config_opts['ssl_buildserver']:
-            key_and_cert = config_opts['builder_key_and_cert']
-        else:
-            key_and_cert = None
-        http_server = lighttpdManager.lighttpdManager(http_cnf_file, config_opts['hostname'], port, work_dir, True, key_and_cert)
-    else:
-        if config_opts['ssl_buildserver']:
-            http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
-        else:
-            http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, None)
+    http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
     http_server.start()
 
     # Stop running as root



From oliver at linux-kernel.at  Wed Jul 20 14:56:43 2005
From: oliver at linux-kernel.at (Oliver Falk)
Date: Wed, 20 Jul 2005 16:56:43 +0200
Subject: extras-buildsys/client client.py,1.12,1.13
In-Reply-To: <200507201452.j6KEqKtr011675@cvs-int.fedora.redhat.com>
References: <200507201452.j6KEqKtr011675@cvs-int.fedora.redhat.com>
Message-ID: <42DE662B.9030106@linux-kernel.at>

On 07/20/2005 04:51 PM, Daniel Williams (dcbw) wrote:
> Author: dcbw
> 
> Update of /cvs/fedora/extras-buildsys/client
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/client
> 
> Modified Files:
> 	client.py 
> Log Message:
> 2005-07-20  Dan Williams 
> 
>     * builder/builder.py
>       server/main.py
>         - Don't use lighttpd any more
>         - Fix some issues with non-SSL build systems (Oliver Falk)

Oops, thanks for mentioning. :-)

Best,
  Oliver



From fedora-extras-commits at redhat.com  Wed Jul 20 15:25:05 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 20 Jul 2005 11:25:05 -0400
Subject: rpms/bash-completion/FC-4 .cvsignore, 1.7, 1.8 bash-completion.spec,
	1.9, 1.10 sources, 1.7, 1.8 bash-completion-documents.patch,
	1.1, NONE bash-completion-players.patch, 1.1,
	NONE bash-completion-tarballs.patch, 1.1, NONE
Message-ID: <200507201525.j6KFPaE8013070@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13032/FC-4

Modified Files:
	.cvsignore bash-completion.spec sources 
Removed Files:
	bash-completion-documents.patch bash-completion-players.patch 
	bash-completion-tarballs.patch 
Log Message:
* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
- 20050720, all patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Jul 2005 19:59:19 -0000	1.7
+++ .cvsignore	20 Jul 2005 15:25:03 -0000	1.8
@@ -1 +1 @@
-bash-completion-20050712.tar.bz2
+bash-completion-20050720.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bash-completion.spec	18 Jul 2005 19:58:46 -0000	1.9
+++ bash-completion.spec	20 Jul 2005 15:25:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bash-completion
-Version:        20050712
-Release:        1
+Version:        20050720
+Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,9 +8,6 @@
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
-Patch0:         %{name}-tarballs.patch
-Patch1:         %{name}-players.patch
-Patch2:         %{name}-documents.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,9 +20,6 @@
 
 %prep
 %setup -q -n bash_completion
-%patch0
-%patch1
-%patch2
 
 
 %build
@@ -133,6 +127,9 @@
 
 
 %changelog
+* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
+- 20050720, all patches applied upstream.
+
 * Mon Jul 18 2005 Ville Skytt??  - 20050712-1
 - 20050712.
 - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jul 2005 19:59:19 -0000	1.7
+++ sources	20 Jul 2005 15:25:03 -0000	1.8
@@ -1 +1 @@
-4f38a59eabf97a6dd7db0f10c0ee5063  bash-completion-20050712.tar.bz2
+2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2


--- bash-completion-documents.patch DELETED ---


--- bash-completion-players.patch DELETED ---


--- bash-completion-tarballs.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Jul 20 15:25:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 20 Jul 2005 11:25:06 -0400
Subject: rpms/bash-completion/devel .cvsignore, 1.7, 1.8 bash-completion.spec,
	1.9, 1.10 sources, 1.7, 1.8 bash-completion-documents.patch,
	1.1, NONE bash-completion-players.patch, 1.1,
	NONE bash-completion-tarballs.patch, 1.1, NONE
Message-ID: <200507201525.j6KFPaKj013075@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13032/devel

Modified Files:
	.cvsignore bash-completion.spec sources 
Removed Files:
	bash-completion-documents.patch bash-completion-players.patch 
	bash-completion-tarballs.patch 
Log Message:
* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
- 20050720, all patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Jul 2005 19:59:19 -0000	1.7
+++ .cvsignore	20 Jul 2005 15:25:04 -0000	1.8
@@ -1 +1 @@
-bash-completion-20050712.tar.bz2
+bash-completion-20050720.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bash-completion.spec	18 Jul 2005 19:58:47 -0000	1.9
+++ bash-completion.spec	20 Jul 2005 15:25:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bash-completion
-Version:        20050712
-Release:        1
+Version:        20050720
+Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,9 +8,6 @@
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
-Patch0:         %{name}-tarballs.patch
-Patch1:         %{name}-players.patch
-Patch2:         %{name}-documents.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,9 +20,6 @@
 
 %prep
 %setup -q -n bash_completion
-%patch0
-%patch1
-%patch2
 
 
 %build
@@ -133,6 +127,9 @@
 
 
 %changelog
+* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
+- 20050720, all patches applied upstream.
+
 * Mon Jul 18 2005 Ville Skytt??  - 20050712-1
 - 20050712.
 - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jul 2005 19:59:19 -0000	1.7
+++ sources	20 Jul 2005 15:25:04 -0000	1.8
@@ -1 +1 @@
-4f38a59eabf97a6dd7db0f10c0ee5063  bash-completion-20050712.tar.bz2
+2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2


--- bash-completion-documents.patch DELETED ---


--- bash-completion-players.patch DELETED ---


--- bash-completion-tarballs.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Jul 20 16:10:41 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 12:10:41 -0400
Subject: extras-buildsys/client client.py,1.13,1.14
Message-ID: <200507201610.j6KGAfT0014360@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14328/client

Modified Files:
	client.py 
Log Message:
Remove some debug prints


Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- client.py	20 Jul 2005 14:51:48 -0000	1.13
+++ client.py	20 Jul 2005 16:10:39 -0000	1.14
@@ -121,8 +121,6 @@
         # List all jobs
         query_args['uid_gt'] = "0"
 
-    print query_args
-
     try:
         (e, msg, jobs) = server.list_jobs(query_args)
     except socket.error, e:



From fedora-extras-commits at redhat.com  Wed Jul 20 16:10:41 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 12:10:41 -0400
Subject: extras-buildsys/server UserInterface.py,1.21,1.22
Message-ID: <200507201610.j6KGAfns014366@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14328/server

Modified Files:
	UserInterface.py 
Log Message:
Remove some debug prints


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- UserInterface.py	20 Jul 2005 14:51:53 -0000	1.21
+++ UserInterface.py	20 Jul 2005 16:10:39 -0000	1.22
@@ -216,8 +216,6 @@
             jobrec['archjobs'] = []
             jobs.append(copy.deepcopy(jobrec))
 
-        print len(jobs)
-
         # Mash all returned job UIDs into an SQL query to get all their archjobs
         uids = ''
         for job in jobs:
@@ -243,7 +241,6 @@
                 ajrec['builder_status'] = row[7]
                 for job in jobs:
                     if job['uid'] == ajrec['parent_uid']:
-                        print "appending"
                         job['archjobs'].append(copy.deepcopy(ajrec))
 
         del curs



From fedora-extras-commits at redhat.com  Wed Jul 20 16:15:21 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 20 Jul 2005 12:15:21 -0400
Subject: rpms/inadyn/devel .cvsignore, 1.2, 1.3 inadyn.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <200507201615.j6KGFLw2014579@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Apr 2005 19:42:23 -0000	1.2
+++ .cvsignore	20 Jul 2005 16:15:19 -0000	1.3
@@ -1 +1 @@
-inadyn.v1.90.zip
+inadyn.v1.95.zip


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- inadyn.spec	8 Jul 2005 18:23:05 -0000	1.10
+++ inadyn.spec	20 Jul 2005 16:15:19 -0000	1.11
@@ -1,6 +1,7 @@
 Name:           inadyn
-Version:        1.90
-Release:        11%{?dist}
+
+Version:        1.95
+Release:        1
 
 Summary:        Dynamic DNS Client
 
@@ -31,18 +32,19 @@
 %setup -q -c
 
 %build
-make -f makefile.linux CFLAGS="$RPM_OPT_FLAGS"
+cd inadyn
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m 0755 bin/inadyn $RPM_BUILD_ROOT%{_sbindir}
+install -m 0755 inadyn/bin/linux/inadyn $RPM_BUILD_ROOT%{_sbindir}
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-install -p -m 0644 man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install -p -m 0644 man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install -p -m 0644 inadyn/man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -p -m 0644 inadyn/man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
@@ -74,13 +76,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc readme.html
+%doc inadyn/readme.html
 %{_sbindir}/inadyn
 %{_mandir}/man*/*
 %attr(0755,root,root) %{_initrddir}/inadyn
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Wed Jul 20 2005 Jochen Schmitt  1.95-1
+- New upstream release
+
 * Tue May  3 2005 Jochen Schmitt  1.90-11
 - Move note from README.Fedora to %%description
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Apr 2005 19:42:23 -0000	1.2
+++ sources	20 Jul 2005 16:15:19 -0000	1.3
@@ -1 +1 @@
-65552d4a34f825aa7f214775bdeac1cc  inadyn.v1.90.zip
+3d4c912ba9678284d330de043b7d05cb  inadyn.v1.95.zip



From fedora-extras-commits at redhat.com  Wed Jul 20 16:25:39 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 12:25:39 -0400
Subject: rpms/koffice/devel admin-visibility.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 koffice.spec, 1.1, 1.2 sources, 1.2, 1.3 subdirs-koffice,
	1.1, 1.2 koffice-1.3-menu.patch, 1.1,
	NONE koffice-1.3.1-rpath.patch, 1.1,
	NONE koffice-1.3.5-immodule.patch, 1.1,
	NONE post-1.3.5-koffice.diff, 1.1, NONE
Message-ID: <200507201625.j6KGPdoU014643@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	.cvsignore koffice.spec sources subdirs-koffice 
Added Files:
	admin-visibility.patch 
Removed Files:
	koffice-1.3-menu.patch koffice-1.3.1-rpath.patch 
	koffice-1.3.5-immodule.patch post-1.3.5-koffice.diff 
Log Message:
update to 1.4.1


admin-visibility.patch:

--- NEW FILE admin-visibility.patch ---
--- arts-1.4.1/admin/acinclude.m4.in.gcc4	2005-05-23 13:28:33.000000000 +0200
+++ arts-1.4.1/admin/acinclude.m4.in	2005-05-24 18:46:07.000000000 +0200
@@ -3052,8 +3052,6 @@
 
   AC_PROG_CXX
 
-  KDE_CHECK_FOR_BAD_COMPILER
-
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
     if test "$kde_use_debug_code" != "no"; then
       if test "$CXX" = "KCC"; then
@@ -3282,14 +3280,7 @@
     KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-    [
-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-        KDE_CHECK_VISIBILITY_GCC_BUG
-
-        HAVE_GCC_VISIBILITY=1
-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-    ])
+    AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
   fi
 ])
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jul 2005 09:21:50 -0000	1.2
+++ .cvsignore	20 Jul 2005 16:25:37 -0000	1.3
@@ -1,2 +1,29 @@
 koffice-1.3.5.tar.bz2
 koffice-i18n-1.3.5.tar.bz2
+koffice-l10n-bg-1.4.1.tar.bz2
+koffice-l10n-ca-1.4.1.tar.bz2
+koffice-l10n-cs-1.4.1.tar.bz2
+koffice-l10n-cy-1.4.1.tar.bz2
+koffice-l10n-da-1.4.1.tar.bz2
+koffice-l10n-de-1.4.1.tar.bz2
+koffice-l10n-el-1.4.1.tar.bz2
+koffice-l10n-en_GB-1.4.1.tar.bz2
+koffice-l10n-es-1.4.1.tar.bz2
+koffice-l10n-et-1.4.1.tar.bz2
+koffice-l10n-fi-1.4.1.tar.bz2
+koffice-l10n-fr-1.4.1.tar.bz2
+koffice-l10n-hu-1.4.1.tar.bz2
+koffice-l10n-it-1.4.1.tar.bz2
+koffice-l10n-nb-1.4.1.tar.bz2
+koffice-l10n-nl-1.4.1.tar.bz2
+koffice-l10n-nn-1.4.1.tar.bz2
+koffice-l10n-pl-1.4.1.tar.bz2
+koffice-l10n-pt-1.4.1.tar.bz2
+koffice-l10n-pt_BR-1.4.1.tar.bz2
+koffice-l10n-ru-1.4.1.tar.bz2
+koffice-l10n-sl-1.4.1.tar.bz2
+koffice-l10n-sr-1.4.1.tar.bz2
+koffice-l10n-sv-1.4.1.tar.bz2
+koffice-l10n-ta-1.4.1.tar.bz2
+koffice-l10n-tg-1.4.1.tar.bz2
+koffice-l10n-zh_CN-1.4.1.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koffice.spec	20 Jul 2005 09:21:50 -0000	1.1
+++ koffice.spec	20 Jul 2005 16:25:37 -0000	1.2
@@ -1,8 +1,8 @@
 %define debug 0
 %define final 0
 
-%define qt_version 3.3.3
-%define kde_version 3.3.0
+%define qt_version 3.3.4
+%define kde_version 3.4.1
 
 %define redhatify 1
 
@@ -11,29 +11,50 @@
 %define buildall 0
 
 Name: koffice
-Version: 1.3.5
-Release: 3
+Version: 1.4.1
+Release: 1
 Epoch: 4
 URL: http://koffice.kde.org/
 Summary: A set of office applications for KDE.
 Group: User Interface/Desktops
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-i18n-%{version}.tar.bz2
-Source2: koshell.png
-Source3: subdirs-koffice
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-bg-1.4.1.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ca-1.4.1.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-cs-1.4.1.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-cy-1.4.1.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-da-1.4.1.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-de-1.4.1.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-el-1.4.1.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-en_GB-1.4.1.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-es-1.4.1.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-et-1.4.1.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-fi-1.4.1.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-fr-1.4.1.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-hu-1.4.1.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-it-1.4.1.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nb-1.4.1.tar.bz2
+Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nl-1.4.1.tar.bz2
+Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nn-1.4.1.tar.bz2
+Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pl-1.4.1.tar.bz2
+Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pt-1.4.1.tar.bz2
+Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pt_BR-1.4.1.tar.bz2
+Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ru-1.4.1.tar.bz2
+Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sl-1.4.1.tar.bz2
+Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sr-1.4.1.tar.bz2
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sv-1.4.1.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ta-1.4.1.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-tg-1.4.1.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-zh_CN-1.4.1.tar.bz2
+Source100: koshell.png
+Source101: subdirs-koffice
 
 Patch0: kde-libtool.patch
 Patch1: koffice-1.2.94-fPIC.patch
-Patch2: koffice-1.3-menu.patch 
-Patch3: koffice-1.3.1-rpath.patch
-Patch4: koffice-1.3.5-immodule.patch
-
-# security fixes
-# kpdf Buffer Overflow Vulnerability, CAN-2005-0064
-Patch100: post-1.3.5-koffice.diff
+Patch2: admin-visibility.patch
+Patch100: koffice-l10n-es-1.4.1-broken.patch
 
 Prereq: kdelibs >= 6:%{kde_version}
 
@@ -87,23 +108,29 @@
 %setup -q
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .fPIC
-%patch2 -p1 -b .menu
-%patch3 -p1 -b .rpath
-%patch4 -p1 -b .im
-%patch100 -p1 -b .CAN-2005-0064
+%patch2 -p1 -b .gcc4
 
-# Workaround for legacy auto* tools
 %if %{libtool}
   make -f admin/Makefile.common cvs
 %endif
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNO_DEBUG -DNDEBUG"
+FLAGS="$RPM_OPT_FLAGS"
 export KDEDIR=%{_prefix}
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 
+# i18n
+for i in $(cat %{SOURCE101}) ; do
+  tar jxf $RPM_SOURCE_DIR/%{name}-l10n-$i-%{version}.tar.bz2
+  pushd %{name}-l10n-$i-%{version}
+  [ "$i" == "es" ] && patch -p1 < %{PATCH100}
+  %configure
+  make %{?_smp_mflags}
+  popd
+done
+
 # koffice
 %configure \
 %if %{final}
@@ -116,25 +143,13 @@
 
 make %{?_smp_mflags}
 
-# koffice-i18n
-tar jxf %{SOURCE1}
-pushd %{name}-i18n-%{version}
-%if ! %{buildall}
-  rm -rf ar bg bs eo eu fa lt ms mt se sr sq ta th ven vi xh zu
-  cp %{SOURCE3} subdirs
-%endif
-%if %{libtool}
-  make -f admin/Makefile.common cvs
-%endif
-%configure
-make %{?_smp_mflags}
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT -C %{name}-i18n-%{version} install
+for i in $(cat %{SOURCE101}) ; do
+  make -C %{name}-l10n-$i-%{version} datadir=%{_datadir} DESTDIR=$RPM_BUILD_ROOT install
+done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
@@ -173,9 +188,14 @@
 %{_libdir}/*.so
 %{_libdir}/*.la
 %{_libdir}/kde3/*
+%{_datadir}/applications/kde/*
+%{_datadir}/applnk/Utilities/*
 %{_datadir}/applnk/Office
 %{_datadir}/apps/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/config/*
 %{_datadir}/icons/*/*/*/*
+%{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/templates
@@ -188,17 +208,10 @@
 %files i18n
 %defattr(-,root,root)
 %{_datadir}/apps/koffice/autocorrect
-
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-%endif
-
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
 %lang(da) %doc %{_docdir}/HTML/da/*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
@@ -206,92 +219,42 @@
 %lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %doc %{_docdir}/HTML/en_GB/*
-
-%if %{buildall}
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-%endif
-
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
 %lang(es) %doc %{_docdir}/HTML/es/*
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
 %lang(et) %doc %{_docdir}/HTML/et/*
-
-%if %{buildall}
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-%endif
-
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
 %lang(fr) %doc %{_docdir}/HTML/fr/*
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %doc %{_docdir}/HTML/it/*
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
-%endif
-
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %doc %{_docdir}/HTML/nl/*
 %lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
-%lang(pl) %doc %{_docdir}/HTML/pl/*
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %doc %{_docdir}/HTML/pt/*
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
 %lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %doc %{_docdir}/HTML/ru/*
-
-%if %{buildall}
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-%endif
-
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %doc %{_docdir}/HTML/sk/*
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 %lang(sl) %doc %{_docdir}/HTML/sl/*
-
-%if %{buildall}
-%lang(sq) %{_datadir}/locale/sq/LC_MESSAGES/*
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%endif
-
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %doc %{_docdir}/HTML/sv/*
-
-%if %{buildall}
-%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
-%endif
-
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
-%endif
-
-%if %{buildall}
-%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
-%endif
-
-%if %{buildall}
-%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
-%lang(xh) %doc %{_docdir}/HTML/xh/*
-%endif
-
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
-%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
-%if %{buildall}
-%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/*
-%endif
 
 %changelog
+* Wed Jul 20 2005 Than Ngo  5:1.4.1-1
+- update to 1.4.1
+- drop some patches, which are included in upstream
+
 * Sat Feb 12 2005 Than Ngo  4:1.3.5-3
 - backport from CVS for working with qt-immodule
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jul 2005 09:21:50 -0000	1.2
+++ sources	20 Jul 2005 16:25:37 -0000	1.3
@@ -1,2 +1,27 @@
-dbc7e76c86647709a3e74f57c0fcf7f5  koffice-1.3.5.tar.bz2
-7a4af78be2a9e09a148717079f44a7a7  koffice-i18n-1.3.5.tar.bz2
+445f35bf43b60c7799df116bd90957ad  koffice-l10n-bg-1.4.1.tar.bz2
+f011aa527e4b476f18f1fda9a043f81b  koffice-l10n-ca-1.4.1.tar.bz2
+8b56e381765bece8a32fec3b67e881c2  koffice-l10n-cs-1.4.1.tar.bz2
+e15377d70faef67a91a361b421b8be84  koffice-l10n-cy-1.4.1.tar.bz2
+3bcda6ccf32a2b0916f5de47981be655  koffice-l10n-da-1.4.1.tar.bz2
+b54a04db280a5b00f0105407c24ce49c  koffice-l10n-de-1.4.1.tar.bz2
+a744de5d6e97a25257a809f7a0f79a11  koffice-l10n-el-1.4.1.tar.bz2
+deaaf836cce7efcd9c83d800a6b4e51b  koffice-l10n-en_GB-1.4.1.tar.bz2
+b779db42a85037de1c464c1027093ffb  koffice-l10n-es-1.4.1.tar.bz2
+0ecd275357b76d245b2367a1925bda59  koffice-l10n-et-1.4.1.tar.bz2
+a2e26094907dc77365266c215183c587  koffice-l10n-fi-1.4.1.tar.bz2
+37a18640975a8a1ba38044a6ea7dbd37  koffice-l10n-fr-1.4.1.tar.bz2
+95e046ab8097fda8b4f146b4a625b7a3  koffice-l10n-hu-1.4.1.tar.bz2
+cac43b60ea3d01cfa0ac337bc0a296be  koffice-l10n-it-1.4.1.tar.bz2
+0d9c12a3881861377130801a3a431dd2  koffice-l10n-nb-1.4.1.tar.bz2
+a960e30b5bd883ed71ada339f238bb38  koffice-l10n-nl-1.4.1.tar.bz2
+7e55ada0f26bc0125ae26ab7c7b1eae2  koffice-l10n-nn-1.4.1.tar.bz2
+c6c38ec4a42d2c2abd289b83e2398c21  koffice-l10n-pl-1.4.1.tar.bz2
+af2c79e0694d913a749a9591598641c5  koffice-l10n-pt-1.4.1.tar.bz2
+96f2a0ba7a249078e64ea319b8f27dc9  koffice-l10n-pt_BR-1.4.1.tar.bz2
+d198b6cc3574ea9305701a48324085bb  koffice-l10n-ru-1.4.1.tar.bz2
+3c27784f5630ca6f3b0cfbae89271176  koffice-l10n-sl-1.4.1.tar.bz2
+f49d2141aa8bd2c68f0ab892cdc4e1a8  koffice-l10n-sr-1.4.1.tar.bz2
+58ffb4991e48caa73f434f30ca2b4761  koffice-l10n-sv-1.4.1.tar.bz2
+43e954db7f2af6f4c4f34a85a31e33d2  koffice-l10n-ta-1.4.1.tar.bz2
+2e35a578c8afb853ef5c23e71c2d575e  koffice-l10n-tg-1.4.1.tar.bz2
+02491c50d888600dccd1685a9ef7ed6c  koffice-l10n-zh_CN-1.4.1.tar.bz2


Index: subdirs-koffice
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/subdirs-koffice,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subdirs-koffice	20 Jul 2005 09:21:50 -0000	1.1
+++ subdirs-koffice	20 Jul 2005 16:25:37 -0000	1.2
@@ -1,27 +1,27 @@
-af
+bg
 ca
 cs
+cy
 da
 de
 el
 en_GB
 es
 et
+fi
 fr
-he
 hu
 it
-ja
-nl
 nb
+nl
 nn
 pl
 pt
 pt_BR
 ru
-sk
 sl
+sr
 sv
-tr
+ta
+tg
 zh_CN
-zh_TW


--- koffice-1.3-menu.patch DELETED ---


--- koffice-1.3.1-rpath.patch DELETED ---


--- koffice-1.3.5-immodule.patch DELETED ---


--- post-1.3.5-koffice.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Jul 20 16:28:06 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 12:28:06 -0400
Subject: rpms/koffice/devel koffice-l10n-es-1.4.1-broken.patch,NONE,1.1
Message-ID: <200507201628.j6KGS6c2014681@cvs-int.fedora.redhat.com>

Author: than

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

Added Files:
	koffice-l10n-es-1.4.1-broken.patch 
Log Message:
fix broken docbooks


koffice-l10n-es-1.4.1-broken.patch:

--- NEW FILE koffice-l10n-es-1.4.1-broken.patch ---
--- koffice-l10n-es-1.4.1/docs/koffice/kword/index.docbook.tn	2005-07-20 12:45:37.000000000 +0200
+++ koffice-l10n-es-1.4.1/docs/koffice/kword/index.docbook	2005-07-20 13:18:38.000000000 +0200
@@ -3110,6 +3110,15 @@
 
 
 
+
+
+
+
+
+
+
 
 Encabezado
--- koffice-l10n-es-1.4.1/docs/koffice/kword/mailmerge.docbook.tn	2005-07-20 13:00:04.000000000 +0200
+++ koffice-l10n-es-1.4.1/docs/koffice/kword/mailmerge.docbook	2005-07-20 13:09:16.000000000 +0200
@@ -65,7 +65,7 @@
 
 Si quiere usar una base de datos SQL externa, haga clic Si quiere usar una base de datos SQL externa, haga clic aqu?? para tener acceso a las instrucciones.
@@ -353,7 +353,7 @@
 >
 
 Usar un documento de &kspread: para crear documentos personalizados es un proceso de tres pasos:
+>Usar un documento de &kspread; para crear documentos personalizados es un proceso de tres pasos:
 
 Tambi??n puede guardar una lista de distribuci??n usando el bot??n Guardar como lista de distribuci??n.... Si quiere m??s informaci??n sobre listas de distribuci??n puede ver la documentaci??n de la libreta de direcciones de &kde:.. Si quiere m??s informaci??n sobre listas de distribuci??n puede ver la documentaci??n de la libreta de direcciones de &kde;.
 
 &kword; puede verificar la ortograf??a de su documento mientras lo edita. Subrayar?? en rojo cualquier palabra que no encuentre en el diccionario. Este comportamiento lo puede activar y desactivar el usuario. Seleccionando HerramientasHerramientasVerificar ortograf??aComprobaci??n ortogr??fica autom??tica...

Author: qspencer

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 16:54:22 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:54:22 -0400
Subject: rpms/umfpack/devel - New directory
Message-ID: <200507201654.j6KGsMoW014817@cvs-int.fedora.redhat.com>

Author: qspencer

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 16:55:12 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:55:12 -0400
Subject: rpms/umfpack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507201655.j6KGtCRT014864@cvs-int.fedora.redhat.com>

Author: qspencer

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 20 16:55:13 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:55:13 -0400
Subject: rpms/umfpack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507201655.j6KGtDBW014869@cvs-int.fedora.redhat.com>

Author: qspencer

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

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


--- NEW 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 Jul 20 16:57:02 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:57:02 -0400
Subject: rpms/umfpack import.log,1.1,1.2
Message-ID: <200507201657.j6KGvWe7014940@cvs-int.fedora.redhat.com>

Author: qspencer

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/umfpack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Jul 2005 16:55:10 -0000	1.1
+++ import.log	20 Jul 2005 16:57:00 -0000	1.2
@@ -0,0 +1 @@
+umfpack-4_4-1:HEAD:umfpack-4.4-1.src.rpm:1121878610



From fedora-extras-commits at redhat.com  Wed Jul 20 16:57:02 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:57:02 -0400
Subject: rpms/umfpack/devel umfpack-4.4-make.patch, NONE, 1.1 umfpack.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200507201657.j6KGv2mR014935@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	.cvsignore sources 
Added Files:
	umfpack-4.4-make.patch umfpack.spec 
Log Message:
auto-import umfpack-4.4-1 on branch devel from umfpack-4.4-1.src.rpm

umfpack-4.4-make.patch:

--- NEW FILE umfpack-4.4-make.patch ---
--- AMD/Make/Make.include.~1~	2004-01-29 13:40:45.000000000 -0600
+++ AMD/Make/Make.include	2005-03-29 09:18:47.231800504 -0600
@@ -47,7 +47,7 @@
 # portable.  Try this option first, then use your architecture-specific
 # configuration, below, to add the BLAS library.  AMD ignores the -DNBLAS flag.
 
-CONFIG = -DNBLAS
+# CONFIG = -DNBLAS
 
 #------------------------------------------------------------------------------
 # Archicture-specific configuration (for both AMD and UMFPACK)


--- NEW FILE umfpack.spec ---
Name:           umfpack
Version:        4.4
Release:        1
Summary:        Routines for solving unsymmetric sparse linear systems

Group:          System Environment/Libraries
License:        Distributable
URL:            http://www.cise.ufl.edu/research/sparse/umfpack/
Source0:        http://www.cise.ufl.edu/research/sparse/umfpack/v4.4/UMFPACKv4.4.tar.gz
Patch0:         umfpack-4.4-make.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
UMFPACK is a set of routines for solving unsymmetric sparse linear
systems, Ax=b, using the Unsymmetric MultiFrontal method. Written in
ANSI/ISO C, with a MATLAB (Version 6.0 and later) interface.

Version 4.x uses dynamic memory allocation, and has a symbolic preordering
and analysis phase that also reports the upper bounds on the nonzeros
in L and U, flop count, and memory usage in the numeric phase. It supports
matrices that are both real and complex, rectangular and square, and
singular or non-singular.

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

%description devel
The umfpack-devel package contains files needed for developing
applications which use umfpack.


%prep
%setup -q -n UMFPACKv%{version}
%patch0 -p0


%build
%define amd_version 1.1
%define amd_version_major 1
%define version_major 4
pushd AMD
  pushd Source
    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
    gcc -shared -Wl,-soname,libamd.so.%{amd_version_major} -o ../Lib/libamd.so.%{amd_version} `ls *.o`
  popd
  cp Lib/*.a Lib/*.so* Include/*.h ..
  cp Doc/License ../AMD_License
  cp Doc/ChangeLog ../AMD_ChangeLog
popd
ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
ln -sf libamd.so.%{amd_version} libamd.so
pushd UMFPACK
  pushd Source
    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
    gcc -shared -Wl,-soname,libumfpack.so.%{version_major} -o ../Lib/libumfpack.so.%{version} `ls *.o` -lblas -lm
  popd
  cp Lib/*.a Lib/*.so* Include/*.h ..
  cp Doc/License ../UMFPACK_License
  cp Doc/ChangeLog ../UMFPACK_ChangeLog
popd
ln -sf libumfpack.so.%{version} libumfpack.so.%{version_major}
ln -sf libumfpack.so.%{version} libumfpack.so


%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/%{name}
for f in *.a *.so*; do
  cp -a $f ${RPM_BUILD_ROOT}%{_libdir}/$f
done
for f in *.h;  do
  cp -a $f ${RPM_BUILD_ROOT}%{_includedir}/%{name}/$f
done


%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


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

%files devel
%defattr(-,root,root)
%doc AMD/Doc/*.pdf UMFPACK/Doc/*.pdf
%{_includedir}/umfpack
%{_libdir}/lib*.a
%{_libdir}/lib*.so

%changelog
* Wed Jul 20 2005 Quentin Spencer  4.4-1
- First version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/umfpack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jul 2005 16:55:11 -0000	1.1
+++ .cvsignore	20 Jul 2005 16:57:00 -0000	1.2
@@ -0,0 +1 @@
+UMFPACKv4.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/umfpack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jul 2005 16:55:11 -0000	1.1
+++ sources	20 Jul 2005 16:57:00 -0000	1.2
@@ -0,0 +1 @@
+6f4de37ec711c406a50f5d6760ea9f06  UMFPACKv4.4.tar.gz



From ivazquez at ivazquez.net  Wed Jul 20 17:05:46 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Wed, 20 Jul 2005 13:05:46 -0400
Subject: rpms/inadyn/devel .cvsignore, 1.2, 1.3 inadyn.spec, 1.10, 1.11
	sources, 1.2, 1.3
In-Reply-To: <200507201615.j6KGFLw2014579@cvs-int.fedora.redhat.com>
References: <200507201615.j6KGFLw2014579@cvs-int.fedora.redhat.com>
Message-ID: <1121879146.28256.44.camel@ignacio.lan>

On Wed, 2005-07-20 at 12:15 -0400, Jochen Schmitt wrote:
> Author: s4504kr
> 
> Update of /cvs/extras/rpms/inadyn/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14556
> 
> Modified Files:
> 	.cvsignore inadyn.spec sources 
> Log Message:
> 
>   Description:
>     New upstream release.

>  Name:           inadyn
> -Version:        1.90
> -Release:        11%{?dist}
> +
> +Version:        1.95
> +Release:        1

Don't forget to put the dist tag back afterwards if you still need it.
 
>  %setup -q -c
>  
>  %build
> -make -f makefile.linux CFLAGS="$RPM_OPT_FLAGS"
> +cd inadyn
> +make CFLAGS="$RPM_OPT_FLAGS"

If you change the setup line to "%setup -q -n inadyn" then you won't
have to worry about going into the inadyn dir everywhere else.

-- 
Ignacio Vazquez-Abrams 
http://fedora.ivazquez.net/

gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: 

From fedora-extras-commits at redhat.com  Wed Jul 20 17:27:52 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 13:27:52 -0400
Subject: rpms/koffice/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200507201727.j6KHRqPn016244@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	.cvsignore sources 
Log Message:
1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jul 2005 16:25:37 -0000	1.3
+++ .cvsignore	20 Jul 2005 17:27:50 -0000	1.4
@@ -27,3 +27,4 @@
 koffice-l10n-ta-1.4.1.tar.bz2
 koffice-l10n-tg-1.4.1.tar.bz2
 koffice-l10n-zh_CN-1.4.1.tar.bz2
+koffice-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jul 2005 16:25:37 -0000	1.3
+++ sources	20 Jul 2005 17:27:50 -0000	1.4
@@ -25,3 +25,4 @@
 43e954db7f2af6f4c4f34a85a31e33d2  koffice-l10n-ta-1.4.1.tar.bz2
 2e35a578c8afb853ef5c23e71c2d575e  koffice-l10n-tg-1.4.1.tar.bz2
 02491c50d888600dccd1685a9ef7ed6c  koffice-l10n-zh_CN-1.4.1.tar.bz2
+91a7b68757addc5934c5a8209a4926d5  koffice-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jul 20 18:11:39 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 14:11:39 -0400
Subject: extras-buildsys/server BuildMaster.py, 1.17, 1.18 UserInterface.py,
	1.22, 1.23
Message-ID: <200507201811.j6KIBdJT017490@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17471/server

Modified Files:
	BuildMaster.py UserInterface.py 
Log Message:
Add an endtime to jobs


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BuildMaster.py	18 Jul 2005 21:11:27 -0000	1.17
+++ BuildMaster.py	20 Jul 2005 18:11:37 -0000	1.18
@@ -55,8 +55,8 @@
             curs.execute('CREATE TABLE jobs (uid INTEGER PRIMARY KEY, ' \
                 'username VARCHAR(20), package VARCHAR(50), ' \
                 'cvs_tag VARCHAR(255), target VARCHAR(20), ' \
-                'buildreq VARCHAR(75), time_submitted BIGINT, ' \
-                'status VARCHAR(15))')
+                'buildreq VARCHAR(75), starttime BIGINT, ' \
+                'endtime BIGINT, status VARCHAR(15))')
         except sqlite.OperationalError, e:
             print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
             os._exit(1)
@@ -215,6 +215,13 @@
             uid = job.get_uid()
             self._write_job_status_to_db(uid, curstage)
 
+            # Update job end time
+            try:
+                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (time.time(), uid))
+            except sqlite.OperationalError, e:
+                print "DB Error: could not access jobs database. Reason: '%s'" % e
+            self.dbcx.commit()
+
             # If there are any status updates in the queue for this job, remove them
             self._status_updates_lock.acquire()
             if self._status_updates.has_key(uid):
@@ -286,8 +293,8 @@
                 continue
 
             self.curs.execute('INSERT INTO jobs (uid, username, package,' \
-                    ' cvs_tag, target, buildreq, time_submitted, status)' \
-                    ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, "%s")' \
+                    ' cvs_tag, target, buildreq, starttime, endtime, status)' \
+                    ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s")' \
                     % (item['email'], item['package'], locator, item['target'], \
                     item['buildreq'], item['time'], 'waiting'))
             self.dbcx.commit()
@@ -295,7 +302,7 @@
             # Find the UID
             self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \
                     ' package="%s" AND cvs_tag="%s" AND target="%s" AND' \
-                    ' buildreq="%s" AND time_submitted=%d AND status="waiting"' \
+                    ' buildreq="%s" AND starttime=%d AND status="waiting"' \
                     % (item['email'], item['package'], locator, item['target'], \
                     item['buildreq'], item['time']))
             self.dbcx.commit()


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- UserInterface.py	20 Jul 2005 16:10:39 -0000	1.22
+++ UserInterface.py	20 Jul 2005 18:11:37 -0000	1.23
@@ -151,7 +151,7 @@
     def list_jobs(self, args_dict):
         """ Query job information and return it to the user """
 
-        sql = 'SELECT uid, username, package, cvs_tag, target, time_submitted, status FROM jobs WHERE '
+        sql = 'SELECT uid, username, package, cvs_tag, target, starttime, endtime, status FROM jobs WHERE '
         sql_args = []
 
         if args_dict.has_key('email') and args_dict['email']:
@@ -211,8 +211,9 @@
             jobrec['package'] = row[2]
             jobrec['source'] = row[3]
             jobrec['target'] = row[4]
-            jobrec['submit_time'] = row[5]
-            jobrec['status'] = row[6]
+            jobrec['starttime'] = row[5]
+            jobrec['endtime'] = row[6]
+            jobrec['status'] = row[7]
             jobrec['archjobs'] = []
             jobs.append(copy.deepcopy(jobrec))
 



From fedora-extras-commits at redhat.com  Wed Jul 20 19:42:32 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 15:42:32 -0400
Subject: common tobuild,1.1962,1.1963
Message-ID: <200507201942.j6KJgWRL018846@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18829

Modified Files:
	tobuild 
Log Message:
request build of rpms/umfpack/devel umfpack-4_4-1 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1962
retrieving revision 1.1963
diff -u -r1.1962 -r1.1963
--- tobuild	20 Jul 2005 12:12:08 -0000	1.1962
+++ tobuild	20 Jul 2005 19:42:30 -0000	1.1963
@@ -103,3 +103,4 @@
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
 karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
+qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel



From fedora-extras-commits at redhat.com  Wed Jul 20 19:56:43 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 15:56:43 -0400
Subject: extras-buildsys/server UserInterface.py,1.23,1.24
Message-ID: <200507201956.j6KJuhuW018886@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18869/server

Modified Files:
	UserInterface.py 
Log Message:
Add an XMLRPC method to return targets the server supports


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- UserInterface.py	20 Jul 2005 18:11:37 -0000	1.23
+++ UserInterface.py	20 Jul 2005 19:56:41 -0000	1.24
@@ -72,6 +72,12 @@
         return None
     return uid
 
+def validate_target(target):
+    target_dict = config_opts['targets']
+    if target in target_dict.keys():
+        return True
+    return False
+
 
 class UserInterface:
     """
@@ -185,6 +191,11 @@
                 return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid<%d' % uid)
 
+        if args_dict.has_key('target') and args_dict['target']:
+            if not validate_target(args_dict['target']):
+                return (-1, "Error: Invalid job UID.", [])
+            sql_args.append('target="%s"' % args_dict['target'])
+
         if not len(sql_args):
             return (-1, "Error: Invalid query.", [])
 
@@ -261,6 +272,10 @@
         builder_list = self._builder_manager.list_builders()
         return (0, "Success.", builder_list)
 
+    def targets(self):
+        target_dict = config_opts['targets']
+        return target_dict.keys()
+
 
 class UserInterfaceSSLAuth(UserInterface):
     """
@@ -313,6 +328,11 @@
         return UserInterface.list_builders(self)
 
 
+    def targets(self):
+        user = AuthedXMLRPCServer.get_authinfo()
+        return UserInterface.targets(self)
+
+
 class UserInterfaceNoAuth(UserInterface):
     """
     Allow all operations, NULL authentication



From fedora-extras-commits at redhat.com  Wed Jul 20 20:50:09 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 16:50:09 -0400
Subject: extras-buildsys/server Builder.py, 1.7, 1.8 BuilderManager.py, 1.6,
	1.7
Message-ID: <200507202050.j6KKo9u6020085@cvs-int.fedora.redhat.com>

Author: dcbw

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

Modified Files:
	Builder.py BuilderManager.py 
Log Message:
Return unavailable builders in the builder list


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Builder.py	16 Jul 2005 15:47:43 -0000	1.7
+++ Builder.py	20 Jul 2005 20:50:07 -0000	1.8
@@ -210,17 +210,17 @@
         return self._prepping_jobs
 
     def to_dict(self):
-        client_dict = {}
-        client_dict['address'] = self._address
+        builder_dict = {}
+        builder_dict['address'] = self._address
         arches = []
         for target in self._target_arches.keys():
             for arch in self._target_arches[target]:
                 if not arch in arches:
                     arches.append(arch)
-        client_dict['arches'] = arches
+        builder_dict['arches'] = arches
         if self._cur_jobid:
-            client_dict['status'] = 'building'
+            builder_dict['status'] = 'building'
         else:
-            client_dict['status'] = 'idle'
-        return client_dict
+            builder_dict['status'] = 'idle'
+        return builder_dict
 


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BuilderManager.py	18 Jul 2005 19:07:48 -0000	1.6
+++ BuilderManager.py	20 Jul 2005 20:50:07 -0000	1.7
@@ -111,6 +111,21 @@
         builder_list = []
         for builder in self.running_builders:
             builder_list.append(builder.to_dict())
+
+        # Add unavailable builders
+        for builder in self.possible_builders:
+            found = False
+            for tmp in builder_list:
+                if builder == tmp['address']:
+                    found = True
+            if found:
+                continue
+            builder_dict = {}
+            builder_dict['address'] = builder
+            builder_dict['arches'] = []
+            builder_dict['status'] = "unavailable"
+            builder_list.append(builder_dict)
+
         return builder_list
 
     def have_work(self):



From fedora-extras-commits at redhat.com  Wed Jul 20 22:27:50 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 20 Jul 2005 18:27:50 -0400
Subject: rpms/p7zip/FC-4 p7zip.spec,1.2,1.3
Message-ID: <200507202228.j6KMSbRZ022806@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	p7zip.spec 
Log Message:
Convert spec files to UTF-8 (and find out what the aogon is!).



Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/FC-4/p7zip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- p7zip.spec	5 Jun 2005 21:14:15 -0000	1.2
+++ p7zip.spec	20 Jul 2005 22:27:47 -0000	1.3
@@ -100,13 +100,13 @@
 - Move files from /usr/share to /usr/libexec.
 - Various other minor changes.
 
-* Mon Jan 24 2005 Marcin Zaj?czkowski 
+* Mon Jan 24 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14.01
 
-* Sun Jan 16 2005 Marcin Zaj?czkowski 
+* Sun Jan 16 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14
 
-* Mon Dec 20 2004 Marcin Zaj?czkowski 
+* Mon Dec 20 2004 Marcin Zaj??czkowski 
  - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z
    use it simultaneously
  - returned to plugins in separate package
@@ -116,14 +116,14 @@
  - added 7z (not just 7za) with a shell wrapper
  - added gcc-c++ to the BuildRequires list
 
-* Sat Nov 20 2004 Marcin Zaj?czkowski 
+* Sat Nov 20 2004 Marcin Zaj??czkowski 
  - upgraded to 4.12
  - added virtual file system for Midnight Commander
 
-* Thu Nov 11 2004 Marcin Zaj?czkowski 
+* Thu Nov 11 2004 Marcin Zaj??czkowski 
  - upgraded to 4.10
  - plugins support was dropped out from p7zip
 
-* Sun Aug 29 2004 Marcin Zaj?czkowski 
+* Sun Aug 29 2004 Marcin Zaj??czkowski 
  - initial release
 



From fedora-extras-commits at redhat.com  Wed Jul 20 22:27:51 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 20 Jul 2005 18:27:51 -0400
Subject: rpms/p7zip/devel p7zip.spec,1.2,1.3
Message-ID: <200507202228.j6KMSb9I022807@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	p7zip.spec 
Log Message:
Convert spec files to UTF-8 (and find out what the aogon is!).



Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- p7zip.spec	5 Jun 2005 21:14:16 -0000	1.2
+++ p7zip.spec	20 Jul 2005 22:27:49 -0000	1.3
@@ -100,13 +100,13 @@
 - Move files from /usr/share to /usr/libexec.
 - Various other minor changes.
 
-* Mon Jan 24 2005 Marcin Zaj?czkowski 
+* Mon Jan 24 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14.01
 
-* Sun Jan 16 2005 Marcin Zaj?czkowski 
+* Sun Jan 16 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14
 
-* Mon Dec 20 2004 Marcin Zaj?czkowski 
+* Mon Dec 20 2004 Marcin Zaj??czkowski 
  - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z
    use it simultaneously
  - returned to plugins in separate package
@@ -116,14 +116,14 @@
  - added 7z (not just 7za) with a shell wrapper
  - added gcc-c++ to the BuildRequires list
 
-* Sat Nov 20 2004 Marcin Zaj?czkowski 
+* Sat Nov 20 2004 Marcin Zaj??czkowski 
  - upgraded to 4.12
  - added virtual file system for Midnight Commander
 
-* Thu Nov 11 2004 Marcin Zaj?czkowski 
+* Thu Nov 11 2004 Marcin Zaj??czkowski 
  - upgraded to 4.10
  - plugins support was dropped out from p7zip
 
-* Sun Aug 29 2004 Marcin Zaj?czkowski 
+* Sun Aug 29 2004 Marcin Zaj??czkowski 
  - initial release
 



From fedora-extras-commits at redhat.com  Thu Jul 21 01:07:44 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 20 Jul 2005 21:07:44 -0400
Subject: rpms/mod_security/FC-4 mod_security.conf, 1.1, 1.2 mod_security.spec,
	1.2, 1.3
Message-ID: <200507210107.j6L17iZr027190@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mod_security.conf mod_security.spec 
Log Message:
Sync with devel



Index: mod_security.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_security.conf	19 May 2005 01:39:17 -0000	1.1
+++ mod_security.conf	21 Jul 2005 01:07:42 -0000	1.2
@@ -1,5 +1,4 @@
 # Example configuration file for the mod_security Apache module
-# This is a minimal setup. You should add some extra entries here.
 
 LoadModule security_module modules/mod_security.so
 
@@ -38,18 +37,18 @@
     # SecFilter 111
    
     # Prevent path traversal (..) attacks
-    SecFilter "\.\./"
+    # SecFilter "\.\./"
 
     # Weaker XSS protection but allows common HTML tags
-    SecFilter "<( |\n)*script"
+    # SecFilter "<( |\n)*script"
 
     # Prevent XSS atacks (HTML/Javascript injection)
-    SecFilter "<(.|\n)+>"
+    # SecFilter "<(.|\n)+>"
 
     # Very crude filters to prevent SQL injection attacks
-    SecFilter "delete[[:space:]]+from"
-    SecFilter "insert[[:space:]]+into"
-    SecFilter "select.+from"
+    # SecFilter "delete[[:space:]]+from"
+    # SecFilter "insert[[:space:]]+into"
+    # SecFilter "select.+from"
 
     # Require HTTP_USER_AGENT and HTTP_HOST headers
     SecFilterSelective "HTTP_USER_AGENT|HTTP_HOST" "^$"
@@ -69,4 +68,40 @@
     # (and you don't need it anyway)
     SecFilterSelective HTTP_Transfer-Encoding "!^$"
 
-    
+    # Some common application-related rules from
+    # http://modsecrules.monkeydev.org/rules.php?safety=safe
+
+    #Nuke Bookmarks XSS
+    SecFilterSelective THE_REQUEST "/modules\.php\?name=Bookmarks\&file=(del_cat\&catname|del_mark\&markname|edit_cat\&catname|edit_cat\&catcomment|marks\&catname|uploadbookmarks\&category)=(<[[:space:]]*script|(http|https|ftp)\:/)"
+
+    #Nuke Bookmarks Marks.php SQL Injection Vulnerability
+    SecFilterSelective THE_REQUEST "modules\.php\?name=Bookmarks\&file=marks\&catname=.*\&category=.*/\*\*/(union|select|delete|insert)"
+
+    #PHPNuke general XSS attempt
+    #/modules.php?name=News&file=article&sid=1&optionbox=
+    SecFilterSelective THE_REQUEST "/modules\.php\?*name=<[[:space:]]*script"
+
+    # PHPNuke SQL injection attempt
+    SecFilterSelective THE_REQUEST "/modules\.php\?*name=Search*instory="
+
+    #phpnuke sql insertion
+    SecFilterSelective THE_REQUEST "/modules\.php*name=Forums.*file=viewtopic*/forum=.*\'/"
+
+    # WEB-PHP phpbb quick-reply.php arbitrary command attempt
+
+    SecFilterSelective THE_REQUEST "/quick-reply\.php" chain
+    SecFilter "phpbb_root_path="
+
+    #Topic Calendar Mod for phpBB Cross-Site Scripting Attack
+    SecFilterSelective THE_REQUEST "/calendar_scheduler\.php\?start=(<[[:space:]]*script|(http|https|ftp)\:/)"
+    
+    # phpMyAdmin: Safe
+
+    #phpMyAdmin Export.PHP File Disclosure Vulnerability
+    SecFilterSelective SCRIPT_FILENAME "export\.php$" chain
+    SecFilterSelective ARG_what "\.\."
+
+    #phpMyAdmin path vln
+    SecFilterSelective REQUEST_URI "/css/phpmyadmin\.css\.php\?GLOBALS\[cfg\]\[ThemePath\]=/etc"
+    	
+


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_security.spec	19 May 2005 06:42:01 -0000	1.2
+++ mod_security.spec	21 Jul 2005 01:07:42 -0000	1.3
@@ -1,20 +1,20 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.8.7
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-1.8.7.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz
 Source1: mod_security.conf
-BuildRoot: %{_tmppath}/%{name}-root/
-Requires: httpd >= 2.0.38
-BuildRequires: httpd-devel >= 2.0.38
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
+BuildRequires: httpd-devel
 
 %description
-ModSecurity is an open source intrusion detection and prevention engine for web
-applications. It operates embedded into the web server, acting as a powerful
-umbrella - shielding web applications from attacks.
+ModSecurity is an open source intrusion detection and prevention engine
+for web applications. It operates embedded into the web server, acting
+as a powerful umbrella - shielding web applications from attacks.
 
 %prep
 
@@ -40,6 +40,15 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Sat Jul 9 2005 Michael Fleming  1.8.7-4
+- Add Requires: httpd-mmn to get the appropriate "module magic" version
+  (thanks Ville Skytt?)
+- Disabled an overly-agressive rule or two..
+
+* Sat Jul 9 2005 Michael Fleming  1.8.7-3
+- Correct Buildroot
+- Some sensible and safe rules for common apps in mod_security.conf
+
 * Thu May 19 2005 Michael Fleming  1.8.7-2
 - Don't strip the module (so we can get a useful debuginfo package)
 



From fedora-extras-commits at redhat.com  Thu Jul 21 01:12:46 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 20 Jul 2005 21:12:46 -0400
Subject: common tobuild,1.1963,1.1964
Message-ID: <200507210112.j6L1Ck1g027283@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27266

Modified Files:
	tobuild 
Log Message:
request build of rpms/mod_security/FC-3 mod_security-1_8_7-4_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1963
retrieving revision 1.1964
diff -u -r1.1963 -r1.1964
--- tobuild	20 Jul 2005 19:42:30 -0000	1.1963
+++ tobuild	21 Jul 2005 01:12:44 -0000	1.1964
@@ -104,3 +104,4 @@
 karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
 karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
+mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3



From fedora-extras-commits at redhat.com  Thu Jul 21 01:13:15 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 20 Jul 2005 21:13:15 -0400
Subject: common tobuild,1.1964,1.1965
Message-ID: <200507210113.j6L1DFLC027316@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27299

Modified Files:
	tobuild 
Log Message:
request build of rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1964
retrieving revision 1.1965
diff -u -r1.1964 -r1.1965
--- tobuild	21 Jul 2005 01:12:44 -0000	1.1964
+++ tobuild	21 Jul 2005 01:13:13 -0000	1.1965
@@ -105,3 +105,4 @@
 karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
+mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 02:10:59 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 20 Jul 2005 22:10:59 -0400
Subject: owners owners.list,1.22,1.23
Message-ID: <200507210210.j6L2AxYP028593@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	owners.list 
Log Message:
added apel


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- owners.list	17 Jul 2005 16:29:02 -0000	1.22
+++ owners.list	21 Jul 2005 02:10:57 -0000	1.23
@@ -26,6 +26,7 @@
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|apachetop|A top-like display of Apache logs|gauret at free.fr|extras-qa at fedoraproject.org|
+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|



From fedora-extras-commits at redhat.com  Thu Jul 21 04:03:36 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:03:36 -0400
Subject: extras-buildsys/www - New directory
Message-ID: <200507210403.j6L43aGn031007@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30993/www

Log Message:
Directory /cvs/fedora/extras-buildsys/www added to the repository




From fedora-extras-commits at redhat.com  Thu Jul 21 04:04:35 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:04:35 -0400
Subject: extras-buildsys/www/css - New directory
Message-ID: <200507210404.j6L44ZCt031025@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31015/css

Log Message:
Directory /cvs/fedora/extras-buildsys/www/css added to the repository




From fedora-extras-commits at redhat.com  Thu Jul 21 04:05:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:05:01 -0400
Subject: extras-buildsys/www/template - New directory
Message-ID: <200507210405.j6L451oW031037@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31015/template

Log Message:
Directory /cvs/fedora/extras-buildsys/www/template added to the repository




From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:55 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:55 -0400
Subject: extras-buildsys ChangeLog,1.66,1.67
Message-ID: <200507210407.j6L47tP9031182@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121

Modified Files:
	ChangeLog 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog	20 Jul 2005 14:51:47 -0000	1.66
+++ ChangeLog	21 Jul 2005 04:07:53 -0000	1.67
@@ -1,3 +1,8 @@
+2005-07-21  Dan Williams 
+
+    * www/*
+        - Add the web front-end
+
 2005-07-20  Dan Williams 
 
     * builder/builder.py



From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:56 -0400
Subject: extras-buildsys/www builders.psp, NONE, 1.1 config.psp, NONE,
	1.1 index.psp, NONE, 1.1 indiv.psp, NONE, 1.1
Message-ID: <200507210407.j6L47ubP031187@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/www

Added Files:
	builders.psp config.psp index.psp indiv.psp 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




--- NEW FILE builders.psp ---

<%
curpage = 'builders'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>


    

    

    

<%
import socket, xmlrpclib

args = {}
args['status'] = 'building'
try:
    (e, msg, jobs) = server.list_jobs(args)
    (e, msg, builders) = server.list_builders()
except socket.error, e:
    msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
except xmlrpclib.Fault, fault:
    msg = "XMLRPC Fault"
    e = -1

if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
else:
    for builder in builders:
        import urllib
        type, rest = urllib.splittype(builder['address'])
        addr, port = urllib.splitport(rest)
        addr = addr[2:]

        arch_list = ""
        for arch in builder['arches']:
            arch_list = arch_list + arch
            if arch != builder['arches'][len(builder['arches'])-1]:
                arch_list = arch_list + ", "
        # endfor

        unavail_color = ''
        if builder['status'] == 'unavailable':
            unavail_color = 'color="#ff4444"'
        # endif
%>

    
    
    
<%
        bjob = None
        for job in jobs:
            archjobs = job['archjobs']
            if not archjobs:
                continue
            job_text = 'Jobs:'
            for aj in archjobs:
                if aj['builder_addr'] == addr:
%>
        
<%
                # endif
                job_text = ''
            # endfor
        # endfor
%>
    
    
        
    
            ><%=addr%>  (<%=builder['status']%>)
            <%=arch_list%>
        
    
            
                
    
                
    
                    
    
                        
                            Job:
                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
                            Status:
                             <%=aj['status']%>/<%=aj['builder_status']%>
                        
                    
    
                
    
                
    
                		
        
    
    
    
    
    

<%
    # endfor
# endif
%>


    

<%@ include file="template/foot.psp"%>

    



--- NEW FILE config.psp ---
<%
config_opts = {}
config_opts['system_name'] = "Fedora Extras Build System"
config_opts['base_url'] = "http://127.0.0.1/"

%>


--- NEW FILE index.psp ---

<%
curpage = 'main'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>

<%
import socket, xmlrpclib
try:
    args = {}
    args['status'] = 'waiting'
    (e, msg, waiting_jobs) = server.list_jobs(args)
    args['status'] = 'building'
    (e, msg, building_jobs) = server.list_jobs(args)
except socket.error, e:
    msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
except xmlrpclib.Fault, fault:
    msg = "XMLRPC Fault"
    e = -1

if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
else:
    i = 1
%>


    

    


<%
    i = 1
    for job in building_jobs:
        # Don't show finished jobs older than 1 day
        col = '#efefef'
        if int(i / 2.0) == (i / 2.0):
            col = '#dddddd'
        # endif
        source = job['source']
        if '/' in source:
            import os
            source = os.path.basename(source)
        # endif
%>
        
<%
        i = i + 1
    # endfor

    for job in waiting_jobs:
        # Don't show finished jobs older than 1 day
        col = '#efefef'
        if int(i / 2.0) == (i / 2.0):
            col = '#dddddd'
        # endif
        source = job['source']
        if '/' in source:
            import os
            source = os.path.basename(source)
        # endif
%>
        
<%
        i = i + 1
    # endfor

    # No jobs...
    if i == 1:
%>
        
<%
    # endif
%>


    

    
    
    


    
    Job ID
    Package Name
    Source
    Status
    Target
    Submitter

    

    
            <%=job['uid']%>
            <%=job['package']%>
            <%=source%>
            <%=job['status']%>
            <%=job['target']%>
            <%=job['username']%>
        
    
            <%=job['uid']%>
            <%=job['package']%>
            <%=source%>
            <%=job['status']%>
            <%=job['target']%>
            <%=job['username']%>
        
    
            No jobs found.
        
    

    

    

    

<%
# endtry
%>

<%@ include file="template/foot.psp"%>

    



--- NEW FILE indiv.psp ---

<%
curpage = 'individual'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>

<%
if not len(user_email):
%>

    
    Email Address:  
    

    
<%
else:
    import socket, xmlrpclib
    args = {}
    args['email'] = str(user_email)
    cur_status = ''
    if form.has_key('status') and form['status']:
        cur_status = str(form['status'])
        if cur_status != 'ALL':
            args['status'] = cur_status
    cur_target = ''
    if form.has_key('target') and form['target']:
        cur_target = str(form['target'])
        if cur_target != 'ALL':
            args['target'] = cur_target
    try:
        (e, msg, jobs) = server.list_jobs(args)
        targets = server.targets()
        targets.insert(0, 'ALL')
    except socket.error, e:
        msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
    except xmlrpclib.Fault, fault:
        msg = "XMLRPC Fault"
        e = -1

    if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
    else:
%>

<%
        # default cutoff is 1 day
        cutoff_time = 86400

        status_list = ['ALL', 'waiting', 'building', 'addtorepo', 'needsign', 'failed', 'killed']
%>


    

    

    
    
    
        
            
    
                
    
                
    
                    Filter by:
                    
                        Status:
                        
                    
                    
                        Target:
                        
                    
                    
                
    
                
            
    
            		
    
    

    

    

    


    


<%
        i = 1
        for job in jobs:
            # Don't show finished jobs older than 1 day
            now = time.time()
            if job['status'] == 'killed' or job['status'] == 'needsign':
                if job['endtime'] != 0 and job['endtime'] < time.time() - cutoff_time:
                    continue
            col = '#efefef'
            if int(i / 2.0) == (i / 2.0):
                col = '#dddddd'
            # endif
            source = job['source']
            if '/' in source:
                import os
                source = os.path.basename(source)
            # endif
%>
        
<%
            i = i + 1
        # endfor

        # No jobs...
        if i == 1:
%>
        
<%
        # endif
    # endtry
%>


    

    
    
    


    
    Job ID
    Package Name
    Source
    Status
    Target

    

    
            <%=job['uid']%>
            <%=job['package']%>
            <%=source%>
            <%=job['status']%>
            <%=job['target']%>
        
    
            No jobs found.
        
    

    

    

    

<%
# endif
%>

<%@ include file="template/foot.psp"%>

    




From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:57 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:57 -0400
Subject: extras-buildsys/www/template foot.psp, NONE, 1.1 head.psp, NONE,
	1.1 main.psp, NONE, 1.1
Message-ID: <200507210407.j6L47vWw031197@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/www/template

Added Files:
	foot.psp head.psp main.psp 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




--- NEW FILE foot.psp ---

      
    
  



--- NEW FILE head.psp ---
<%@ include file="config.psp"%>
<%
import time

email_string = ''
email_url = ''
if len(user_email):
    email_string = "<" + user_email + ">"
    email_url = '?email=' + user_email
# endif

active_color = 'bgcolor="#0000cc"'

main_color = '#cc0000'
if curpage == 'main':
    main_color = active_color
builders_color = '#cc0000'
if curpage == 'builders':
    builders_color = active_color
indiv_color = '#cc0000'
if curpage == 'individual':
    indiv_color = active_color
#endif
%>


	
		Fedora Extras Build System
        
		
	
	


-            
+            
@@ -160,6 +164,7 @@
 
    
  
    
    
      
    
        
    
          <%=config_opts['system_name']%>  <%=str(email_string)%>
          Today is: <%=str(time.strftime("%A %B %d, %Y"))%>
        
    
        
    
            
                
    
                    
    
                        >Main
                        >Builders
                        >Individual View
                    
    
                
    
                		
        
    
      
    

      
      
@@ -86,7 +86,6 @@
         
 <%
                 # endif
-                job_text = ''
             # endfor
         # endfor
 %>


Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.psp	22 Jul 2005 05:39:19 -0000	1.2
+++ index.psp	23 Jul 2005 00:55:31 -0000	1.3
@@ -10,6 +10,7 @@
 try:
     args = {}
     args['status'] = 'waiting'
+    args['maxrows'] = 30
     (e, msg, waiting_jobs) = server.list_jobs(args)
     args['status'] = 'building'
     (e, msg, building_jobs) = server.list_jobs(args)
@@ -62,9 +63,11 @@
             import os
             source = os.path.basename(source)
         # endif
+
+        joblink = job_link(job['uid'])
 %>
         
-            
+            
@@ -90,7 +93,7 @@
         # endif
 %>
         
-            
+            
@@ -115,6 +118,7 @@
 
    
        
    
          
            
    


--- NEW FILE main.psp ---
<%
import time
import os
from plague import XMLRPCServerProxy
from OpenSSL import SSL

certs = {}
certs['key_and_cert'] = "/var/www/certs/fedora.cert"
certs['ca_cert'] = "/var/www/certs/fedora-upload-ca.cert"
certs['peer_ca_cert'] = "/var/www/certs/fedora-server-ca.cert"

server = XMLRPCServerProxy.PlgXMLRPCServerProxy("https://flare.boston.redhat.com:8887", certs)

action = 'status'
user_email = ''
if form.has_key('action'):
    action = str(form['action'])
if form.has_key('email'):
    user_email = str(form['email'])

# endif
%>



From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:56 -0400
Subject: extras-buildsys/www/css style.css,NONE,1.1
Message-ID: <200507210407.j6L47uuT031192@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/www/css

Added Files:
	style.css 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




--- NEW FILE style.css ---
html {
	min-width: 800px;
}

body {
	margin: 0;
	padding: 0;
	text-align: center;
	background: #ffffff;
}

* {
	font-family:	"Luxi Sans", "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", helvetica, verdana, arial, sans-serif;
	font-size:	14px;
}

a:link {
	color:	#0468de;
}

table.page {
	width:			100%;
	border:			0px;
	background-color:	#ffffff;
	padding:			0px;
}


/*
-------------------------------
 Top table
-------------------------------
*/

table.top {
	text-align:		bottom;
	width:			100%;
	height:			75px;
	border:			0px;
    margin:         0px;
}

td.top {
    padding:        0px 2px 0px 2px;
    background-color:   #cc0000;
    vertical-align: bottom;
    text-align:     bottom;
    border-bottom:  1px solid #aaaaaa;
}

td.navtable-parent {
    background-color:   #ffffff;
    vertical-align: top;
}

table.navtable {
    background-color:   #cc0000;
    width:              auto;
    padding:            0px;
}

td.navtable-button-left {
    padding:            4px 17px 4px 17px;
}

td.navtable-button {
    padding:            4px 17px 4px 17px;
    border-left:        1px solid #d4d4d4;
}

font.header-text {
	font-size:	24px;
	font-weight:	800;
	color:		#ffffff;
	text-align:	left;
}

font.header-date {
	text-align:	right;
	font-weight:	bold;
	color: #ffffff;
}

a.navtable-button {
    text-align:         center;
    font-weight:        bold;
    color:              #ffffff;
    font-size:          12px;
    text-decoration:    none;
}

table.main {
	width:		100%;
	border:		0px;
}


/*
-------------------------------
 joblist table
-------------------------------
*/

#joblist table {
	padding:			0px;
	background-color:	#dedede;
	border:			solid 1px #999999;
	width:			80%;
	margin-bottom:		5px;
}

#joblist th {
    font-weight:    bold;
    font-size:      14px;
    border-bottom:  solid 1px #999999;
    padding:        3px;
}

#joblist td {
    font-size:      14px;
    text-align:     left;
    padding:        3px;
}

font.status-failed {
    color:          #aa0000;
    font-weight:    bold;
    font-size:      12px;
}

font.status-addtorepo {
    color:          #aaaa00;
    font-weight:    bold;
    font-size:      12px;
}

font.status-needsign {
    color:          #00aa00;
    font-weight:    bold;
    font-size:      12px;
}

font.status-building {
    color:          #0000aa;
    font-weight:    bold;
    font-size:      12px;
}


/*
-------------------------------
 builderlist table
-------------------------------
*/

#builderlist table {
    padding:            1px 2px 1px 2px;
    border:             solid 1px #999999;
    width:              60%; 
    background-color:   #dedede;
}

td.builderlist-head {
    font-size:      14px;
    padding:        1px 2px 1px 2px;
    border-bottom:  solid 1px #999999;
}

font.builderlistaddr {
    font-weight:    bold;
    font-size:      14px;
}

font.builderlistarches {
    font-size:      12px;
    text-align:     right;
}

#archjoblist table {
    padding:            1 px 2px 1px 2px;
    border:             none;
    background-color:   #efefef;
    width:              100%;
}

#archjoblist td {
    font-size:      14px;
    text-align:     left;
    padding-left:   2px;
    padding-right:  2px;
}

font.archjobtag {
    font-weight:    bold;
    font-size:      12px;
}



a.tasktable-item-option-link {
	font-size:	12px;
}

font.tasktable-item-option-nolink {
	font-weight:	800;
	font-size:	12px;
}

table.tasktable-parent-collapsed {
	width:		100%;
}

table.tasktable-parent-expanded {
	width:		100%;
}

a.tasktable-item-collapsed {
	text-align:		left;
	font-weight:		bold;
	border-bottom:		none;
	text-decoration:	none;
}

font.tasktable-item-aux {
	color:		#000000;
	text-align:	left;
	font-size:	12px;
}

a.tasktable-item-expanded {
	text-align:		left;
	font-weight:		bold;
	border-bottom:		none;
	text-decoration:	none;
}

td.tasktable-header {
	font-size:		12px;
	font-weight:		bold;
	color:			#000000;
	background-color:	#749CBB;
}

td.tasktable-task {
	font-size:		12px;
	border-bottom:		1px solid #bcd6f0;
	background-color:	inherit;
}

a.tasktable-bug-link {
	font-size:		12px;
}

td.tasktable-task-last {
	font-size:		12px;
	background-color:	inherit;
}

td.tasktable-no-tasks {
	font-style:		italic;
	background-color:	#ffffff;
}



From fedora-extras-commits at redhat.com  Thu Jul 21 05:42:23 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:23 -0400
Subject: rpms/nco - New directory
Message-ID: <200507210542.j6L5gNNE032553@cvs-int.fedora.redhat.com>

Author: edhill

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

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




From fedora-extras-commits at redhat.com  Thu Jul 21 05:42:23 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:23 -0400
Subject: rpms/nco/devel - New directory
Message-ID: <200507210542.j6L5gNUl032558@cvs-int.fedora.redhat.com>

Author: edhill

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

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




From fedora-extras-commits at redhat.com  Thu Jul 21 05:42:33 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:33 -0400
Subject: rpms/nco Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507210542.j6L5gX3t032605@cvs-int.fedora.redhat.com>

Author: edhill

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 21 05:42:34 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:34 -0400
Subject: rpms/nco/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507210542.j6L5gYBp032610@cvs-int.fedora.redhat.com>

Author: edhill

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

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


--- NEW 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 Jul 21 05:43:25 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:43:25 -0400
Subject: rpms/nco/devel nco-3.0.0-fixudunits.patch, NONE, 1.1 nco.spec, NONE,
	1.1 nco_install_C_headers.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200507210543.j6L5hPHE032684@cvs-int.fedora.redhat.com>

Author: edhill

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

Modified Files:
	.cvsignore sources 
Added Files:
	nco-3.0.0-fixudunits.patch nco.spec 
	nco_install_C_headers.patch 
Log Message:
auto-import nco-3.0.1-3 on branch devel from nco-3.0.1-3.src.rpm

nco-3.0.0-fixudunits.patch:

--- NEW FILE nco-3.0.0-fixudunits.patch ---
--- nco-3.0.0/configure.in.BAD	2005-04-22 10:53:36.000000000 -0500
+++ nco-3.0.0/configure.in	2005-04-22 10:53:54.000000000 -0500
@@ -408,10 +408,8 @@
     LDFLAGS="${LDFLAGS} -L${UDUNITS_PATH}/lib"
     CPPFLAGS="${CPPFLAGS} -I${UDUNITS_PATH}/include"
 #    nco_udunits_dat=${UDUNITS_PATH}/src/lib/udunits.dat
-  elif test "${NETCDF_INC}"; then
-    nco_udunits_dat="${NETCDF_INC}/../etc/udunits.dat"
   else
-    nco_udunits_dat="/usr/local/etc/udunits.dat"
+    nco_udunits_dat="/etc/udunits.dat"
   fi
 # warn if udunits.dat is not found, but continue anyway since the builder may savy and know to add it later, like when building packages (e.g. .debs)
   AC_CHECK_FILE([$nco_udunits_dat],,AC_WARN([file $nco_udunits_dat was not found but will be compiled into NCO. Some executables may fail without it.]))


--- NEW FILE nco.spec ---
Name:           nco
Version:        3.0.1
Release:        3%{?dist}
Summary:        Suite of programs for manipulating NetCDF/HDF4 files
Group:          Applications/Engineering
License:        GPL
URL:            http://nco.sourceforge.net/

#  The NCO web site now recommends CVS so the tar.gz was obtained
#  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
Patch0:		nco_install_C_headers.patch
Patch1:         nco-3.0.0-fixudunits.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  netcdf-devel, libtool, automake, autoconf
BuildRequires:  udunits, udunits-devel, opendap-devel
BuildRequires:  curl-devel, libxml2-devel, librx-devel

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

%description
The netCDF Operators, NCO, are a suite of command line programs known
as operators.  The operators facilitate manipulation and analysis of
self-describing data stored in the freely available netCDF and HDF
formats (http://www.unidata.ucar.edu/packages/netcdf and
http://hdf.ncsa.uiuc.edu, respectively).  Each NCO operator (e.g.,
ncks) takes netCDF or HDF input file(s), performs an operation (e.g.,
averaging, hyperslabbing, or renaming), and outputs a processed netCDF
file.  Although most users of netCDF and HDF data are involved in
scientific research, these data formats, and thus NCO, are generic and
are equally useful in fields from agriculture to zoology.  The NCO
User's Guide illustrates NCO use with examples from the field of
climate modeling and analysis.  The NCO homepage is
http://nco.sourceforge.net/.

%description devel
This package contains the NCO header files and static libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
aclocal
autoheader
automake --foreign
autoconf
export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
%configure --includedir=%{_includedir}/nco
make %{?_smp_mflags}
unset NETCDF_INC NETCDF_LIB CPPFLAGS

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/nco
make install DESTDIR=${RPM_BUILD_ROOT}
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir

%clean
rm -rf ${RPM_BUILD_ROOT}


%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/nco.info.gz \
    %{_infodir}/dir 2>/dev/null || :

%postun
/sbin/ldconfig
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/nco.info.gz \
    %{_infodir}/dir 2>/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc doc/README doc/LICENSE doc/rtfm.txt
%{_bindir}/*
%{_mandir}/*/*
%{_infodir}/*
%{_libdir}/libnco*[0-9]*.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/nco
%{_libdir}/libnco*.a
%{_libdir}/libnco.so
%{_libdir}/libnco_c++.so


%changelog
* Thu Jul 21 2005 Ed Hill  - 3.0.1-3
- add LICENSE file

* Sat Jul  9 2005 Ed Hill  - 3.0.1-2
- add BuildRequires: opendap-devel

* Sun Jun 19 2005 Ed Hill  - 3.0.1-1
- update to upstream 3.0.1
- comment & fixes for BuildRequires

* Sat Apr 23 2005 Ed Hill  - 3.0.0-2
- add BuildRequires and fix CXXFLAGS per Tom Callaway
- add udunits patch per Tom Callaway

* Sat Apr 16 2005 Ed Hill  - 3.0.0-1
- update to ver 3.0.0
- devel package fixes per D.M. Kaplan and M. Schwendt
- fix info post/postun

* Sun Dec  5 2004 Ed Hill  - 0:2.9.9-0.fdr.4
- sync with netcdf-3.6.0beta6-0.fdr.0
- split into devel and non-devel

* Wed Dec  1 2004 Ed Hill  - 0:2.9.9-0.fdr.3
- sync with netcdf-0:3.5.1-0.fdr.11
- added '-fpermissive' for GCC 3.4.2 warnings
- added "Provides:nco-devel" for the headers and libs

* Mon Oct  4 2004 Ed Hill  - 0:2.9.9-0.fdr.2
- Add some of Michael Schwendt's suggested INC/LIB path fixes and 
  sync with the netcdf-3.5.1-0.fdr.10 dependency.

* Thu Sep 23 2004 Ed Hill  - 0:2.9.9-0.fdr.1
- add NETCDF_INC and NETCDF_LIB to work on systems where old
  versions of netcdf may exist in /usr/local

* Wed Sep  8 2004 Ed Hill  - 0:2.9.9-0.fdr.0
- updated to ver 2.9.9

* Sat Aug  7 2004 Ed Hill  - 0:2.9.8-0.fdr.0
- updated to ver 2.9.8

* Sat Jul 17 2004 Ed Hill  - 0:2.9.7-0.fdr.2
- removed unneeded %ifarch

* Sat Jul 17 2004 Ed Hill  - 0:2.9.7-0.fdr.1
- Add %post,%postun

* Sat Jul 17 2004 Ed Hill  - 0:2.9.7-0.fdr.0
- Initial working version


nco_install_C_headers.patch:

--- NEW FILE nco_install_C_headers.patch ---
--- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
@@ -69,6 +69,8 @@
 # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
 libnco_la_LDFLAGS = -release @VERSION@
 
+include_HEADERS = $(HEADER_SRC)
+
 libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
 nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
 nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jul 2005 05:42:32 -0000	1.1
+++ .cvsignore	21 Jul 2005 05:43:23 -0000	1.2
@@ -0,0 +1 @@
+nco-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jul 2005 05:42:32 -0000	1.1
+++ sources	21 Jul 2005 05:43:23 -0000	1.2
@@ -0,0 +1 @@
+72f76553c95bc2b2fdaddcd7cc876f67  nco-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 05:43:24 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:43:24 -0400
Subject: rpms/nco import.log,1.1,1.2
Message-ID: <200507210543.j6L5ht7Z032694@cvs-int.fedora.redhat.com>

Author: edhill

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nco/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jul 2005 05:42:31 -0000	1.1
+++ import.log	21 Jul 2005 05:43:22 -0000	1.2
@@ -0,0 +1 @@
+nco-3_0_1-3:HEAD:nco-3.0.1-3.src.rpm:1121924611



From fedora-extras-commits at redhat.com  Thu Jul 21 06:46:04 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 02:46:04 -0400
Subject: rpms/libapreq2/devel .cvsignore, 1.2, 1.3 libapreq2.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200507210646.j6L6k4Af001486@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jul 2005 14:22:45 -0000	1.2
+++ .cvsignore	21 Jul 2005 06:46:02 -0000	1.3
@@ -1 +1 @@
-libapreq2-2.05-dev.tar.gz
+libapreq2-2.06-dev.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libapreq2.spec	10 Jul 2005 14:22:45 -0000	1.1
+++ libapreq2.spec	21 Jul 2005 06:46:02 -0000	1.2
@@ -1,9 +1,9 @@
 %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}}
 
 Name:           libapreq2
-Version:        2.05
-Release:        0.6
-Summary:        Generic Apache Request Library
+Version:        2.06
+Release:        1%{?dist}
+Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
@@ -13,7 +13,6 @@
 Patch0:         %{name}-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  httpd-devel >= 2.0.48
 BuildRequires:  libtool
 BuildRequires:  apr-devel >= 0.9.4
@@ -26,7 +25,10 @@
 Provides:       libapreq = %{version}-%{release}
 
 %description
-%{summary}.
+libapreq is a shared library with associated modules for manipulating
+client request data via the Apache API.  Functionality includes
+parsing of application/x-www-form-urlencoded and multipart/form-data
+content, as well as HTTP cookies.
 
 %package        devel
 Summary:        Development files for %{name}
@@ -39,14 +41,15 @@
 %{summary}.
 
 %package     -n perl-%{name}
-Summary:        Perl interface to %{name}
+Summary:        Perl interface to the Apache HTTP request library
 Group:          Development/Libraries
 Requires:       mod_perl >= 2.0.0-0.rc5
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-libapreq = %{version}-%{release}
 
 %description -n perl-%{name}
-%{summary}.
+This package contains a Perl interface to the Apache HTTP request
+library.
 
 
 %prep
@@ -77,7 +80,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 # make test # requires write access to system locations?
 
 
@@ -104,7 +107,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc __docs/*
+%doc STATUS __docs/*
 %{_bindir}/apreq2-config
 %{_includedir}/apreq2/
 %{_includedir}/httpd/apreq2/
@@ -121,6 +124,22 @@
 
 
 %changelog
+* Thu Jul 21 2005 Ville Skytt??  - 2.06-1
+- 2.06.
+
+* Tue Jul 19 2005 Ville Skytt??  - 2.06-0.2.rc4
+- 2.06-dev-rc4.
+
+* Sat Jul 16 2005 Ville Skytt??  - 2.06-0.2.rc3
+- 2.06-dev-rc3.
+
+* Wed Jul 13 2005 Ville Skytt??  - 2.06-0.2.rc2
+- 2.06-dev-rc2.
+
+* Sun Jul 10 2005 Ville Skytt??  - 2.06-0.1.rc1
+- 2.06-dev-rc1.
+- Improve summaries and descriptions.
+
 * Wed Jun 29 2005 Ville Skytt??  - 2.05-0.6
 - Rebuild with mod_perl 2.0.1.
 - Drop static libs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 14:22:45 -0000	1.2
+++ sources	21 Jul 2005 06:46:02 -0000	1.3
@@ -1 +1 @@
-0985e102b6d2bc9c747a56b04a85cba6  libapreq2-2.05-dev.tar.gz
+e245db341c4967e0a23b7f767d6486d9  libapreq2-2.06-dev.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 06:50:33 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 02:50:33 -0400
Subject: common tobuild,1.1965,1.1966
Message-ID: <200507210650.j6L6oX4K001516@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499

Modified Files:
	tobuild 
Log Message:
Prevent apel-xemacs from being built for now, use one from Sumo (#162952).


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1965
retrieving revision 1.1966
diff -u -r1.1965 -r1.1966
--- tobuild	21 Jul 2005 01:13:13 -0000	1.1965
+++ tobuild	21 Jul 2005 06:50:30 -0000	1.1966
@@ -93,7 +93,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 pfrields	rpms/nautilus-open-terminal/devel	nautilus-open-terminal-0_4-5_fc5	devel
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
-tagoh	rpms/apel/devel	apel-10_6-7_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
 jpo	rpms/perl-GD/FC-3	perl-GD-2_25-1_fc3	fc3
 jpo	rpms/perl-GD/FC-4	perl-GD-2_25-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 09:00:32 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 21 Jul 2005 05:00:32 -0400
Subject: fedora-security/audit fc4,1.27,1.28
Message-ID: <200507210900.j6L90WN6004600@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4583

Modified Files:
	fc4 
Log Message:
FC4 security updates for firefox, thunderbird, and mysql



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fc4	20 Jul 2005 09:45:53 -0000	1.27
+++ fc4	21 Jul 2005 09:00:30 -0000	1.28
@@ -3,25 +3,29 @@
 
 ** are items that need attention
 
-2005-2270 VULNERABLE (firefox, fixed 1.0.5)
+2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2270 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2269 VULNERABLE (firefox, fixed 1.0.5)
+2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2269 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2268 VULNERABLE (firefox, fixed 1.0.5)
+2005-2269 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2268 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2267 VULNERABLE (firefox, fixed 1.0.5)
-2005-2266 VULNERABLE (firefox, fixed 1.0.5)
+2005-2267 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2266 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2265 VULNERABLE (firefox, fixed 1.0.5)
-2005-2265 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2264 VULNERABLE (firefox, fixed 1.0.5)
-2005-2263 VULNERABLE (firefox, fixed 1.0.5)
+2005-2266 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
+2005-2265 VULNERABLE (mozilla, fixed 1.7.9) [si
+2005-2265 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2264 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2263 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2262 VULNERABLE (firefox, fixed 1.0.5)
-2005-2261 VULNERABLE (thunderbird, fixed 1.0.5)
-2005-2261 VULNERABLE (firefox, fixed 1.0.5)
+2005-2262 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+2005-2261 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2261 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2260 VULNERABLE (firefox, fixed 1.0.5)
+2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2260 VULNERABLE (mozilla, fixed 1.7.9)
 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
 2005-2114 ** mozilla, can't find out when this was fixed upstream
@@ -29,7 +33,7 @@
 2005-2096 backport (rpm) [since FEDORA-2005-565]
 2005-2095 VULNERABLE (squirrelmail)
 2005-2088 VULNERABLE (httpd)
-2005-1937 VULNERABLE (firefox, fixed 1.0.5)
+2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-1937 VULNERABLE (mozilla, fixed 1.7.9)
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
@@ -66,10 +70,11 @@
 2005-1704 backport (binutils) ...eadelf-overflows.patch [since FEDORA-2005-498]
 2005-1689 backport (krb5) [since FEDORA-2005-553]
 2005-1686 ignore (gedit, not a vulnerability)
-2005-1636 VULNERABLE (mysql, fixed 4.1.12) minor issue
+2005-1636 version (mysql, fixed 4.1.12) [since FEDORA-2005-557]
 2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0
 2005-1544 version (libtiff, fixed 3.7.1 at least)
 2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
+2005-1532 version (thunderbird) [since FEDORA-2005-606]
 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]
@@ -120,7 +125,9 @@
 2005-1175 backport (krb5) [since FEDORA-2005-553]
 2005-1174 backport (krb5) [since FEDORA-2005-553]
 2005-1160 version (firefox, mozilla)
+2005-1160 version (thunderbird) [since FEDORA-2005-606]
 2005-1159 version (firefox, mozilla)
+2005-1159 version (thunderbird) [since FEDORA-2005-606]
 2005-1158 version (firefox, fixed 1.0.3)
 2005-1157 version (firefox, mozilla)
 2005-1156 version (firefox, mozilla)
@@ -139,6 +146,7 @@
 2005-0990 backport (sharutils) from srpm
 2005-0989 version (mozilla, fixed 1.7.7)
 2005-0989 version (firefox, fixed 1.0.3)
+2005-0989 version (thunderbird) [since FEDORA-2005-606]
 2005-0988 backport (gzip) from srpm
 2005-0977 version (kernel, fixed 2.6.11)
 2005-0967 version (gaim, fixed 1.2.1)



From fedora-extras-commits at redhat.com  Thu Jul 21 12:12:02 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 21 Jul 2005 08:12:02 -0400
Subject: rpms/brightside/devel brightside.spec,1.8,1.9
Message-ID: <200507211212.j6LCC2gY009705@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	brightside.spec 
Log Message:
rebuild due to updated libwnck


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- brightside.spec	23 May 2005 15:47:06 -0000	1.8
+++ brightside.spec	21 Jul 2005 12:11:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	7
+Release: 	8
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Thorsten Leemhuis  - 1.4.0-8
+- rebuild
+
 * Mon May 23 2005 Thorsten Leemhuis  - 1.4.0-7
 - ExcludeArch: ppc ppc64 for now (#158560)
 



From fedora-extras-commits at redhat.com  Thu Jul 21 12:12:54 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 21 Jul 2005 08:12:54 -0400
Subject: common tobuild,1.1966,1.1967
Message-ID: <200507211212.j6LCCsOn009767@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9750

Modified Files:
	tobuild 
Log Message:
request build of rpms/brightside/devel brightside-1_4_0-8 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1966
retrieving revision 1.1967
diff -u -r1.1966 -r1.1967
--- tobuild	21 Jul 2005 06:50:30 -0000	1.1966
+++ tobuild	21 Jul 2005 12:12:52 -0000	1.1967
@@ -105,3 +105,4 @@
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
+thl	rpms/brightside/devel	brightside-1_4_0-8	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 14:34:45 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Thu, 21 Jul 2005 10:34:45 -0400
Subject: rpms/scim/devel .cvsignore, 1.5, 1.6 scim.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200507211434.j6LEYjMX012310@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	.cvsignore scim.spec sources 
Log Message:
Import Scim-1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jul 2005 03:38:16 -0000	1.5
+++ .cvsignore	21 Jul 2005 14:34:43 -0000	1.6
@@ -1 +1 @@
-scim-1.3.3.tar.gz
+scim-1.4.0.tar.gz


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim.spec	9 Jul 2005 03:38:16 -0000	1.6
+++ scim.spec	21 Jul 2005 14:34:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:      scim
-Version:   1.3.3
+Version:   1.4.0
 Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
@@ -10,7 +10,7 @@
 Source1:   xinput-scim
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-PreReq:    %{_bindir}/update-gtk-immodules
+PreReq:        %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
 
 %description
@@ -36,7 +36,7 @@
 
 
 %build
-%configure --disable-static --disable-ld-version-script
+%configure
 make %{?_smp_mflags}
 
 
@@ -45,8 +45,8 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
-# remove .la files
-find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
+# Kill all .a and .la
+find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f
 
 # install setup panel
 desktop-file-install \
@@ -66,7 +66,7 @@
 
 # install xinput config file.
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 644 %{SOURCE1} \
+install -pm 755 %{SOURCE1} \
   ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
 
 
@@ -132,23 +132,14 @@
 %{_libdir}/libscim*.so
 %{_libdir}/pkgconfig/*.pc
 
+#--------------------------------------------------
 
 %changelog
-* Sat Jul  9 2005 Jens Petersen  - 1.3.3-1
-- update to 1.3.3 release
-  - disable linking with version-scripts for now since they cause some problems
-- disable building of static libs
-
-* Tue Jul  5 2005 Jens Petersen  - 1.3.2-1
-- update to 1.3.2 test release
-- don't set xinput.d script executable
-- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script
+* Fri Jul 16 2005 Ryo Dairiki  - 1.4.0-1
+- update to 1.4.0 release
 
-* Mon Jun 20 2005 Ryo Dairiki  - 1.2.3-2
-- Remove one of doubled capplets for setup.
-
-* Sat May 28 2005 Ryo Dairiki  - 1.2.3-1
-- Update packaging for Fedora Extras
+* Sat May 28 2005 Ryo Dairiki  - 1.2.3-1
+- update to 1.2.3 release
 
 * Fri Mar 13 2005 Ryo Dairiki  - 1.2.2-9
 - Initial packaging for Fedora Extras
@@ -169,3 +160,120 @@
 * Sat Jun 19 2004  James Su 
 - Added /usr/libexec/scim-launcher.
 - Remove setup module for SocketFrontEnd and SocketIMEngine.
+
+* Mon Mar 8 2004  James Su 
+- Added scim-config-agent.
+
+* Thu Oct 30 2003 James Su 
+- Added Simplified Chinese User Manual.
+
+* Wed Sep 03 2003 James Su 
+- cleanup spec.
+
+* Tue Sep 02 2003 James Su 
+- upto 0.8.0
+
+* Tue Jul 29 2003 James Su 
+- updated to include scim-panel-gtk.
+
+* Thu Jun 19 2003 James Su 
+- updated to include scim-setup and its modules.
+
+* Thu Apr 3 2003 James Su 
+- added suite package, which includes all necessary components of SCIM.
+
+* Tue Mar 25 2003 James Su 
+- updated to v0.4.0
+
+* Wed Feb 26 2003 James Su 
+- implemented dynamic adjust feature for generic table module.
+- fixed key handling bug in generic table module.
+
+* Mon Feb 10 2003 James Su 
+- Replaced highlight_start and highlight_end in scim_server
+  and scim_frontend with AttributeList (scim_attributes.h)
+- Moved icons/* to data/icons and gtkstringview.* to
+  utils/
+
+* Thu Jan 2 2003 James Su 
+- updated configure.ac and Makefile.am
+- ready to release 0.3.0
+
+* Tue Nov 12 2002 James Su 
+- merged signal system from libinti.
+- implemented namespace scim.
+- implemented referenced object.
+- version 0.3.0
+
+* Tue Nov 05 2002 James Su 
+- minor fixes for table IM module.
+
+* Mon Nov 04 2002 James Su 
+- More IMdkit memory leak fixes.
+- Table input method bugfixes.
+- version 0.2.2
+
+* Fri Nov 01 2002 James Su 
+- improved table input method.
+- actually fixed the memleaks within IMdkit.
+- pumped the version to 0.2.1
+
+* Thu Oct 31 2002 James Su 
+- fixed some memory leaks in IMdkit
+- reduced memory usage.
+- upgraded to libtool-1.4.3
+
+* Tue Oct 29 2002 James Su 
+- finished Generic Table input server module.
+- fixed several bugs in scim-lib.
+
+* Thu Oct 10 2002 James Su 
+- used gettext to support i18n message.
+- added release info to lib name.
+
+* Mon Sep 30 2002 James Su 
+- version 0.1.4
+- added Embedded Lookup Table style into X11 FrontEnd.
+- use wchar_t instead of unsigned long if __STDC_ISO_10646__ defined.
+
+* Sun Sep 22 2002 James Su 
+- version 0.1.3
+- config button of X11 FrontEnd was disabled.
+
+* Fri Sep 6 2002 James Su 
+- simplified the utilities and lookup table interface.
+
+* Wed Aug 21 2002 James Su 
+- version 0.1.2
+- added configuration options to disable modules.
+- enhanced X11 FrontEnd.
+
+* Sun Aug 11 2002 James Su 
+- version 0.1.1
+- X11 FrontEnd was enhanced.
+
+* Sat Aug 10 2002 James Su 
+- version 0.1.0
+- many bugfixes.
+- Help window of X11 FrontEnd was implemented.
+- scim can exit cleanly.
+
+* Fri Aug 2 2002 James Su 
+- SCIM 0.0.13.
+- Minor bugfixes.
+
+* Mon Jul 29 2002 James Su 
+- SCIM 0.0.12.
+- Minor bugfixes.
+
+* Sun Jul 28 2002 James Su 
+- SCIM 0.0.11.
+- Minor bugfixes.
+
+* Sun Jul 21 2002 James Su 
+- SCIM 0.0.10.
+- Added Simple Config module.
+
+* Sat Jun 22 2002 James Su 
+- first public release of SCIM.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2005 03:38:16 -0000	1.5
+++ sources	21 Jul 2005 14:34:43 -0000	1.6
@@ -1 +1 @@
-6644e6ff3a5c01fbb06ea5809c9396f8  scim-1.3.3.tar.gz
+9af14f5dc73435affb36b116ad77b53e  scim-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 14:36:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 10:36:56 -0400
Subject: extras-buildsys/server PackageJob.py,1.11,1.12
Message-ID: <200507211436.j6LEautj012376@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/server

Modified Files:
	PackageJob.py 
Log Message:
2005-07-21  Dan Williams 

    * common/FileDownloader.py
      server/PackageJob.py
        - Remove usage of os.chdir() since it's process-wide
        - Lock usage of tempfile.mkdtemp() since it seems to have
            threading issues




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PackageJob.py	18 Jul 2005 21:26:30 -0000	1.11
+++ PackageJob.py	21 Jul 2005 14:36:54 -0000	1.12
@@ -99,6 +99,10 @@
     return False
 
 
+# tempfile.mkdtemp seems to have threading issues
+_mkdtemp_lock = threading.Lock()
+
+
 class PackageJob:
     """ Controller object for building 1 SRPM on multiple arches """
 
@@ -249,11 +253,12 @@
     def _checkout(self):
         self._set_cur_stage('checkout')
         dir_prefix = self.cvs_tag + "-"
+        _mkdtemp_lock.acquire()
         self.checkout_tmpdir = tempfile.mkdtemp(prefix=dir_prefix, dir=config_opts['tmpdir'])
-        os.chdir(self.checkout_tmpdir)
+        _mkdtemp_lock.release()
 
         # Checkout the module
-        cmd = '%s co -r %s %s' % (config_opts['cvs_cmd'], self.cvs_tag, self.package)
+        cmd = 'cd %s; %s co -r %s %s' % (self.checkout_tmpdir, config_opts['cvs_cmd'], self.cvs_tag, self.package)
         debugprint("%d: Running %s" % (self.uid, cmd))
         s, o = commands.getstatusoutput(cmd)
         if s != 0:
@@ -264,11 +269,9 @@
         # get it from CVS
         pkg_path = os.path.join(self.checkout_tmpdir, self.package)
         if not os.path.exists(os.path.join(pkg_path, "common")):
-            os.chdir(pkg_path)
-            cmd = '%s co common' % config_opts['cvs_cmd']
+            cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd'])
             debugprint("%d: Running %s" % (self.uid, cmd))
             s, o = commands.getstatusoutput(cmd)
-            os.chdir(self.checkout_tmpdir)
             if s != 0:
                 msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o)
                 raise PrepError(msg)
@@ -290,9 +293,7 @@
             msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag)
             raise PrepError(msg)
 
-        os.chdir(srpm_dir)
-
-        cmd = '%s srpm' % config_opts['make_cmd']
+        cmd = 'cd %s; %s srpm' % (srpm_dir, config_opts['make_cmd'])
         debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir))
         s, o = commands.getstatusoutput(cmd)
         if s != 0:



From fedora-extras-commits at redhat.com  Thu Jul 21 14:36:51 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 10:36:51 -0400
Subject: extras-buildsys ChangeLog,1.67,1.68
Message-ID: <200507211437.j6LEbLGj012379@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329

Modified Files:
	ChangeLog 
Log Message:
2005-07-21  Dan Williams 

    * common/FileDownloader.py
      server/PackageJob.py
        - Remove usage of os.chdir() since it's process-wide
        - Lock usage of tempfile.mkdtemp() since it seems to have
            threading issues




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	21 Jul 2005 04:07:53 -0000	1.67
+++ ChangeLog	21 Jul 2005 14:36:48 -0000	1.68
@@ -1,5 +1,13 @@
 2005-07-21  Dan Williams 
 
+    * common/FileDownloader.py
+      server/PackageJob.py
+        - Remove usage of os.chdir() since it's process-wide
+        - Lock usage of tempfile.mkdtemp() since it seems to have
+            threading issues
+
+2005-07-21  Dan Williams 
+
     * www/*
         - Add the web front-end
 



From fedora-extras-commits at redhat.com  Thu Jul 21 14:36:51 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 10:36:51 -0400
Subject: extras-buildsys/common FileDownloader.py,1.12,1.13
Message-ID: <200507211437.j6LEbLrL012382@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/common

Modified Files:
	FileDownloader.py 
Log Message:
2005-07-21  Dan Williams 

    * common/FileDownloader.py
      server/PackageJob.py
        - Remove usage of os.chdir() since it's process-wide
        - Lock usage of tempfile.mkdtemp() since it seems to have
            threading issues




Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FileDownloader.py	18 Jul 2005 17:24:38 -0000	1.12
+++ FileDownloader.py	21 Jul 2005 14:36:49 -0000	1.13
@@ -103,7 +103,6 @@
         if self._url and self._target_dir and self._filename:
             if not os.path.exists(self._target_dir):
                 os.makedirs(self._target_dir)
-            os.chdir(self._target_dir)
             target_file = os.path.join(self._target_dir, self._filename)
             try:
                 result = self._opener.retrieve(self._url, target_file)



From fedora-extras-commits at redhat.com  Thu Jul 21 14:40:46 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 21 Jul 2005 10:40:46 -0400
Subject: mock mock.py,1.21,1.22
Message-ID: <200507211440.j6LEekhX012412@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12393

Modified Files:
	mock.py 
Log Message:

make more exceptions to allow for better exit codes from mock to define
failures.



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mock.py	8 Jul 2005 05:49:52 -0000	1.21
+++ mock.py	21 Jul 2005 14:40:44 -0000	1.22
@@ -34,9 +34,35 @@
     print >> sys.stderr, msg
 
 
-class Locked(Exception): pass
-class ReturnValue(Exception): pass
-class Error(Exception): pass
+class Error(Exception):
+    def __init__(self, msg):
+        exceptions.Exception.__init__(self)
+        self.msg = msg
+        self.resultcode = 1
+
+class YumError(Error): 
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 30
+
+class PkgError(Error):
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 40
+
+class BuildError(Error):
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 10
+
+class RootError(Error):
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 20
 
 
 
@@ -142,7 +168,7 @@
             if retval != 0:
                 error("Errors cleaning out chroot: %s" % output)
                 if os.path.exists(self.rootdir):
-                    raise Error, "Failed to clean basedir, exiting"
+                    raise RootError, "Failed to clean basedir, exiting"
 
 
     def state(self, curstate=None):
@@ -187,7 +213,7 @@
         self.root_log(output)
 
         if retval != 0:
-            raise Error, "Error peforming yum command: %s" % command
+            raise YumError, "Error peforming yum command: %s" % command
         
         return (retval, output)
         
@@ -216,14 +242,14 @@
         if retval != 0:
             msg = "Error installing srpm: %s" % srpmfn
             self.root_log(msg)
-            raise Error, msg
+            raise RootError, msg
         
         specdir = os.path.join(bd_out, 'SPECS')
         specs = glob.glob('%s/*.spec' % specdir)
         if len(specs) < 1:
             msg =  "No Spec file found in srpm: %s" % srpmfn
             self.root_log(msg)
-            raise Error, msg
+            raise PkgError, msg
 
         spec = specs[0] # if there's more than one then someone is an idiot
     
@@ -236,14 +262,14 @@
         (retval, output) = self.do_chroot(cmd)
         self.root_log(output)
         if retval != 0:
-            raise Error, "Error building srpm from installed spec. See Root log."
+            raise PkgError, "Error building srpm from installed spec. See Root log."
             
         srpmdir = os.path.join(bd_out, 'SRPMS')
         srpms = glob.glob('%s/*.src.rpm' % srpmdir)
         if len(srpms) < 1:
             msg = "No srpm created from specfile from srpm: %s" % srpmfn
             self.root_log(msg)
-            raise Error, msg
+            raise PkgError, msg
         
         srpm = srpms[0] # if there's more than one then something is weird
         
@@ -265,7 +291,7 @@
             for line in output.split('\n'):
                 if line.find('No Package Found for') != -1:
                     errorpkg = line.replace('No Package Found for', '')
-                    raise Error, "Cannot find build req %s. Exiting." % errorpkg
+                    raise BuildError, "Cannot find build req %s. Exiting." % errorpkg
             # nothing made us exit, so we continue
             self.yum('install %s' % arg_string)
 
@@ -296,7 +322,7 @@
         self.build_log(output)
         
         if retval != 0:
-            raise Error, "Error building package from %s, See build log" % srpmfn
+            raise BuildError, "Error building package from %s, See build log" % srpmfn
         
         bd_out = self.rootdir + self.builddir 
         rpms = glob.glob(bd_out + '/RPMS/*.rpm')
@@ -369,7 +395,7 @@
         if retval != 0:
             if output.find('already mounted') == -1: # probably won't work in other LOCALES
                 self.root_log(output)
-                raise Error, "could not mount /dev/pts error was: %s" % output
+                raise RootError, "could not mount /dev/pts error was: %s" % output
         
 
     def _umount(self, path):
@@ -381,7 +407,7 @@
         if retval != 0:
             if output.find('not mounted') == -1: # this probably won't work in other LOCALES
                 self.root_log(output)
-                raise Error, "could not umount %s error was: %s" % (path, output)
+                raise RootError, "could not umount %s error was: %s" % (path, output)
 
     
     def _umount_by_file(self):
@@ -417,7 +443,7 @@
 
         return (retval, output)
 
-    def do_chroot(self, command, fatal = False):
+    def do_chroot(self, command, fatal = False, exitcode=None):
         """execute given command in root"""
         cmd = ""
         
@@ -434,6 +460,9 @@
         (ret, output) = self.do(cmd)
         if (ret != 0) and fatal:
             self.close()
+            if exitcode:
+                ret = exitcode
+            
             error("Non-zero return value %d on executing %s\n" % (ret, cmd))
             sys.exit(ret)
         
@@ -493,7 +522,7 @@
                 (retval, output) = self.do(cmd)
                 if retval != 0:
                     self.root_log(output)
-                    raise Error, "could not mknod error was: %s" % output
+                    raise RootError, "could not mknod error was: %s" % output
 
         # link fd to ../proc/self/fd
         devpath = os.path.join(self.rootdir, 'dev/fd')
@@ -525,7 +554,7 @@
         # make the buildusers/groups
         if not os.path.exists(self.rootdir + self.homedir):
             if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')):
-                raise Error, "Could not find useradd in chroot, maybe the install failed?"
+                raise RootError, "Could not find useradd in chroot, maybe the install failed?"
             cmd = '/usr/sbin/useradd -u %s -d %s %s' % (self.config['chrootuid'], 
                     self.homedir, self.config['chrootuser'])
             self.do_chroot(cmd, fatal = True)
@@ -743,10 +772,10 @@
             my.prep()
             my.build(srpm)
         except Error, e:
-            print e
+            error(e)
             if my:
                 my.close()
-            sys.exit(100)
+            sys.exit(e.resultcode)
     
         my.close()
         print "Results and/or logs in: %s" % my.resultdir



From fedora-extras-commits at redhat.com  Thu Jul 21 16:43:28 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 21 Jul 2005 12:43:28 -0400
Subject: rpms/denyhosts/devel .cvsignore, 1.3, 1.4 denyhosts.spec, 1.2,
	1.3 sources, 1.3, 1.4 denyhosts-0.5.5-workdir.patch, 1.1,
	NONE denyhosts-0.6.0-version.patch, 1.1, NONE
Message-ID: <200507211643.j6LGhSG7015593@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	.cvsignore denyhosts.spec sources 
Removed Files:
	denyhosts-0.5.5-workdir.patch denyhosts-0.6.0-version.patch 
Log Message:
* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-1
- Update to 0.8.0
- Use proper Python installation mechanism.
- Drop denyhosts-0.6.0-version.patch as it's no longer necessary.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 21:37:55 -0000	1.3
+++ .cvsignore	21 Jul 2005 16:43:26 -0000	1.4
@@ -1 +1 @@
-DenyHosts-0.6.0.tar.gz
+DenyHosts-0.8.0.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts.spec	2 Jul 2005 21:37:55 -0000	1.2
+++ denyhosts.spec	21 Jul 2005 16:43:26 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        0.6.0
+Version:        0.8.0
 Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -10,12 +10,11 @@
 Source1:	denyhosts.cron
 Source2:	denyhosts.init
 Source3:	denyhosts-allowed-hosts
-Patch0:		denyhosts-0.5.5-workdir.patch
-Patch1:		denyhosts-0.6.0-version.patch
+Patch0:		denyhosts-0.8.0-workdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
-#BuildRequires:  
+BuildRequires:  python-devel
 Requires:       openssh-server
 
 %description
@@ -30,18 +29,19 @@
 %prep
 %setup -q -n DenyHosts-%{version}
 %patch0 -p0
-%patch1 -p0
+
+%build
+python ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
 
-install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 
 install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts
 
-install -p -m 755 denyhosts.py $RPM_BUILD_ROOT%{_bindir}
 install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts
@@ -56,11 +56,13 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/chkconfig --add denyhosts
 /sbin/service denyhosts condrestart >> /dev/null
 exit 0
 
+
 %preun
 if [ $1 = 0 ]; then
   /sbin/chkconfig --del denyhosts
@@ -68,7 +70,8 @@
 fi
 exit 0
 
-%files
+
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE.txt README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
@@ -85,10 +88,15 @@
 
 %dir %{_localstatedir}/lib/denyhosts
 
-%{_bindir}/denyhosts.py
 %{_initrddir}/denyhosts
 
+
 %changelog
+* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-1
+- Update to 0.8.0
+- Use proper Python installation mechanism.
+- Drop denyhosts-0.6.0-version.patch as it's no longer necessary.
+
 * Sat Jul  2 2005 Jason L Tibbitts III  - 0.6.0-1
 - Update to 0.6.0
 - Add fix for "from version import VERSION" issue.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 21:37:55 -0000	1.3
+++ sources	21 Jul 2005 16:43:26 -0000	1.4
@@ -1 +1 @@
-6d65457ed9c31c548160e2aa74e5a80e  DenyHosts-0.6.0.tar.gz
+951bfb51b045f12281d114594115878a  DenyHosts-0.8.0.tar.gz


--- denyhosts-0.5.5-workdir.patch DELETED ---


--- denyhosts-0.6.0-version.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jul 21 16:56:24 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 21 Jul 2005 12:56:24 -0400
Subject: rpms/denyhosts/devel denyhosts.spec,1.3,1.4
Message-ID: <200507211656.j6LGuO6k016779@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.spec 
Log Message:
* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-2
- Package CHANGELOG.txt and denyhosts.cfg-dist as well (as
  documentation).



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- denyhosts.spec	21 Jul 2005 16:43:26 -0000	1.3
+++ denyhosts.spec	21 Jul 2005 16:56:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        0.8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -73,7 +73,7 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc LICENSE.txt README.txt setup.py
+%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-2
+- Package CHANGELOG.txt and denyhosts.cfg-dist as well (as
+  documentation).
+
 * Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-1
 - Update to 0.8.0
 - Use proper Python installation mechanism.



From fedora-extras-commits at redhat.com  Thu Jul 21 16:57:12 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 21 Jul 2005 12:57:12 -0400
Subject: rpms/denyhosts/devel denyhosts-0.8.0-workdir.patch,NONE,1.1
Message-ID: <200507211657.j6LGvC08016813@cvs-int.fedora.redhat.com>

Author: tibbs

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

Added Files:
	denyhosts-0.8.0-workdir.patch 
Log Message:
Add file.


denyhosts-0.8.0-workdir.patch:

--- NEW FILE denyhosts-0.8.0-workdir.patch ---
--- denyhosts.cfg-dist.orig	2005-07-20 15:46:07.000000000 -0500
+++ denyhosts.cfg-dist	2005-07-21 09:10:52.257847547 -0500
@@ -89,7 +89,7 @@
 # WORK_DIR: the path that DenyHosts will use for writing data to
 # (it will be created if it does not already exist).       
 #
-WORK_DIR = denyhosts
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 



From fedora-extras-commits at redhat.com  Thu Jul 21 17:18:09 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 21 Jul 2005 13:18:09 -0400
Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.4,1.5
Message-ID: <200507211718.j6LHI9Yq017990@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17973/common

Modified Files:
	AuthedXMLRPCServer.py 
Log Message:


. Remove unnecessary/pointless locking. Since all operations use threading.currentThread(), there is no contention to 
avoid.
. Simplify get_authinfo.



Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AuthedXMLRPCServer.py	13 Jul 2005 15:21:05 -0000	1.4
+++ AuthedXMLRPCServer.py	21 Jul 2005 17:18:07 -0000	1.5
@@ -37,30 +37,16 @@
 
 """
 
-__authinfos_lock = threading.Lock()
 __authinfos = {}
 
-
 def _add_authinfo(authinfo):
-    __authinfos_lock.acquire()
     __authinfos[threading.currentThread()] = authinfo
-    __authinfos_lock.release()
 
 def get_authinfo():
-    i = None
-    __authinfos_lock.acquire()
-    try:
-        i = __authinfos[threading.currentThread()]
-    except KeyError:
-        pass
-    __authinfos_lock.release()
-    return i
+    return __authinfos.get(threading.currentThread())
 
 def _del_authinfo():
-    __authinfos_lock.acquire()
     del __authinfos[threading.currentThread()]
-    __authinfos_lock.release()
-
 
 class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
 



From fedora-extras-commits at redhat.com  Thu Jul 21 17:55:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 13:55:44 -0400
Subject: rpms/cdlabelgen/devel .cvsignore, 1.2, 1.3 cdlabelgen.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200507211756.j6LHuEUK018156@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
Update in order to prepare for first Extras build ever (#159127).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Mar 2005 11:04:45 -0000	1.2
+++ .cvsignore	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-cdlabelgen-3.0.0.tgz
+cdlabelgen-3.5.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/cdlabelgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdlabelgen.spec	7 Mar 2005 11:04:45 -0000	1.1
+++ cdlabelgen.spec	21 Jul 2005 17:55:42 -0000	1.2
@@ -1,12 +1,10 @@
 Name: cdlabelgen
-Summary: Generates frontcards and traycards for inserting in CD jewelcases.
-Version: 3.0.0
-Release: 1
-#Source: http://www.red-bean.com/~bwf/software/cdlabelgen/cdlabelgen-1.5.0.tar.gz
-#URL: http://www.red-bean.com/~bwf/software/cdlabelgen
-Source: http://www.aczone.com/pub/tools/cdlabelgen-%{version}.tgz
-URL: http://www.aczone.com/tools/cdinsert/
-BuildRoot: %{_tmppath}/%{name}-root
+Summary: Generates frontcards and traycards for inserting in CD jewelcases
+Version: 3.5.0
+Release: 1%{?dist}
+Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
+URL: http://www.aczoom.com/tools/cdinsert/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPL
 Group: Applications/Publishing
 BuildArch: noarch
@@ -24,9 +22,9 @@
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,10 +33,14 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README cdlabelgen.html
 %{_bindir}/cdlabelgen
-%{_datadir}/cdlabelgen
-%{_mandir}/*/*
+%{_datadir}/cdlabelgen/
+%{_mandir}/man1/*
 
 %changelog
+* Thu Jul 21 2005 Matthias Saou  3.5.0-1
+- Update to 3.5.0.
+- Update URL and Source to new locations.
+
 * Tue Sep 21 2004 Harald Hoyer  3.0.0
 - Updated to new version 3.0.0
 
@@ -88,8 +90,11 @@
 
 * Mon May 8 2000 Tim Powers 
 - rebuilt for 7.0
+
 * Tue Jan 4 2000 Tim Powers 
 - removed unneeded defines
 - rebuilt for 6.2
+
 * Mon Aug 23 1999 Preston Brown 
 - adopted for Powertools 6.1.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Mar 2005 11:04:45 -0000	1.2
+++ sources	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-7e5c5464c168dffa2fadfb6d0d36cdb7  cdlabelgen-3.0.0.tgz
+bbe82a25e9eeb66df54ca8f61d561f59  cdlabelgen-3.5.0.tgz



From fedora-extras-commits at redhat.com  Thu Jul 21 17:55:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 13:55:44 -0400
Subject: rpms/cdlabelgen/FC-4 .cvsignore, 1.2, 1.3 cdlabelgen.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200507211756.j6LHuE2v018161@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
Update in order to prepare for first Extras build ever (#159127).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Mar 2005 11:04:45 -0000	1.2
+++ .cvsignore	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-cdlabelgen-3.0.0.tgz
+cdlabelgen-3.5.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/FC-4/cdlabelgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdlabelgen.spec	7 Mar 2005 11:04:45 -0000	1.1
+++ cdlabelgen.spec	21 Jul 2005 17:55:42 -0000	1.2
@@ -1,12 +1,10 @@
 Name: cdlabelgen
-Summary: Generates frontcards and traycards for inserting in CD jewelcases.
-Version: 3.0.0
-Release: 1
-#Source: http://www.red-bean.com/~bwf/software/cdlabelgen/cdlabelgen-1.5.0.tar.gz
-#URL: http://www.red-bean.com/~bwf/software/cdlabelgen
-Source: http://www.aczone.com/pub/tools/cdlabelgen-%{version}.tgz
-URL: http://www.aczone.com/tools/cdinsert/
-BuildRoot: %{_tmppath}/%{name}-root
+Summary: Generates frontcards and traycards for inserting in CD jewelcases
+Version: 3.5.0
+Release: 1%{?dist}
+Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
+URL: http://www.aczoom.com/tools/cdinsert/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPL
 Group: Applications/Publishing
 BuildArch: noarch
@@ -24,9 +22,9 @@
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,10 +33,14 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README cdlabelgen.html
 %{_bindir}/cdlabelgen
-%{_datadir}/cdlabelgen
-%{_mandir}/*/*
+%{_datadir}/cdlabelgen/
+%{_mandir}/man1/*
 
 %changelog
+* Thu Jul 21 2005 Matthias Saou  3.5.0-1
+- Update to 3.5.0.
+- Update URL and Source to new locations.
+
 * Tue Sep 21 2004 Harald Hoyer  3.0.0
 - Updated to new version 3.0.0
 
@@ -88,8 +90,11 @@
 
 * Mon May 8 2000 Tim Powers 
 - rebuilt for 7.0
+
 * Tue Jan 4 2000 Tim Powers 
 - removed unneeded defines
 - rebuilt for 6.2
+
 * Mon Aug 23 1999 Preston Brown 
 - adopted for Powertools 6.1.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Mar 2005 11:04:45 -0000	1.2
+++ sources	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-7e5c5464c168dffa2fadfb6d0d36cdb7  cdlabelgen-3.0.0.tgz
+bbe82a25e9eeb66df54ca8f61d561f59  cdlabelgen-3.5.0.tgz



From fedora-extras-commits at redhat.com  Thu Jul 21 17:56:58 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 13:56:58 -0400
Subject: common tobuild,1.1967,1.1968
Message-ID: <200507211756.j6LHuwtT018223@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206

Modified Files:
	tobuild 
Log Message:
request build of rpms/cdlabelgen/FC-4 cdlabelgen-3_5_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1967
retrieving revision 1.1968
diff -u -r1.1967 -r1.1968
--- tobuild	21 Jul 2005 12:12:52 -0000	1.1967
+++ tobuild	21 Jul 2005 17:56:55 -0000	1.1968
@@ -106,3 +106,4 @@
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
 thl	rpms/brightside/devel	brightside-1_4_0-8	devel
+thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 18:02:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:02:26 -0400
Subject: rpms/libxml++/FC-4 .cvsignore, 1.2, 1.3 libxml++.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200507211803.j6LI3HQf019443@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19392

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Taking over from Panu.
Version 2.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:48:49 -0000	1.2
+++ .cvsignore	21 Jul 2005 18:02:23 -0000	1.3
@@ -1 +1 @@
-libxml++-0.26.0.tar.bz2
+libxml++-2.10.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libxml++.spec	22 May 2005 22:59:57 -0000	1.8
+++ libxml++.spec	21 Jul 2005 18:02:23 -0000	1.9
@@ -1,77 +1,89 @@
-Name: libxml++
-Version: 0.26.0
-Release: 5
-
-Summary: C++ wrapper for the libxml2 XML parser library
-Group: System Environment/Libraries
-License: LGPL
-URL: http://libxmlplusplus.sourceforge.net/
-Source: http://dl.sf.net/libxmlplusplus/libxml++-0.26.0.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxml2-devel >= 2.5.1, doxygen, graphviz
+Name:           libxml++
+Version:        2.10.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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
 author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
+
 %package devel
-Summary: %{summary}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig, libxml2-devel, glibmm24-devel
 
 %description devel
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
-author is Ari Johnson and it is currently maintained by Christophe de Vienne
-and Murray Cumming.
-
 This package contains the headers and libraries for libxml++ development.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
-make -C docs/reference
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
-rm -rf _reference _examples
-mkdir _reference && cp -a docs/reference/html _reference/reference
-mkdir _examples && cp -a examples _examples/examples
+rm -rf _reference _examples _manual
+mkdir -m 755 _reference _examples _manual
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/reference/2.*/html _reference/reference
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/manual _manual/manual
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+cp -a examples _examples/examples
 # Delete non-working makefiles, object files, prebuilt binaries and empty files.
 find _examples -type f -a \( -name Makefile\* -o -name \*.o \
-    -o \( -name example.C -a -perm +0111 \) -o -empty \) \
-    -exec rm -f {} ';'
-rm -rf _examples/*/*/.libs
+    -o \( -name example.C -a -perm +0111 \) -o -empty \) | xargs rm -f
+find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
-%{_libdir}/libxml++-0.1.so.*
+%{_libdir}/*.so.*
+
 
 %files devel
 %defattr (-,root,root,-)
-%doc _examples/examples _reference/reference
-%{_includedir}/libxml++-1.0
-%{_libdir}/libxml++-*a
-%{_libdir}/libxml++-*.so
-%{_libdir}/pkgconfig/libxml++-1.0.pc
+%doc _examples/examples _reference/reference _manual/manual
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
 
 %changelog
+* Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
+- Version 2.10.0
+- Rearrange and conform to new FE standards
+- Buildrequire glibmm24-devel
+- Add devel requires to -devel
+
 * Sun May 22 2005 Jeremy Katz  - 0.26.0-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:48:49 -0000	1.2
+++ sources	21 Jul 2005 18:02:24 -0000	1.3
@@ -1 +1 @@
-2602cf491a6d285f3f6c276ac2f659f7  libxml++-0.26.0.tar.bz2
+1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jul 21 18:02:52 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 14:02:52 -0400
Subject: common tobuild,1.1968,1.1969
Message-ID: <200507211803.j6LI3NtK019446@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19424

Modified Files:
	tobuild 
Log Message:
request build of rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1968
retrieving revision 1.1969
diff -u -r1.1968 -r1.1969
--- tobuild	21 Jul 2005 17:56:55 -0000	1.1968
+++ tobuild	21 Jul 2005 18:02:50 -0000	1.1969
@@ -107,3 +107,4 @@
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
 thl	rpms/brightside/devel	brightside-1_4_0-8	devel
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
+thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 18:06:22 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:06:22 -0400
Subject: rpms/libxml++/devel .cvsignore, 1.2, 1.3 libxml++.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200507211806.j6LI6MS6019480@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Taking over from Panu.
Version 2.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:48:49 -0000	1.2
+++ .cvsignore	21 Jul 2005 18:06:12 -0000	1.3
@@ -1 +1 @@
-libxml++-0.26.0.tar.bz2
+libxml++-2.10.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libxml++.spec	22 May 2005 22:59:57 -0000	1.8
+++ libxml++.spec	21 Jul 2005 18:06:12 -0000	1.9
@@ -1,77 +1,89 @@
-Name: libxml++
-Version: 0.26.0
-Release: 5
-
-Summary: C++ wrapper for the libxml2 XML parser library
-Group: System Environment/Libraries
-License: LGPL
-URL: http://libxmlplusplus.sourceforge.net/
-Source: http://dl.sf.net/libxmlplusplus/libxml++-0.26.0.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxml2-devel >= 2.5.1, doxygen, graphviz
+Name:           libxml++
+Version:        2.10.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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
 author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
+
 %package devel
-Summary: %{summary}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig, libxml2-devel, glibmm24-devel
 
 %description devel
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
-author is Ari Johnson and it is currently maintained by Christophe de Vienne
-and Murray Cumming.
-
 This package contains the headers and libraries for libxml++ development.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
-make -C docs/reference
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
-rm -rf _reference _examples
-mkdir _reference && cp -a docs/reference/html _reference/reference
-mkdir _examples && cp -a examples _examples/examples
+rm -rf _reference _examples _manual
+mkdir -m 755 _reference _examples _manual
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/reference/2.*/html _reference/reference
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/manual _manual/manual
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+cp -a examples _examples/examples
 # Delete non-working makefiles, object files, prebuilt binaries and empty files.
 find _examples -type f -a \( -name Makefile\* -o -name \*.o \
-    -o \( -name example.C -a -perm +0111 \) -o -empty \) \
-    -exec rm -f {} ';'
-rm -rf _examples/*/*/.libs
+    -o \( -name example.C -a -perm +0111 \) -o -empty \) | xargs rm -f
+find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
-%{_libdir}/libxml++-0.1.so.*
+%{_libdir}/*.so.*
+
 
 %files devel
 %defattr (-,root,root,-)
-%doc _examples/examples _reference/reference
-%{_includedir}/libxml++-1.0
-%{_libdir}/libxml++-*a
-%{_libdir}/libxml++-*.so
-%{_libdir}/pkgconfig/libxml++-1.0.pc
+%doc _examples/examples _reference/reference _manual/manual
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
 
 %changelog
+* Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
+- Version 2.10.0
+- Rearrange and conform to new FE standards
+- Buildrequire glibmm24-devel
+- Add devel requires to -devel
+
 * Sun May 22 2005 Jeremy Katz  - 0.26.0-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:48:49 -0000	1.2
+++ sources	21 Jul 2005 18:06:20 -0000	1.3
@@ -1 +1 @@
-2602cf491a6d285f3f6c276ac2f659f7  libxml++-0.26.0.tar.bz2
+1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jul 21 18:09:20 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:09:20 -0400
Subject: common tobuild,1.1969,1.1970
Message-ID: <200507211809.j6LI9K3n019589@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19572

Modified Files:
	tobuild 
Log Message:
request build of rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1969
retrieving revision 1.1970
diff -u -r1.1969 -r1.1970
--- tobuild	21 Jul 2005 18:02:50 -0000	1.1969
+++ tobuild	21 Jul 2005 18:09:18 -0000	1.1970
@@ -108,3 +108,4 @@
 thl	rpms/brightside/devel	brightside-1_4_0-8	devel
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
+icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 18:10:01 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:10:01 -0400
Subject: common tobuild,1.1970,1.1971
Message-ID: <200507211810.j6LIA1vW019652@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19635

Modified Files:
	tobuild 
Log Message:
request build of rpms/libxml++/devel libxml++-2_10_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1970
retrieving revision 1.1971
diff -u -r1.1970 -r1.1971
--- tobuild	21 Jul 2005 18:09:18 -0000	1.1970
+++ tobuild	21 Jul 2005 18:09:59 -0000	1.1971
@@ -109,3 +109,4 @@
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4
+icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 18:24:34 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:24:34 -0400
Subject: rpms/libcddb/FC-3 .cvsignore, 1.3, 1.4 libcddb.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200507211824.j6LIOYdq019753@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
libcddb: 1.1.0 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 May 2005 12:01:25 -0000	1.3
+++ .cvsignore	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-libcddb-1.0.2.tar.gz
+libcddb-1.1.0.tar.gz


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcddb.spec	11 May 2005 12:01:25 -0000	1.6
+++ libcddb.spec	21 Jul 2005 18:24:32 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.0.2
-Release:	1
+Version:	1.1.0
+Release:	1%{?dist}
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -26,6 +26,7 @@
 This package contains development files (static libraries, headers)
 for libcddb.
 
+
 %prep
 %setup -q
 
@@ -65,6 +66,15 @@
 
 
 %changelog
+* Thu Jul 21 2005 Dams  - 1.1.0-1
+- Updated to 1.1.0
+
+* Sun May 22 2005 Jeremy Katz  - 1.0.2-2
+- rebuild on all arches
+
+* Wed May 11 2005 Dams  - 0:1.0.2-1.4
+- Rebuilt for FC4
+
 * Wed May 11 2005 Dams  - 0:1.0.2-1
 - Added libcdio and pkgconfig buildreq
 - Updated to 1.0.2
@@ -80,4 +90,3 @@
 
 * Tue Mar  9 2004 Dams 
 - Initial build.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2005 12:01:25 -0000	1.3
+++ sources	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-a8f8549cc1afb3bc702a96c7d71d2241  libcddb-1.0.2.tar.gz
+c15ee69fcb9459c9450e8140cdef0952  libcddb-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 18:24:36 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:24:36 -0400
Subject: rpms/libcddb/devel .cvsignore, 1.3, 1.4 libcddb.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200507211824.j6LIOaRc019772@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
libcddb: 1.1.0 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 May 2005 12:01:25 -0000	1.3
+++ .cvsignore	21 Jul 2005 18:24:33 -0000	1.4
@@ -1 +1 @@
-libcddb-1.0.2.tar.gz
+libcddb-1.1.0.tar.gz


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libcddb.spec	23 May 2005 00:15:55 -0000	1.10
+++ libcddb.spec	21 Jul 2005 18:24:33 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.0.2
-Release: 2
+Version:	1.1.0
+Release:	1%{?dist}
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Dams  - 1.1.0-1
+- Updated to 1.1.0
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2005 12:01:25 -0000	1.3
+++ sources	21 Jul 2005 18:24:33 -0000	1.4
@@ -1 +1 @@
-a8f8549cc1afb3bc702a96c7d71d2241  libcddb-1.0.2.tar.gz
+c15ee69fcb9459c9450e8140cdef0952  libcddb-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 18:24:34 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:24:34 -0400
Subject: rpms/libcddb/FC-4 .cvsignore, 1.3, 1.4 libcddb.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200507211824.j6LIOYIe019764@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
libcddb: 1.1.0 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 May 2005 12:01:25 -0000	1.3
+++ .cvsignore	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-libcddb-1.0.2.tar.gz
+libcddb-1.1.0.tar.gz


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libcddb.spec	23 May 2005 00:15:55 -0000	1.10
+++ libcddb.spec	21 Jul 2005 18:24:32 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.0.2
-Release: 2
+Version:	1.1.0
+Release:	1%{?dist}
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Dams  - 1.1.0-1
+- Updated to 1.1.0
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2005 12:01:25 -0000	1.3
+++ sources	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-a8f8549cc1afb3bc702a96c7d71d2241  libcddb-1.0.2.tar.gz
+c15ee69fcb9459c9450e8140cdef0952  libcddb-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 18:26:00 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:26:00 -0400
Subject: common tobuild,1.1971,1.1972
Message-ID: <200507211826.j6LIQ0vw019836@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819

Modified Files:
	tobuild 
Log Message:
request build of rpms/libcddb/FC-4 libcddb-1_1_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1971
retrieving revision 1.1972
diff -u -r1.1971 -r1.1972
--- tobuild	21 Jul 2005 18:09:59 -0000	1.1971
+++ tobuild	21 Jul 2005 18:25:57 -0000	1.1972
@@ -110,3 +110,4 @@
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
+anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 19:02:10 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:02:10 -0400
Subject: rpms/lft/devel lft.spec,1.15,1.16
Message-ID: <200507211902.j6LJ2Ws2021022@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	lft.spec 
Log Message:
* Thu Jul 21 2005 Ville Skytt??  - 2.31-3
- Rebuild against new libpcap.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lft.spec	19 May 2005 18:38:28 -0000	1.15
+++ lft.spec	21 Jul 2005 19:02:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.31
-Release:        2
+Release:        3
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Ville Skytt??  - 2.31-3
+- Rebuild against new libpcap.
+
 * Thu May 19 2005 Ville Skytt??  - 2.31-2
 - 2.31.
 



From fedora-extras-commits at redhat.com  Thu Jul 21 19:04:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:04:32 -0400
Subject: common tobuild,1.1972,1.1973
Message-ID: <200507211905.j6LJ52jp021084@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067

Modified Files:
	tobuild 
Log Message:
request build of rpms/lft/devel lft-2_31-3 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -r1.1972 -r1.1973
--- tobuild	21 Jul 2005 18:25:57 -0000	1.1972
+++ tobuild	21 Jul 2005 19:04:07 -0000	1.1973
@@ -111,3 +111,4 @@
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
+scop	rpms/lft/devel	lft-2_31-3	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 19:53:58 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:53:58 -0400
Subject: common tobuild,1.1973,1.1974
Message-ID: <200507211953.j6LJrwCW021296@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/FC-4 bash-completion-20050720-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1973
retrieving revision 1.1974
diff -u -r1.1973 -r1.1974
--- tobuild	21 Jul 2005 19:04:07 -0000	1.1973
+++ tobuild	21 Jul 2005 19:53:56 -0000	1.1974
@@ -112,3 +112,4 @@
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
+scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 19:54:51 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:54:51 -0400
Subject: common tobuild,1.1974,1.1975
Message-ID: <200507211954.j6LJsp4D021359@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21342

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/devel bash-completion-20050720-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1974
retrieving revision 1.1975
diff -u -r1.1974 -r1.1975
--- tobuild	21 Jul 2005 19:53:56 -0000	1.1974
+++ tobuild	21 Jul 2005 19:54:49 -0000	1.1975
@@ -113,3 +113,4 @@
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
+scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 19:56:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:56:50 -0400
Subject: common tobuild,1.1975,1.1976
Message-ID: <200507211956.j6LJuow9021455@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21438

Modified Files:
	tobuild 
Log Message:
request build of rpms/bochs/devel bochs-2_2_1-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1975
retrieving revision 1.1976
diff -u -r1.1975 -r1.1976
--- tobuild	21 Jul 2005 19:54:49 -0000	1.1975
+++ tobuild	21 Jul 2005 19:56:48 -0000	1.1976
@@ -114,3 +114,4 @@
 scop	rpms/lft/devel	lft-2_31-3	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
+scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 19:58:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:58:06 -0400
Subject: common tobuild,1.1976,1.1977
Message-ID: <200507211958.j6LJw6Ve021493@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21476

Modified Files:
	tobuild 
Log Message:
request build of rpms/bochs/FC-4 bochs-2_2_1-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -r1.1976 -r1.1977
--- tobuild	21 Jul 2005 19:56:48 -0000	1.1976
+++ tobuild	21 Jul 2005 19:58:04 -0000	1.1977
@@ -115,3 +115,4 @@
 scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
+scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:09:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:09:32 -0400
Subject: common tobuild,1.1977,1.1978
Message-ID: <200507212010.j6LKA2EA022679@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22662

Modified Files:
	tobuild 
Log Message:
request build of rpms/synaptic/FC-3 synaptic-0_57_2-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1977
retrieving revision 1.1978
diff -u -r1.1977 -r1.1978
--- tobuild	21 Jul 2005 19:58:04 -0000	1.1977
+++ tobuild	21 Jul 2005 20:09:30 -0000	1.1978
@@ -116,3 +116,4 @@
 scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
+scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3



From fedora-extras-commits at redhat.com  Thu Jul 21 20:11:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:11:43 -0400
Subject: common tobuild,1.1978,1.1979
Message-ID: <200507212012.j6LKCDGT022745@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22725

Modified Files:
	tobuild 
Log Message:
request build of rpms/synaptic/FC-4 synaptic-0_57_2-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -r1.1978 -r1.1979
--- tobuild	21 Jul 2005 20:09:30 -0000	1.1978
+++ tobuild	21 Jul 2005 20:11:41 -0000	1.1979
@@ -117,3 +117,4 @@
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
+scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:14:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:14:32 -0400
Subject: common tobuild,1.1979,1.1980
Message-ID: <200507212014.j6LKEWL1022838@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22821

Modified Files:
	tobuild 
Log Message:
request build of rpms/synaptic/devel synaptic-0_57_2-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -r1.1979 -r1.1980
--- tobuild	21 Jul 2005 20:11:41 -0000	1.1979
+++ tobuild	21 Jul 2005 20:14:30 -0000	1.1980
@@ -118,3 +118,4 @@
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
+scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:35:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:35:43 -0400
Subject: common tobuild,1.1980,1.1981
Message-ID: <200507212035.j6LKZhIb022931@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22914

Modified Files:
	tobuild 
Log Message:
request build of rpms/dvb-apps/FC-4 dvb-apps-1_1_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -r1.1980 -r1.1981
--- tobuild	21 Jul 2005 20:14:30 -0000	1.1980
+++ tobuild	21 Jul 2005 20:35:41 -0000	1.1981
@@ -119,3 +119,4 @@
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
+scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:36:10 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:36:10 -0400
Subject: common tobuild,1.1981,1.1982
Message-ID: <200507212036.j6LKaAUC022993@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22976

Modified Files:
	tobuild 
Log Message:
request build of rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -r1.1981 -r1.1982
--- tobuild	21 Jul 2005 20:35:41 -0000	1.1981
+++ tobuild	21 Jul 2005 20:36:08 -0000	1.1982
@@ -120,3 +120,4 @@
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
 scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
+scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:37:35 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:37:35 -0400
Subject: common tobuild,1.1982,1.1983
Message-ID: <200507212037.j6LKbZ6i023060@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23043

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-IO-Socket-SSL/FC-4 perl-IO-Socket-SSL-0_97-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -r1.1982 -r1.1983
--- tobuild	21 Jul 2005 20:36:08 -0000	1.1982
+++ tobuild	21 Jul 2005 20:37:33 -0000	1.1983
@@ -121,3 +121,4 @@
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
 scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
+scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:38:01 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:38:01 -0400
Subject: common tobuild,1.1983,1.1984
Message-ID: <200507212038.j6LKc1J8023122@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23105

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL-0_97-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -r1.1983 -r1.1984
--- tobuild	21 Jul 2005 20:37:33 -0000	1.1983
+++ tobuild	21 Jul 2005 20:37:59 -0000	1.1984
@@ -122,3 +122,4 @@
 scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
 scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
+scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:39:15 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:39:15 -0400
Subject: common tobuild,1.1984,1.1985
Message-ID: <200507212039.j6LKdFJF023191@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23174

Modified Files:
	tobuild 
Log Message:
request build of rpms/gdome2/FC-4 gdome2-0_8_1-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -r1.1984 -r1.1985
--- tobuild	21 Jul 2005 20:37:59 -0000	1.1984
+++ tobuild	21 Jul 2005 20:39:13 -0000	1.1985
@@ -123,3 +123,4 @@
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
 scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
 scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
+scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:39:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:39:43 -0400
Subject: common tobuild,1.1985,1.1986
Message-ID: <200507212039.j6LKdh94023253@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236

Modified Files:
	tobuild 
Log Message:
request build of rpms/gdome2/devel gdome2-0_8_1-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1985
retrieving revision 1.1986
diff -u -r1.1985 -r1.1986
--- tobuild	21 Jul 2005 20:39:13 -0000	1.1985
+++ tobuild	21 Jul 2005 20:39:41 -0000	1.1986
@@ -124,3 +124,4 @@
 scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
 scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
 scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
+scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:41:52 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:41:52 -0400
Subject: common tobuild,1.1986,1.1987
Message-ID: <200507212041.j6LKfqux023325@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23308

Modified Files:
	tobuild 
Log Message:
request build of rpms/rpmlint/FC-4 rpmlint-0_70-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1986
retrieving revision 1.1987
diff -u -r1.1986 -r1.1987
--- tobuild	21 Jul 2005 20:39:41 -0000	1.1986
+++ tobuild	21 Jul 2005 20:41:50 -0000	1.1987
@@ -125,3 +125,4 @@
 scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
 scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
+scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:42:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:42:29 -0400
Subject: common tobuild,1.1987,1.1988
Message-ID: <200507212042.j6LKgTnj023387@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23370

Modified Files:
	tobuild 
Log Message:
request build of rpms/rpmlint/devel rpmlint-0_70-4_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -r1.1987 -r1.1988
--- tobuild	21 Jul 2005 20:41:50 -0000	1.1987
+++ tobuild	21 Jul 2005 20:42:27 -0000	1.1988
@@ -126,3 +126,4 @@
 scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
+scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 02:54:09 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 22:54:09 -0400
Subject: extras-buildsys/server CONFIG.py, 1.19, 1.20 UserInterface.py, 1.24,
	1.25
Message-ID: <200507220254.j6M2s9Hj030733@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30683/server

Modified Files:
	CONFIG.py UserInterface.py 
Log Message:
2005-07-21  Dan Williams 

    * builder/CONFIG.py
      builder/builder.py
        - You must now specify a target/arch -> mock buildroot name
            mapping in the config file

    * server/UserInterface.py
      server/CONFIG.py
        - Add client target alias support so people don't have to
            know the exact target name
        - Add rowlimit support to job listing




Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CONFIG.py	16 Jul 2005 15:47:43 -0000	1.19
+++ CONFIG.py	22 Jul 2005 02:54:07 -0000	1.20
@@ -58,11 +58,28 @@
 config_opts['targets'] = {  'development' :	['i386'] }
 
 
+# Client Target Map
+#
+# If people don't want to type the whole target name exactly, then add some
+# aliases here.  The target which the server receives from the client when 
+# it enqueues a package is run through this alias list first to determine
+# the final target name.  The aliases are NOT case-sensitive.
+#
+# Mapping - our_target: client_alias
+#
+# ex: { 'development' : ['devel'], '5' : ['fc-5', 'fc5'] }
+
+config_opts['client_target_map'] = { 'development' : ['devel'] }
+
+
+
 # If you're using CVS building, sometimes the CVS directory layout won't match
 # the targets we've defined in config_opts['target'].  Add aliases for them
-# here, like "{  'devel': 'development', '4': 'FC-4' }
+# here.
 #
 # Mapping -   our_target: cvs_target
+#
+# ex: { 'development': 'devel', '4': 'FC-4' }
 
 config_opts['cvs_target_map'] = {}
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- UserInterface.py	20 Jul 2005 19:56:41 -0000	1.24
+++ UserInterface.py	22 Jul 2005 02:54:07 -0000	1.25
@@ -22,6 +22,7 @@
 import sys
 import os
 import copy
+import exceptions
 import BuildMaster
 import PackageJob
 from plague import AuthedXMLRPCServer
@@ -72,11 +73,32 @@
         return None
     return uid
 
-def validate_target(target):
+
+class InvalidTargetError(exceptions.Exception): pass
+
+def resolve_target(target):
+    client_target_map = config_opts['client_target_map']
+
+    # Resolve aliases first
+    resolved_target = target
+    done = True
+    for master_target in client_target_map.keys():
+        for alias in client_target_map[master_target]:
+            if resolved_target.lower() == alias.lower():
+                resolved_target = master_target
+                done = True
+                break
+        if done:
+            break
+
+    # Make sure we actually build the resolved target
     target_dict = config_opts['targets']
-    if target in target_dict.keys():
-        return True
-    return False
+    for master_target in target_dict.keys():
+        if resolved_target.lower() == master_target.lower():
+            return master_target
+
+    raise InvalidTargetError()
+
 
 
 class UserInterface:
@@ -97,20 +119,16 @@
                     "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target))
             return (-1, "This build server is set up for building SRPMS only.  Use the 'enqueue_srpm' command instead.")
 
-        print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" \
-                % (package, cvs_tag, target, email)
-        targets = config_opts['targets']
-        jobid = -1
-        if not targets.has_key(target):
-            print "Error setting up build for %s on %s: target does not exist."\
-                    % (cvs_tag, target)
+        try:
+            real_target = resolve_target(target)
+        except InvalidTargetError:
             email_result(email, cvs_tag, "Error setting up build for %s on "\
                     "%s: target does not exist." % (cvs_tag, target))
             return (-1, "This build server does not support the target %s." % target)
         else:
-            self._bm.enqueue(email, package, cvs_tag, target, buildreq, time.time())
-        return (0, "Success: package has been queued.")
-
+            print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email)
+            self._bm.enqueue(email, package, cvs_tag, real_target, buildreq, time.time())
+            return (0, "Success: package has been queued.")
 
     def enqueue_srpm(self, email, package, srpm_file, target, buildreq=None):
         """ Accept a job to build from SRPM file and stuff it into the job database """
@@ -132,19 +150,16 @@
                     "%s: The SRPM does not exist, or is not accessible.  Remember to use absolute paths." % (srpm_file, target))
             return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.")
 
-        print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" \
-                % (package, srpm_file, target, email)
-        targets = config_opts['targets']
-        jobid = -1
-        if not targets.has_key(target):
-            print "Error setting up build for %s on %s: target does not exist."\
-                    % (srpm_file, target)
+        try:
+            real_target = resolve_target(target)
+        except InvalidTargetError:
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: target does not exist." % (srpm_file, target))
             return (-1, "This build server does not support the target %s." % target)
         else:
-            self._bm.enqueue_srpm(email, package, srpm_file, target, buildreq, time.time())
-        return (0, "Success: package has been queued.")
+            print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email)
+            self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time())
+            return (0, "Success: package has been queued.")
 
     def _kill_job(self, email, job, jobid):
         if not job:
@@ -192,9 +207,11 @@
             sql_args.append('uid<%d' % uid)
 
         if args_dict.has_key('target') and args_dict['target']:
-            if not validate_target(args_dict['target']):
+            try:
+                real_target = resolve_target(args_dict['target'])
+            except InvalidTargetError:
                 return (-1, "Error: Invalid job UID.", [])
-            sql_args.append('target="%s"' % args_dict['target'])
+            sql_args.append('target="%s"' % real_target)
 
         if not len(sql_args):
             return (-1, "Error: Invalid query.", [])
@@ -207,6 +224,12 @@
                 sql = sql + " AND "
             i = i + 1
 
+        # Deal with max # records
+        if args_dict.has_key('maxrows') and args_dict['maxrows']:
+            if not validate_uid(args_dict['maxrows']):
+                return (-1, "Error: Invalid max rows number.", [])
+            sql = sql + " LIMIT %d" % args_dict['maxrows']
+
         # Run the query for the job
         try:
             dbcx, curs = get_dbcx()



From fedora-extras-commits at redhat.com  Fri Jul 22 02:54:03 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 22:54:03 -0400
Subject: extras-buildsys ChangeLog,1.68,1.69
Message-ID: <200507220254.j6M2sXP6030736@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30683

Modified Files:
	ChangeLog 
Log Message:
2005-07-21  Dan Williams 

    * builder/CONFIG.py
      builder/builder.py
        - You must now specify a target/arch -> mock buildroot name
            mapping in the config file

    * server/UserInterface.py
      server/CONFIG.py
        - Add client target alias support so people don't have to
            know the exact target name
        - Add rowlimit support to job listing




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog	21 Jul 2005 14:36:48 -0000	1.68
+++ ChangeLog	22 Jul 2005 02:54:00 -0000	1.69
@@ -1,5 +1,18 @@
 2005-07-21  Dan Williams 
 
+    * builder/CONFIG.py
+      builder/builder.py
+        - You must now specify a target/arch -> mock buildroot name
+            mapping in the config file
+
+    * server/UserInterface.py
+      server/CONFIG.py
+        - Add client target alias support so people don't have to
+            know the exact target name
+        - Add rowlimit support to job listing
+
+2005-07-21  Dan Williams 
+
     * common/FileDownloader.py
       server/PackageJob.py
         - Remove usage of os.chdir() since it's process-wide



From fedora-extras-commits at redhat.com  Fri Jul 22 02:54:04 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 22:54:04 -0400
Subject: extras-buildsys/builder CONFIG.py,1.6,1.7 builder.py,1.22,1.23
Message-ID: <200507220254.j6M2sY7J030740@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30683/builder

Modified Files:
	CONFIG.py builder.py 
Log Message:
2005-07-21  Dan Williams 

    * builder/CONFIG.py
      builder/builder.py
        - You must now specify a target/arch -> mock buildroot name
            mapping in the config file

    * server/UserInterface.py
      server/CONFIG.py
        - Add client target alias support so people don't have to
            know the exact target name
        - Add rowlimit support to job listing




Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CONFIG.py	13 Jul 2005 19:36:06 -0000	1.6
+++ CONFIG.py	22 Jul 2005 02:54:01 -0000	1.7
@@ -5,26 +5,39 @@
 
 config_opts['builder_cmd'] = "/usr/bin/mock"
 
-# Distro and Repo:
-#
-# The builder constructs the buildroot name that it
-# passes to mock from a few things.  The format is:
-#
-# ---
+config_opts['ssl_buildserver'] = True
+config_opts['fileserver_port'] = 8889
+config_opts['xmlrpc_port'] = 8888
+config_opts['hostname'] = 'localhost'
+
+# distro and repo
 #
-# both  and  come from the build server.
-# This constructed name NEEDS to match a mock config
-# file in /etc/mock.
+# These will eventually go away...
 config_opts['distro_name'] = "fedora"
 config_opts['repo_name'] = "core"
 
-config_opts['ssl_buildserver'] = True
 
-config_opts['fileserver_port'] = 8889
-config_opts['xmlrpc_port'] = 8888
-config_opts['hostname'] = 'localhost'
+# Targets
+#
+# These targets are maps of (target, arch) -> "mock buildroot name"
+# Mock buildroot names must currently match the buildroot config files
+# found in /etc/mock
+
+config_opts['mock_buildroot_map'] = {
+    ('fedora', 'development', 'i386', 'core')   : "fedora-development-i386-core",
+    ('fedora', 'development', 'x86_64', 'core') : "fedora-development-x86_64-core",
+    ('fedora', '5', 'i386', 'core')             : "fedora-5-i386-core",
+    ('fedora', '5', 'x86_64', 'core')           : "fedora-5-x86_64-core"
+}
+
+# Arches
+#
+# A list of all architectures and sub-architectures that this builder
+# can build.
 config_opts['arches'] = ['i386', 'i486', 'i586', 'i686']
 
+
+
 BUILDER_DIR = "/etc/plague/builder"
 
 # SSL Certs and keys


Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- builder.py	20 Jul 2005 14:51:48 -0000	1.22
+++ builder.py	22 Jul 2005 02:54:01 -0000	1.23
@@ -30,6 +30,7 @@
 import fcntl
 import urllib
 import errno
+import exceptions
 from plague import ArchUtils
 from plague import FileDownloader
 from plague import AuthedXMLRPCServer
@@ -396,44 +397,54 @@
         return False
 
 
+def resolve_buildroot_name(target, arch):
+    buildroot_map = config_opts['mock_buildroot_map']
+    try:
+        return buildroot_map[(config_opts['distro_name'], target, arch, config_opts['repo_name'])]
+    except KeyError:
+        raise InvalidTargetError()
+
+
+class InvalidTargetError(exceptions.Exception): pass
+
 class i386Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-i386-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'i386')
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/setarch i686'
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class x86_64Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-x86_64-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'x86_64')
         self.buildarch = buildarch
         self.arch_command = ''
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class PPCArch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-ppc-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'ppc')
         self.buildarch = buildarch
         self.arch_command = ''
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class PPC64Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-ppc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'ppc64')
         self.buildarch = buildarch
         self.arch_command = ''
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class SparcArch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-sparc-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'sparc')
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/sparc32'
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class Sparc64Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-sparc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'sparc64')
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/sparc64'
         BuilderMock.__init__(self, uniqid, target, srpm_url)
@@ -609,23 +620,10 @@
     return 0
 
 
-def read_mock_configs(allowed_arches):
-    MOCK_CONFIG_DIR = "/etc/mock/"
-    tmp_list = os.listdir(MOCK_CONFIG_DIR)
+def get_target_arches(allowed_arches):
     target_arches = {}
-    for f in tmp_list:
-        if not f.endswith(".cfg"):
-            continue
-        try:
-            t = f.index("-")
-        except ValueError:
-            continue
-        cfg_name = f[:len(f)-4]
-        try:
-            (distro, target, arch, repo) = cfg_name.split('-')
-        except ValueError:
-            print "Unrecognized config %s, ignoring." % cfg_name
-            continue
+    for t in config_opts['mock_buildroot_map'].keys():
+        (distro, target, arch, repo) = t
         if distro == config_opts['distro_name'] and repo == config_opts['repo_name']:
             # 'arch' is by definition the "master" arch, ie i386 or x86_64,
             # not i486/i586/ia32e/etc.  We want to add on the "sub" arches
@@ -693,9 +691,9 @@
             print "Arch '%s' specified in the config file is not supported." % arch
             sys.exit(1)
 
-    target_arch_dict = read_mock_configs(config_opts['arches'])
+    target_arch_dict = get_target_arches(config_opts['arches'])
     if len(target_arch_dict) == 0:
-        print "No mock configuration files were found.  Exiting."
+        print "No useable mock buildroot names configured.  Exiting."
         sys.exit(1)
 
     if opts.daemon:



From fedora-extras-commits at redhat.com  Fri Jul 22 04:43:19 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Fri, 22 Jul 2005 00:43:19 -0400
Subject: web/html/docs/release-notes index.php,1.4,1.5
Message-ID: <200507220443.j6M4hJbU000639@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622

Modified Files:
	index.php 
Log Message:
Making it more obvious that these notes are recent.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.php	11 Jul 2005 10:00:19 -0000	1.4
+++ index.php	22 Jul 2005 04:43:17 -0000	1.5
@@ -24,7 +24,7 @@
 				
  • Fedora Core 4
    • 
 				
 				
  • Fedora Core 3
    • 



From fedora-extras-commits at redhat.com  Fri Jul 22 05:06:54 2005
From: fedora-extras-commits at redhat.com (Kevin Gray (iprone))
Date: Fri, 22 Jul 2005 01:06:54 -0400
Subject: owners owners.list,1.23,1.24
Message-ID: <200507220507.j6M57Qco001792@cvs-int.fedora.redhat.com>

Author: iprone

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- owners.list	21 Jul 2005 02:10:57 -0000	1.23
+++ owners.list	22 Jul 2005 05:06:49 -0000	1.24
@@ -278,7 +278,7 @@
 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|
-Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|hula|A calendar and mail server|hula-kevin at iprone.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jul 22 05:23:38 2005
From: fedora-extras-commits at redhat.com (Kevin Gray (iprone))
Date: Fri, 22 Jul 2005 01:23:38 -0400
Subject: rpms/hula/devel .cvsignore, 1.4, 1.5 hula.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200507220523.j6M5NcLY001925@cvs-int.fedora.redhat.com>

Author: iprone

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

Modified Files:
	.cvsignore hula.spec sources 
Log Message:
auto-import hula-r261-1 on branch devel from hula-r261-1.src.rpm
import of version r261


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Apr 2005 17:17:18 -0000	1.4
+++ .cvsignore	22 Jul 2005 05:23:35 -0000	1.5
@@ -1 +1 @@
-hula-r200.tgz
+hula-r261.tgz


Index: hula.spec
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/hula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hula.spec	26 Apr 2005 17:17:18 -0000	1.4
+++ hula.spec	22 Jul 2005 05:23:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		hula
 Summary:	A calendar and mail server
-Version:	r200
+Version:	r261
 Release:	1
 Source0:	http://www.kelley.ca/hulaTar/tars/%{name}-%{version}.tgz
 Source1:	hula.init
@@ -32,7 +32,7 @@
 %setup -q
 
 %build 
-./autogen.sh
+./autogen.sh --with-user=hula
 %configure
 make %{?_smp_mflags}
 
@@ -41,7 +41,10 @@
 %makeinstall
 
 # remove all .la files
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/hulamdb/*.la $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/modweb/*.la
+/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/connmgr/*.la \
+	    $RPM_BUILD_ROOT%{_libdir}/hulamdb/*.la \
+	    $RPM_BUILD_ROOT%{_libdir}/*.la \
+	    $RPM_BUILD_ROOT%{_libdir}/modweb/*.la
 
 # remove empty or irrelevant doco
 for foo in ChangeLog INSTALL NEWS; do
@@ -56,6 +59,10 @@
   /sbin/chkconfig --add hula
 fi
 
+%pre
+# Create system user for hula
+/usr/sbin/useradd -c "Hula" -s /sbin/nologin -r hula 2> /dev/null || :
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/service hula stop >/dev/null 2>&1 ||:
@@ -71,10 +78,12 @@
 %defattr(-,root,root,0755)
 %doc HACKING TODO AUTHORS README style-guide.html
 %{_sysconfdir}/rc.d/init.d/hula
+%{_bindir}/hulasqlite
 %{_bindir}/mwcomp
 %{_sbindir}/hulaavirus
 %{_sbindir}/hulaantispam
 %{_sbindir}/hulacalagent
+%{_sbindir}/hulaconnmgr
 %{_sbindir}/huladmc
 %{_sbindir}/hulaforward
 %{_sbindir}/hulageneric
@@ -83,12 +92,19 @@
 %{_sbindir}/hulamanager
 %{_sbindir}/hulamodweb
 %{_sbindir}/hulanmap
+%{_sbindir}/hulapluspack
 %{_sbindir}/hulapop3
 %{_sbindir}/hularules
+%{_sbindir}/hulasendmail
 %{_sbindir}/hulasetup
 %{_sbindir}/hulasmtp
 %{_sbindir}/hulastats
 %{_sbindir}/hulawebadmin
+%dir %{_libdir}/connmgr
+%{_libdir}/connmgr/libcmlists.so
+%{_libdir}/connmgr/libcmrbl.so
+%{_libdir}/connmgr/libcmrdns.so
+%{_libdir}/connmgr/libcmuser.so
 %dir %{_libdir}/hulamdb
 %{_libdir}/hulamdb/libmdbfile.so
 %dir %{_libdir}/modweb
@@ -99,6 +115,8 @@
 %{_libdir}/modweb/public.ctp
 %dir %{_libdir}/netmail/schemas
 %{_libdir}/netmail/schemas/webadmin.sch
+%dir %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/hula.pc
 %dir %{_libdir}/webadmin
 %{_libdir}/webadmin/1stdobj.wat
 %{_libdir}/webadmin/5nmail.wat
@@ -109,14 +127,22 @@
 %{_libdir}/webadmin/8certgen.wat
 %{_libdir}/webadmin/chooser.wat
 %{_libdir}/webadmin/webadmin.wat
+%{_libdir}/libhulaconnio.so.0.0.0
+%{_libdir}/libhulaconnmgr.so.0.0.0
+%{_libdir}/libhulaical.so.0.0.0
+%{_libdir}/libhulaical2.so.0.0.0
 %{_libdir}/libhulalogger.so.0
 %{_libdir}/libhulalogger.so.0.0.0
+%{_libdir}/libhulamanagement.so.0.0.0
 %{_libdir}/libhulamdb.so.0
 %{_libdir}/libhulamdb.so.0.0.0
 %{_libdir}/libhulamemmgr.so.0
 %{_libdir}/libhulamemmgr.so.0.0.0
 %{_libdir}/libhulamsgapi.so.0
 %{_libdir}/libhulamsgapi.so.0.0.0
+%{_libdir}/libhulanmap.so.0.0.0
+%{_libdir}/libhulastreamio.so.0.0.0
+%{_libdir}/libhulautil.so.0.0.0
 %{_libdir}/libhulaxpl.so.0
 %{_libdir}/libhulaxpl.so.0.0.0
 %{_libdir}/libwacert.so
@@ -130,11 +156,14 @@
 %{_libdir}/libwastdobj.so.0
 %{_libdir}/libwastdobj.so.0.0.0
 
+
 %files -n %{name}-devel
 %defattr(-,root,root,0755)
 %dir %{_includedir}/hula
 %{_includedir}/hula/calendar.ary
 %{_includedir}/hula/calendar.tok
+%{_includedir}/hula/cmlib.h
+%{_includedir}/hula/connmgr.h
 %{_includedir}/hula/connio.h
 %{_includedir}/hula/hulautil.h
 %{_includedir}/hula/libical.h
@@ -184,7 +213,9 @@
 %{_includedir}/hula/xplthread.h
 %{_includedir}/hula/xplutil.h
 %{_libdir}/libhulaconnio.a
+%{_libdir}/libhulaconnmgr.a
 %{_libdir}/libhulaical.a
+%{_libdir}/libhulaical2.a
 %{_libdir}/libhulalogger.a
 %{_libdir}/libhulalogger.so
 %{_libdir}/libhulamanagement.a
@@ -203,6 +234,11 @@
 %{_libdir}/libwanmail.a
 %{_libdir}/libwastats.a
 %{_libdir}/libwastdobj.a
+%dir %{_libdir}/connmgr
+%{_libdir}/connmgr/libcmlists.a
+%{_libdir}/connmgr/libcmrbl.a
+%{_libdir}/connmgr/libcmrdns.a
+%{_libdir}/connmgr/libcmuser.a
 %dir %{_libdir}/hulamdb
 %{_libdir}/hulamdb/libmdbfile.a
 %dir %{_libdir}/modweb


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Apr 2005 17:17:18 -0000	1.4
+++ sources	22 Jul 2005 05:23:35 -0000	1.5
@@ -1 +1 @@
-020ed75fab30e0e081364c2468038541  hula-r200.tgz
+b35ff06992eb18a03df4fb3d438be811  hula-r261.tgz



From fedora-extras-commits at redhat.com  Fri Jul 22 05:23:32 2005
From: fedora-extras-commits at redhat.com (Kevin Gray (iprone))
Date: Fri, 22 Jul 2005 01:23:32 -0400
Subject: rpms/hula import.log,1.5,1.6
Message-ID: <200507220524.j6M5O3WK001928@cvs-int.fedora.redhat.com>

Author: iprone

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

Modified Files:
	import.log 
Log Message:
auto-import hula-r261-1 on branch devel from hula-r261-1.src.rpm
import of version r261


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hula/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	26 Apr 2005 17:17:18 -0000	1.5
+++ import.log	22 Jul 2005 05:23:28 -0000	1.6
@@ -2,3 +2,4 @@
 hula-r178-2:HEAD:hula-r178-2.src.rpm:1113599587
 hula-r186-1:HEAD:hula-r186-1.src.rpm:1114526895
 hula-r200-1:HEAD:hula-r200-1.src.rpm:1114535333
+hula-r261-1:HEAD:hula-r261-1.src.rpm:1122009801



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:21 -0400
Subject: extras-buildsys/www builders.psp, 1.1, 1.2 index.psp, 1.1,
	1.2 indiv.psp, 1.1, 1.2
Message-ID: <200507220539.j6M5dLbj002057@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www

Modified Files:
	builders.psp index.psp indiv.psp 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- builders.psp	21 Jul 2005 04:07:54 -0000	1.1
+++ builders.psp	22 Jul 2005 05:39:19 -0000	1.2
@@ -50,11 +50,14 @@
         # endif
 %>
 
-    
    
-    
+    
    
-            
+            
+            
 <%
         bjob = None
@@ -68,18 +71,17 @@
 %>
         
 <%
@@ -89,8 +91,7 @@
         # endfor
 %>
     
    
         
    ><%=addr%>  (<%=builder['status']%>)
-            <%=arch_list%>
+            
+                ><%=addr%>  (<%=builder['status']%>)
    
+                <%=arch_list%>
+                		
         
    
             
-                
    
-                
+                
    
-                        
+                        
    
                     
    
+                        
                             Job:
-                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
+                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
                             Status:
-                             <%=aj['status']%>/<%=aj['builder_status']%>
+                             <%=aj['status']%>/<%=aj['builder_status']%>
                         
                     
    
                 
    
-                
    
                 		
         
    
-    
    
-    
    
+    

    
 
 <%
     # endfor


Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.psp	21 Jul 2005 04:07:54 -0000	1.1
+++ index.psp	22 Jul 2005 05:39:19 -0000	1.2
@@ -31,31 +31,32 @@
 %>
 
 
    
-
    
-
+
    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
 
 <%
     i = 1
     for job in building_jobs:
-        # Don't show finished jobs older than 1 day
-        col = '#efefef'
+        top = ''
+        if i == 1:
+            top = '-top'
+        col_mod = ''
         if int(i / 2.0) == (i / 2.0):
-            col = '#dddddd'
-        # endif
+            col_mod = '-alt'
+
         source = job['source']
         if '/' in source:
             import os
@@ -63,23 +64,25 @@
         # endif
 %>
         
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
 <%
         i = i + 1
     # endfor
 
     for job in waiting_jobs:
-        # Don't show finished jobs older than 1 day
-        col = '#efefef'
+        top = ''
+        if i == 1:
+            top = '-top'
+        col_mod = ''
         if int(i / 2.0) == (i / 2.0):
-            col = '#dddddd'
-        # endif
+            col_mod = '-alt'
+
         source = job['source']
         if '/' in source:
             import os
@@ -87,12 +90,12 @@
         # endif
 %>
         
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
 <%
         i = i + 1


Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indiv.psp	21 Jul 2005 04:07:54 -0000	1.1
+++ indiv.psp	22 Jul 2005 05:39:19 -0000	1.2
@@ -55,17 +55,15 @@
 %>
 
 
    
-
    
-
    
 
     
     
     
 
 
    Job IDPackage NameSourceStatusTargetSubmitterJOB IDPACKAGE NAMESOURCESTATUSTARGETSUBMITTER
 
    
 
    <%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%><%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%>
         
    <%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%><%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%>
         
    
-    
-        
    
-            
-                
-                
-                    
-                    
    Filter by:
-                        Status:
-                        
+    
-    
+                    
+                
+                
+            
+            
+        
    
+        
+            
+            
+                
+                
+                
-                    
+                
+                
-                    
-                
-                
-            
    Filter by:Status:
+                    
-                    
-                        Target:
-                        
+                Target:
+                    
-                    
    
-        
    
+    
    
 
    
-
-
    
 
-
    
-
+
    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
 
@@ -129,10 +123,12 @@
             if job['status'] == 'killed' or job['status'] == 'needsign':
                 if job['endtime'] != 0 and job['endtime'] < time.time() - cutoff_time:
                     continue
-            col = '#efefef'
+            top = ''
+            if i == 1:
+                top = '-top'
+            col_mod = ''
             if int(i / 2.0) == (i / 2.0):
-                col = '#dddddd'
-            # endif
+                col_mod = '-alt'
             source = job['source']
             if '/' in source:
                 import os
@@ -140,11 +136,11 @@
             # endif
 %>
         
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
 <%
             i = i + 1
@@ -154,7 +150,7 @@
         if i == 1:
 %>
         
-            
+            
 <%
         # endif
@@ -163,7 +159,6 @@
 
 
    
 
     
     
     
 
 
    Job IDPackage NameSourceStatusTargetJOB IDPACKAGE NAMESOURCESTATUSTARGET
 
    
 
    <%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%>
         
    No jobs found.No jobs found.
         
    
 
    
-
    
 
 
 <%



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:22 -0400
Subject: extras-buildsys/www/template head.psp,1.1,1.2
Message-ID: <200507220539.j6M5dM0P002069@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www/template

Modified Files:
	head.psp 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: head.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- head.psp	21 Jul 2005 04:07:55 -0000	1.1
+++ head.psp	22 Jul 2005 05:39:20 -0000	1.2
@@ -9,17 +9,15 @@
     email_url = '?email=' + user_email
 # endif
 
-active_color = 'bgcolor="#0000cc"'
-
-main_color = '#cc0000'
+main_active = ''
 if curpage == 'main':
-    main_color = active_color
-builders_color = '#cc0000'
+    main_active = '-active'
+builders_active = ''
 if curpage == 'builders':
-    builders_color = active_color
-indiv_color = '#cc0000'
+    builders_active = '-active'
+indiv_active = ''
 if curpage == 'individual':
-    indiv_color = active_color
+    indiv_active = '-active'
 #endif
 %>
 
@@ -36,19 +34,24 @@
         		
       
-          
-          
+          
+          
+      
    
         
    <%=config_opts['system_name']%>  <%=str(email_string)%>Today is: <%=str(time.strftime("%A %B %d, %Y"))%><%=config_opts['system_name']%>
+            
+              
+              
+            
    <%=str(email_string)%>
    Today is: <%=str(time.strftime("%A %B %d, %Y"))%>
    
+              		
         
    
+
+      
+      
-            
+          
+          
+          
+          
+          
    
         
    
-                
-                    
-                        
-                        
-                        
-                    
-                
    >Main>Builders>Individual View
    
-                		MainlBuilder StatuslMy Packages
         
    
       
    
 



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:21 -0400
Subject: extras-buildsys/www/css style.css,1.1,1.2
Message-ID: <200507220539.j6M5dLPQ002063@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www/css

Modified Files:
	style.css 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: style.css
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- style.css	21 Jul 2005 04:07:54 -0000	1.1
+++ style.css	22 Jul 2005 05:39:19 -0000	1.2
@@ -10,8 +10,8 @@
 }
 
 * {
-	font-family:	"Luxi Sans", "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", helvetica, verdana, arial, sans-serif;
-	font-size:	14px;
+    font-family:    "Luxi Sans", "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", helvetica, verdana, arial, sans-serif;
+    font-size:      14px;
 }
 
 a:link {
@@ -19,10 +19,10 @@
 }
 
 table.page {
-	width:			100%;
-	border:			0px;
-	background-color:	#ffffff;
-	padding:			0px;
+    width:              100%;
+    border:             0px;
+    background-color:   #ffffff;
+    padding:            0px;
 }
 
 
@@ -41,34 +41,13 @@
 }
 
 td.top {
-    padding:        0px 2px 0px 2px;
+    padding:            0px 2px 0px 2px;
     background-color:   #cc0000;
-    vertical-align: bottom;
-    text-align:     bottom;
-    border-bottom:  1px solid #aaaaaa;
-}
-
-td.navtable-parent {
-    background-color:   #ffffff;
-    vertical-align: top;
-}
-
-table.navtable {
-    background-color:   #cc0000;
-    width:              auto;
-    padding:            0px;
-}
-
-td.navtable-button-left {
-    padding:            4px 17px 4px 17px;
+    vertical-align:     bottom;
+    text-align:         bottom;
 }
 
-td.navtable-button {
-    padding:            4px 17px 4px 17px;
-    border-left:        1px solid #d4d4d4;
-}
-
-font.header-text {
+font.header-system-name {
 	font-size:	24px;
 	font-weight:	800;
 	color:		#ffffff;
@@ -81,12 +60,37 @@
 	color: #ffffff;
 }
 
-a.navtable-button {
+/*
+-------------------------------
+ Navigation links table
+-------------------------------
+*/
+
+table.nav {
+    width:              auto;
+    padding:            5px 5px 5px 5px;
+}
+
+td.nav-link-sep {
+    padding:            0px 12px 0px 12px;
+}
+
+font.nav-link-sep {
+    text-align:         center;
+    color:              #000000;
+    font-weight:        bolder;
+    font-size:          18px;
+}
+
+a.nav-link {
+    text-align:         center;
+    font-weight:        bold;
+}
+
+a.nav-link-active {
+    color:              #cc0000;
     text-align:         center;
     font-weight:        bold;
-    color:              #ffffff;
-    font-size:          12px;
-    text-decoration:    none;
 }
 
 table.main {
@@ -97,29 +101,75 @@
 
 /*
 -------------------------------
+ Filter table
+-------------------------------
+*/
+
+table.filter {
+    width:          80%;
+    padding-bottom: 6px;
+}
+
+table.filter-form {
+    width:          auto;
+    vertical-align: center;
+}
+
+td.filter-form-head {
+    padding-left:   8px;
+    font-weight:    bold;
+    vertical-align: center;
+}
+
+td.filter-form-label {
+    padding-left:   10px;
+    text-align:     right;
+    vertical-align: center;
+}
+
+td.filter-form-item {
+    padding-left:   2px;
+    text-align:     left;
+    vertical-align: center;
+}
+
+
+/*
+-------------------------------
  joblist table
 -------------------------------
 */
 
-#joblist table {
-	padding:			0px;
-	background-color:	#dedede;
+table.jobs {
 	border:			solid 1px #999999;
 	width:			80%;
-	margin-bottom:		5px;
 }
 
-#joblist th {
-    font-weight:    bold;
-    font-size:      14px;
-    border-bottom:  solid 1px #999999;
-    padding:        3px;
+th.jobs {
+    font-weight:        bold;
+    font-size:          14px;
+    border-bottom:      solid 1px #999999;
+    padding:            3px;
+    text-align:         left;
+    background-color:   #86b5d9;
 }
 
-#joblist td {
-    font-size:      14px;
+td.job-top {
+    text-align:     left;
+    padding:        4px;
+}
+
+td.job {
     text-align:     left;
-    padding:        3px;
+    border-top:     1px solid #bcd6f0;
+    padding:        4px;
+}
+
+td.job-alt {
+    text-align:         left;
+    border-top:         1px solid #bcd6f0;
+    background-color:   #f1f1f1;
+    padding:            4px;
 }
 
 font.status-failed {
@@ -153,41 +203,40 @@
 -------------------------------
 */
 
-#builderlist table {
-    padding:            1px 2px 1px 2px;
-    border:             solid 1px #999999;
-    width:              60%; 
-    background-color:   #dedede;
+table.builderlist {
+    width:              50%;
 }
 
-td.builderlist-head {
-    font-size:      14px;
-    padding:        1px 2px 1px 2px;
-    border-bottom:  solid 1px #999999;
+td.builderaddr-side {
+    width:              3px;
+    background-color:   #aaaaaa;
+    padding-bottom:     5px;
+}
+
+td.builderaddr {
+    padding:            2px 4px 5px 4px;
+    background-color:   #efefef;
 }
 
-font.builderlistaddr {
+font.builderaddr {
     font-weight:    bold;
     font-size:      14px;
 }
 
-font.builderlistarches {
+font.builderarches {
     font-size:      12px;
-    text-align:     right;
+    font-style:     italic;
+    font-weight:    normal;
 }
 
-#archjoblist table {
+table.archjobs {
     padding:            1 px 2px 1px 2px;
     border:             none;
-    background-color:   #efefef;
-    width:              100%;
+    width:              80%;
 }
 
-#archjoblist td {
-    font-size:      14px;
-    text-align:     left;
-    padding-left:   2px;
-    padding-right:  2px;
+td.archjobs {
+    padding-top:        5px;
 }
 
 font.archjobtag {
@@ -195,68 +244,7 @@
     font-size:      12px;
 }
 
-
-
-a.tasktable-item-option-link {
-	font-size:	12px;
-}
-
-font.tasktable-item-option-nolink {
-	font-weight:	800;
-	font-size:	12px;
-}
-
-table.tasktable-parent-collapsed {
-	width:		100%;
-}
-
-table.tasktable-parent-expanded {
-	width:		100%;
-}
-
-a.tasktable-item-collapsed {
-	text-align:		left;
-	font-weight:		bold;
-	border-bottom:		none;
-	text-decoration:	none;
-}
-
-font.tasktable-item-aux {
-	color:		#000000;
-	text-align:	left;
-	font-size:	12px;
-}
-
-a.tasktable-item-expanded {
-	text-align:		left;
-	font-weight:		bold;
-	border-bottom:		none;
-	text-decoration:	none;
-}
-
-td.tasktable-header {
-	font-size:		12px;
-	font-weight:		bold;
-	color:			#000000;
-	background-color:	#749CBB;
-}
-
-td.tasktable-task {
-	font-size:		12px;
-	border-bottom:		1px solid #bcd6f0;
-	background-color:	inherit;
-}
-
-a.tasktable-bug-link {
-	font-size:		12px;
-}
-
-td.tasktable-task-last {
-	font-size:		12px;
-	background-color:	inherit;
+font.archjob {
+    font-size:      12px;
 }
 
-td.tasktable-no-tasks {
-	font-style:		italic;
-	background-color:	#ffffff;
-}



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:15 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:15 -0400
Subject: extras-buildsys ChangeLog,1.69,1.70
Message-ID: <200507220539.j6M5djBA002072@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981

Modified Files:
	ChangeLog 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	22 Jul 2005 02:54:00 -0000	1.69
+++ ChangeLog	22 Jul 2005 05:39:13 -0000	1.70
@@ -1,3 +1,8 @@
+2005-07-22  Dan Williams 
+
+    * Web front-end cleanup
+        - Use Diana Fong's new design.  Delicious!
+
 2005-07-21  Dan Williams 
 
     * builder/CONFIG.py



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:15 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:15 -0400
Subject: extras-buildsys/builder builder.py,1.23,1.24
Message-ID: <200507220539.j6M5dkZ4002073@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/builder

Modified Files:
	builder.py 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- builder.py	22 Jul 2005 02:54:01 -0000	1.23
+++ builder.py	22 Jul 2005 05:39:13 -0000	1.24
@@ -754,6 +754,9 @@
             xmlserver.handle_request()
         except KeyboardInterrupt, e:
             print "Shutting down..."
+            curjob = xmlserver.get_cur_job()
+            if curjob:
+                xmlserver.die(curjob)
             break
 
         cur_time = time.time()



From fedora-extras-commits at redhat.com  Fri Jul 22 06:51:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:51:55 -0400
Subject: rpms/bash-completion/FC-4 .cvsignore, 1.8, 1.9 bash-completion.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200507220651.j6M6ptdH003385@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350/FC-4

Modified Files:
	.cvsignore bash-completion.spec sources 
Log Message:
* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
- 20050721.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jul 2005 15:25:03 -0000	1.8
+++ .cvsignore	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-bash-completion-20050720.tar.bz2
+bash-completion-20050721.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bash-completion.spec	20 Jul 2005 15:25:03 -0000	1.10
+++ bash-completion.spec	22 Jul 2005 06:51:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           bash-completion
-Version:        20050720
+Version:        20050721
 Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
+- 20050721.
+
 * Wed Jul 20 2005 Ville Skytt??  - 20050720-1
 - 20050720, all patches applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Jul 2005 15:25:03 -0000	1.8
+++ sources	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2
+4de9f0dee0663f08b5e24f64490e642e  bash-completion-20050721.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jul 22 06:51:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:51:56 -0400
Subject: rpms/bash-completion/devel .cvsignore, 1.8, 1.9 bash-completion.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200507220651.j6M6puwL003393@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350/devel

Modified Files:
	.cvsignore bash-completion.spec sources 
Log Message:
* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
- 20050721.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jul 2005 15:25:04 -0000	1.8
+++ .cvsignore	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-bash-completion-20050720.tar.bz2
+bash-completion-20050721.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bash-completion.spec	20 Jul 2005 15:25:04 -0000	1.10
+++ bash-completion.spec	22 Jul 2005 06:51:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           bash-completion
-Version:        20050720
+Version:        20050721
 Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
+- 20050721.
+
 * Wed Jul 20 2005 Ville Skytt??  - 20050720-1
 - 20050720, all patches applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Jul 2005 15:25:04 -0000	1.8
+++ sources	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2
+4de9f0dee0663f08b5e24f64490e642e  bash-completion-20050721.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jul 22 06:52:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:52:41 -0400
Subject: common tobuild,1.1988,1.1989
Message-ID: <200507220652.j6M6qfuF003458@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3441

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -r1.1988 -r1.1989
--- tobuild	21 Jul 2005 20:42:27 -0000	1.1988
+++ tobuild	22 Jul 2005 06:52:39 -0000	1.1989
@@ -127,3 +127,4 @@
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel
+scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 06:53:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:53:08 -0400
Subject: common tobuild,1.1989,1.1990
Message-ID: <200507220653.j6M6r8To003520@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3503

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/devel bash-completion-20050721-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -r1.1989 -r1.1990
--- tobuild	22 Jul 2005 06:52:39 -0000	1.1989
+++ tobuild	22 Jul 2005 06:53:06 -0000	1.1990
@@ -128,3 +128,4 @@
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4
+scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 06:54:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:54:07 -0400
Subject: common tobuild,1.1990,1.1991
Message-ID: <200507220654.j6M6s7bG003548@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3531

Modified Files:
	tobuild 
Log Message:
Remove unneeded bash-completion builds.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -r1.1990 -r1.1991
--- tobuild	22 Jul 2005 06:53:06 -0000	1.1990
+++ tobuild	22 Jul 2005 06:54:05 -0000	1.1991
@@ -112,8 +112,6 @@
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
-scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
-scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3



From fedora-extras-commits at redhat.com  Fri Jul 22 07:52:28 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 22 Jul 2005 03:52:28 -0400
Subject: fedora-security/audit fc4,1.28,1.29
Message-ID: <200507220752.j6M7qSoD004911@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4894

Modified Files:
	fc4 
Log Message:
Mozilla is now released; fix the bad sorting



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fc4	21 Jul 2005 09:00:30 -0000	1.28
+++ fc4	22 Jul 2005 07:52:26 -0000	1.29
@@ -4,57 +4,55 @@
 ** are items that need attention
 
 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2270 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2269 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2269 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2269 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2268 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2268 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+2005-2267 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2267 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2266 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2266 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2266 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
-2005-2265 VULNERABLE (mozilla, fixed 1.7.9) [si
+2005-2265 version (mozilla, fixed 1.7.9) [si [since FEDORA-2005-619]
 2005-2265 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2264 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2263 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2263 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2262 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2261 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2261 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2261 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2260 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
 2005-2114 ** mozilla, can't find out when this was fixed upstream
 2005-2096 backport (zlib) [since FEDORA-2005-523]
 2005-2096 backport (rpm) [since FEDORA-2005-565]
 2005-2095 VULNERABLE (squirrelmail)
 2005-2088 VULNERABLE (httpd)
+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-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-1937 VULNERABLE (mozilla, fixed 1.7.9)
+2005-1937 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
+2005-1831 ignore (sudo) unsubstantiated report
+2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
 2005-1768 version (kernel, fixed 2.6.6)
+2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483]
 2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1761 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
-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-1937 VULNERABLE (firefox)
-2005-1937 VULNERABLE (mozilla)
-2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
-2005-1831 ignore (sudo) unsubstantiated report
-2005-1763 version (kernel) [since FEDORA-2005-510]
-2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
-2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483]
 2005-1760 VULNERABLE (sysreport)
 2005-1759 VULNERABLE (nmap)
 2005-1759 VULNERABLE (openldap)
@@ -62,7 +60,6 @@
 2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
 2005-1751 VULNERABLE (openldap, fixed shtool 2.0.2)
 2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
-2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 2005-1740 backport (net-snmp, not fixed)
 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1]
 2005-1705 version (gdb, fixed 6.3)
@@ -72,6 +69,7 @@
 2005-1686 ignore (gedit, not a vulnerability)
 2005-1636 version (mysql, fixed 4.1.12) [since FEDORA-2005-557]
 2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0
+2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 2005-1544 version (libtiff, fixed 3.7.1 at least)
 2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
 2005-1532 version (thunderbird) [since FEDORA-2005-606]



From fedora-extras-commits at redhat.com  Fri Jul 22 09:08:11 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Fri, 22 Jul 2005 05:08:11 -0400
Subject: web/html/docs/release-notes/fc4/errata index.php, 1.4,
	1.5 ld-txt-fedora-desktop-screenshot.php, 1.3, 1.4
Message-ID: <200507220908.j6M98Bm8007800@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc4/errata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7781

Modified Files:
	index.php ld-txt-fedora-desktop-screenshot.php 
Log Message:
Adding in a section that mirrors the Wiki page ForbiddenItems.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc4/errata/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.php	19 Jul 2005 23:10:39 -0000	1.4
+++ index.php	22 Jul 2005 09:08:09 -0000	1.5
@@ -22,40 +22,43 @@
 
 
    
 
    1. Welcome to Fedora Core 4
    
-
    1.1. New in Fedora Core 4
    
+
    
+
    1.1. New in Fedora Core 4
    
+
    1.2. MP3 Codecs and Other Patented or Closed Source Software
    
+
    
 
    2. Legalnotice
    
 
    3. Introduction and Technical Release Notes
    
 
    4. Hardware Requirements
    
 
    
-
    4.1. CPU Requirements
    
-
    4.2. Hard Disk Space Requirements
    
-
    4.3. Memory Requirements
    
+
    4.1. CPU Requirements
    
+
    4.2. Hard Disk Space Requirements
    
+
    4.3. Memory Requirements
    
 
    4.4. PPC Hardware Requirements
    
 
    
 
    5. Overview of This Release
    
 
    6. Installation-Related Notes
    
 
    
 
    6.1. PPC Installation Notes
    
-
    6.2. Anaconda Notes
    
-
    6.3. Installation-Related Issues
    
+
    6.2. Anaconda Notes
    
+
    6.3. Installation-Related Issues
    
 
    
-
    7. Package-Specific Notes
    
+
    7. Package-Specific Notes
    
 
    
 
    7.1. Basic Components
    
 
    
-
    7.1.1. Fedora Extras Repository
    
+
    7.1.1. Fedora Extras Repository
    
 
    7.1.2. Audit Daemon auditd and Log
 	Files
    
 
    7.1.3. LinuxThreads versus NPTL
    
-
    7.1.4. Enabling the slocate Database
    
-
    7.1.5. Stricter Controls in openssh
    
+
    7.1.4. Enabling the slocate Database
    
+
    7.1.5. Stricter Controls in openssh
    
 
    7.1.6. Perl Binary Compat Symlinks
    
 
    7.1.7. Server and System Configuration Tools
    
-
    7.1.8. Java Package Recommendations
    
+
    7.1.8. Java Package Recommendations
    
 
    
 
    7.2. Core
    
 
    
-
    7.2.1. yum
    
+
    7.2.1. yum
    
 
    7.2.2. 
     Linux Kernel
   
    
@@ -65,8 +68,8 @@
     Development Tools
   
 
    7.3.1. GCC Compiler Collection
    
-
    7.4. Language Support
    
-
    7.4.1. The IIIMF Input System
    
+
    7.4. Language Support
    
+
    7.4.1. The IIIMF Input System
    
 
    7.5. Web Servers
    
 
    
 
    7.5.1. mod_perl
    
@@ -151,8 +154,8 @@
 	
    
 
    
 
    
-
    
-
    [D]
+
    
+
    [D]
 
    
 
    
 
    Example??1.??New desktop featuring Clearlooks and Evince
    
@@ -223,6 +226,134 @@
 	
    
 
    
 
    
+
    
+
    
+
    
+1.2.??MP3 Codecs and Other Patented or Closed Source Software
    
+
    
+
    
+
    
+      This section is a brief explanation of why certain software is not
+      included in Fedora Core or Fedora Extras.  This information was drawn directly
+      from the canonical wiki page:
+    
    
+
    
+      http://fedoraproject.org/wiki/ForbiddenItems
+    
    
+
    
+      A frequent question of the Fedora Project is why certain items are not
+      included in Fedora Core or Fedora Extras. This briefly explains some of the
+      reasons.
+    
    
+
    
+      Other items, such as file systems support, requires community
+      participation.  For more information, refer to http://fedoraproject.org/wiki/Wishlist
+    
    
+
    
+
    NTFS
    
+
    
+	    NTFS Support is not included in the Fedora Core kernel because of
+	    patent concerns. Using a file system natively supported by
+	    Linux such as ext3 is a better option. If you must share
+	    files between Windows and Linux on a single system, use
+	    FAT/FAT32 (vfat) instead. For sharing across a network,
+	    Samba is a good option.
+	  
    
+
    MP3 encode/decode functionality
    
+
    
+	    MP3 support is not included in any Fedora Core application because
+	    MP3 is heavily patented in several regions including the
+	    United States. The patent holder is unwilling to give an
+	    unrestricted patent grant, as required by the GPL. Other
+	    platforms might have paid the royalty and/or included
+	    proprietary software. Other Linux distributions not based in
+	    a region affected by the patent might ship MP3
+	    decoders/encoders. However, Fedora Core cannot and does not ship
+	    MP3 decoders/encoders in order to serve the goal of shipping
+	    only free and open source software. Using other open source
+	    formats such as Ogg Vorbis (a lossy codec that has better
+	    quality than MP3) or FLAC (a lossless codec) is highly
+	    recommended.
+	  
    
+
    NVIDIA 3D drivers
    
+
    
+	    The NVIDIA 3D drivers are closed source. Fedora Core does not
+	    include proprietary binaries. Consider using an Intel or any
+	    other manufacturer that supports open source cards with full
+	    specifications and/or source code.
+	  
    
+
    ATI 3D drivers
    
+
    
+	    The ATI 3D drivers are closed source. Fedora Core does not include
+	    proprietary binaries. Consider using an Intel or any other
+	    manufacturer that supports open source cards with full
+	    specifications and/or source code.
+	  
    
+
    RealPlayer
    
+
    
+	    RealPlayer is a closed source application. Fedora Core does not
+	    include proprietary binaries. Consider using open source
+	    codecs that do not have patent restrictions.
+	  
    
+
    DVD video playback
    
+
    
+	    DVD video playback (of CSS encrypted DVDs) may violate the
+	    US DMCA (refer to http://en.wikipedia.org/wiki/DMCA) 
+	    because it may be considered circumventing an encryption
+	    mechanism. Additionally, MPEG2 is a patented codec, so even
+	    DVDs without encryption cannot be played. Consider using
+	    open source unencrypted mediums such as Ogg Theora formats.
+	  
    
+
    Mono
    
+
    
+	    Mono packages are not currently included due to potential
+	    legal issues. (Pending more input.) Applications can be
+	    written in other languages that are open source, such as
+	    Python, Perl, or Ruby. Java is cross-platform and GCJ is a
+	    relatively mature open source implementation of it. These
+	    are not direct one-to-one equivalents with .NET but might
+	    serve your purpose.
+	  
    
+
    Cryptology (mcrypt)
    
+
    
+	    Some cryptology related packages such as mcrypt are not
+	    included within Fedora Core due to US export restrictions. Consider
+	    using non-restricted cryptographical methods instead.
+	  
    
+
    szip
    
+
    
+	    The szip license is too restrictive for inclusion in Fedora Extras.
+	    Use other open source alternatives.
+	  
    
+
    
+
    
+      In conclusion:
+    
    
+
      
+
    •  If it is proprietary, it cannot be included in Fedora.
+	
      • 
+
    • 
+	  If it is legally encumbered, it cannot be included in Fedora.
+	
      • 
+
    • 
+	  If it violates US Federal law, it cannot be included in Fedora.
+	
      • 
+
    
+
    
+      Of course, the logical followup is: "But I want to get foo and do
+      bar, how can I do one of the items listed above?"
+    
    
+
    
+      The unofficial http://fedorafaq.org provides
+      useful answers on commonly asked questions. However, these are
+      completely unsupported by the Fedora Project. The Fedora Project recommends using free
+      and open source software alternatives whenever possible.
+    
    
+
    
+      The binary only drivers can be acquired from the vendors. You can
+      find many interesting things with Google.
+    
    
+
    
 
    
 
    
 
    
@@ -252,7 +383,7 @@
     produced for the Fedora Project.
     
    
 
    
-    RELEASE-NOTES-FC4 (2005-07-19-T16:20-0700)
+    RELEASE-NOTES-FC4 (2005-07-22-T04:20-0700)
   
    
 
    
     Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
@@ -357,7 +488,7 @@
 
    
 
    
 
    
-4.1.??CPU Requirements
    
+4.1.??CPU Requirements
    
 
    
 
    
 
    This section lists the CPU specifications required by Fedora Core
@@ -401,7 +532,7 @@
 
    
 
    
 
    
-4.2.??Hard Disk Space Requirements
    
+4.2.??Hard Disk Space Requirements
    
 
    
 
    
 
    This section lists the disk space required to install Fedora Core
@@ -464,7 +595,7 @@
 
    
 
    
 
    
-4.3.??Memory Requirements
    
+4.3.??Memory Requirements
    
 
    
 
 
    This section lists the memory required to install Fedora Core
@@ -947,7 +1078,7 @@
 
    
 
    
 
    
-6.2.??Anaconda Notes
    
+6.2.??Anaconda Notes
    
 
    
 
 
      
@@ -1010,7 +1141,7 @@
 
      
 
      
 
      
-6.3.??Installation-Related Issues
      
+6.3.??Installation-Related Issues
      
 
      
 
    
 
      
@@ -1110,7 +1241,7 @@
 
      
 
      
 
      
-7.??Package-Specific Notes
      
+7.??Package-Specific Notes
      
 
      
 
    
 
    
@@ -1132,7 +1263,7 @@
 
    
 
    
 
    
-7.1.1.??Fedora Extras Repository
    
+7.1.1.??Fedora Extras Repository
    
 
    
 
 
    
@@ -1274,7 +1405,7 @@
 
    
 
    
 
    
-7.1.4.??Enabling the slocate Database
    
+7.1.4.??Enabling the slocate Database
    
 
    
 
 
    
@@ -1288,7 +1419,7 @@
 
    
 
    
 
    
-7.1.5.??Stricter Controls in openssh
    
+7.1.5.??Stricter Controls in openssh
    
 
    
 
 
    
@@ -1374,7 +1505,7 @@
 
    
 
    
 
    
-7.1.8.??Java Package Recommendations
    
+7.1.8.??Java Package Recommendations
    
 
    
 
 
    
@@ -1405,7 +1536,7 @@
 
    
 
    
 
    
-7.2.1.??yum
    
+7.2.1.??yum
    
 
    
 
 
    
@@ -1899,7 +2030,7 @@
 
    
 
    
 
    
-7.4.??Language Support
    
+7.4.??Language Support
    
 
    
 
 
    
@@ -1909,7 +2040,7 @@
 
    
 
    
 
    
-7.4.1.??The IIIMF Input System
    
+7.4.1.??The IIIMF Input System
    
 
    
 
 
    





From fedora-extras-commits at redhat.com  Fri Jul 22 10:04:16 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 22 Jul 2005 06:04:16 -0400
Subject: rpms/scim/devel scim.spec,1.7,1.8
Message-ID: <200507221005.j6MA59PL008957@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	scim.spec 
Log Message:
Restore Jens previous commits



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim.spec	21 Jul 2005 14:34:43 -0000	1.7
+++ scim.spec	22 Jul 2005 10:04:14 -0000	1.8
@@ -36,17 +36,17 @@
 
 
 %build
-%configure
+%configure --disable-static --disable-ld-version-script
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
+mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
 # Kill all .a and .la
-find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f
+find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
 # install setup panel
 desktop-file-install \
@@ -138,6 +138,16 @@
 * Fri Jul 16 2005 Ryo Dairiki  - 1.4.0-1
 - update to 1.4.0 release
 
+* Sat Jul  9 2005 Jens Petersen  - 1.3.3-1
+- update to 1.3.3 release
+- disable linking with version-scripts for now since they cause some problems
+- disable building of static libs
+
+* Tue Jul  5 2005 Jens Petersen  - 1.3.2-1
+- update to 1.3.2 test release
+- don't set xinput.d script executable
+- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script
+
 * Sat May 28 2005 Ryo Dairiki  - 1.2.3-1
 - update to 1.2.3 release
 



From fedora-extras-commits at redhat.com  Fri Jul 22 12:02:08 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 22 Jul 2005 08:02:08 -0400
Subject: fedora-security/audit fc4,1.29,1.30
Message-ID: <200507221202.j6MC2cBi011372@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11355

Modified Files:
	fc4 
Log Message:
Catch up on released updated



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fc4	22 Jul 2005 07:52:26 -0000	1.29
+++ fc4	22 Jul 2005 12:02:06 -0000	1.30
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+2005-2355 backport (fetchmail) [since FEDORA-2005-613]
 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
@@ -92,8 +93,8 @@
 2005-1458 version (ethereal, fixed 0.10.11)
 2005-1457 version (ethereal, fixed 0.10.11)
 2005-1456 version (ethereal, fixed 0.10.11)
-2005-1455 VULNERABLE (freeradius, affects 1.0.2) waiting for upstream
-2005-1454 VULNERABLE (freeradius, affects 1.0.2) waiting for upstream
+2005-1455 version (freeradius, fixed 1.0.3) [since FEDORA-2005-602]
+2005-1454 version (freeradius, fixed 1.0.3) [since FEDORA-2005-602]
 2005-1431 version (gnutls, fixed 1.0.25)
 2005-1410 version (postgresql, fixed 8.0.2)
 2005-1409 version (postgresql, fixed 8.0.1)



From fedora-extras-commits at redhat.com  Fri Jul 22 13:17:13 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Fri, 22 Jul 2005 09:17:13 -0400
Subject: rpms/galeon/FC-4 galeon.spec,1.12,1.13
Message-ID: <200507221317.j6MDHDcF012723@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	galeon.spec 
Log Message:
galeon: release bumping


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- galeon.spec	7 Jul 2005 20:52:05 -0000	1.12
+++ galeon.spec	22 Jul 2005 13:17:11 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	1.3.21
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -101,7 +101,10 @@
 
 
 %changelog
-* Thu Jul  7 2005 Dams  - 1.3.21
+* Fri Jul 22 2005 Dams  - 1.3.21-9
+- Rebuilt against mozilla 1.7.10
+
+* Thu Jul  7 2005 Dams  - 1.3.21-8
 - Hopefully fixed BuildReq.
 - replaced name by galeon in Source0
 



From fedora-extras-commits at redhat.com  Fri Jul 22 13:18:26 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Fri, 22 Jul 2005 09:18:26 -0400
Subject: common tobuild,1.1991,1.1992
Message-ID: <200507221318.j6MDIQ85012788@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12771

Modified Files:
	tobuild 
Log Message:
request build of rpms/galeon/FC-4 galeon-1_3_21-9_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -r1.1991 -r1.1992
--- tobuild	22 Jul 2005 06:54:05 -0000	1.1991
+++ tobuild	22 Jul 2005 13:18:24 -0000	1.1992
@@ -127,3 +127,4 @@
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel
+anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 15:07:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:07:59 -0400
Subject: common tobuild,1.1992,1.1993
Message-ID: <200507221507.j6MF7xVE015400@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15383

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder-0_27-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -r1.1992 -r1.1993
--- tobuild	22 Jul 2005 13:18:24 -0000	1.1992
+++ tobuild	22 Jul 2005 15:07:56 -0000	1.1993
@@ -128,3 +128,4 @@
 scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel
 anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4
+scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3



From fedora-extras-commits at redhat.com  Fri Jul 22 15:08:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:08:26 -0400
Subject: common tobuild,1.1993,1.1994
Message-ID: <200507221508.j6MF8QLR015433@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15416

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -r1.1993 -r1.1994
--- tobuild	22 Jul 2005 15:07:56 -0000	1.1993
+++ tobuild	22 Jul 2005 15:08:24 -0000	1.1994
@@ -129,3 +129,4 @@
 scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel
 anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3
+scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 15:08:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:08:45 -0400
Subject: common tobuild,1.1994,1.1995
Message-ID: <200507221508.j6MF8jiJ015466@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15449

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -r1.1994 -r1.1995
--- tobuild	22 Jul 2005 15:08:24 -0000	1.1994
+++ tobuild	22 Jul 2005 15:08:43 -0000	1.1995
@@ -130,3 +130,4 @@
 anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3
 scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4
+scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 15:11:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:11:27 -0400
Subject: common tobuild,1.1995,1.1996
Message-ID: <200507221511.j6MFBRli015539@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15522

Modified Files:
	tobuild 
Log Message:
request build of rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -r1.1995 -r1.1996
--- tobuild	22 Jul 2005 15:08:43 -0000	1.1995
+++ tobuild	22 Jul 2005 15:11:25 -0000	1.1996
@@ -131,3 +131,4 @@
 scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3
 scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel
+scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 15:15:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:15:34 -0400
Subject: common tobuild,1.1996,1.1997
Message-ID: <200507221515.j6MFFYEk015615@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15598

Modified Files:
	tobuild 
Log Message:
request build of rpms/libapreq2/devel libapreq2-2_06-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -r1.1996 -r1.1997
--- tobuild	22 Jul 2005 15:11:25 -0000	1.1996
+++ tobuild	22 Jul 2005 15:15:32 -0000	1.1997
@@ -132,3 +132,4 @@
 scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel
 scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4
+scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 16:27:06 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 22 Jul 2005 12:27:06 -0400
Subject: rpms/denyhosts/devel README.fedora, NONE,
	1.1 denyhosts-0.8.0-config.patch, NONE,
	1.1 denyhosts-0.8.0-setup.patch, NONE, 1.1 denyhosts.cron, 1.2,
	1.3 denyhosts.init, 1.1, 1.2 denyhosts.spec, 1.4,
	1.5 denyhosts-0.8.0-workdir.patch, 1.1, NONE
Message-ID: <200507221627.j6MGR6qw017048@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.cron denyhosts.init denyhosts.spec 
Added Files:
	README.fedora denyhosts-0.8.0-config.patch 
	denyhosts-0.8.0-setup.patch 
Removed Files:
	denyhosts-0.8.0-workdir.patch 
Log Message:
* Fri Jul 22 2005 Jason L Tibbitts III  - 0.8.0-3
- Rename the lockfile used by the initscript/cron setup because
  DenyHosts now has its own internal locking and they chose the exact
  same lockfile we were using.
- Turn on PURGE_DENY in the installed config file.
- Delete data_files from setup.py.
- Enable purging in denyhosts.cron.
- Add README.fedora file.



--- NEW FILE README.fedora ---
Some useful information about DenyHosts as packaged by Fedora Extras
--------------------------------------------------------------------

It installs and runs as a service, so you can start it with:

  service denyhosts start

and enable it at boot time with:

  chkconfig denyhosts on


By default it will process your logs every ten minutes.  You can
change the interval by editing /etc/cron.d/denyhosts.  You can see a
description of the file format by running:

  man 5 crontab


By default, DenyHosts is set up to purge old block entries, but only
after one year.  If you wish to adjust this, edit /etc/denyhosts.conf
and look for "PURGE_DENY".  The purge procedure is run daily at 5AM.
To adjust this frequency, edit /etc/cron.d/denyhosts.


DenyHosts will process only your current logfile (/var/log/secure).
If you want to incorporate an old logfile (in this example,
/var/log/secure.1) , you can run

  denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1

DenyHosts can also handle logs compressed with gzip or bzip2.



denyhosts-0.8.0-config.patch:

--- NEW FILE denyhosts-0.8.0-config.patch ---
--- denyhosts.cfg-dist.orig	2005-07-22 08:58:03.668064303 -0500
+++ denyhosts.cfg-dist	2005-07-22 10:15:48.146561932 -0500
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 1y
 #######################################################################
 
 
@@ -89,7 +94,7 @@
 # WORK_DIR: the path that DenyHosts will use for writing data to
 # (it will be created if it does not already exist).       
 #
-WORK_DIR = denyhosts
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 

denyhosts-0.8.0-setup.patch:

--- NEW FILE denyhosts-0.8.0-setup.patch ---
--- setup.py.orig	2005-07-22 10:18:29.184475189 -0500
+++ setup.py	2005-07-22 10:18:42.445844737 -0500
@@ -21,11 +21,11 @@
       ##package_dir={'': 'modules'},
       ##packages=["."],
       py_modules=["denyhosts_version"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
-                  (libpath, glob("LICENSE.txt"))],
+#      data_files=[(libpath, glob("denyhosts.cfg-dist")),
+#                  (libpath, glob("setup.py")),
+#                  (libpath, glob("CHANGELOG.txt")),
+#                  (libpath, glob("README.txt")),
+#                  (libpath, glob("LICENSE.txt"))],
       license="GPL",
       extra_path='denyhosts',
       long_description="""


Index: denyhosts.cron
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts.cron	2 Jul 2005 21:37:55 -0000	1.2
+++ denyhosts.cron	22 Jul 2005 16:27:04 -0000	1.3
@@ -2,5 +2,9 @@
 # heavily attacked then it is reasonable to make it run as frequently as once
 # every minute.  DenyHosts runs quickly once it has initially processed your
 # logs and should not take a significant amount of CPU time.
-*/10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
+*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+#
+# Automatically purge old entries early in the morning.  Note that you must
+# edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the
+# default value purge time is set very high.
+0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge


Index: denyhosts.init
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- denyhosts.init	20 May 2005 04:57:02 -0000	1.1
+++ denyhosts.init	22 Jul 2005 16:27:04 -0000	1.2
@@ -15,7 +15,7 @@
 # source function library
 . /etc/rc.d/init.d/functions
 
-lockfile=/var/lock/subsys/denyhosts
+lockfile=/var/lock/subsys/denyhosts.init
 
 RETVAL=0
 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- denyhosts.spec	21 Jul 2005 16:56:22 -0000	1.4
+++ denyhosts.spec	22 Jul 2005 16:27:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -10,7 +10,9 @@
 Source1:	denyhosts.cron
 Source2:	denyhosts.init
 Source3:	denyhosts-allowed-hosts
-Patch0:		denyhosts-0.8.0-workdir.patch
+Source4:	README.fedora
+Patch0:		denyhosts-0.8.0-config.patch
+Patch1:		denyhosts-0.8.0-setup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
@@ -29,10 +31,15 @@
 %prep
 %setup -q -n DenyHosts-%{version}
 %patch0 -p0
+%patch1 -p0
+
+cp %{SOURCE4} .
+
 
 %build
 python ./setup.py build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
@@ -73,7 +80,8 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt README.txt setup.py
+%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
+%doc README.fedora README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts
@@ -92,6 +100,15 @@
 
 
 %changelog
+* Fri Jul 22 2005 Jason L Tibbitts III  - 0.8.0-3
+- Rename the lockfile used by the initscript/cron setup because
+  DenyHosts now has its own internal locking and they chose the exact
+  same lockfile we were using.
+- Turn on PURGE_DENY in the installed config file.
+- Delete data_files from setup.py.
+- Enable purging in denyhosts.cron.
+- Add README.fedora file.
+
 * Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-2
 - Package CHANGELOG.txt and denyhosts.cfg-dist as well (as
   documentation).


--- denyhosts-0.8.0-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jul 22 17:04:08 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Fri, 22 Jul 2005 13:04:08 -0400
Subject: owners owners.list,1.24,1.25
Message-ID: <200507221704.j6MH4V06018229@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	owners.list 
Log Message:
extras-qa is not a valid owner


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- owners.list	22 Jul 2005 05:06:49 -0000	1.24
+++ owners.list	22 Jul 2005 17:04:04 -0000	1.25
@@ -62,7 +62,7 @@
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|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-qa at fedoraproject.org|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|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  Fri Jul 22 17:20:08 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:20:08 -0400
Subject: rpms/wesnoth/devel wesnoth.spec, 1.12, 1.13 wesnoth-64bit.patch, 1.1,
	NONE
Message-ID: <200507221720.j6MHK8IE018304@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	wesnoth.spec 
Removed Files:
	wesnoth-64bit.patch 
Log Message:
Delete obsolete patch and use an ugly %find_lang hack which also
works with FC3.



Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wesnoth.spec	8 Jul 2005 10:07:50 -0000	1.12
+++ wesnoth.spec	22 Jul 2005 17:20:06 -0000	1.13
@@ -85,7 +85,8 @@
 install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
 
-/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
+%find_lang %{name}.\*
+#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
 
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
@@ -114,7 +115,7 @@
 fi
 
 
-%files -f %{name}.lang
+%files -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %doc COPYING changelog README copyright MANUAL* README.fedora
 %{_bindir}/wesnoth


--- wesnoth-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jul 22 17:21:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:21:33 -0400
Subject: rpms/wesnoth/FC-4 README.fedora, NONE, 1.1 wesnoth.sysconfig, NONE,
	1.1 wesnothd.init, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wesnoth.spec, 1.8, 1.9 wesnoth-64bit.patch, 1.1, NONE
Message-ID: <200507221721.j6MHLXjA018344@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Added Files:
	README.fedora wesnoth.sysconfig wesnothd.init 
Removed Files:
	wesnoth-64bit.patch 
Log Message:
Sync with devel.



--- NEW FILE README.fedora ---
This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
upgrade this game package, since it may affect your [or your users'] saved
games or result in unexpected incompatibilities or changes.

With development release 0.8.8 the developers switched to a different
release model and discontinued their stable branch. There won't be another
stable release until 1.0 is ready. Version 0.8, which was the last stable
release from June/July 2004, is quite old, unsupported, and is also
incompatible with the official game server at wesnoth.org. The game server
will run always the most recent version of the software shortly after its
release.



--- NEW FILE wesnoth.sysconfig ---
#
# wesnothd(6) options. Pick a custom port here if needed, for example.
#
WESNOTHD_OPTIONS=""


--- NEW FILE wesnothd.init ---
#!/bin/sh
#
# wesnothd     This shell script takes care of starting and stopping
#              the Wesnoth game server.
#
# chkconfig:   - 15 85
# description: The Wesnoth server supports playing networked \
#              multi-player games.
# processname: wesnothd
# config:      /etc/sysconfig/wesnothd
# pidfile:     /var/run/wesnothd.pid

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

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/sbin/wesnothd"
prog=$(basename $exec)
pidfile=/var/run/$prog.pid
socketfile=/var/run/wesnothd/socket

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting Wesnoth game server: "
    if [ -n "`/sbin/pidof $prog`" ]; then
        echo -n $"$prog already running"
        failure
        echo
        return 1
    fi
    [ -p $socketfile ] && rm -f $socketfile
    daemon --user wesnothd $exec --daemon $WESNOTHD_OPTIONS >/dev/null 2>&1
    retval=$?
    if [ $retval -eq 0 ]; then
        success
        touch $lockfile
        pidofproc $prog > $pidfile
    else
        failure
    fi
    echo
    return $retval
}

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

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
    ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:33:21 -0000	1.3
+++ .cvsignore	22 Jul 2005 17:21:31 -0000	1.4
@@ -1 +1 @@
-wesnoth-0.8.tar.gz
+wesnoth-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:33:21 -0000	1.3
+++ sources	22 Jul 2005 17:21:31 -0000	1.4
@@ -1 +1 @@
-c6258d08645a97c311c9538128f5af6e  wesnoth-0.8.tar.gz
+833bd6995a26c873485750875607f127  wesnoth-0.9.3.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wesnoth.spec	26 May 2005 16:48:07 -0000	1.8
+++ wesnoth.spec	22 Jul 2005 17:21:31 -0000	1.9
@@ -1,19 +1,23 @@
 Name:           wesnoth
-Version:        0.8
-Release: 5
-
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.wesnoth.org/files/wesnoth-0.8.tar.gz
-Patch0: wesnoth-64bit.patch
+Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
+Source1:        wesnothd.init
+Source2:        wesnoth.sysconfig
+Source3:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  libpng-devel
+BuildRequires:  desktop-file-utils, gettext
+
+Requires:       /sbin/chkconfig
 
 %description
 %{summary}.
@@ -23,22 +27,46 @@
 of attacks. Units gain experience and advance levels, and are carried over
 from one scenario to the next campaign.
 
+
+%package server
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description server
+This package contains the binaries for running a Wesnoth server
+for multi-player games.
+
+
+%package tools
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description tools
+This package contains the game editor and development tools.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
+cp %{SOURCE3} .
 
 
 %build
 %configure --disable-dependency-tracking \
-           --enable-server \
-           --enable-editor
-
+    --with-localedir=%{_datadir}/locale \
+    --enable-editor \
+    --enable-tools \
+    --enable-server \
+    --with-fifodir=/var/run/wesnothd \
+    --with-server-uid=$(id -u) \
+    --with-server-gid=$(id -g) 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
@@ -47,22 +75,93 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 
+# arrange server package files
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p ${RPM_BUILD_ROOT}/var/run/wesnothd
+touch ${RPM_BUILD_ROOT}/var/run/wesnothd/socket
+install -Dpm 755 %{SOURCE1} \
+    $RPM_BUILD_ROOT%{_initrddir}/wesnothd
+install -Dpm 644 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
+
+%find_lang %{name}.\*
+#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
+
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+
+%pre server
+/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
+	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
+
+
+%post server
+/sbin/chkconfig --add wesnothd
+if [ $1 -gt 1 ]; then
+    %{_initrddir}/wesnothd try-restart >/dev/null || :
+fi
+
+
+%preun server
+if [ $1 -eq 0 ]; then
+    %{_initrddir}/wesnothd stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del wesnothd
+fi
+
+
+%files -f %{name}.\*.lang
 %defattr(-,root,root,-)
-%doc COPYING changelog README copyright MANUAL*
-%{_bindir}/*
+%doc COPYING changelog README copyright MANUAL* README.fedora
+%{_bindir}/wesnoth
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_mandir}/man6/*
+%{_mandir}/man6/wesnoth.6*
+%{_mandir}/*/man6/wesnoth.6*
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/wesnoth_editor
+%{_bindir}/exploder
+%{_bindir}/cutter
+%{_bindir}/wmlxgettext
+%{_mandir}/man6/wesnoth_editor.6*
+%{_mandir}/*/man6/wesnoth_editor.6*
+
+%files server
+%defattr(-,root,root,-)
+%config %{_initrddir}/wesnothd
+%config(noreplace) %{_sysconfdir}/sysconfig/wesnoth
+%{_sbindir}/wesnothd
+%{_mandir}/man6/wesnothd.*
+%{_mandir}/*/man6/wesnothd.*
+%attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/
+%ghost /var/run/wesnothd/socket
 
 %changelog
+* Fri Jul  8 2005 Michael Schwendt  - 0.9.3-1
+- update to 0.9.3
+
+* Mon Jun 13 2005 Michael Schwendt  - 0.9.2-1
+- update to 0.9.2
+- BR libpng-devel is needed
+- add initscript and scriptlets for -server package
+- don't build campaign server (upstream suggestion)
+- split off editor+tools into -tools sub-package
+- install translations into system's locale directories
+- merge Panu's changes:
+  Sat Apr 16 2005 Panu Matilainen  0.9.0-1
+- enable campaign server and tools
+- split server to separate package
+- add wesnothd user in server %%pre
+- buildrequire gettext
+
 * Thu May 26 2005 Jeremy Katz  - 0.8-5
 - fix build on x86_64
 


--- wesnoth-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jul 22 17:22:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:22:33 -0400
Subject: rpms/wesnoth/FC-3 README.fedora, NONE, 1.1 wesnoth.sysconfig, NONE,
	1.1 wesnothd.init, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wesnoth.spec, 1.4, 1.5
Message-ID: <200507221722.j6MHMXRE018410@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Added Files:
	README.fedora wesnoth.sysconfig wesnothd.init 
Log Message:
Sync with devel.



--- NEW FILE README.fedora ---
This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
upgrade this game package, since it may affect your [or your users'] saved
games or result in unexpected incompatibilities or changes.

With development release 0.8.8 the developers switched to a different
release model and discontinued their stable branch. There won't be another
stable release until 1.0 is ready. Version 0.8, which was the last stable
release from June/July 2004, is quite old, unsupported, and is also
incompatible with the official game server at wesnoth.org. The game server
will run always the most recent version of the software shortly after its
release.



--- NEW FILE wesnoth.sysconfig ---
#
# wesnothd(6) options. Pick a custom port here if needed, for example.
#
WESNOTHD_OPTIONS=""


--- NEW FILE wesnothd.init ---
#!/bin/sh
#
# wesnothd     This shell script takes care of starting and stopping
#              the Wesnoth game server.
#
# chkconfig:   - 15 85
# description: The Wesnoth server supports playing networked \
#              multi-player games.
# processname: wesnothd
# config:      /etc/sysconfig/wesnothd
# pidfile:     /var/run/wesnothd.pid

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

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/sbin/wesnothd"
prog=$(basename $exec)
pidfile=/var/run/$prog.pid
socketfile=/var/run/wesnothd/socket

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting Wesnoth game server: "
    if [ -n "`/sbin/pidof $prog`" ]; then
        echo -n $"$prog already running"
        failure
        echo
        return 1
    fi
    [ -p $socketfile ] && rm -f $socketfile
    daemon --user wesnothd $exec --daemon $WESNOTHD_OPTIONS >/dev/null 2>&1
    retval=$?
    if [ $retval -eq 0 ]; then
        success
        touch $lockfile
        pidofproc $prog > $pidfile
    else
        failure
    fi
    echo
    return $retval
}

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

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
    ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:33:21 -0000	1.3
+++ .cvsignore	22 Jul 2005 17:22:31 -0000	1.4
@@ -1 +1 @@
-wesnoth-0.8.tar.gz
+wesnoth-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:33:21 -0000	1.3
+++ sources	22 Jul 2005 17:22:31 -0000	1.4
@@ -1 +1 @@
-c6258d08645a97c311c9538128f5af6e  wesnoth-0.8.tar.gz
+833bd6995a26c873485750875607f127  wesnoth-0.9.3.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wesnoth.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ wesnoth.spec	22 Jul 2005 17:22:31 -0000	1.5
@@ -1,66 +1,176 @@
 Name:           wesnoth
-Version:        0.8
-Release:        2
-Epoch:          0
-Summary:        Battle for Wesnoth is a fantasy turn-based strategy game.
+Version:        0.9.3
+Release:        1%{?dist}
+Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
 
-Group:         	Amusements/Games
+Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.wesnoth.org/files/wesnoth-0.8.tar.gz
+Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
+Source1:        wesnothd.init
+Source2:        wesnoth.sysconfig
+Source3:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
-BuildRequires:	SDL_ttf-devel, SDL_net-devel, freetype-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
+BuildRequires:  libpng-devel
+BuildRequires:  desktop-file-utils, gettext
+
+Requires:       /sbin/chkconfig
 
 %description
-%{summary}
+%{summary}.
 
-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 
+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.
 
+
+%package server
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description server
+This package contains the binaries for running a Wesnoth server
+for multi-player games.
+
+
+%package tools
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description tools
+This package contains the game editor and development tools.
+
+
 %prep
 %setup -q
+cp %{SOURCE3} .
 
 
 %build
 %configure --disable-dependency-tracking \
-	   --enable-server \
-	   --enable-editor
-
-make %{?_smp_mflags} 
+    --with-localedir=%{_datadir}/locale \
+    --enable-editor \
+    --enable-tools \
+    --enable-server \
+    --with-fifodir=/var/run/wesnothd \
+    --with-server-uid=$(id -u) \
+    --with-server-gid=$(id -g) 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-		     --mode="0644" --vendor fedora \
-		     --add-category="X-Fedora" icons/%{name}.desktop
-# add icon for menus		     
+                     --mode="0644" --vendor fedora \
+                     --add-category="X-Fedora" icons/%{name}.desktop
+# add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 
+# arrange server package files
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p ${RPM_BUILD_ROOT}/var/run/wesnothd
+touch ${RPM_BUILD_ROOT}/var/run/wesnothd/socket
+install -Dpm 755 %{SOURCE1} \
+    $RPM_BUILD_ROOT%{_initrddir}/wesnothd
+install -Dpm 644 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
+
+%find_lang %{name}.\*
+#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
+
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+
+%pre server
+/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
+	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
+
+
+%post server
+/sbin/chkconfig --add wesnothd
+if [ $1 -gt 1 ]; then
+    %{_initrddir}/wesnothd try-restart >/dev/null || :
+fi
+
+
+%preun server
+if [ $1 -eq 0 ]; then
+    %{_initrddir}/wesnothd stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del wesnothd
+fi
+
+
+%files -f %{name}.\*.lang
 %defattr(-,root,root,-)
-%doc COPYING changelog README copyright MANUAL*
-%{_bindir}/*
+%doc COPYING changelog README copyright MANUAL* README.fedora
+%{_bindir}/wesnoth
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_mandir}/man6/*
+%{_mandir}/man6/wesnoth.6*
+%{_mandir}/*/man6/wesnoth.6*
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/wesnoth_editor
+%{_bindir}/exploder
+%{_bindir}/cutter
+%{_bindir}/wmlxgettext
+%{_mandir}/man6/wesnoth_editor.6*
+%{_mandir}/*/man6/wesnoth_editor.6*
+
+%files server
+%defattr(-,root,root,-)
+%config %{_initrddir}/wesnothd
+%config(noreplace) %{_sysconfdir}/sysconfig/wesnoth
+%{_sbindir}/wesnothd
+%{_mandir}/man6/wesnothd.*
+%{_mandir}/*/man6/wesnothd.*
+%attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/
+%ghost /var/run/wesnothd/socket
 
 %changelog
+* Fri Jul  8 2005 Michael Schwendt  - 0.9.3-1
+- update to 0.9.3
+
+* Mon Jun 13 2005 Michael Schwendt  - 0.9.2-1
+- update to 0.9.2
+- BR libpng-devel is needed
+- add initscript and scriptlets for -server package
+- don't build campaign server (upstream suggestion)
+- split off editor+tools into -tools sub-package
+- install translations into system's locale directories
+- merge Panu's changes:
+  Sat Apr 16 2005 Panu Matilainen  0.9.0-1
+- enable campaign server and tools
+- split server to separate package
+- add wesnothd user in server %%pre
+- buildrequire gettext
+
+* Thu May 26 2005 Jeremy Katz  - 0.8-5
+- fix build on x86_64
+
+* Sun May 22 2005 Jeremy Katz  - 0.8-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Fri Jul 09 2004 Panu Matilainen  0:0.8-0.fdr.2
 - use upstream desktop file and icon
 



From fedora-extras-commits at redhat.com  Fri Jul 22 17:30:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:30:24 -0400
Subject: rpms/wesnoth/devel README.fedora,1.1,1.2
Message-ID: <200507221730.j6MHUsio018511@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	README.fedora 
Log Message:
fix a typo in readme


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	17 Jun 2005 01:17:19 -0000	1.1
+++ README.fedora	22 Jul 2005 17:30:22 -0000	1.2
@@ -1,4 +1,4 @@
-This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
+This is a DEVELOPMENT release of "Battle for Wesnoth". Be careful when to
 upgrade this game package, since it may affect your [or your users'] saved
 games or result in unexpected incompatibilities or changes.
 



From fedora-extras-commits at redhat.com  Fri Jul 22 17:30:23 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:30:23 -0400
Subject: rpms/wesnoth/FC-3 README.fedora,1.1,1.2
Message-ID: <200507221730.j6MHUrdG018507@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	README.fedora 
Log Message:
fix a typo in readme


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	22 Jul 2005 17:22:31 -0000	1.1
+++ README.fedora	22 Jul 2005 17:30:21 -0000	1.2
@@ -1,4 +1,4 @@
-This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
+This is a DEVELOPMENT release of "Battle for Wesnoth". Be careful when to
 upgrade this game package, since it may affect your [or your users'] saved
 games or result in unexpected incompatibilities or changes.
 



From fedora-extras-commits at redhat.com  Fri Jul 22 17:30:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:30:24 -0400
Subject: rpms/wesnoth/FC-4 README.fedora,1.1,1.2
Message-ID: <200507221730.j6MHUs1u018510@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	README.fedora 
Log Message:
fix a typo in readme


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	22 Jul 2005 17:21:31 -0000	1.1
+++ README.fedora	22 Jul 2005 17:30:21 -0000	1.2
@@ -1,4 +1,4 @@
-This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
+This is a DEVELOPMENT release of "Battle for Wesnoth". Be careful when to
 upgrade this game package, since it may affect your [or your users'] saved
 games or result in unexpected incompatibilities or changes.
 



From fedora-extras-commits at redhat.com  Fri Jul 22 18:11:10 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Fri, 22 Jul 2005 14:11:10 -0400
Subject: owners owners.list,1.25,1.26
Message-ID: <200507221811.j6MIBAZx019753@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	owners.list 
Log Message:
extras-qa is not a valid owner


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- owners.list	22 Jul 2005 17:04:04 -0000	1.25
+++ owners.list	22 Jul 2005 18:11:08 -0000	1.26
@@ -280,7 +280,7 @@
 Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|hula-kevin at iprone.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org|
@@ -628,7 +628,7 @@
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|pure-ftpd|Lightweight, fast and secure FTP server|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-qa at fedoraproject.org|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|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at linux.duke.edu|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|
@@ -861,7 +861,7 @@
 Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xosd|On-screen display library for X|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xtide|A program for calculating tide all over the world|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:05 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:05 -0400
Subject: rpms/pytz/devel - New directory
Message-ID: <200507222058.j6MKw5J6022426@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:04 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:04 -0400
Subject: rpms/pytz - New directory
Message-ID: <200507222058.j6MKw4H6022421@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:14 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:14 -0400
Subject: rpms/pytz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507222058.j6MKwEnh022469@cvs-int.fedora.redhat.com>

Author: orion

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 22 20:58:15 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:15 -0400
Subject: rpms/pytz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507222058.j6MKwFZI022474@cvs-int.fedora.redhat.com>

Author: orion

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

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


--- NEW 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 Jul 22 20:58:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:41 -0400
Subject: rpms/pytz import.log,1.1,1.2
Message-ID: <200507222058.j6MKwfSt022537@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	import.log 
Log Message:
auto-import pytz-2005i-2 on branch devel from pytz-2005i-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pytz/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jul 2005 20:58:12 -0000	1.1
+++ import.log	22 Jul 2005 20:58:38 -0000	1.2
@@ -0,0 +1 @@
+pytz-2005i-2:HEAD:pytz-2005i-2.src.rpm:1122065914



From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:41 -0400
Subject: rpms/pytz/devel pytz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200507222058.j6MKwfKY022544@cvs-int.fedora.redhat.com>

Author: orion

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

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


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

Name:           pytz
Version:        2005i
Release:        2
Summary:        World Timezone Definitions for Python

Group:          Development/Languages
License:        MIT
URL:            http://pytz.sourceforge.net/
Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

%description
pytz brings the Olson tz database into Python. This library allows accurate
and cross platform timezone calculations using Python 2.3 or higher. It
also solves the issue of ambiguous times at the end of daylight savings,
which you can read more about in the Python Library Reference
(datetime.tzinfo).

Amost all (over 540) of the Olson timezones are supported.

%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/pytz/*.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt
%{python_sitelib}/pytz/

%changelog
* Fri Jul 22 2005 Orion Poplawski  2005i-2
- Remove -O1 from install command

* Tue Jul 05 2005 Orion Poplawski  2005i-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jul 2005 20:58:13 -0000	1.1
+++ .cvsignore	22 Jul 2005 20:58:39 -0000	1.2
@@ -0,0 +1 @@
+pytz-2005i.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jul 2005 20:58:13 -0000	1.1
+++ sources	22 Jul 2005 20:58:39 -0000	1.2
@@ -0,0 +1 @@
+45aeaba1bc49c62e65490c047ff7fbea  pytz-2005i.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:28 -0400
Subject: extras-buildsys ChangeLog,1.70,1.71
Message-ID: <200507222135.j6MLZS0O023830@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772

Modified Files:
	ChangeLog 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	22 Jul 2005 05:39:13 -0000	1.70
+++ ChangeLog	22 Jul 2005 21:35:26 -0000	1.71
@@ -1,5 +1,40 @@
 2005-07-22  Dan Williams 
 
+    * builder/builder.py
+        - Fix traceback when killing jobs on shutdown of the builder
+
+    * client/client.py
+        - Add a job detail command
+
+    * server/ArchJob.py
+        - Store job start and end times in the database
+
+    * server/BuildMaster.py
+        - Remove JobsQuery class, no longer used
+        - Store more info in the job database to support web front end features
+        - Don't try to restart jobs in the 'initialize' state since they'll
+            get restarted anyway
+
+    * server/PackageJob.py
+        - Generalize log URL construction so it can be accessed from the user interface
+        - Pass more job info to the BuildMaster to be written to the DB
+        - Don't use tempfile.mkdtemp(), it seems to have issues
+        - Return 30 lines of log rather than 20
+
+    * server/User.py
+        - Grab a new connection to the database on every access, so that
+            user addition/modification can happen when the server is running
+
+    * server/UserInterface.py
+        - Add a "job detail" interface that returns information about a single
+            specific job
+
+    * server/main.py
+        - Greatly reduce buffer size for the logfile, now it actually gets written
+            out in a timely fashion
+
+2005-07-22  Dan Williams 
+
     * Web front-end cleanup
         - Use Diana Fong's new design.  Delicious!
 



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:28 -0400
Subject: extras-buildsys/builder builder.py,1.24,1.25
Message-ID: <200507222135.j6MLZSJ6023836@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772/builder

Modified Files:
	builder.py 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- builder.py	22 Jul 2005 05:39:13 -0000	1.24
+++ builder.py	22 Jul 2005 21:35:26 -0000	1.25
@@ -104,7 +104,7 @@
     def die(self, sig=15):
         # Do nothing if we've already been killed
         if self._done_status == 'killed':
-            return
+            return True
 
         self.log("Killing build process...\n")
         # Don't try to kill a running cleanup process
@@ -754,9 +754,9 @@
             xmlserver.handle_request()
         except KeyboardInterrupt, e:
             print "Shutting down..."
-            curjob = xmlserver.get_cur_job()
+            (curjob, status) = bcs.get_cur_job()
             if curjob:
-                xmlserver.die(curjob)
+                bcs.die(curjob)
             break
 
         cur_time = time.time()



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:29 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:29 -0400
Subject: extras-buildsys/client client.py,1.14,1.15
Message-ID: <200507222135.j6MLZTWf023840@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772/client

Modified Files:
	client.py 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- client.py	20 Jul 2005 16:10:39 -0000	1.14
+++ client.py	22 Jul 2005 21:35:27 -0000	1.15
@@ -141,6 +141,20 @@
             except IOError:
                 pass
 
+def detail_job(server, email, jobid):
+    """
+    Get a single job's details
+    """
+    try:
+        (err, msg, jobrec) = server.detail_job(email, jobid)
+    except socket.error, e:
+        print "Error connecting to build server: '%s'" % e
+        return
+    if err == -1:
+        print msg
+    else:
+        print jobrec
+
 
 def kill(server, email, jobid):
     """
@@ -293,6 +307,8 @@
             print e.message
     elif cmd == 'list':
         list_jobs(server, sys.argv[2:])
+    elif cmd == 'detail':
+        detail_job(server, email, sys.argv[2])
     elif cmd == 'kill':
         if len(sys.argv) < 3:
             print "Error: need a job UID to kill"



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:29 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:29 -0400
Subject: extras-buildsys/server ArchJob.py, 1.6, 1.7 BuildMaster.py, 1.18,
	1.19 PackageJob.py, 1.12, 1.13 User.py, 1.4,
	1.5 UserInterface.py, 1.25, 1.26 main.py, 1.10, 1.11
Message-ID: <200507222135.j6MLZTpl023847@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772/server

Modified Files:
	ArchJob.py BuildMaster.py PackageJob.py User.py 
	UserInterface.py main.py 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ArchJob.py	18 Jul 2005 17:24:39 -0000	1.6
+++ ArchJob.py	22 Jul 2005 21:35:27 -0000	1.7
@@ -51,6 +51,7 @@
         self._builder_gone = False
         self.downloads = {}
         self.starttime = time.time()
+        self.endtime = 0
 
     def _builder_finished(self):
         if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned':
@@ -83,6 +84,8 @@
         attrdict['builder_addr'] = host
         attrdict['status'] = self.status
         attrdict['builder_status'] = self.builder_status
+        attrdict['starttime'] = self.starttime
+        attrdict['endtime'] = self.endtime
         return attrdict
 
     def set_builder_status(self, status):
@@ -189,6 +192,7 @@
             # All done downloading?
             if not undownloaded:
                 self._print_downloaded_files()
+                self.endtime = time.time()
                 self._set_status('done')
                 self.par_job.wake()
 


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BuildMaster.py	20 Jul 2005 18:11:37 -0000	1.18
+++ BuildMaster.py	22 Jul 2005 21:35:27 -0000	1.19
@@ -30,18 +30,6 @@
 execfile(CONFIG_LOCATION + "CONFIG.py")
 
 
-class JobsQuery:
-    """ Wrapper class around DB query results.  Since only one
-        thread has access to the database (to work around sqlite
-        locking limitations), this object wraps requests to and
-        from the BuildMaster thread.
-    """
-    def __init__(self, query):
-        self.sql = query
-        self.done = False
-        self.result = None
-
-
 def ensure_job_db_tables(dbcx):
     """ Central routine to create the database table structure """
 
@@ -52,11 +40,22 @@
     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), ' \
-                'cvs_tag VARCHAR(255), target VARCHAR(20), ' \
-                'buildreq VARCHAR(75), starttime BIGINT, ' \
-                'endtime BIGINT, status VARCHAR(15))')
+            curs.execute('CREATE TABLE jobs ('  \
+                'uid INTEGER PRIMARY KEY, '     \
+                'username VARCHAR(20), '        \
+                'package VARCHAR(50), '         \
+                'cvs_tag VARCHAR(255), '        \
+                'target VARCHAR(20), '          \
+                'buildreq VARCHAR(75), '        \
+                'starttime BIGINT, '            \
+                'endtime BIGINT, '              \
+                'status 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)
@@ -75,10 +74,16 @@
     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))')
+            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)
@@ -111,7 +116,7 @@
         self._archjob_status_updates = {}
         self._archjob_status_updates_lock = threading.Lock()
 
-        self._building_jobs = []
+        self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
         try:
@@ -131,7 +136,7 @@
 
     def _restart_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed")')
+        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize")')
         self.dbcx.commit()
         jobs = self.curs.fetchall()
 
@@ -139,21 +144,21 @@
             return
 
         for row in jobs:
-            uniqid = row[0]
+            uid = row[0]
             # Kill any archjobs that are left around
-            self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uniqid)
+            self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid)
             self.dbcx.commit()
 
             # Now requeue the job
             try:
                 repo = self.repos[row[4]]
             except KeyError:
-                print "%s (%s): Target '%s' not found." % (uniqid, row[2], row[4])
+                print "%s (%s): Target '%s' not found." % (uid, row[2], row[4])
             else:
-                job = PackageJob.PackageJob(uniqid, row[1], row[2], row[3], repo, self, self.hostname)
-                print "%s (%s): Restarting '%s' on target '%s'" % (uniqid, row[2], row[3], row[4])
+                job = PackageJob.PackageJob(uid, row[1], row[2], row[3], repo, self, self.hostname)
+                print "%s (%s): Restarting '%s' on target '%s'" % (uid, row[2], row[3], row[4])
                 self._building_jobs_lock.acquire()
-                self._building_jobs.append(job)
+                self._building_jobs[uid] = job
                 self._building_jobs_lock.release()
 
     def stop(self):
@@ -188,18 +193,18 @@
         self._new_queue.append(job_desc)
         self._new_queue_lock.release()
 
-    def queue_job_status_update(self, uid, status):
+    def queue_job_status_update(self, uid, attrdict):
         self._status_updates_lock.acquire()
         lcl_uid = copy.copy(uid)
-        lcl_status = copy.copy(status)
-        self._status_updates[lcl_uid] = lcl_status
+        lcl_attrdict = copy.deepcopy(attrdict)
+        self._status_updates[lcl_uid] = lcl_attrdict
         self._status_updates_lock.release()
 
-    def queue_archjob_status_update(self, jobid, attrdict):
+    def queue_archjob_status_update(self, uid, attrdict):
         self._archjob_status_updates_lock.acquire()
-        lcl_jobid = copy.copy(jobid)
+        lcl_uid = copy.copy(uid)
         lcl_attrdict = copy.deepcopy(attrdict)
-        self._archjob_status_updates[lcl_jobid] = lcl_attrdict
+        self._archjob_status_updates[lcl_uid] = lcl_attrdict
         self._archjob_status_updates_lock.release()
 
     def notify_job_done(self, job):
@@ -211,9 +216,10 @@
         self._done_queue_lock.acquire()
 
         for job in self._done_queue:
-            curstage = job.get_cur_stage()
             uid = job.get_uid()
-            self._write_job_status_to_db(uid, curstage)
+            attrdict = {}
+            attrdict['status'] = job.get_cur_stage()
+            self._write_job_status_to_db(uid, attrdict)
 
             # Update job end time
             try:
@@ -229,36 +235,44 @@
             self._status_updates_lock.release()
 
             print "%s (%s): Job finished." % (uid, job.package)
+
             self._building_jobs_lock.acquire()
-            self._building_jobs.remove(job)
+            self._building_jobs[uid] = None
             self._building_jobs_lock.release()
 
         self._done_queue = []
         self._done_queue_lock.release()
 
-    def _write_job_status_to_db(self, uid, status):
+    def _write_job_status_to_db(self, uid, attrdict):
+        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'], attrdict['version'], attrdict['release'])
+        if attrdict.has_key('result_msg'):
+            import urllib
+            sql = sql + ', result_msg="%s"' % (urllib.quote(attrdict['result_msg']))
+
+        sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid
         try:
-            self.curs.execute('UPDATE jobs SET status="%s" WHERE uid=%d' \
-                % (status, uid))
+            self.curs.execute(sql)
         except sqlite.OperationalError, e:
             print "DB Error: could not access jobs database. Reason: '%s'" % e
 
         self.dbcx.commit()
 
-    def _write_archjob_status_to_db(self, jobid, attrdict):
-        self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % jobid)
+    def _write_archjob_status_to_db(self, uid, attrdict):
+        self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % uid)
         self.dbcx.commit()
         if len(self.curs.fetchall()) == 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")' % (jobid, attrdict['parent_uid'], time.time(), 0, attrdict['arch'], \
-                    attrdict['builder_addr'], attrdict['status'], attrdict['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:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
         else:            
             try:
-                self.curs.execute('UPDATE archjobs SET status="%s", builder_status="%s" ' \
-                    'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], attrdict['builder_status'], jobid, attrdict['parent_uid']))
+                self.curs.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:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
 
@@ -275,8 +289,8 @@
         self._status_updates_lock.release()
 
         self._archjob_status_updates_lock.acquire()
-        for jobid in self._archjob_status_updates.keys():
-            self._write_archjob_status_to_db(jobid, self._archjob_status_updates[jobid])
+        for uid in self._archjob_status_updates.keys():
+            self._write_archjob_status_to_db(uid, self._archjob_status_updates[uid])
         self._archjob_status_updates = {}
         self._archjob_status_updates_lock.release()
 
@@ -319,7 +333,7 @@
                     item['package'], locator, item['target'])
 
             self._building_jobs_lock.acquire()
-            self._building_jobs.append(job)
+            self._building_jobs[row['uid']] = job
             self._building_jobs_lock.release()
 
         self._new_queue = []
@@ -354,13 +368,12 @@
 
         return False
 
-    def get_job(self, jobid):
+    def get_job(self, uid):
         self._building_jobs_lock.acquire()
-        ret_job = None
-        for job in self._building_jobs:
-            if job.uid == jobid:
-                ret_job = job
-                break
+        try:
+            ret_job = self._building_jobs[uid]
+        except KeyError:
+            ret_job = None
         self._building_jobs_lock.release()
         return ret_job
 


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PackageJob.py	21 Jul 2005 14:36:54 -0000	1.12
+++ PackageJob.py	22 Jul 2005 21:35:27 -0000	1.13
@@ -27,6 +27,7 @@
 import shutil
 import tempfile
 import smtplib
+import copy
 from email.MIMEText import MIMEText
 import string
 import SimpleXMLRPCServer
@@ -98,9 +99,10 @@
         return True
     return False
 
-
-# tempfile.mkdtemp seems to have threading issues
-_mkdtemp_lock = threading.Lock()
+def make_job_log_url(target, uid, name, ver, release):
+    if target and uid and name and ver and release:
+        return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], target, uid, name, ver, release)
+    return None
 
 
 class PackageJob:
@@ -112,14 +114,16 @@
         self.curstage = ''
         self.bm = buildmaster
         self.uid = uid
+        self.package = package
+        self.name = None
+        self.epoch = None
+        self.ver = None
+        self.release = None
         pjc = PackageJobController(self, 'initialize', 'waiting')
 
         self.hostname = hostname
         self.username = username
         self.starttime = time.time()
-        self.endtime = None
-        self.package = package
-        self.name = None
         self.target = repo.target()
         self.repo = repo
         self.no_cvs = config_opts['use_srpm_not_cvs']
@@ -139,14 +143,23 @@
     def get_cur_stage(self):
         return self.curstage
 
-    def _set_cur_stage(self, stage):
+    def _set_cur_stage(self, stage, result_msg=None):
         """ Update our internal job stage, and notify the BuildMaster that
             we've changed as well.
         """
         oldstage = self.curstage
         self.curstage = stage
         if oldstage != stage:
-            self.bm.queue_job_status_update(self.uid, stage)
+            attrdict = {}
+            attrdict['status'] = copy.copy(stage)
+            if self.name and self.epoch and self.ver and self.release:
+                attrdict['epoch'] = self.epoch
+                attrdict['version'] = self.ver
+                attrdict['release'] = self.release
+            if result_msg:
+                attrdict['result_msg'] = result_msg
+
+            self.bm.queue_job_status_update(self.uid, attrdict)
 
     def get_uid(self):
         return self.uid
@@ -252,10 +265,13 @@
         
     def _checkout(self):
         self._set_cur_stage('checkout')
-        dir_prefix = self.cvs_tag + "-"
-        _mkdtemp_lock.acquire()
-        self.checkout_tmpdir = tempfile.mkdtemp(prefix=dir_prefix, dir=config_opts['tmpdir'])
-        _mkdtemp_lock.release()
+
+        # Create the temporary checkout directory
+        dirname = "%s-%s-%d" % (self.uid, self.cvs_tag, time.time())
+        self.checkout_tmpdir = os.path.join(config_opts['tmpdir'], dirname)
+        if os.path.exists(self.checkout_tmpdir):
+            shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
+        os.makedirs(self.checkout_tmpdir)
 
         # Checkout the module
         cmd = 'cd %s; %s co -r %s %s' % (self.checkout_tmpdir, config_opts['cvs_cmd'], self.cvs_tag, self.package)
@@ -323,6 +339,9 @@
         ts = rpmUtils.transaction.initReadOnlyTransaction()
         hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.srpm_path)
         self.name = hdr['name']
+        self.epoch = hdr['epoch']
+        if not self.epoch:
+            self.epoch = '0'
         self.ver = hdr['version']
         self.release = hdr['release']
         (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr)
@@ -411,7 +430,11 @@
 
     def die(self, username):
         # Kill any building jobs
-        self._set_cur_stage('killed')
+        resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username)
+
+        self._set_cur_stage('killed', resultstring)
+        self.email_result(resultstring)
+
         self._archjobs_lock.acquire()
         for job in self.archjobs.values():
             if job:
@@ -419,8 +442,6 @@
         self.archjobs = {}
         self._archjobs_lock.release()
 
-        resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username)
-        self.email_result(resultstring)
         self.bm.notify_job_done(self)
 
     def wake(self):
@@ -451,10 +472,11 @@
                 shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
             subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
             self.email_result(resultstring=e.args, subject=subj)
-            self._failed()
+            self._failed(e.args)
         except BuildError, e:
             subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
-            msg = "%s\n\n         Build logs may be found at %s\n\n" % (e.msg, self._make_log_url())
+            log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release)
+            msg = "%s\n\n         Build logs may be found at %s\n\n" % (e.msg, log_url)
             logtail = self._get_log_tail(e.arch)
             msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail)
             self.email_result(resultstring=msg, subject=subj)
@@ -464,7 +486,7 @@
                 if job:
                     job.die()
             self._archjobs_lock.release()
-            self._failed()
+            self._failed(e.msg)
         else:
             # Wait to be woken up when long-running operations complete
             if wait:
@@ -499,8 +521,8 @@
     def get_stage_dir(self):
         return self.stage_dir
 
-    def _failed(self):
-        self._set_cur_stage('failed')
+    def _failed(self, msg=None):
+        self._set_cur_stage('failed', msg)
         self.bm.notify_job_done(self)
         
     def _add_to_repo(self):
@@ -535,19 +557,17 @@
         self.wake()
 
     def _succeeded(self):
-        self._set_cur_stage('needsign')
-        resultstring = """ %s (%s): Build on target %s succeeded.
+        resultstring = " %s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target)
+        self._set_cur_stage('needsign', resultstring)
 
-     Build logs may be found at %s
-""" % (self.uid, self.name, self.target, self._make_log_url())
+        log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release)
+        resultstring = resultstring + "\n     Build logs may be found at %s\n" % (log_url)
         self.email_result(resultstring)
-        self.bm.notify_job_done(self)
 
-    def _make_log_url(self, arch=None):
-        return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release)
+        self.bm.notify_job_done(self)
 
     def _get_log_tail(self, arch):
-        """ Returns the last 20 lines of the most relevant log file """
+        """ Returns the last 30 lines of the most relevant log file """
 
         pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
         log_dir = os.path.join(config_opts['server_work_dir'], self.target, pkg_dir, arch)
@@ -577,14 +597,14 @@
         except:
             pass
         lines = []
-        # Grab the last 20 lines from the file
+        # Grab the last 30 lines from the file
         while True:
             try:
                 line = f.next()
             except StopIteration:
                 break
             lines.append(line)
-            if len(lines) > 20:  # only want last 20 lines
+            if len(lines) > 30:  # only want last 30 lines
                 del lines[0]
 
         f.close()


Index: User.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/User.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- User.py	10 Jul 2005 03:44:37 -0000	1.4
+++ User.py	22 Jul 2005 21:35:27 -0000	1.5
@@ -34,45 +34,51 @@
         self.server_admin = False
 
 
+def get_userdb_dbcx():
+    try:
+        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=4)
+        curs = dbcx.cursor()
+        return (dbcx, curs)
+    except sqlite.DatabaseError, e:
+        print "sqlite DatabaseError: %s" % str(e)
+        return (None, None)
+
 class Authenticator:
     """
     Talks to a database of users & capabilities
     """
 
     def __init__(self):
-        try:
-            self.dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=2)
-        except sqlite.DatabaseError, e:
-            s = "%s" % e
-            if s == 'unable to open database file':
-                print "Unable to open the user database.  Exiting..."
-                os._exit(1)
-        self.curs = self.dbcx.cursor()
+        (dbcx, curs) = get_userdb_dbcx()
+        if not dbcx or not curs:
+            print "Unable to open the user database.  Exiting..."
+            os._exit(1)
 
         # Ensure the table exists in the database
         create = False
         try:
-            self.curs.execute('SELECT * FROM users')
-            self.dbcx.commit()
+            curs.execute('SELECT * FROM users')
+            dbcx.commit()
         except sqlite._sqlite.DatabaseError, e:
             create = True
 
         if create:
-            self.curs.execute('CREATE TABLE users (email VARCHAR(50), ' \
+            curs.execute('CREATE TABLE users (email VARCHAR(50), ' \
                     'own_jobs BOOLEAN, kill_any_job BOOLEAN, ' \
                     'modify_users BOOLEAN, server_admin BOOLEAN)')
-            self.dbcx.commit()
+            dbcx.commit()
 
 
     def new_authed_user(self, email, client_address):
         if not email:
             return None
 
+        (dbcx, curs) = get_userdb_dbcx()
         user = None
-        self.curs.execute('SELECT email, own_jobs, kill_any_job, modify_users, ' \
+        curs.execute('SELECT email, own_jobs, kill_any_job, modify_users, ' \
                 'server_admin FROM users WHERE email="%s"' % email)
-        self.dbcx.commit()
-        item = self.curs.fetchone()
+        dbcx.commit()
+        item = curs.fetchone()
         if item:
             user = User(email, False)
             user.own_jobs = item['own_jobs']


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- UserInterface.py	22 Jul 2005 02:54:07 -0000	1.25
+++ UserInterface.py	22 Jul 2005 21:35:27 -0000	1.26
@@ -69,6 +69,8 @@
         uid = int(uid_in)
     except ValueError:
         return None
+    except TypeError:
+        return None
     if uid < 0:
         return None
     return uid
@@ -284,6 +286,71 @@
         return (0, "Success.", jobs)
 
 
+    def detail_job(self, uid):
+        """ Query job information and return it to the user """
+
+        uid = validate_uid(uid)
+        if not uid:
+            return (-1, "Error: Invalid job UID.", {})
+
+        sql = 'SELECT uid, username, package, cvs_tag, target, starttime, endtime, status, '\
+                'epoch, version, release, archlist, result_msg 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.", {})
+        curs.execute(sql)
+        job = curs.fetchone()
+        if not job:
+            return (-1, "Error: Invalid job UID.", {})
+        jobrec = {}
+        jobrec['uid'] = job[0]
+        jobrec['username'] = job[1]
+        jobrec['package'] = job[2]
+        jobrec['source'] = job[3]
+        jobrec['target'] = job[4]
+        jobrec['starttime'] = job[5]
+        jobrec['endtime'] = job[6]
+        jobrec['status'] = job[7]
+        if job[8]:
+            jobrec['epoch'] = job[8]
+        if job[9]:
+            jobrec['version'] = job[9]
+        if job[10]:
+            jobrec['release'] = job[10]
+        if job[12]:        
+            jobrec['result_msg'] = job[12]
+        log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
+        if log_url and len(log_url):
+            jobrec['log_url'] = log_url
+        jobrec['archjobs'] = []
+
+        # Get all archjobs for this job
+        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()
+        for row in data:
+            ajrec = {}
+            ajrec['jobid'] = row[0]
+            ajrec['parent_uid'] = row[1]
+            ajrec['starttime'] = row[2]
+            ajrec['endtime'] = row[3]
+            ajrec['arch'] = row[4]
+            ajrec['builder_addr'] = row[5]
+            ajrec['status'] = row[6]
+            ajrec['builder_status'] = row[7]
+            jobrec['archjobs'].append(ajrec)
+
+        del curs
+        del dbcx
+
+        ret_job = copy.deepcopy(jobrec)
+        return (0, "Success.", ret_job)
+
+
     def update_builders(self):
         execfile("/etc/plague/server/CONFIG.py")
         builder_list = self._builder_manager.update_builders()
@@ -337,6 +404,11 @@
         return UserInterface.list_jobs(self, args_dict)
 
 
+    def detail_job(self, email, jobid):
+        user = AuthedXMLRPCServer.get_authinfo()
+        return UserInterface.detail_job(self, jobid)
+
+
     def update_builders(self):
         user = AuthedXMLRPCServer.get_authinfo()
         if not user or not user.server_admin:


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- main.py	20 Jul 2005 14:51:53 -0000	1.10
+++ main.py	22 Jul 2005 21:35:27 -0000	1.11
@@ -86,7 +86,8 @@
         open(opts.pidfile, 'w').write('%d\n' % os.getpid())
 
     if opts.logfile:
-        log=open(opts.logfile, 'a')
+        # 1 == line buffer the log file
+        log=open(opts.logfile, 'a', 1)
         sys.stdout=log
         sys.stderr=log
 



From fedora-extras-commits at redhat.com  Fri Jul 22 21:57:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:57:09 -0400
Subject: rpms/liferea/devel .cvsignore, 1.7, 1.8 liferea.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200507222157.j6MLv9K9023942@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Jul 22 2005 Brian Pepple  - 0.9.4-2
- Update to 0.9.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jul 2005 20:22:17 -0000	1.7
+++ .cvsignore	22 Jul 2005 21:57:07 -0000	1.8
@@ -1 +1 @@
-liferea-0.9.3.tar.gz
+liferea-0.9.4.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- liferea.spec	7 Jul 2005 20:22:17 -0000	1.12
+++ liferea.spec	22 Jul 2005 21:57:07 -0000	1.13
@@ -1,14 +1,14 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        0.9.3
-Release:        1%{?dist}
+Version:        0.9.4
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/%{name}-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Brian Pepple  - 0.9.4-2
+- Update to 0.9.4.
+
 * Thu Jul  7 2005 Brian Pepple  - 0.9.3-1
 - Update to 0.9.3.
 - Enable dbus.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jul 2005 20:22:17 -0000	1.8
+++ sources	22 Jul 2005 21:57:07 -0000	1.9
@@ -1 +1 @@
-8a592a2e73b8d6e1bc78417e91ab82b2  liferea-0.9.3.tar.gz
+91994fb89c107230ef3b15708aa31209  liferea-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Jul 22 21:59:00 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:59:00 -0400
Subject: rpms/liferea/FC-4 .cvsignore, 1.7, 1.8 liferea.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200507222159.j6MLx0N7023975@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Jul 22 2005 Brian Pepple  - 0.9.4-1
- Update to 0.9.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jul 2005 20:23:42 -0000	1.7
+++ .cvsignore	22 Jul 2005 21:58:57 -0000	1.8
@@ -1 +1 @@
-liferea-0.9.3.tar.gz
+liferea-0.9.4.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- liferea.spec	7 Jul 2005 20:23:43 -0000	1.12
+++ liferea.spec	22 Jul 2005 21:58:57 -0000	1.13
@@ -1,14 +1,14 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/%{name}-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Brian Pepple  - 0.9.4-1
+- Update to 0.9.4.
+
 * Thu Jul  7 2005 Brian Pepple  - 0.9.3-1
 - Update to 0.9.3.
 - Enable dbus.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jul 2005 20:23:43 -0000	1.8
+++ sources	22 Jul 2005 21:58:57 -0000	1.9
@@ -1 +1 @@
-8a592a2e73b8d6e1bc78417e91ab82b2  liferea-0.9.3.tar.gz
+91994fb89c107230ef3b15708aa31209  liferea-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Jul 22 21:59:37 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:59:37 -0400
Subject: common tobuild,1.1997,1.1998
Message-ID: <200507222159.j6MLxbwS024066@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24049

Modified Files:
	tobuild 
Log Message:
request build of rpms/liferea/devel liferea-0_9_4-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -r1.1997 -r1.1998
--- tobuild	22 Jul 2005 15:15:32 -0000	1.1997
+++ tobuild	22 Jul 2005 21:59:35 -0000	1.1998
@@ -133,3 +133,4 @@
 scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel
 scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4
 scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel
+bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 21:59:53 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:59:53 -0400
Subject: common tobuild,1.1998,1.1999
Message-ID: <200507222159.j6MLxrmB024099@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24082

Modified Files:
	tobuild 
Log Message:
request build of rpms/liferea/FC-4 liferea-0_9_4-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -r1.1998 -r1.1999
--- tobuild	22 Jul 2005 21:59:35 -0000	1.1998
+++ tobuild	22 Jul 2005 21:59:51 -0000	1.1999
@@ -134,3 +134,4 @@
 scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4
 scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
+bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 22:25:27 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 18:25:27 -0400
Subject: common tobuild,1.1999,1.2000
Message-ID: <200507222225.j6MMPRUV025363@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25346

Modified Files:
	tobuild 
Log Message:
request build of rpms/pytz/devel pytz-2005i-2 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1999
retrieving revision 1.2000
diff -u -r1.1999 -r1.2000
--- tobuild	22 Jul 2005 21:59:51 -0000	1.1999
+++ tobuild	22 Jul 2005 22:25:25 -0000	1.2000
@@ -135,3 +135,4 @@
 scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
+orion	rpms/pytz/devel	pytz-2005i-2	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 00:39:42 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 22 Jul 2005 20:39:42 -0400
Subject: owners owners.list,1.26,1.27
Message-ID: <200507230039.j6N0dg8R029156@cvs-int.fedora.redhat.com>

Author: wtogami

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

Modified Files:
	owners.list 
Log Message:
hula-kevin at iprone.com doesn't exist



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- owners.list	22 Jul 2005 18:11:08 -0000	1.26
+++ owners.list	23 Jul 2005 00:39:39 -0000	1.27
@@ -278,7 +278,7 @@
 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|
-Fedora Extras|hula|A calendar and mail server|hula-kevin at iprone.com|extras-qa at fedoraproject.org|
+Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:39 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:39 -0400
Subject: extras-buildsys/www/template head.psp,1.2,1.3
Message-ID: <200507230055.j6N0tdTW030323@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/www/template

Modified Files:
	head.psp 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: head.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- head.psp	22 Jul 2005 05:39:20 -0000	1.2
+++ head.psp	23 Jul 2005 00:55:37 -0000	1.3
@@ -9,6 +9,15 @@
     email_url = '?email=' + user_email
 # endif
 
+def job_link(uid):
+    string = ''
+    if len(email_url):
+        string = "%s&uid=%d" % (email_url, uid)
+    else:
+        string = "?uid=%d" % uid
+    return string
+
+
 main_active = ''
 if curpage == 'main':
     main_active = '-active'
@@ -45,13 +54,33 @@
       
    
 
       
-      
+      
    
-          
-          
-          
-          
-          
+          
+          
    
         
    MainlBuilder StatuslMy Packages
+            
+              
+                
+                
+                
+                
+                
+              
+            
    MainlBuilder StatuslMy Packages
    
+              		
+            
    
+                Job ID:  
+<%
+if user_email and len(user_email):
+    t = 1
+%>
+                
+<%
+# endif
+%>
+                  
+             
    
+              		
         
    
       
    
 



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:27 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:27 -0400
Subject: extras-buildsys ChangeLog,1.71,1.72
Message-ID: <200507230055.j6N0twch030336@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232

Modified Files:
	ChangeLog 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	22 Jul 2005 21:35:26 -0000	1.71
+++ ChangeLog	23 Jul 2005 00:55:25 -0000	1.72
@@ -1,5 +1,14 @@
 2005-07-22  Dan Williams 
 
+    * server/UserInterface.py
+        - Fix traceback in job detail code
+
+    * www/*
+        - Add an individual job view
+        - Cleanups for Safari
+
+2005-07-22  Dan Williams 
+
     * builder/builder.py
         - Fix traceback when killing jobs on shutdown of the builder
 



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:28 -0400
Subject: extras-buildsys/server UserInterface.py,1.26,1.27
Message-ID: <200507230055.j6N0tx48030339@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/server

Modified Files:
	UserInterface.py 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- UserInterface.py	22 Jul 2005 21:35:27 -0000	1.26
+++ UserInterface.py	23 Jul 2005 00:55:26 -0000	1.27
@@ -314,17 +314,15 @@
         jobrec['starttime'] = job[5]
         jobrec['endtime'] = job[6]
         jobrec['status'] = job[7]
-        if job[8]:
+        if job[8] and job[9] and job[10]:
             jobrec['epoch'] = job[8]
-        if job[9]:
             jobrec['version'] = job[9]
-        if job[10]:
             jobrec['release'] = job[10]
+            log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
+            if log_url and len(log_url):
+                jobrec['log_url'] = log_url
         if job[12]:        
             jobrec['result_msg'] = job[12]
-        log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
-        if log_url and len(log_url):
-            jobrec['log_url'] = log_url
         jobrec['archjobs'] = []
 
         # Get all archjobs for this job



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:33 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:33 -0400
Subject: extras-buildsys/www job.psp, NONE, 1.1 builders.psp, 1.2,
	1.3 index.psp, 1.2, 1.3 indiv.psp, 1.2, 1.3
Message-ID: <200507230055.j6N0tX44030298@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/www

Modified Files:
	builders.psp index.psp indiv.psp 
Added Files:
	job.psp 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




--- NEW FILE job.psp ---

<%
curpage = 'job'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>


    

    

    

<%
if not form.has_key('uid') or not form['uid'] or not len(str(form['uid'])):
    i = 1
%>
        
    Please enter a Job ID.
    
<%
else:
    uid = str(form['uid'])
    import socket, xmlrpclib

    try:
        (e, msg, job) = server.detail_job('', uid)
    except socket.error, e:
        msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
    except xmlrpclib.Fault, fault:
        msg = "XMLRPC Fault"
        e = -1

    if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
    else:
        if job.has_key('version') and job.has_key('release'):
            title = "%s-%s-%s" % (job['package'], job['version'], job['release'])
        else:
            title = job['package']
        # endif
%>

    
    
        
    
            
            
                
<%
        if job['endtime'] != 0:
            total_time = (int(job['endtime']) - int(job['starttime'])) / 60
%>
                    
<%
        # endif
        if job.has_key('log_url') and job['log_url'] and len(job['log_url']):
            log_url = str(job['log_url'])
%>
                    
<%
        # endif
        if job.has_key('result_msg') and job['result_msg'] and len(job['result_msg']):
            import urllib
            result_msg = urllib.unquote(str(job['result_msg']))
%>
                    
<%
        # endif
%>
                
    
                    
    <%=str(job['uid'])%>: <%=title%>  (<%=job['status']%>)
    
                    
    Target:<%=str(job['target'])%>
    
                    
    Submitter:<%=str(job['username'])%>
    
                    
    Source:<%=str(job['source'])%>
    Build Time:<%=str(total_time)%> minutes
    Logs:<%=log_url%>
    Result:"<%=result_msg%>"
    
                		
            
        
    
    
    
    
    
    
<%
        for aj in job['archjobs']:
            i = 1
%>
        
<%
        # endfor
%>
    
    
            
                
<%
            colspan = ''
            if aj['endtime'] == 0:
                colspan = 'colspan="2"'
            #endif
%>
                        
<%
            if aj['endtime'] != 0:
                aj_time = (int(aj['endtime']) - int(aj['starttime'])) / 60
%>
                        
<%
            # endif
%>
                        
    
                    
    
                        
                        
                            <%=aj['arch']%>:
                             <%=aj['builder_addr']%>
                        >
                            Status:
                             <%=aj['status']%>/<%=aj['builder_status']%>
                        
                            Build Time:
                             <%=aj_time%> minutes
                        
                    
    
                
    
                		
        
    
    

    

<%
    # endif
# endif
%>


    

<%@ include file="template/foot.psp"%>

    



Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- builders.psp	22 Jul 2005 05:39:19 -0000	1.2
+++ builders.psp	23 Jul 2005 00:55:31 -0000	1.3
@@ -65,9 +65,9 @@
             archjobs = job['archjobs']
             if not archjobs:
                 continue
-            job_text = 'Jobs:'
             for aj in archjobs:
                 if aj['builder_addr'] == addr:
+                    joblink = job_link(job['uid'])
 %>
         
    
             
@@ -76,7 +76,7 @@
                         
                         
                             Job:
-                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
+                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
                             Status:
                              <%=aj['status']%>/<%=aj['builder_status']%>
                         
    <%=job['uid']%><%=job['uid']%>
             <%=job['package']%>
             <%=source%>
             <%=job['status']%>
    <%=job['uid']%><%=job['uid']%>
             <%=job['package']%>
             <%=source%>
             <%=job['status']%>
    
 
 
+

    
 
 <%
 # endtry


Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- indiv.psp	22 Jul 2005 05:39:19 -0000	1.2
+++ indiv.psp	23 Jul 2005 00:55:31 -0000	1.3
@@ -8,10 +8,12 @@
 <%
 if not len(user_email):
 %>
+
    
 
    
     Email Address:  
     
 
    
+
    
 <%
 else:
     import socket, xmlrpclib
@@ -134,9 +136,11 @@
                 import os
                 source = os.path.basename(source)
             # endif
+
+            joblink = job_link(job['uid'])
 %>
         
    <%=job['uid']%><%=job['uid']%>
             <%=job['package']%>
             <%=source%>
             <%=job['status']%>
    
 
    
 
+

    
 
 <%
 # endif



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:34 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:34 -0400
Subject: extras-buildsys/www/css style.css,1.2,1.3
Message-ID: <200507230056.j6N0u4GM030348@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/www/css

Modified Files:
	style.css 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: style.css
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- style.css	22 Jul 2005 05:39:19 -0000	1.2
+++ style.css	23 Jul 2005 00:55:32 -0000	1.3
@@ -82,6 +82,17 @@
     font-size:          18px;
 }
 
+td.nav-job-form {
+    padding:            5px 6px 0px 6px;
+    vertical-align:     center;
+}
+
+font.nav-job-form {
+    color:              #000000;
+    font-weight:        bold;
+    font-size:          14px;
+}
+
 a.nav-link {
     text-align:         center;
     font-weight:        bold;
@@ -232,11 +243,11 @@
 table.archjobs {
     padding:            1 px 2px 1px 2px;
     border:             none;
-    width:              80%;
+    width:              100%;
 }
 
 td.archjobs {
-    padding-top:        5px;
+    padding:        5px 10px 5px 10px;
 }
 
 font.archjobtag {
@@ -248,3 +259,58 @@
     font-size:      12px;
 }
 
+
+/*
+-------------------------------
+ jobdetail table
+-------------------------------
+*/
+
+table.jobdetail {
+    width:              50%;
+}
+
+td.jobdetail-side {
+    width:              3px;
+    background-color:   #aaaaaa;
+    padding-bottom:     5px;
+}
+
+td.jobdetail-info {
+    padding:            2px 4px 5px 4px;
+    background-color:   #efefef;
+}
+
+td.jobdetail-title {
+    padding:            2px 4px 5px 4px;
+    background-color:   #efefef;
+    border-bottom:      solid 1px #999999;
+}
+
+font.jobdetail-title {
+    font-weight:    bold;
+    font-size:      14px;
+}
+
+td.jobdetail-tag {
+    padding:        4px 2px 0px 2px;
+    text-align:     right;
+    width:          15%;
+}
+
+font.jobdetail-tag {
+    font-weight:    bold;
+    font-size:      12px;
+}
+
+td.jobdetail-text {
+    padding:        4px 2px 0px 2px;
+    text-align:     left;
+}
+
+font.builderarches {
+    font-size:      12px;
+    font-style:     italic;
+    font-weight:    normal;
+}
+



From fedora-extras-commits at redhat.com  Sat Jul 23 06:48:27 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sat, 23 Jul 2005 02:48:27 -0400
Subject: common tobuild,1.2000,1.2001
Message-ID: <200507230648.j6N6mRDl005102@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5079

Modified Files:
	tobuild 
Log Message:

get rid of some outdated entries



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2000
retrieving revision 1.2001
diff -u -r1.2000 -r1.2001
--- tobuild	22 Jul 2005 22:25:25 -0000	1.2000
+++ tobuild	23 Jul 2005 06:48:24 -0000	1.2001
@@ -25,7 +25,6 @@
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-2_fc4	fc4
 petersen	rpms/scim/devel	scim-1_3_3-1_fc5	devel
 ensc	rpms/ip-sentinel/FC-3	ip-sentinel-0_12-5_fc3	fc3
-ixs	rpms/barcode/devel	barcode-0_98-6_fc5	devel
 ensc	rpms/ip-sentinel/FC-4	ip-sentinel-0_12-5_fc4	fc4
 ensc	rpms/ip-sentinel/devel	ip-sentinel-0_12-5_fc5	devel
 ixs	rpms/mod_suphp/devel	mod_suphp-0_5_2-8_fc5	devel
@@ -62,9 +61,6 @@
 ixs	rpms/perl-Crypt-CBC/devel	perl-Crypt-CBC-2_14-2_fc5	devel
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
-jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-1_fc5	devel
-jwboyer	rpms/gaim-meanwhile/FC-4	gaim-meanwhile-1_2_4-1_fc4	fc4
-jwboyer	rpms/gaim-meanwhile/FC-3	gaim-meanwhile-1_2_4-1_fc3	fc3
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel
 thias	rpms/gkrellm-freq/devel	gkrellm-freq-0_1_1-2_fc5	devel
 bpepple	rpms/freeciv/devel	freeciv-2_0_3-2_fc5	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 07:30:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:30:29 -0400
Subject: rpms/leafpad/FC-3 leafpad.spec,1.9,1.10
Message-ID: <200507230730.j6N7UTbS006322@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	leafpad.spec 
Log Message:
Upstream update


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-3/leafpad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- leafpad.spec	19 May 2005 06:45:20 -0000	1.9
+++ leafpad.spec	23 Jul 2005 07:30:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.1
-Release:        1.fc3
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -56,10 +56,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1.fc3
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  0.8.3-1
 - Upstream update
 
-* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1.fc3
+* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1
+- Upstream update
+
+* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1
 - Upstream update
 - Cleanups
 



From fedora-extras-commits at redhat.com  Sat Jul 23 07:30:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:30:30 -0400
Subject: rpms/leafpad/devel .cvsignore, 1.4, 1.5 leafpad.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200507230730.j6N7UUh4006338@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore leafpad.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 May 2005 06:45:21 -0000	1.4
+++ .cvsignore	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-leafpad-0.8.1.tar.gz
+leafpad-0.8.3.tar.gz


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- leafpad.spec	19 May 2005 06:45:21 -0000	1.11
+++ leafpad.spec	23 Jul 2005 07:30:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.1
-Release:        1.fc4
+Version:        0.8.3
+Release:        1%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -57,10 +57,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1.fc4
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  0.8.3-1
 - Upstream update
 
-* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1.fc4
+* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1
+- Upstream update
+
+* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1
 - Upstream update
 
 * Fri Apr 22 2005 Ignacio Vazquez-Abrams  0.7.9-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 May 2005 06:45:21 -0000	1.4
+++ sources	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-4e640c48b45f5963109b376b57a4c2be  leafpad-0.8.1.tar.gz
+a19aaeba4ba7cdfce5d08903a4d9086b  leafpad-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 07:30:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:30:30 -0400
Subject: rpms/leafpad/FC-4 .cvsignore, 1.4, 1.5 leafpad.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200507230730.j6N7UUA1006330@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore leafpad.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 May 2005 06:45:21 -0000	1.4
+++ .cvsignore	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-leafpad-0.8.1.tar.gz
+leafpad-0.8.3.tar.gz


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-4/leafpad.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- leafpad.spec	19 May 2005 06:45:21 -0000	1.11
+++ leafpad.spec	23 Jul 2005 07:30:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.1
-Release:        1.fc4
+Version:        0.8.3
+Release:        1%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -57,10 +57,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1.fc4
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  0.8.3-1
 - Upstream update
 
-* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1.fc4
+* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1
+- Upstream update
+
+* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1
 - Upstream update
 
 * Fri Apr 22 2005 Ignacio Vazquez-Abrams  0.7.9-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 May 2005 06:45:21 -0000	1.4
+++ sources	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-4e640c48b45f5963109b376b57a4c2be  leafpad-0.8.1.tar.gz
+a19aaeba4ba7cdfce5d08903a4d9086b  leafpad-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 07:31:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:31:32 -0400
Subject: common tobuild,1.2001,1.2002
Message-ID: <200507230731.j6N7VWRm006458@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441

Modified Files:
	tobuild 
Log Message:
request build of rpms/leafpad/FC-3 leafpad-0_8_3-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -r1.2001 -r1.2002
--- tobuild	23 Jul 2005 06:48:24 -0000	1.2001
+++ tobuild	23 Jul 2005 07:31:30 -0000	1.2002
@@ -132,3 +132,4 @@
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
+ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Jul 23 07:31:48 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:31:48 -0400
Subject: common tobuild,1.2002,1.2003
Message-ID: <200507230731.j6N7VmoB006491@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6474

Modified Files:
	tobuild 
Log Message:
request build of rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2002
retrieving revision 1.2003
diff -u -r1.2002 -r1.2003
--- tobuild	23 Jul 2005 07:31:30 -0000	1.2002
+++ tobuild	23 Jul 2005 07:31:46 -0000	1.2003
@@ -133,3 +133,4 @@
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3
+ivazquez	rpms/leafpad/FC-4	leafpad-0_8_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 07:32:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:32:01 -0400
Subject: common tobuild,1.2003,1.2004
Message-ID: <200507230732.j6N7W1Wi006524@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6507

Modified Files:
	tobuild 
Log Message:
request build of rpms/leafpad/devel leafpad-0_8_3-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2003
retrieving revision 1.2004
diff -u -r1.2003 -r1.2004
--- tobuild	23 Jul 2005 07:31:46 -0000	1.2003
+++ tobuild	23 Jul 2005 07:31:58 -0000	1.2004
@@ -134,3 +134,4 @@
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3
 ivazquez	rpms/leafpad/FC-4	leafpad-0_8_3-1_fc4	fc4
+ivazquez	rpms/leafpad/devel	leafpad-0_8_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 07:53:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:53:26 -0400
Subject: rpms/notecase/FC-3 notecase-1.0.0-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 notecase.spec, 1.9, 1.10 sources, 1.3,
	1.4 notecase-0.8.9-paths.patch, 1.1, NONE
Message-ID: <200507230753.j6N7rQuO006638@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.0.0-paths.patch 
Removed Files:
	notecase-0.8.9-paths.patch 
Log Message:
Upstream update

notecase-1.0.0-paths.patch:

--- NEW FILE notecase-1.0.0-paths.patch ---
--- notecase/Makefile.paths	2005-07-23 03:40:28.000000000 -0400
+++ notecase/Makefile	2005-07-23 03:41:07.000000000 -0400
@@ -44,7 +44,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
 
 #
 # define default project to build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:33:39 -0000	1.3
+++ .cvsignore	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-notecase-0.8.9_src.zip
+notecase-1.0.0_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-3/notecase.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- notecase.spec	29 May 2005 13:37:47 -0000	1.9
+++ notecase.spec	23 Jul 2005 07:53:24 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           notecase
-Version:        0.8.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
 Patch:          notecase-0.8.9-unix2dos.patch
 Patch1:         notecase-0.8.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,14 +32,13 @@
 s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
 
 %build
-make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-echo "GenericName=Hierarchical Note Manager" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -67,6 +66,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  1.0.0-1
+- Upstream update
+
 * Sun May 29 2005 Ignacio Vazquez-Abrams  0.8.9-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:33:39 -0000	1.3
+++ sources	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip
+702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip


--- notecase-0.8.9-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 07:53:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:53:27 -0400
Subject: rpms/notecase/devel notecase-1.0.0-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 notecase.spec, 1.10, 1.11 sources, 1.3,
	1.4 notecase-0.8.9-paths.patch, 1.1, NONE
Message-ID: <200507230753.j6N7rR6Z006656@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.0.0-paths.patch 
Removed Files:
	notecase-0.8.9-paths.patch 
Log Message:
Upstream update

notecase-1.0.0-paths.patch:

--- NEW FILE notecase-1.0.0-paths.patch ---
--- notecase/Makefile.paths	2005-07-23 03:40:28.000000000 -0400
+++ notecase/Makefile	2005-07-23 03:41:07.000000000 -0400
@@ -44,7 +44,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
 
 #
 # define default project to build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:33:40 -0000	1.3
+++ .cvsignore	23 Jul 2005 07:53:25 -0000	1.4
@@ -1 +1 @@
-notecase-0.8.9_src.zip
+notecase-1.0.0_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- notecase.spec	29 May 2005 13:37:48 -0000	1.10
+++ notecase.spec	23 Jul 2005 07:53:25 -0000	1.11
@@ -1,14 +1,14 @@
 Name:           notecase
-Version:        0.8.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
 Patch:          notecase-0.8.9-unix2dos.patch
-Patch1:         notecase-0.8.9-paths.patch
+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
@@ -32,14 +32,13 @@
 s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
 
 %build
-make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-echo "GenericName=Hierarchical Note Manager" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -67,6 +66,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  1.0.0-1
+- Upstream update
+
 * Sun May 29 2005 Ignacio Vazquez-Abrams  0.8.9-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:33:40 -0000	1.3
+++ sources	23 Jul 2005 07:53:25 -0000	1.4
@@ -1 +1 @@
-a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip
+702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip


--- notecase-0.8.9-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 07:53:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:53:27 -0400
Subject: rpms/notecase/FC-4 notecase-1.0.0-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 notecase.spec, 1.10, 1.11 sources, 1.3,
	1.4 notecase-0.8.9-paths.patch, 1.1, NONE
Message-ID: <200507230753.j6N7rRr0006648@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.0.0-paths.patch 
Removed Files:
	notecase-0.8.9-paths.patch 
Log Message:
Upstream update

notecase-1.0.0-paths.patch:

--- NEW FILE notecase-1.0.0-paths.patch ---
--- notecase/Makefile.paths	2005-07-23 03:40:28.000000000 -0400
+++ notecase/Makefile	2005-07-23 03:41:07.000000000 -0400
@@ -44,7 +44,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
 
 #
 # define default project to build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:33:40 -0000	1.3
+++ .cvsignore	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-notecase-0.8.9_src.zip
+notecase-1.0.0_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- notecase.spec	29 May 2005 13:37:48 -0000	1.10
+++ notecase.spec	23 Jul 2005 07:53:24 -0000	1.11
@@ -1,14 +1,14 @@
 Name:           notecase
-Version:        0.8.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
 Patch:          notecase-0.8.9-unix2dos.patch
-Patch1:         notecase-0.8.9-paths.patch
+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
@@ -32,14 +32,13 @@
 s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
 
 %build
-make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-echo "GenericName=Hierarchical Note Manager" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -67,6 +66,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  1.0.0-1
+- Upstream update
+
 * Sun May 29 2005 Ignacio Vazquez-Abrams  0.8.9-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:33:40 -0000	1.3
+++ sources	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip
+702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip


--- notecase-0.8.9-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 07:54:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:54:09 -0400
Subject: common tobuild,1.2004,1.2005
Message-ID: <200507230754.j6N7s9FH006686@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6669

Modified Files:
	tobuild 
Log Message:
Not just yet...


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2004
retrieving revision 1.2005
diff -u -r1.2004 -r1.2005
--- tobuild	23 Jul 2005 07:31:58 -0000	1.2004
+++ tobuild	23 Jul 2005 07:54:07 -0000	1.2005
@@ -132,6 +132,3 @@
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
-ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3
-ivazquez	rpms/leafpad/FC-4	leafpad-0_8_3-1_fc4	fc4
-ivazquez	rpms/leafpad/devel	leafpad-0_8_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 07:54:58 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:54:58 -0400
Subject: rpms/leafpad/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200507230754.j6N7swtB006716@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Log Message:
Whoops, missed these...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 May 2005 06:45:20 -0000	1.4
+++ .cvsignore	23 Jul 2005 07:54:56 -0000	1.5
@@ -1 +1 @@
-leafpad-0.8.1.tar.gz
+leafpad-0.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 May 2005 06:45:20 -0000	1.4
+++ sources	23 Jul 2005 07:54:56 -0000	1.5
@@ -1 +1 @@
-4e640c48b45f5963109b376b57a4c2be  leafpad-0.8.1.tar.gz
+a19aaeba4ba7cdfce5d08903a4d9086b  leafpad-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 08:40:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 04:40:49 -0400
Subject: rpms/gpredict/FC-3 gpredict.spec,1.6,1.7
Message-ID: <200507230840.j6N8en0W008442@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	gpredict.spec 
Log Message:
Fixed Source0 URL (#161673)


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/rpms/gpredict/FC-3/gpredict.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpredict.spec	26 May 2005 16:44:28 -0000	1.6
+++ gpredict.spec	23 Jul 2005 08:40:47 -0000	1.7
@@ -5,7 +5,7 @@
 Group:          Applications/Communications
 License:        GPL
 URL:            http://sourceforge.net/projects/groundstation/
-Source0:        http://prdownloads.sourceforge.net/groundstation/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/groundstation/%{name}-%{version}.tar.gz
 Patch0:         gpredict-0.5.0-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
@@ -64,6 +64,9 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams 
+- Fixed Source0 URL (#161673)
+
 * Thu May 26 2005 Ignacio Vazquez-Abrams  0.5.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Jul 23 09:00:24 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 05:00:24 -0400
Subject: rpms/kphone/devel kphone-4.2-callaudio-stun-init.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.16, 1.17 sources, 1.3, 1.4
Message-ID: <200507230900.j6N90OEp008926@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:04 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:22 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kphone.spec	20 May 2005 05:42:04 -0000	1.16
+++ kphone.spec	23 Jul 2005 09:00:22 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams  4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13.fc4
+* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13
 - Patch to prevent stripping of binary (#157261)
 
 * Thu Apr  7 2005 Michael Schwendt 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:04 -0000	1.3
+++ sources	23 Jul 2005 09:00:22 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 09:00:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 05:00:18 -0400
Subject: rpms/kphone/FC-3 kphone-4.2-callaudio-stun-init.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <200507230900.j6N90mPk008943@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:03 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:16 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kphone.spec	20 May 2005 05:42:03 -0000	1.12
+++ kphone.spec	23 Jul 2005 09:00:16 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams  4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-12.fc3
+* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-12
 - Patch to prevent stripping of binary (#157261)
 
 * Sat Mar 26 2005 Ignacio Vazquez-Abrams  4.1.0-11


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:03 -0000	1.3
+++ sources	23 Jul 2005 09:00:16 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 09:00:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 05:00:19 -0400
Subject: rpms/kphone/FC-4 kphone-4.2-callaudio-stun-init.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.16, 1.17 sources, 1.3, 1.4
Message-ID: <200507230900.j6N90nXK008949@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:04 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:17 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kphone.spec	20 May 2005 05:42:04 -0000	1.16
+++ kphone.spec	23 Jul 2005 09:00:17 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams  4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13.fc4
+* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13
 - Patch to prevent stripping of binary (#157261)
 
 * Thu Apr  7 2005 Michael Schwendt 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:04 -0000	1.3
+++ sources	23 Jul 2005 09:00:17 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 12:29:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 23 Jul 2005 08:29:59 -0400
Subject: rpms/xemacs-sumo/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xemacs-sumo.spec, 1.9, 1.10 xemacs-sumo-jde-equal.patch,
	1.1, NONE xemacs-sumo-sql-abbrev.patch, 1.1,
	NONE xemacs-sumo-w3.css, 1.1, NONE
Message-ID: <200507231229.j6NCTx64013893@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13872

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Removed Files:
	xemacs-sumo-jde-equal.patch xemacs-sumo-sql-abbrev.patch 
	xemacs-sumo-w3.css 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jun 2005 21:00:01 -0000	1.5
+++ .cvsignore	23 Jul 2005 12:29:57 -0000	1.6
@@ -1,3 +1,2 @@
-xemacs-mule-sumo-2005-05-05.tar.bz2
-xemacs-sumo-2005-05-05.tar.bz2
-cc-mode-1.45-pkg.tar.gz
+xemacs-mule-sumo-2005-07-15.tar.bz2
+xemacs-sumo-2005-07-15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jun 2005 21:00:01 -0000	1.5
+++ sources	23 Jul 2005 12:29:57 -0000	1.6
@@ -1,3 +1,2 @@
-561bac71479bc400173c21c854c37beb  xemacs-mule-sumo-2005-05-05.tar.bz2
-f98700b3db3ce279fe2c4234806f7dfa  xemacs-sumo-2005-05-05.tar.bz2
-e1a2e251e57f29ce6e082181c13c7f04  cc-mode-1.45-pkg.tar.gz
+016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
+28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xemacs-sumo.spec	2 Jun 2005 16:56:40 -0000	1.9
+++ xemacs-sumo.spec	23 Jul 2005 12:29:57 -0000	1.10
@@ -1,94 +1,81 @@
-%define sumo_ver 2005-05-05
+%define sumo    2005-07-15
+%define pkgdir  %{_datadir}/xemacs
 
-Summary: XEmacs Lisp packages
-Name: xemacs-sumo
-Version: %(echo %{sumo_ver} | tr -d -)
-Release: 4.1
-License: GPL
-Group: Applications/Editors
-Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
-Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2
-Source2: %{name}-w3.css
-Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz
-Source10: Emacs.ad.ja_JP.eucJP
-Source11: Emacs.ad.ko_KR.eucKR
-Source12: Emacs.ad.zh_CN.GB2312
-Source13: Emacs.ad.zh_TW.Big5
-Source14: Emacs.ad.ja_JP.UTF-8
-Source15: Emacs.ad.ko_KR.UTF-8
-Source16: Emacs.ad.zh_CN.UTF-8
-Source17: Emacs.ad.zh_TW.UTF-8
-URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: xemacs-nox perl /sbin/install-info
-Requires: xemacs-common
-Conflicts: xemacs < 21.4.12-12
-BuildArch: noarch
-Provides:  ruby-mode-xemacs
-Obsoletes: ruby-mode-xemacs tm
-# Provides/Obsoletes for upgradeability from the latest FC version, needed
-# until (if?) there will be separate apel, mew, and ddskk packages for
-# XEmacs again.  ddskk-xemacs is not provided because the
-# version shipping here is the original skk, not ddskk.  It is obsoleted
-# anyway to for the sake of smooth upgrades.
-Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2
-Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5
-Patch0: %{name}-jde-equal.patch
-Patch1: %{name}-sql-abbrev.patch
-Patch6: auctex-texsite-jlatex-detect-69129.patch
-Patch7: auctex-texjp-platex.patch
-Patch8: egg-wnn-host-unix-79826.patch
-Patch11: browse-url-htmlview-84262.patch
-Patch12: psgml-browsers-84262.patch
-Patch13: jde-ug-rel-links.patch
-Patch14: jde-ug-section-links-89499.patch
-Patch15: avoid-catch-error-65346.patch
+Name:           xemacs-sumo
+Version:        %(echo %{sumo} | tr -d -)
+Release:        1
+Summary:        XEmacs lisp packages
+
+Group:          Applications/Editors
+License:        GPL
+URL:            http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
+Source0:        ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2
+Source1:        ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2
+Source10:       Emacs.ad.ja_JP.eucJP
+Source11:       Emacs.ad.ko_KR.eucKR
+Source12:       Emacs.ad.zh_CN.GB2312
+Source13:       Emacs.ad.zh_TW.Big5
+Source14:       Emacs.ad.ja_JP.UTF-8
+Source15:       Emacs.ad.ko_KR.UTF-8
+Source16:       Emacs.ad.zh_CN.UTF-8
+Source17:       Emacs.ad.zh_TW.UTF-8
+Patch6:         auctex-texsite-jlatex-detect-69129.patch
+Patch7:         auctex-texjp-platex.patch
+Patch8:         egg-wnn-host-unix-79826.patch
+Patch11:        browse-url-htmlview-84262.patch
+Patch12:        psgml-browsers-84262.patch
+Patch13:        jde-ug-rel-links.patch
+Patch14:        jde-ug-section-links-89499.patch
+Patch15:        avoid-catch-error-65346.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  xemacs-nox
+BuildRequires:  sed >= 3.95
+BuildRequires:  /sbin/install-info
+Requires:       xemacs-common
+Provides:       apel-xemacs = 10.2
+Provides:       ruby-mode-xemacs
+Obsoletes:      apel-xemacs < 10.6-6
+Obsoletes:      ruby-mode-xemacs
+Obsoletes:      tm
+Conflicts:      xemacs < 21.4.12-12
 
 %description
-XEmacs (like GNU Emacs) is a self-documenting, customizable,
-extensible, real-time display editor. XEmacs is self-documenting
-because at any time you can type control-h to find out what your
-options are or find out what a command does. XEmacs is customizable
-because you can change the definitions of XEmacs commands. XEmacs is
-extensible because you can write entirely new commands-programs in the
-Lisp language to be run by Emacs' own Lisp interpreter. XEmacs
-includes a real-time display, which means that the text being edited
-is visible on the screen and is updated very frequently (usually after
-every character or pair of characters) as you type.
-
-The XEmacs Sumo packages contain a large collection of useful
-Lisp packages for XEmacs including mailreaders, programming modes
-and utilities, and mule related packages.
-
-%package el
-Summary: The .el source files for the XEmacs Sumo packages.
-Group: Applications/Editors
-Requires: xemacs-sumo = %{version}
-Conflicts: xemacs-el < 21.4.12-12
-
-%description el
-xemacs-sumo-el is not needed to run XEmacs. You only need to install it if
-you are planning to incorporate some Lisp programming into your XEmacs
-experience.
-
-%package info
-Summary: Information files for XEmacs.
-Group: Applications/Editors
-Conflicts: xemacs-info < 21.4.12-12
-
-%description info
-This package contains optional info files that are distributed
-with the XEmacs Sumo packages.
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+The XEmacs Sumo packages contain a large collection of useful lisp
+packages for XEmacs including mailreaders, programming modes and
+utilities, and packages related to using XEmacs in multi-lingual
+environments.
+
+%package        el
+Summary:        Emacs lisp source files for the XEmacs Sumo packages
+Group:          Development/Libraries
+Requires:       xemacs-sumo = %{version}
+Conflicts:      xemacs-el < 21.4.12-12
+
+%description    el
+This package is not needed to run XEmacs; it contains the lisp source
+files for the XEmacs Sumo packages, mainly of interest when developing
+or debugging the packages.
+
+%package        info
+Summary:        XEmacs packages documentation in GNU texinfo format
+Group:          Documentation
+Conflicts:      xemacs-info < 21.4.12-12
+
+%description    info
+This package contains optional documentation for the XEmacs Sumo
+packages in GNU texinfo format
 
-%define pkgdir %{_datadir}/xemacs
 
 %prep
 %setup -q -c -a1
-%{__tar} zx -C xemacs-packages -f %{SOURCE3}
-# fix font-lock warnings in JDE
-%patch0 -p0
-# fix abbrev error when loading sql-mode
-%patch1 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -106,87 +93,89 @@
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch15 -p0
 
-rm xemacs-packages/etc/w3/stylesheet
-install -pm 644 %{SOURCE2} xemacs-packages/etc/w3/stylesheet
-
-perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \
+sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
   xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
 
-chmod +x \
-  xemacs-packages/etc/bbdb/*.pl \
-  xemacs-packages/etc/erc/servers.pl \
-  xemacs-packages/etc/ess/config.guess \
-  xemacs-packages/etc/idlwave/idlwave_catalog
-
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
 
 
 %build
-%define _xemacs_batch xemacs-nox -batch -vanilla
+export xemacs_batch="xemacs-nox -batch -vanilla"
+
+# mew is provided by mew-xemacs, and skk by ddskk-xemacs
+$xemacs_batch -l package-admin -eval \
+  "(package-admin-delete-binary-package 'mew \"xemacs-packages\")"
+rmdir xemacs-packages/{etc,lisp,man}/mew
+$xemacs_batch -l package-admin -eval \
+  "(package-admin-delete-binary-package 'skk \"mule-packages\")"
+rmdir mule-packages/{etc,lisp,man}/skk
 
 export EMACSPACKAGEPATH=`pwd`
-%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
+$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
   -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
-%_xemacs_batch -f batch-byte-recompile-directory \
+$xemacs_batch -f batch-byte-recompile-directory \
   xemacs-packages/lisp mule-packages/lisp
 
 
 %install
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
-# install packages in buildroot
-mkdir -p %buildroot%{pkgdir}
-cp -rp xemacs-packages mule-packages %buildroot%{pkgdir}
-
-( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults
-  mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
-  iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
-  iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
-  iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
-  mv de de_DE
-  mv fr fr_FR
-  mv ro ro_RO
-  install -m 644 %SOURCE10 ja_JP.eucJP/Emacs
-  install -m 644 %SOURCE11 ko_KR.eucKR/Emacs
-  install -m 644 %SOURCE12 zh_CN.GB2312/Emacs
-  install -m 644 %SOURCE13 zh_TW.Big5/Emacs
-  install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs
-  install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs
-  install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs
-  install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs
-## don't seem to appear in manifest
-#  ln -s ja_JP.eucJP ja_JP
-#  ln -s ko_KR.eucKR ko_KR
-#  ln -s zh_CN.GB2312 zh_CN
-#  ln -s zh_TW.Big5 zh_TW
-)
+mkdir -p $RPM_BUILD_ROOT%{pkgdir}
+cp -rp xemacs-packages mule-packages $RPM_BUILD_ROOT%{pkgdir}
 
-# Make sure nothing is 0400
-chmod -R a+rX  %buildroot/usr
+cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
+mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \
+  ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
+iconv -f ISO-8859-1  -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
+iconv -f ISO-8859-1  -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
+iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
+mv de de_DE
+mv fr fr_FR
+mv ro ro_RO
+install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs
+install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs
+install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs
+install -pm 644 %{SOURCE13} zh_TW.Big5/Emacs
+install -pm 644 %{SOURCE14} ja_JP.UTF-8/Emacs
+install -pm 644 %{SOURCE15} ko_KR.UTF-8/Emacs
+install -pm 644 %{SOURCE16} zh_CN.UTF-8/Emacs
+install -pm 644 %{SOURCE17} zh_TW.UTF-8/Emacs
+# these don't seem to appear in manifest
+#ln -s ja_JP.eucJP ja_JP
+#ln -s ko_KR.eucKR ko_KR
+#ln -s zh_CN.GB2312 zh_CN
+#ln -s zh_TW.Big5 zh_TW
+cd -
 
 # info docs: pre-generate "dir"s and compress files
-for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do
+for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do
   /sbin/install-info $file `dirname $file`/dir
 done
-find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9
+find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
 rm -f *.files base-files el-files info-files
-echo "%defattr(-,root,root)" > base-files
-echo "%defattr(-,root,root)" > el-files
-echo "%defattr(-,root,root)" > info-files
+echo "%%defattr(-,root,root,-)" > base-files
+echo "%%defattr(-,root,root,-)" > el-files
+echo "%%defattr(-,root,root,-)" > info-files
+
+find $RPM_BUILD_ROOT%{pkgdir}/* \
+  \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
+  \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
+  \( -type d -name info -fprint info.files -prune \) -o \
+  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
+     -fprint base-el-not-bytecomped.files \) \)
 
-find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)
-
-perl -pi -e "s|%buildroot||" *.files
+sed -i -e "s|$RPM_BUILD_ROOT||" *.files
 cat base-*.files dir.files >> base-files
-cat el-*.files dir.files >> el-files
-cat info.files >> info-files
+cat el-*.files   dir.files >> el-files
+cat info.files             >> info-files
 
 
 %clean
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f base-files
@@ -197,6 +186,15 @@
 
 
 %changelog
+* Sat Jul 16 2005 Ville Skytt??  - 20050715-1
+- 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
+  permissions fixed upstream.
+- Use sed instead of perl for in-place edits during build.
+
+* Wed Jul 13 2005 Ville Skytt??  - 20050505-7
+- Remove mew and skk, they're in separate packages again (#162952).
+- Reformat specfile.
+
 * Thu Jun  2 2005 Ville Skytt??  - 20050505-4.1
 - Make sure we're using files included in this package
   when byte-recompiling patched *.el; also allows the byte-compilation


--- xemacs-sumo-jde-equal.patch DELETED ---


--- xemacs-sumo-sql-abbrev.patch DELETED ---


--- xemacs-sumo-w3.css DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 12:31:13 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 23 Jul 2005 08:31:13 -0400
Subject: common tobuild,1.2005,1.2006
Message-ID: <200507231231.j6NCVDUK013955@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938

Modified Files:
	tobuild 
Log Message:
request build of rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2005
retrieving revision 1.2006
diff -u -r1.2005 -r1.2006
--- tobuild	23 Jul 2005 07:54:07 -0000	1.2005
+++ tobuild	23 Jul 2005 12:31:11 -0000	1.2006
@@ -132,3 +132,4 @@
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
+scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 13:16:00 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 09:16:00 -0400
Subject: rpms/gcfilms import.log,1.5,1.6
Message-ID: <200507231316.j6NDG0DP015225@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	import.log 
Log Message:
auto-import gcfilms-5.3-1.fc4 on branch FC-4 from gcfilms-5.3-1.fc4.src.rpm
New upstream version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	29 Jun 2005 16:58:40 -0000	1.5
+++ import.log	23 Jul 2005 13:15:57 -0000	1.6
@@ -2,3 +2,4 @@
 gcfilms-5_1-1:FC-4:gcfilms-5.1-1.src.rpm:1119195786
 gcfilms-5_2-1:FC-4:gcfilms-5.2-1.src.rpm:1119471667
 gcfilms-5_2-1:HEAD:gcfilms-5.2-1.src.rpm:1120064311
+gcfilms-5_3-1_fc4:FC-4:gcfilms-5.3-1.fc4.src.rpm:1122124549



From fedora-extras-commits at redhat.com  Sat Jul 23 13:16:00 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 09:16:00 -0400
Subject: rpms/gcfilms/FC-4 .cvsignore, 1.4, 1.5 gcfilms.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200507231316.j6NDG05J015233@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	.cvsignore gcfilms.spec sources 
Log Message:
auto-import gcfilms-5.3-1.fc4 on branch FC-4 from gcfilms-5.3-1.fc4.src.rpm
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 20:21:23 -0000	1.4
+++ .cvsignore	23 Jul 2005 13:15:58 -0000	1.5
@@ -1 +1 @@
-gcfilms-5.2.tar.gz
+gcfilms-5.3.tar.gz


Index: gcfilms.spec
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/gcfilms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcfilms.spec	22 Jun 2005 20:21:23 -0000	1.3
+++ gcfilms.spec	23 Jul 2005 13:15:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gcfilms
-Version:        5.2
-Release:        1
+Version:        5.3
+Release:        1%{?dist}
 Summary:        Movies collection management
 
 Group:          Applications/Databases
@@ -100,6 +100,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Fri Jul 1 2005 Tian  - 5.3-1
+  - New upstream version.
+  - Added dist tag
 * Wed Jun 22 2005 Tian  - 5.2-1
   - New upstream version with important bug fixes.
 * Sun Jun 19 2005 Tian  - 5.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 20:21:23 -0000	1.4
+++ sources	23 Jul 2005 13:15:58 -0000	1.5
@@ -1 +1 @@
-5b8954427e264998b8078bc0a0b1be6f  gcfilms-5.2.tar.gz
+91a9c544d1c904928ea0744755078fa8  gcfilms-5.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 13:38:32 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 09:38:32 -0400
Subject: common tobuild,1.2006,1.2007
Message-ID: <200507231338.j6NDcW6T015318@cvs-int.fedora.redhat.com>

Author: Tian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15300

Modified Files:
	tobuild 
Log Message:
request build of rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2006
retrieving revision 1.2007
diff -u -r1.2006 -r1.2007
--- tobuild	23 Jul 2005 12:31:11 -0000	1.2006
+++ tobuild	23 Jul 2005 13:38:30 -0000	1.2007
@@ -133,3 +133,4 @@
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4
+Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 15:09:02 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 23 Jul 2005 11:09:02 -0400
Subject: rpms/mhonarc/devel .cvsignore, 1.4, 1.5 mhonarc.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200507231509.j6NF921e017716@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore mhonarc.spec sources 
Log Message:
- version 2.6.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Jun 2005 19:58:18 -0000	1.4
+++ .cvsignore	23 Jul 2005 15:09:00 -0000	1.5
@@ -1 +1 @@
-MHonArc-2.6.12.tar.bz2
+MHonArc-2.6.14.tar.bz2


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mhonarc.spec	11 Jun 2005 19:58:18 -0000	1.8
+++ mhonarc.spec	23 Jul 2005 15:09:00 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           mhonarc
-Version:        2.6.12
+Version:        2.6.14
 Release:        1%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.mhonarc.org/
-Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.12.tar.bz2
+Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.14.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Jul 23 2005 Aurelien Bompard  2.6.14-1
+- version 2.6.14
+
 * Sat Jun 11 2005 Aurelien Bompard  2.6.12-1
 - version 2.6.12 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jun 2005 19:58:18 -0000	1.4
+++ sources	23 Jul 2005 15:09:00 -0000	1.5
@@ -1 +1 @@
-b1aa510bc503f4e47d3cf23419a41166  MHonArc-2.6.12.tar.bz2
+c0565ec34a4cfaaee9cbfa76fe817539  MHonArc-2.6.14.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jul 23 16:11:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 12:11:27 -0400
Subject: devel/cgoban cgoban.spec,1.7,1.8
Message-ID: <200507231611.j6NGBR8m018957@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/cgoban
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18940

Modified Files:
	cgoban.spec 
Log Message:
Apply patch from bugzilla #161676.


Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/devel/cgoban/cgoban.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cgoban.spec	6 Apr 2005 22:11:34 -0000	1.7
+++ cgoban.spec	23 Jul 2005 16:11:25 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           cgoban
 Version:        1.9.14
-Release:        4
+Release:        5
 
 Summary:        X board for playing go
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://cgoban1.sourceforge.net/
-Source0:	http://prdownloads.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
+Source0:	http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
 Source1:        cgoban.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Jun 25 2005 Colin Charles  1.9.14-5
+- Fix download URL
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Jul 23 17:12:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 13:12:05 -0400
Subject: devel/cksfv cksfv-1.3-print.c.patch,NONE,1.1 cksfv.spec,1.7,1.8
Message-ID: <200507231712.j6NHC5Pv020251@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/cksfv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20231

Modified Files:
	cksfv.spec 
Added Files:
	cksfv-1.3-print.c.patch 
Log Message:
Bug-fix. Package is orphaned.

cksfv-1.3-print.c.patch:

--- NEW FILE cksfv-1.3-print.c.patch ---
diff -Nur cksfv-1.3-orig/src/print.c cksfv-1.3/src/print.c
--- cksfv-1.3-orig/src/print.c	2001-07-06 08:33:08.000000000 +0200
+++ cksfv-1.3/src/print.c	2005-07-23 19:09:45.000000000 +0200
@@ -66,7 +66,7 @@
 
 void prsfv_head(char *fn)
 {
-  char          head[81], *p;
+  char          head[82], *p;
   int           len;
   
   fprintf(stderr, "cksfv v%s written by Bryan Call \n",


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/devel/cksfv/cksfv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cksfv.spec	6 Apr 2005 22:11:34 -0000	1.7
+++ cksfv.spec	23 Jul 2005 17:12:03 -0000	1.8
@@ -1,12 +1,12 @@
 Summary:          Utility to manipulate SFV files
 Name:             cksfv
 Version:          1.3
-Release:          3
-
+Release:          4
 URL:              http://www.fodder.org/cksfv
 License:          GPL
 Group:            Applications/File
 Source0:          http://www.fodder.org/cksfv/cksfv-1.3.tar.gz
+Patch0:           cksfv-1.3-print.c.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 Prefix:           %{_prefix}
 
@@ -17,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .print.c
 
 %build
 make %{?_smp_mflags} "CFLAGS=-Wall %{optflags}"
@@ -36,6 +37,9 @@
 %{_bindir}/cksfv
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 1.3-4
+- Fix "array subscript out of range" (#149461).
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Jul 23 17:12:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 13:12:53 -0400
Subject: common tobuild,1.2007,1.2008
Message-ID: <200507231712.j6NHCriI020310@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Modified Files:
	tobuild 
Log Message:
request build of devel/cksfv cksfv-1_3-4 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2007
retrieving revision 1.2008
diff -u -r1.2007 -r1.2008
--- tobuild	23 Jul 2005 13:38:30 -0000	1.2007
+++ tobuild	23 Jul 2005 17:12:51 -0000	1.2008
@@ -134,3 +134,4 @@
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
+mschwendt	devel/cksfv	cksfv-1_3-4	devel



From ed at eh3.com  Sat Jul 23 17:18:00 2005
From: ed at eh3.com (Ed Hill)
Date: Sat, 23 Jul 2005 13:18:00 -0400
Subject: APPROVED: hdf
Message-ID: <1122139080.5322.203.camel@ernie>

Name: hdf
Summary: A general purpose library and file format for storing
scientific data

HDF is a general purpose library and file format for storing scientific
data.  HDF can store two primary objects: datasets and groups.  A
dataset is essentially a multidimensional array of data elements, and a
group is a structure for organizing objects in an HDF file.  Using these
two basic objects, one can create and store almost any kind of
scientific data structure, such as images, arrays of vectors, and
structured and unstructured grids.  You can also mix and match them in
HDF files according to your needs.

Maintainer:  Orion Poplawski
Reviewer:  Ed Hill

-- 
Edward H. Hill III, PhD
office:  MIT Dept. of EAPS;  Rm 54-1424;  77 Massachusetts Ave.
             Cambridge, MA 02139-4307
emails:  eh3 at mit.edu                ed at eh3.com
URLs:    http://web.mit.edu/eh3/    http://eh3.com/
phone:   617-253-0098
fax:     617-253-4464



From fedora-extras-commits at redhat.com  Sat Jul 23 18:27:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 14:27:18 -0400
Subject: devel/freeze freeze-2.5.0-printf.patch, NONE,
	1.1 freeze-2.5.0-deffile.patch, NONE, 1.1 freeze.spec, 1.6, 1.7
Message-ID: <200507231827.j6NIRIA4021570@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/freeze
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21547

Modified Files:
	freeze.spec 
Added Files:
	freeze-2.5.0-printf.patch freeze-2.5.0-deffile.patch 
Log Message:
see changelog entry

freeze-2.5.0-printf.patch:

--- NEW FILE freeze-2.5.0-printf.patch ---
diff -Nur freeze-2.5.0-orig/freeze.c freeze-2.5.0/freeze.c
--- freeze-2.5.0-orig/freeze.c	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/freeze.c	2005-07-23 20:25:42.000000000 +0200
@@ -76,7 +76,7 @@
     fprintf(stderr, "\n\
       -c         Write output on stdout, don't remove original.\n\
       -d         If given, melting is done instead.\n\
-      -g         Use \"greedy\" parsing (1.5% worse, 40% faster).\n\
+      -g         Use \"greedy\" parsing (1.5%% worse, 40%% faster).\n\
       -f         Forces output file to be generated, even if one already\n\
                  exists, and even if no space is saved by freezeing.\n\
       -i         Image mode.\n\
diff -Nur freeze-2.5.0-orig/statist.c freeze-2.5.0/statist.c
--- freeze-2.5.0-orig/statist.c	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/statist.c	2005-07-23 20:25:42.000000000 +0200
@@ -261,7 +261,7 @@
 		}
 		in_count += i;
 		if ((in_count > indc_count)) {
-			fprintf(stderr, "%5dK\b\b\b\b\b\b", in_count / 1024);
+			fprintf(stderr, "%5ldK\b\b\b\b\b\b", in_count / 1024);
 			fflush (stderr);
 			indc_count += 4096;
 		}

freeze-2.5.0-deffile.patch:

--- NEW FILE freeze-2.5.0-deffile.patch ---
diff -Nur freeze-2.5.0-orig/freeze.1 freeze-2.5.0/freeze.1
--- freeze-2.5.0-orig/freeze.1	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/freeze.1	2005-07-23 20:21:06.000000000 +0200
@@ -109,7 +109,7 @@
 of following files in the command string. An explicite definition
 of the file's type can give up to 2% of additional compression.
 The list of types is stored in file
-.IR /usr/local/lib/freeze.cnf .
+.IR /usr/lib/freeze.cnf .
 Types may be abbreviated while not ambigious. You can also determine
 values for the static Huffman table by using a list of 8 numbers
 separated by commas instead of
diff -Nur freeze-2.5.0-orig/README freeze-2.5.0/README
--- freeze-2.5.0-orig/README	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/README	2005-07-23 20:23:28.000000000 +0200
@@ -160,7 +160,7 @@
 Note: If you use "gensample | statist", remember that INTR influence BOTH
 processes !!
 
-You may create the /etc/default/freeze (or rather /usr/local/lib/freeze.cnf,
+You may create the /etc/default/freeze (or rather /usr/lib/freeze.cnf,
 which is now the default, NOTE IT!) file (in MS-DOS it is FREEZE.CNF in
 the directory of FREEZE.EXE), which has the following format:  name =
 ``statist's output (8 numbers)'', e.g.:


Index: freeze.spec
===================================================================
RCS file: /cvs/extras/devel/freeze/freeze.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freeze.spec	6 Apr 2005 22:11:37 -0000	1.6
+++ freeze.spec	23 Jul 2005 18:27:16 -0000	1.7
@@ -1,13 +1,14 @@
 Name:    freeze
 Version: 2.5.0
-Release: 3
-
+Release: 4
 Summary: freeze/melt/fcat compression utilities
 
 Group:     Applications/Archiving
 License:   Distributable
 Source:    http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
-Patch:     freeze-2.5.patch
+Patch0:    freeze-2.5.patch
+Patch1:    freeze-2.5.0-printf.patch
+Patch2:    freeze-2.5.0-deffile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,7 +18,9 @@
 
 %prep
 %setup
-%patch
+%patch0 -p1 -b .Makefile
+%patch1 -p1 -b .printf
+%patch2 -p1 -b .deffile
 
 %build
 chmod u+x configure
@@ -48,6 +51,11 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 2.5.0-4
+- Fix bad printf string (#149613).
+- Fix default cnf file location in readme and man page.
+- Don't strip.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Jul 23 18:28:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 14:28:04 -0400
Subject: devel/freeze freeze-2.5.patch,1.1,1.2
Message-ID: <200507231828.j6NIS4be021622@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/freeze
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21602

Modified Files:
	freeze-2.5.patch 
Log Message:


freeze-2.5.patch:

Index: freeze-2.5.patch
===================================================================
RCS file: /cvs/extras/devel/freeze/freeze-2.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeze-2.5.patch	8 Nov 2004 04:20:29 -0000	1.1
+++ freeze-2.5.patch	23 Jul 2005 18:28:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr freeze-2.5.orig/Makefile.in freeze-2.5/Makefile.in
---- Makefile.in.in	Wed Sep 11 09:54:37 1996
-+++ Makefile.in	Wed Sep 11 10:14:28 1996
+diff -Nur freeze-2.5.0-orig/Makefile.in freeze-2.5.0/Makefile.in
+--- freeze-2.5.0-orig/Makefile.in	1999-05-20 11:07:51.000000000 +0200
++++ freeze-2.5.0/Makefile.in	2005-07-23 19:44:41.000000000 +0200
 @@ -18,7 +18,7 @@
  default:        prog
  
@@ -10,7 +10,23 @@
  DEST          = $(prefix)/bin
  MANDEST       = $(prefix)/man/man1
  SEC           = 1
-@@ -101,18 +101,18 @@
+@@ -79,15 +79,12 @@
+ 
+ freeze$(EXE):   $(OBJS)
+ 		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+-		-strip $@
+ 
+ statist$(EXE):  statist.$(OBJ) lz.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ statist.$(OBJ) lz.$(OBJ) $(LIBS)
+-		-strip $@
+ 
+ showhuf$(EXE):  showhuf.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ showhuf.$(OBJ) $(LIBS)
+-		-strip $@
+ 
+ clobber:        clean
+ 		rm -f freeze$(EXE) statist$(EXE) showhuf$(EXE) *.man \#* *~ config.h Makefile
+@@ -101,18 +98,18 @@
  
  $(DEST)/freeze: freeze
  		$(INSTALL_PROGRAM) freeze $@



From fedora-extras-commits at redhat.com  Sat Jul 23 18:29:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 14:29:16 -0400
Subject: common tobuild,1.2008,1.2009
Message-ID: <200507231829.j6NITGJN021704@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21687

Modified Files:
	tobuild 
Log Message:
request build of devel/freeze freeze-2_5_0-4 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -r1.2008 -r1.2009
--- tobuild	23 Jul 2005 17:12:51 -0000	1.2008
+++ tobuild	23 Jul 2005 18:29:14 -0000	1.2009
@@ -135,3 +135,4 @@
 scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
 mschwendt	devel/cksfv	cksfv-1_3-4	devel
+mschwendt	devel/freeze	freeze-2_5_0-4	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 19:44:34 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:44:34 -0400
Subject: devel/tetex-lgrind lgrind-3.67-parsevartab.patch, NONE,
	1.1 tetex-lgrind.spec, 1.9, 1.10
Message-ID: <200507231944.j6NJiYdm023029@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/tetex-lgrind
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23009

Modified Files:
	tetex-lgrind.spec 
Added Files:
	lgrind-3.67-parsevartab.patch 
Log Message:
Bug-fix. Package is orphaned.

lgrind-3.67-parsevartab.patch:

--- NEW FILE lgrind-3.67-parsevartab.patch ---
diff -Nur lgrind-orig/source/lgutil.c lgrind/source/lgutil.c
--- lgrind-orig/source/lgutil.c	2001-11-04 12:24:22.000000000 +0100
+++ lgrind/source/lgutil.c	2005-07-23 21:43:45.000000000 +0200
@@ -277,7 +277,7 @@
 	char linebuf[201], *cp;
 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
 
-	if (f==NULL) return;
+	if (f==NULL) return NULL;
 	while (!feof(f))
 	{
 		fscanf(f, "%200[^\n]", linebuf);


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/devel/tetex-lgrind/tetex-lgrind.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-lgrind.spec	22 May 2005 22:26:49 -0000	1.9
+++ tetex-lgrind.spec	23 Jul 2005 19:44:32 -0000	1.10
@@ -6,8 +6,7 @@
 Summary:          Source-code pretty-printer for LaTeX
 Name:             tetex-lgrind
 Version:          3.67
-Release: 6
-
+Release:          7
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -15,6 +14,7 @@
 # automatically generated by the FTP site. To verify the file, the
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
+Patch0:           lgrind-3.67-parsevartab.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):   tetex
 Requires(postun): tetex
@@ -33,6 +33,7 @@
 
 %prep
 %setup -q -n lgrind
+%patch0 -p1 -b .parsevartab
 
 %build
 make %{?_smp_mflags} \
@@ -78,6 +79,9 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 3.67-7
+- Fix "missing expression in return statement" (#150297).
+
 * Sun May 22 2005 Jeremy Katz  - 3.67-6
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sat Jul 23 19:55:14 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:55:14 -0400
Subject: common tobuild,1.2009,1.2010
Message-ID: <200507231955.j6NJtErE023090@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23073

Modified Files:
	tobuild 
Log Message:
request build of devel/tetex-lgrind tetex-lgrind-3_67-7 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2009
retrieving revision 1.2010
diff -u -r1.2009 -r1.2010
--- tobuild	23 Jul 2005 18:29:14 -0000	1.2009
+++ tobuild	23 Jul 2005 19:55:12 -0000	1.2010
@@ -136,3 +136,4 @@
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
 mschwendt	devel/cksfv	cksfv-1_3-4	devel
 mschwendt	devel/freeze	freeze-2_5_0-4	devel
+mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 19:57:37 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:57:37 -0400
Subject: rpms/tetex-lgrind/FC-4 lgrind-3.67-parsevartab.patch, NONE,
	1.1 tetex-lgrind.spec, 1.9, 1.10
Message-ID: <200507231957.j6NJvbFc023121@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	tetex-lgrind.spec 
Added Files:
	lgrind-3.67-parsevartab.patch 
Log Message:
Sync with devel to fix #162523.

lgrind-3.67-parsevartab.patch:

--- NEW FILE lgrind-3.67-parsevartab.patch ---
diff -Nur lgrind-orig/source/lgutil.c lgrind/source/lgutil.c
--- lgrind-orig/source/lgutil.c	2001-11-04 12:24:22.000000000 +0100
+++ lgrind/source/lgutil.c	2005-07-23 21:43:45.000000000 +0200
@@ -277,7 +277,7 @@
 	char linebuf[201], *cp;
 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
 
-	if (f==NULL) return;
+	if (f==NULL) return NULL;
 	while (!feof(f))
 	{
 		fscanf(f, "%200[^\n]", linebuf);


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-lgrind/FC-4/tetex-lgrind.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-lgrind.spec	22 May 2005 22:26:49 -0000	1.9
+++ tetex-lgrind.spec	23 Jul 2005 19:57:35 -0000	1.10
@@ -6,8 +6,7 @@
 Summary:          Source-code pretty-printer for LaTeX
 Name:             tetex-lgrind
 Version:          3.67
-Release: 6
-
+Release:          6.1
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -15,6 +14,7 @@
 # automatically generated by the FTP site. To verify the file, the
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
+Patch0:           lgrind-3.67-parsevartab.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):   tetex
 Requires(postun): tetex
@@ -33,6 +33,7 @@
 
 %prep
 %setup -q -n lgrind
+%patch0 -p1 -b .parsevartab
 
 %build
 make %{?_smp_mflags} \
@@ -78,6 +79,9 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 3.67-6.1
+- Fix "missing expression in return statement" (#150297).
+
 * Sun May 22 2005 Jeremy Katz  - 3.67-6
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sat Jul 23 19:58:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:58:19 -0400
Subject: common tobuild,1.2010,1.2011
Message-ID: <200507231958.j6NJwJeK023178@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23161

Modified Files:
	tobuild 
Log Message:
request build of rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2010
retrieving revision 1.2011
diff -u -r1.2010 -r1.2011
--- tobuild	23 Jul 2005 19:55:12 -0000	1.2010
+++ tobuild	23 Jul 2005 19:58:17 -0000	1.2011
@@ -137,3 +137,4 @@
 mschwendt	devel/cksfv	cksfv-1_3-4	devel
 mschwendt	devel/freeze	freeze-2_5_0-4	devel
 mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel
+mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 20:00:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 16:00:55 -0400
Subject: rpms/tetex-lgrind/FC-3 lgrind-3.67-parsevartab.patch, NONE,
	1.1 tetex-lgrind.spec, 1.5, 1.6
Message-ID: <200507232000.j6NK0tdR023223@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tetex-lgrind/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23203

Modified Files:
	tetex-lgrind.spec 
Added Files:
	lgrind-3.67-parsevartab.patch 
Log Message:
Sync with FC-4 and devel.

lgrind-3.67-parsevartab.patch:

--- NEW FILE lgrind-3.67-parsevartab.patch ---
diff -Nur lgrind-orig/source/lgutil.c lgrind/source/lgutil.c
--- lgrind-orig/source/lgutil.c	2001-11-04 12:24:22.000000000 +0100
+++ lgrind/source/lgutil.c	2005-07-23 21:43:45.000000000 +0200
@@ -277,7 +277,7 @@
 	char linebuf[201], *cp;
 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
 
-	if (f==NULL) return;
+	if (f==NULL) return NULL;
 	while (!feof(f))
 	{
 		fscanf(f, "%200[^\n]", linebuf);


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-lgrind/FC-3/tetex-lgrind.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-lgrind.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ tetex-lgrind.spec	23 Jul 2005 20:00:53 -0000	1.6
@@ -1,13 +1,12 @@
 %define texmf       %{_datadir}/texmf
-%define tdsname     lgrind 
+%define tdsname     lgrind
 %define itexhash    $RPM_INSTALL_PREFIX/bin/texhash
 %define itexmf      $RPM_INSTALL_PREFIX/share/texmf
 
 Summary:          Source-code pretty-printer for LaTeX
 Name:             tetex-lgrind
 Version:          3.67
-Release:          4
-Epoch:            0
+Release:          4.1
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -15,8 +14,10 @@
 # automatically generated by the FTP site. To verify the file, the
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
+Patch0:           lgrind-3.67-parsevartab.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(post,postun): tetex
+Requires(post):   tetex
+Requires(postun): tetex
 Requires:         tetex-latex
 BuildRequires:    tetex-latex, perl
 Prefix:           %{_prefix}
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q -n lgrind
+%patch0 -p1 -b .parsevartab
 
 %build
 make %{?_smp_mflags} \
@@ -44,7 +46,7 @@
 
 %install
 rm -rf %{buildroot}
- 
+
 # Install TeX files.
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/
 install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/
@@ -77,6 +79,13 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 3.67-4.1
+- Fix "missing expression in return statement" (#150297).
+- Drop explicit Epoch 0.
+
+* Fri Mar  4 2005 Ville Skytt?? 
+- Split context marked dependency syntax to work around #118773.
+
 * Fri May  2 2003 Marius Johndal  0:3.67-0.fdr.4
 - Invoke make with %{?_smp_mflags} and from top-level directory to get
   defines right.



From fedora-extras-commits at redhat.com  Sat Jul 23 20:02:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 16:02:39 -0400
Subject: common tobuild,1.2011,1.2012
Message-ID: <200507232002.j6NK2eoT024376@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24361

Modified Files:
	tobuild 
Log Message:
request build of rpms/tetex-lgrind/FC-3 tetex-lgrind-3_67-4_1 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2011
retrieving revision 1.2012
diff -u -r1.2011 -r1.2012
--- tobuild	23 Jul 2005 19:58:17 -0000	1.2011
+++ tobuild	23 Jul 2005 20:02:13 -0000	1.2012
@@ -138,3 +138,4 @@
 mschwendt	devel/freeze	freeze-2_5_0-4	devel
 mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel
 mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4
+mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3



From fedora-extras-commits at redhat.com  Sat Jul 23 22:31:55 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 18:31:55 -0400
Subject: rpms/gcfilms/devel gcfilms.spec,1.3,1.4
Message-ID: <200507232231.j6NMVt0f026947@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	gcfilms.spec 
Log Message:
New upstream version



Index: gcfilms.spec
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcfilms.spec	1 Jul 2005 17:05:28 -0000	1.3
+++ gcfilms.spec	23 Jul 2005 22:31:53 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           gcfilms
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        Movies collection management
 
@@ -100,6 +100,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Fri Jul 1 2005 Tian  - 5.3-1
+  - New upstream version.
+  - Added dist tag
 * Wed Jun 22 2005 Tian  - 5.2-1
   - New upstream version with important bug fixes.
 * Sun Jun 19 2005 Tian  - 5.1-1



From fedora-extras-commits at redhat.com  Sat Jul 23 22:32:28 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 18:32:28 -0400
Subject: common tobuild,1.2012,1.2013
Message-ID: <200507232232.j6NMWSBY027009@cvs-int.fedora.redhat.com>

Author: Tian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26992

Modified Files:
	tobuild 
Log Message:
request build of rpms/gcfilms/devel gcfilms-5_3-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2012
retrieving revision 1.2013
diff -u -r1.2012 -r1.2013
--- tobuild	23 Jul 2005 20:02:13 -0000	1.2012
+++ tobuild	23 Jul 2005 22:32:26 -0000	1.2013
@@ -139,3 +139,4 @@
 mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel
 mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4
 mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3
+Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 08:49:03 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 04:49:03 -0400
Subject: rpms/ulogd/FC-4 ulogd-1.02-init.patch, 1.1, 1.2 ulogd.logrotate, 1.1,
	1.2 ulogd.spec, 1.10, 1.11
Message-ID: <200507240849.j6O8n3bT010666@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd-1.02-init.patch ulogd.logrotate ulogd.spec 
Log Message:
- compress rotated logs
- start after mysql in the init process
- use dist tag



ulogd-1.02-init.patch:

Index: ulogd-1.02-init.patch
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd-1.02-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd-1.02-init.patch	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd-1.02-init.patch	24 Jul 2005 08:49:01 -0000	1.2
@@ -4,7 +4,7 @@
  #!/bin/sh
  #
 -# chkconfig: 345 81 19
-+# chkconfig: 2345 11 89
++# chkconfig: - 81 19
  # description: ulogd is the userspace logging daemon for netfilter/iptables
  #
  


Index: ulogd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd.logrotate	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd.logrotate	24 Jul 2005 08:49:01 -0000	1.2
@@ -2,6 +2,7 @@
     missingok
     notifempty
     weekly
+    compress
     sharedscripts
     postrotate
 	/etc/init.d/ulogd reload > /dev/null 2>&1


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ulogd.spec	19 Apr 2005 12:19:27 -0000	1.10
+++ ulogd.spec	24 Jul 2005 08:49:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.23
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
@@ -120,6 +120,11 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  1.23-2
+- compress rotated logs
+- start after mysql in the init process
+- use dist tag
+
 * Tue Apr 19 2005 Aurelien Bompard  1.23-1.fc4
 - version 1.23
 - change release tag for FC4
@@ -162,4 +167,3 @@
 - Add Epoch: 0
 
 * Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1
-- initial package



From fedora-extras-commits at redhat.com  Sun Jul 24 08:49:04 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 04:49:04 -0400
Subject: rpms/ulogd/devel ulogd-1.02-init.patch, 1.1, 1.2 ulogd.logrotate,
	1.1, 1.2 ulogd.spec, 1.10, 1.11
Message-ID: <200507240849.j6O8n42K010677@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd-1.02-init.patch ulogd.logrotate ulogd.spec 
Log Message:
- compress rotated logs
- start after mysql in the init process
- use dist tag



ulogd-1.02-init.patch:

Index: ulogd-1.02-init.patch
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd-1.02-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd-1.02-init.patch	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd-1.02-init.patch	24 Jul 2005 08:49:02 -0000	1.2
@@ -4,7 +4,7 @@
  #!/bin/sh
  #
 -# chkconfig: 345 81 19
-+# chkconfig: 2345 11 89
++# chkconfig: - 81 19
  # description: ulogd is the userspace logging daemon for netfilter/iptables
  #
  


Index: ulogd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd.logrotate	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd.logrotate	24 Jul 2005 08:49:02 -0000	1.2
@@ -2,6 +2,7 @@
     missingok
     notifempty
     weekly
+    compress
     sharedscripts
     postrotate
 	/etc/init.d/ulogd reload > /dev/null 2>&1


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ulogd.spec	19 Apr 2005 12:19:27 -0000	1.10
+++ ulogd.spec	24 Jul 2005 08:49:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.23
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
@@ -120,6 +120,11 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  1.23-2
+- compress rotated logs
+- start after mysql in the init process
+- use dist tag
+
 * Tue Apr 19 2005 Aurelien Bompard  1.23-1.fc4
 - version 1.23
 - change release tag for FC4
@@ -162,4 +167,3 @@
 - Add Epoch: 0
 
 * Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1
-- initial package



From fedora-extras-commits at redhat.com  Sun Jul 24 09:13:54 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 05:13:54 -0400
Subject: rpms/ulogd/FC-4 ulogd.spec,1.11,1.12
Message-ID: <200507240913.j6O9DsBI011919@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd.spec 
Log Message:
- syntax error


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ulogd.spec	24 Jul 2005 08:49:01 -0000	1.11
+++ ulogd.spec	24 Jul 2005 09:13:52 -0000	1.12
@@ -165,5 +165,3 @@
 
 * Sun May 16 2004 Aurelien Bompard  0:1.02-0.fdr.2
 - Add Epoch: 0
-
-* Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1



From fedora-extras-commits at redhat.com  Sun Jul 24 09:13:55 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 05:13:55 -0400
Subject: rpms/ulogd/devel ulogd.spec,1.11,1.12
Message-ID: <200507240913.j6O9Dt7x011925@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd.spec 
Log Message:
- syntax error


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ulogd.spec	24 Jul 2005 08:49:02 -0000	1.11
+++ ulogd.spec	24 Jul 2005 09:13:53 -0000	1.12
@@ -165,5 +165,3 @@
 
 * Sun May 16 2004 Aurelien Bompard  0:1.02-0.fdr.2
 - Add Epoch: 0
-
-* Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1



From fedora-extras-commits at redhat.com  Sun Jul 24 09:23:17 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:23:17 -0400
Subject: rpms/moodss/FC-3 .cvsignore, 1.5, 1.6 moodss.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200507240923.j6O9NHwS011975@cvs-int.fedora.redhat.com>

Author: jfontain

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jul 2005 11:00:44 -0000	1.5
+++ .cvsignore	24 Jul 2005 09:23:14 -0000	1.6
@@ -1 +1 @@
-moodss-20.2.tar.bz2
+moodss-20.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- moodss.spec	1 Jul 2005 23:32:26 -0000	1.10
+++ moodss.spec	24 Jul 2005 09:23:14 -0000	1.11
@@ -1,11 +1,11 @@
 Name: moodss
-Version: 20.2
+Version: 20.3
 Release: 1%{?dist}
 Epoch: 0
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-20.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 0:8.4.7
@@ -59,6 +59,9 @@
 
 %changelog
 
+* Sun Jul 10 2005 Jean-Luc Fontaine  0:20.3-1
+- 20.3 upstream release
+
 * Sun Jun 26 2005 Jean-Luc Fontaine  0:20.2-1
 - 20.2 source release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jul 2005 00:05:17 -0000	1.5
+++ sources	24 Jul 2005 09:23:14 -0000	1.6
@@ -1 +1 @@
-151a823de023ddb1961d046d8adfaa0b  moodss-20.2.tar.bz2
+fbe241b915fea8d52616be017dee0d54  moodss-20.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jul 24 09:24:46 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:24:46 -0400
Subject: common tobuild,1.2013,1.2014
Message-ID: <200507240924.j6O9Ok9Y012054@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12037

Modified Files:
	tobuild 
Log Message:
request build of rpms/moodss/FC-3 moodss-20_3-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -r1.2013 -r1.2014
--- tobuild	23 Jul 2005 22:32:26 -0000	1.2013
+++ tobuild	24 Jul 2005 09:24:44 -0000	1.2014
@@ -140,3 +140,4 @@
 mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4
 mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3
 Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel
+jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sun Jul 24 09:26:09 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:26:09 -0400
Subject: rpms/moodss/FC-4 .cvsignore, 1.5, 1.6 moodss.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200507240926.j6O9Q9AF012081@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
upstream release 20.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2005 19:47:17 -0000	1.5
+++ .cvsignore	24 Jul 2005 09:26:07 -0000	1.6
@@ -1 +1 @@
-moodss-20.2.tar.bz2
+moodss-20.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- moodss.spec	1 Jul 2005 19:47:17 -0000	1.16
+++ moodss.spec	24 Jul 2005 09:26:07 -0000	1.17
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 20.2
+Version: 20.3
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-20.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -58,6 +58,9 @@
 
 %changelog
 
+* Sun Jul 10 2005 Jean-Luc Fontaine  20.3-1
+- 20.3 upstream release
+
 * Sun Jun 26 2005 Jean-Luc Fontaine  20.2-1
 - 20.2 source release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jul 2005 19:47:17 -0000	1.5
+++ sources	24 Jul 2005 09:26:07 -0000	1.6
@@ -1 +1 @@
-151a823de023ddb1961d046d8adfaa0b  moodss-20.2.tar.bz2
+fbe241b915fea8d52616be017dee0d54  moodss-20.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jul 24 09:27:05 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:27:05 -0400
Subject: rpms/moodss/devel .cvsignore, 1.4, 1.5 moodss.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200507240927.j6O9R57f012137@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
upstream release 20.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 May 2005 19:36:38 -0000	1.4
+++ .cvsignore	24 Jul 2005 09:27:02 -0000	1.5
@@ -1 +1 @@
-moodss-20.1.tar.bz2
+moodss-20.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- moodss.spec	2 Jul 2005 10:43:07 -0000	1.16
+++ moodss.spec	24 Jul 2005 09:27:03 -0000	1.17
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 20.2
+Version: 20.3
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-20.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -58,6 +58,9 @@
 
 %changelog
 
+* Sun Jul 10 2005 Jean-Luc Fontaine  20.3-1
+- 20.3 upstream release
+
 * Sun Jun 26 2005 Jean-Luc Fontaine  20.2-1
 - 20.2 source release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jul 2005 10:43:07 -0000	1.5
+++ sources	24 Jul 2005 09:27:03 -0000	1.6
@@ -1 +1 @@
-151a823de023ddb1961d046d8adfaa0b  moodss-20.2.tar.bz2
+fbe241b915fea8d52616be017dee0d54  moodss-20.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jul 24 10:40:33 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 06:40:33 -0400
Subject: common tobuild,1.2014,1.2015
Message-ID: <200507241040.j6OAeX1u013449@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13432

Modified Files:
	tobuild 
Log Message:
request build of rpms/ulogd/FC-4 ulogd-1_23-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -r1.2014 -r1.2015
--- tobuild	24 Jul 2005 09:24:44 -0000	1.2014
+++ tobuild	24 Jul 2005 10:40:31 -0000	1.2015
@@ -141,3 +141,4 @@
 mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3
 Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel
 jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3
+abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 10:40:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 06:40:57 -0400
Subject: common tobuild,1.2015,1.2016
Message-ID: <200507241040.j6OAevog013511@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13494

Modified Files:
	tobuild 
Log Message:
request build of rpms/ulogd/devel ulogd-1_23-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2015
retrieving revision 1.2016
diff -u -r1.2015 -r1.2016
--- tobuild	24 Jul 2005 10:40:31 -0000	1.2015
+++ tobuild	24 Jul 2005 10:40:55 -0000	1.2016
@@ -142,3 +142,4 @@
 Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel
 jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3
 abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4
+abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 11:07:41 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:07:41 -0400
Subject: rpms/showimg/FC-4 showimg.spec,1.3,1.4
Message-ID: <200507241108.j6OB8BM7014712@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	showimg.spec 
Log Message:
- rebuild for libexif
- use dist tags




Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- showimg.spec	1 Apr 2005 16:36:00 -0000	1.3
+++ showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.4.1
-Release:        3
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -83,6 +83,10 @@
 
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  0.9.4.1-4
+- rebuild for libexif
+- use dist tags
+
 * Fri Apr  1 2005 Michael Schwendt  - 0.9.4.1-3
 - add missing %%dir entry for showimgpart directory
 



From fedora-extras-commits at redhat.com  Sun Jul 24 11:07:41 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:07:41 -0400
Subject: rpms/showimg/devel showimg.spec,1.3,1.4
Message-ID: <200507241108.j6OB8C5b014715@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	showimg.spec 
Log Message:
- rebuild for libexif
- use dist tags




Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- showimg.spec	1 Apr 2005 16:36:00 -0000	1.3
+++ showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.4.1
-Release:        3
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -83,6 +83,10 @@
 
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  0.9.4.1-4
+- rebuild for libexif
+- use dist tags
+
 * Fri Apr  1 2005 Michael Schwendt  - 0.9.4.1-3
 - add missing %%dir entry for showimgpart directory
 



From fedora-extras-commits at redhat.com  Sun Jul 24 11:08:42 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:08:42 -0400
Subject: common tobuild,1.2016,1.2017
Message-ID: <200507241108.j6OB8goF014777@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14760

Modified Files:
	tobuild 
Log Message:
request build of rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -r1.2016 -r1.2017
--- tobuild	24 Jul 2005 10:40:55 -0000	1.2016
+++ tobuild	24 Jul 2005 11:08:40 -0000	1.2017
@@ -143,3 +143,4 @@
 jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3
 abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4
 abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel
+abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 11:09:13 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:09:13 -0400
Subject: common tobuild,1.2017,1.2018
Message-ID: <200507241109.j6OB9D1X014839@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14822

Modified Files:
	tobuild 
Log Message:
request build of rpms/showimg/devel showimg-0_9_4_1-4_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2017
retrieving revision 1.2018
diff -u -r1.2017 -r1.2018
--- tobuild	24 Jul 2005 11:08:40 -0000	1.2017
+++ tobuild	24 Jul 2005 11:09:11 -0000	1.2018
@@ -144,3 +144,4 @@
 abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4
 abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel
 abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4
+abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 12:48:02 2005
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 24 Jul 2005 08:48:02 -0400
Subject: common tobuild,1.2018,1.2019
Message-ID: <200507241248.j6OCm232016299@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16282

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-Crypt-CBC/FC-3 perl-Crypt-CBC-2_14-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -r1.2018 -r1.2019
--- tobuild	24 Jul 2005 11:09:11 -0000	1.2018
+++ tobuild	24 Jul 2005 12:48:00 -0000	1.2019
@@ -145,3 +145,4 @@
 abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel
 abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4
 abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel
+ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3



From fedora-extras-commits at redhat.com  Sun Jul 24 12:49:45 2005
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 24 Jul 2005 08:49:45 -0400
Subject: common tobuild,1.2019,1.2020
Message-ID: <200507241249.j6OCnjU7016361@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16344

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC-2_14-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -r1.2019 -r1.2020
--- tobuild	24 Jul 2005 12:48:00 -0000	1.2019
+++ tobuild	24 Jul 2005 12:49:43 -0000	1.2020
@@ -146,3 +146,4 @@
 abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4
 abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel
 ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3
+ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 13:08:22 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 24 Jul 2005 09:08:22 -0400
Subject: common tobuild,1.2020,1.2021
Message-ID: <200507241308.j6OD8MD5017584@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17567

Modified Files:
	tobuild 
Log Message:
request build of rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -r1.2020 -r1.2021
--- tobuild	24 Jul 2005 12:49:43 -0000	1.2020
+++ tobuild	24 Jul 2005 13:08:20 -0000	1.2021
@@ -147,3 +147,4 @@
 abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel
 ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3
 ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4
+jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 13:58:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 24 Jul 2005 09:58:54 -0400
Subject: common tobuild,1.2021,1.2022
Message-ID: <200507241358.j6ODwsLO017682@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17665

Modified Files:
	tobuild 
Log Message:
Remove builds that I got a "success" notification for.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -r1.2021 -r1.2022
--- tobuild	24 Jul 2005 13:08:20 -0000	1.2021
+++ tobuild	24 Jul 2005 13:58:52 -0000	1.2022
@@ -113,11 +113,7 @@
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
-scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
-scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
-scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
-scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 14:02:07 2005
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 24 Jul 2005 10:02:07 -0400
Subject: common tobuild,1.2022,1.2023
Message-ID: <200507241402.j6OE27cu018821@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807

Modified Files:
	tobuild 
Log Message:
purged successful builds



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -r1.2022 -r1.2023
--- tobuild	24 Jul 2005 13:58:52 -0000	1.2022
+++ tobuild	24 Jul 2005 14:02:05 -0000	1.2023
@@ -58,7 +58,6 @@
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_2-5_fc5	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 eyecon	rpms/leafnode/FC-4	leafnode-1_11_3-2_fc4	fc4
-ixs	rpms/perl-Crypt-CBC/devel	perl-Crypt-CBC-2_14-2_fc5	devel
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel
@@ -70,9 +69,6 @@
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
 jwboyer	rpms/gaim-meanwhile/FC-4	gaim-meanwhile-1_2_4-2_fc4	fc4
 jwboyer	rpms/gaim-meanwhile/FC-3	gaim-meanwhile-1_2_4-2_fc3	fc3
-ixs	rpms/barcode/devel	barcode-0_98-7_fc5	devel
-ixs	rpms/barcode/FC-4	barcode-0_98-7_fc4	fc4
-ixs	rpms/barcode/FC-3	barcode-0_98-7_fc3	fc3
 smccann	rpms/proj/devel	proj-4_4_9-1_fc5	devel
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 ensc	rpms/util-vserver/devel	util-vserver-0_30_208-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 14:19:29 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 24 Jul 2005 10:19:29 -0400
Subject: common tobuild,1.2023,1.2024
Message-ID: <200507241419.j6OEJT5g018942@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925

Modified Files:
	tobuild 
Log Message:
Cleanup



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -r1.2023 -r1.2024
--- tobuild	24 Jul 2005 14:02:05 -0000	1.2023
+++ tobuild	24 Jul 2005 14:19:27 -0000	1.2024
@@ -66,9 +66,6 @@
 bpepple	rpms/freeciv/FC-4	freeciv-2_0_3-1_fc4	fc4
 mschwendt	devel/sylpheed	sylpheed-2_0_0-0_4_beta6	devel
 jfontain	rpms/moodss/FC-3	moodss-20_2-1_fc3	fc3
-jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
-jwboyer	rpms/gaim-meanwhile/FC-4	gaim-meanwhile-1_2_4-2_fc4	fc4
-jwboyer	rpms/gaim-meanwhile/FC-3	gaim-meanwhile-1_2_4-2_fc3	fc3
 smccann	rpms/proj/devel	proj-4_4_9-1_fc5	devel
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 ensc	rpms/util-vserver/devel	util-vserver-0_30_208-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 14:40:12 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 24 Jul 2005 10:40:12 -0400
Subject: common tobuild,1.2024,1.2025
Message-ID: <200507241440.j6OEeCw5019006@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18989

Modified Files:
	tobuild 
Log Message:
remove succesfull build


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -r1.2024 -r1.2025
--- tobuild	24 Jul 2005 14:19:27 -0000	1.2024
+++ tobuild	24 Jul 2005 14:40:10 -0000	1.2025
@@ -94,7 +94,6 @@
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
-thl	rpms/brightside/devel	brightside-1_4_0-8	devel
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 14:49:45 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Sun, 24 Jul 2005 10:49:45 -0400
Subject: rpms/galeon/FC-4 galeon.spec,1.13,1.14
Message-ID: <200507241449.j6OEnjKD019037@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	galeon.spec 
Log Message:
galeon/FC-4: release-bumping


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- galeon.spec	22 Jul 2005 13:17:11 -0000	1.13
+++ galeon.spec	24 Jul 2005 14:49:43 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	1.3.21
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Sun Jul 24 2005 Dams  - 1.3.21-10
+- Bumped release because build server didnt built my previous request
+
 * Fri Jul 22 2005 Dams  - 1.3.21-9
 - Rebuilt against mozilla 1.7.10
 



From fedora-extras-commits at redhat.com  Sun Jul 24 15:52:58 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Sun, 24 Jul 2005 11:52:58 -0400
Subject: web/html/docs/release-notes index.php,1.5,1.6
Message-ID: <200507241552.j6OFqweG020343@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20326

Modified Files:
	index.php 
Log Message:
New date on updated notice.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	22 Jul 2005 04:43:17 -0000	1.5
+++ index.php	24 Jul 2005 15:52:56 -0000	1.6
@@ -24,7 +24,7 @@
 				
  • Fedora Core 4
    • 
 				
 				
  • Fedora Core 3
    • 



From fedora-extras-commits at redhat.com  Sun Jul 24 16:22:22 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Sun, 24 Jul 2005 12:22:22 -0400
Subject: common tobuild,1.2025,1.2026
Message-ID: <200507241622.j6OGMMuM021568@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21551

Modified Files:
	tobuild 
Log Message:
builds succeded, remove entries as requested by Seth


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -r1.2025 -r1.2026
--- tobuild	24 Jul 2005 14:40:10 -0000	1.2025
+++ tobuild	24 Jul 2005 16:22:20 -0000	1.2026
@@ -89,8 +89,6 @@
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
-karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
-karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 16:23:20 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 24 Jul 2005 12:23:20 -0400
Subject: common tobuild,1.2026,1.2027
Message-ID: <200507241623.j6OGNKX2021606@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21589

Modified Files:
	tobuild 
Log Message:
Removed build line per SV request


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -r1.2026 -r1.2027
--- tobuild	24 Jul 2005 16:22:20 -0000	1.2026
+++ tobuild	24 Jul 2005 16:23:18 -0000	1.2027
@@ -80,7 +80,6 @@
 thias	rpms/lighttpd/devel	lighttpd-1_3_15-1_fc5	devel
 thias	rpms/lighttpd/FC-4	lighttpd-1_3_15-1_fc4	fc4
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
-pfrields	rpms/nautilus-open-terminal/devel	nautilus-open-terminal-0_4-5_fc5	devel
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
 jpo	rpms/perl-GD/FC-3	perl-GD-2_25-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sun Jul 24 16:31:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 24 Jul 2005 12:31:16 -0400
Subject: common tobuild,1.2027,1.2028
Message-ID: <200507241631.j6OGVGYs021658@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21641

Modified Files:
	tobuild 
Log Message:
Cleanup


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2027
retrieving revision 1.2028
diff -u -r1.2027 -r1.2028
--- tobuild	24 Jul 2005 16:23:18 -0000	1.2027
+++ tobuild	24 Jul 2005 16:31:14 -0000	1.2028
@@ -3,12 +3,6 @@
 #
 ertzing	rpms/libevent/devel	libevent-1_1a-2_fc5	devel
 jspaleta	rpms/glabels/FC-3	glabels-2_0_3-2_fc3	fc3
-ivazquez	rpms/libifp/FC-3	libifp-1_0_0_1-1_fc3	fc3
-ivazquez	rpms/libifp/FC-4	libifp-1_0_0_1-1_fc4	fc4
-ivazquez	rpms/libifp/devel	libifp-1_0_0_1-1_fc5	devel
-ivazquez	rpms/fyre/FC-3	fyre-1_0_0-9_fc3	fc3
-ivazquez	rpms/fyre/FC-4	fyre-1_0_0-9_fc4	fc4
-ivazquez	rpms/fyre/devel	fyre-1_0_0-9_fc5	devel
 scop	rpms/fedora-rpmdevtools/FC-3	fedora-rpmdevtools-1_1-1_fc3	fc3
 scop	rpms/fedora-rpmdevtools/FC-4	fedora-rpmdevtools-1_1-1_fc4	fc4
 scop	rpms/fedora-rpmdevtools/devel	fedora-rpmdevtools-1_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 16:33:41 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 24 Jul 2005 12:33:41 -0400
Subject: common tobuild,1.2028,1.2029
Message-ID: <200507241633.j6OGXfor021691@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21674

Modified Files:
	tobuild 
Log Message:
perl-GD: build success in FC-3, FC-4, and devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2028
retrieving revision 1.2029
diff -u -r1.2028 -r1.2029
--- tobuild	24 Jul 2005 16:31:14 -0000	1.2028
+++ tobuild	24 Jul 2005 16:33:39 -0000	1.2029
@@ -76,9 +76,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
-jpo	rpms/perl-GD/FC-3	perl-GD-2_25-1_fc3	fc3
-jpo	rpms/perl-GD/FC-4	perl-GD-2_25-1_fc4	fc4
-jpo	rpms/perl-GD/devel	perl-GD-2_25-1_fc5	devel
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 16:38:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 24 Jul 2005 12:38:29 -0400
Subject: common tobuild,1.2029,1.2030
Message-ID: <200507241638.j6OGcT5n021731@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21714

Modified Files:
	tobuild 
Log Message:
Remove more reportedly successful builds.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2029
retrieving revision 1.2030
diff -u -r1.2029 -r1.2030
--- tobuild	24 Jul 2005 16:33:39 -0000	1.2029
+++ tobuild	24 Jul 2005 16:38:27 -0000	1.2030
@@ -88,11 +88,6 @@
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
-scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
-scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
-scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
-scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
-scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 19:04:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 24 Jul 2005 15:04:37 -0400
Subject: common tobuild,1.2030,1.2031
Message-ID: <200507241905.j6OJ5QBS025280@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25263

Modified Files:
	tobuild 
Log Message:
cleanup



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -r1.2030 -r1.2031
--- tobuild	24 Jul 2005 16:38:27 -0000	1.2030
+++ tobuild	24 Jul 2005 19:04:29 -0000	1.2031
@@ -6,15 +6,10 @@
 scop	rpms/fedora-rpmdevtools/FC-3	fedora-rpmdevtools-1_1-1_fc3	fc3
 scop	rpms/fedora-rpmdevtools/FC-4	fedora-rpmdevtools-1_1-1_fc4	fc4
 scop	rpms/fedora-rpmdevtools/devel	fedora-rpmdevtools-1_1-1_fc5	devel
-adrian	rpms/jhead/devel	jhead-2_4-1_fc5	devel
 lmacken	rpms/naim/devel	naim-0_11_7_3_1-2_fc5	devel
 uwog	rpms/aiksaurus/devel	aiksaurus-1_2_1-9	devel
-adrian	rpms/jhead/devel	jhead-2_4-2_fc5	devel
-adrian	rpms/jhead/FC-4	jhead-2_4-2_fc4	fc4
-adrian	rpms/jhead/FC-3	jhead-2_4-2_fc3	fc3
 adrian	rpms/jhead/FC-3	jhead-2_4-3_fc3	fc3
 adrian	rpms/jhead/FC-4	jhead-2_4-3_fc4	fc4
-adrian	rpms/jhead/devel	jhead-2_4-3_fc5	devel
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-1_fc4	fc4
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-2_fc4	fc4
 petersen	rpms/scim/devel	scim-1_3_3-1_fc5	devel
@@ -76,7 +71,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
-adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 19:28:30 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 24 Jul 2005 15:28:30 -0400
Subject: common tobuild,1.2031,1.2032
Message-ID: <200507241928.j6OJSUNP025353@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25336

Modified Files:
	tobuild 
Log Message:
request build of rpms/inadyn/devel inadyn-1_95-1 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -r1.2031 -r1.2032
--- tobuild	24 Jul 2005 19:04:29 -0000	1.2031
+++ tobuild	24 Jul 2005 19:28:27 -0000	1.2032
@@ -113,3 +113,4 @@
 ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3
 ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
+s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 22:07:49 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:07:49 -0400
Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.6,
	1.7 contact-lookup-applet.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200507242208.j6OM8JaY028985@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28933

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Log Message:
* Sun Jul 24 2005 Brian Pepple  - 0.13-2
- Update to 0.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Apr 2005 15:49:50 -0000	1.6
+++ .cvsignore	24 Jul 2005 22:06:58 -0000	1.7
@@ -1 +1 @@
-contact-lookup-applet-0.12.tar.gz
+contact-lookup-applet-0.13.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- contact-lookup-applet.spec	10 May 2005 04:59:36 -0000	1.9
+++ contact-lookup-applet.spec	24 Jul 2005 22:06:58 -0000	1.10
@@ -1,11 +1,11 @@
 Name:		contact-lookup-applet
-Version:	0.12
-Release:	3%{?dist}
+Version:	0.13
+Release:	2%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
-URL:		http://www.burtonini.com/blog/computers/contact-lookup-applet-0.12
+URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
 Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz       
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sun Jul 24 2005 Brian Pepple  - 0.13-2
+- Update to 0.13.
+
 * Tue May 10 2005 Brian Pepple  - 0.12-3
 - Remove hard-coded dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Apr 2005 15:49:50 -0000	1.6
+++ sources	24 Jul 2005 22:06:58 -0000	1.7
@@ -1 +1 @@
-34199504980ac48676c4d5efed6dd56d  contact-lookup-applet-0.12.tar.gz
+8b4b4dbc2778b571e05e583e614ae5a7  contact-lookup-applet-0.13.tar.gz



From fedora-extras-commits at redhat.com  Sun Jul 24 22:08:55 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:08:55 -0400
Subject: common tobuild,1.2032,1.2033
Message-ID: <200507242208.j6OM8td7029047@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030

Modified Files:
	tobuild 
Log Message:
request build of rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -r1.2032 -r1.2033
--- tobuild	24 Jul 2005 19:28:27 -0000	1.2032
+++ tobuild	24 Jul 2005 22:08:52 -0000	1.2033
@@ -114,3 +114,4 @@
 ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
+bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 22:10:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:10:20 -0400
Subject: rpms/contact-lookup-applet/FC-4 .cvsignore, 1.6,
	1.7 contact-lookup-applet.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200507242210.j6OMArxZ029082@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29060

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Log Message:
* Sun Jul 24 2005 Brian Pepple  - 0.13-1
- Update to 0.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Apr 2005 15:49:50 -0000	1.6
+++ .cvsignore	24 Jul 2005 22:10:18 -0000	1.7
@@ -1 +1 @@
-contact-lookup-applet-0.12.tar.gz
+contact-lookup-applet-0.13.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-4/contact-lookup-applet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- contact-lookup-applet.spec	10 May 2005 04:59:36 -0000	1.9
+++ contact-lookup-applet.spec	24 Jul 2005 22:10:18 -0000	1.10
@@ -1,11 +1,11 @@
 Name:		contact-lookup-applet
-Version:	0.12
-Release:	3%{?dist}
+Version:	0.13
+Release:	1%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
-URL:		http://www.burtonini.com/blog/computers/contact-lookup-applet-0.12
+URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
 Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz       
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sun Jul 24 2005 Brian Pepple  - 0.13-1
+- Update to 0.13.
+
 * Tue May 10 2005 Brian Pepple  - 0.12-3
 - Remove hard-coded dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Apr 2005 15:49:50 -0000	1.6
+++ sources	24 Jul 2005 22:10:18 -0000	1.7
@@ -1 +1 @@
-34199504980ac48676c4d5efed6dd56d  contact-lookup-applet-0.12.tar.gz
+8b4b4dbc2778b571e05e583e614ae5a7  contact-lookup-applet-0.13.tar.gz



From fedora-extras-commits at redhat.com  Sun Jul 24 22:11:06 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:11:06 -0400
Subject: common tobuild,1.2033,1.2034
Message-ID: <200507242211.j6OMB6Hg029145@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29128

Modified Files:
	tobuild 
Log Message:
request build of rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2033
retrieving revision 1.2034
diff -u -r1.2033 -r1.2034
--- tobuild	24 Jul 2005 22:08:52 -0000	1.2033
+++ tobuild	24 Jul 2005 22:11:04 -0000	1.2034
@@ -115,3 +115,4 @@
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel
+bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 23:15:01 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 24 Jul 2005 19:15:01 -0400
Subject: rpms/glunarclock/devel glunarclock-0.32.4-bug149711.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200507242315.j6ONF10C030380@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore glunarclock.spec sources 
Added Files:
	glunarclock-0.32.4-bug149711.patch 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 0.32.4-1
- Update to 0.32.4.
- Fix compiler warnings bug #149711.
- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether
  they are still needed.


glunarclock-0.32.4-bug149711.patch:

--- NEW FILE glunarclock-0.32.4-bug149711.patch ---
diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c
--- glunarclock-0.32.4-orig/src/glunarclock.c	2005-04-06 12:51:29.000000000 +0200
+++ glunarclock-0.32.4/src/glunarclock.c	2005-07-25 00:39:56.000000000 +0200
@@ -154,14 +154,14 @@
 			gtk_toggle_button_get_active (toggle), NULL);
 }
 
-static gboolean
+static void
 delete_event (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
 	gtk_widget_hide (widget);
 }
 
-static gboolean
+static void
 close_dialog (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c
--- glunarclock-0.32.4-orig/src/moondata.c	2005-01-04 18:28:43.000000000 +0100
+++ glunarclock-0.32.4/src/moondata.c	2005-07-25 00:39:55.000000000 +0200
@@ -219,14 +219,14 @@
 	mod_time(&moondata.LAT);
 }
 
-static gboolean
+static void
 delete_event (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
 	gtk_widget_hide (widget);
 }
 
-static gboolean
+static void
 close_data_dialog (GtkWidget  *widget,
 		   MoonApplet *moon)
 {
@@ -280,10 +280,10 @@
 /* 	gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */
 /* 	format_time(buf, size, moondata.NewMoon*24.0); */
 
-	g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon);
+	g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon);
 	gtk_label_set_text(GTK_LABEL(mw.flm), buf);
 
-	g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon));
+	g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon));
 	gtk_label_set_text(GTK_LABEL(mw.nwm), buf);
 
 /*  	g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2005 16:42:01 -0000	1.4
+++ .cvsignore	24 Jul 2005 23:14:59 -0000	1.5
@@ -1,2 +1,2 @@
 glunarclock-0.32.2-autoreconf.patch.bz2
-glunarclock-0.32.2.tar.gz
+glunarclock-0.32.4.tar.gz


Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glunarclock.spec	15 Apr 2005 00:38:26 -0000	1.7
+++ glunarclock.spec	24 Jul 2005 23:14:59 -0000	1.8
@@ -1,14 +1,14 @@
 Name:           glunarclock
-Version:        0.32.2
-Release:        4
+Version:        0.32.4
+Release:        1%{?dist}
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://glunarclock.sourceforge.net/
-Source0:        http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz
-Patch0:         glunarclock-configure.in.patch
-Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Patch0:         glunarclock-configure.in.patch
+#Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
 Patch2:         glunarclock-0.32.2-i18n_macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,12 +33,12 @@
 
 %prep
 %setup -q
-%ifarch x86_64
+#%ifarch x86_64
 # patch0 is normally only needed if you want to recreate patch1
-%patch0
+#%patch0
 # was created after autoreconf -f -i and removing autom4te.cache/
-%patch1 -p1
-%endif
+#%patch1 -p1
+#%endif
 %patch2 -p1 -b .i18n_macro
 
 %build
@@ -95,6 +95,12 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 0.32.4-1
+- Update to 0.32.4.
+- Fix compiler warnings bug #149711.
+- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether
+  they are still needed.
+
 * Fri Apr 15 2005 Michael Schwendt  - 0.32.2-4
 - Add patch2 to fix build for FC4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 16:42:01 -0000	1.4
+++ sources	24 Jul 2005 23:14:59 -0000	1.5
@@ -1,2 +1,2 @@
 3ac5e08b5ffa5cd697fe4115d791f4ab  glunarclock-0.32.2-autoreconf.patch.bz2
-3ac61aa62af4e0d53c90c18f09ee988f  glunarclock-0.32.2.tar.gz
+63e1d989581e6bf95cec82ff1bbc56ef  glunarclock-0.32.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Jul 24 23:15:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 24 Jul 2005 19:15:50 -0400
Subject: common tobuild,1.2034,1.2035
Message-ID: <200507242315.j6ONFoYG030442@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30425

Modified Files:
	tobuild 
Log Message:
request build of rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2034
retrieving revision 1.2035
diff -u -r1.2034 -r1.2035
--- tobuild	24 Jul 2005 22:11:04 -0000	1.2034
+++ tobuild	24 Jul 2005 23:15:48 -0000	1.2035
@@ -116,3 +116,4 @@
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel
 bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4
+mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 01:09:45 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 24 Jul 2005 21:09:45 -0400
Subject: common tobuild,1.2035,1.2036
Message-ID: <200507250109.j6P19jOH000385@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv368

Modified Files:
	tobuild 
Log Message:
cleanup


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2035
retrieving revision 1.2036
diff -u -r1.2035 -r1.2036
--- tobuild	24 Jul 2005 23:15:48 -0000	1.2035
+++ tobuild	25 Jul 2005 01:09:43 -0000	1.2036
@@ -31,7 +31,6 @@
 tagoh	rpms/kinput2/devel	kinput2-v3_1-26_fc5	devel
 tagoh	rpms/kinput2/FC-4	kinput2-v3_1-26_fc4	fc4
 tagoh	rpms/uim/devel	uim-0_4_7-1_fc5	devel
-tagoh	rpms/uim/FC-4	uim-0_4_7-1_fc4	fc4
 tagoh	rpms/uim/FC-3	uim-0_4_7-1_fc3	fc3
 thias	rpms/gkrellm-aclock/devel	gkrellm-aclock-0_3_3-1_fc5	devel
 thias	rpms/gkrellm-freq/devel	gkrellm-freq-0_1_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:16:22 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 25 Jul 2005 02:16:22 -0400
Subject: common tobuild,1.2036,1.2037
Message-ID: <200507250616.j6P6GMlk006640@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623

Modified Files:
	tobuild 
Log Message:
remove successfully-built package



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -r1.2036 -r1.2037
--- tobuild	25 Jul 2005 01:09:43 -0000	1.2036
+++ tobuild	25 Jul 2005 06:16:20 -0000	1.2037
@@ -43,7 +43,6 @@
 thias	rpms/gkrellm-aclock/FC-4	gkrellm-aclock-0_3_3-1_fc4	fc4
 thias	rpms/gkrellm-freq/FC-3	gkrellm-freq-0_1_1-1_fc3	fc3
 thias	rpms/gkrellm-freq/FC-4	gkrellm-freq-0_1_1-1_fc4	fc4
-pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_2-5_fc5	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 eyecon	rpms/leafnode/FC-4	leafnode-1_11_3-2_fc4	fc4
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:18:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 25 Jul 2005 02:18:20 -0400
Subject: common tobuild,1.2037,1.2038
Message-ID: <200507250618.j6P6IK2n006715@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6698

Modified Files:
	tobuild 
Log Message:
request build of rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -r1.2037 -r1.2038
--- tobuild	25 Jul 2005 06:16:20 -0000	1.2037
+++ tobuild	25 Jul 2005 06:18:18 -0000	1.2038
@@ -115,3 +115,4 @@
 bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel
 bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4
 mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel
+pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:31:27 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 25 Jul 2005 02:31:27 -0400
Subject: common tobuild,1.2038,1.2039
Message-ID: <200507250631.j6P6VRri006757@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6740

Modified Files:
	tobuild 
Log Message:
- remove broken scim-anthy-0_5_1-1_fc4 and built scim-1_3_3-1_fc5



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -r1.2038 -r1.2039
--- tobuild	25 Jul 2005 06:18:18 -0000	1.2038
+++ tobuild	25 Jul 2005 06:31:24 -0000	1.2039
@@ -10,9 +10,7 @@
 uwog	rpms/aiksaurus/devel	aiksaurus-1_2_1-9	devel
 adrian	rpms/jhead/FC-3	jhead-2_4-3_fc3	fc3
 adrian	rpms/jhead/FC-4	jhead-2_4-3_fc4	fc4
-petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-1_fc4	fc4
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-2_fc4	fc4
-petersen	rpms/scim/devel	scim-1_3_3-1_fc5	devel
 ensc	rpms/ip-sentinel/FC-3	ip-sentinel-0_12-5_fc3	fc3
 ensc	rpms/ip-sentinel/FC-4	ip-sentinel-0_12-5_fc4	fc4
 ensc	rpms/ip-sentinel/devel	ip-sentinel-0_12-5_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:57:15 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:57:15 -0400
Subject: common tobuild,1.2039,1.2040
Message-ID: <200507250657.j6P6vFud006816@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6799

Modified Files:
	tobuild 
Log Message:
request build of rpms/icmpdn/FC-3 icmpdn-0_3-2 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2039
retrieving revision 1.2040
diff -u -r1.2039 -r1.2040
--- tobuild	25 Jul 2005 06:31:24 -0000	1.2039
+++ tobuild	25 Jul 2005 06:57:13 -0000	1.2040
@@ -114,3 +114,4 @@
 bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4
 mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel
+oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 06:57:35 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:57:35 -0400
Subject: common tobuild,1.2040,1.2041
Message-ID: <200507250657.j6P6vZwx006849@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6832

Modified Files:
	tobuild 
Log Message:
request build of rpms/icmpdn/FC-4 icmpdn-0_3-2 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -r1.2040 -r1.2041
--- tobuild	25 Jul 2005 06:57:13 -0000	1.2040
+++ tobuild	25 Jul 2005 06:57:33 -0000	1.2041
@@ -115,3 +115,4 @@
 mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel
 oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3
+oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 06:57:52 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:57:52 -0400
Subject: common tobuild,1.2041,1.2042
Message-ID: <200507250657.j6P6vq3j006882@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6865

Modified Files:
	tobuild 
Log Message:
request build of rpms/icmpdn/devel icmpdn-0_3-2 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2041
retrieving revision 1.2042
diff -u -r1.2041 -r1.2042
--- tobuild	25 Jul 2005 06:57:33 -0000	1.2041
+++ tobuild	25 Jul 2005 06:57:50 -0000	1.2042
@@ -116,3 +116,4 @@
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel
 oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3
 oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4
+oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:58:13 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:58:13 -0400
Subject: common tobuild,1.2042,1.2043
Message-ID: <200507250658.j6P6wDf6006915@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6898

Modified Files:
	tobuild 
Log Message:
request build of rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2042
retrieving revision 1.2043
diff -u -r1.2042 -r1.2043
--- tobuild	25 Jul 2005 06:57:50 -0000	1.2042
+++ tobuild	25 Jul 2005 06:58:11 -0000	1.2043
@@ -117,3 +117,4 @@
 oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3
 oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4
 oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel
+oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:58:37 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:58:37 -0400
Subject: common tobuild,1.2043,1.2044
Message-ID: <200507250658.j6P6wbZp006948@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6931

Modified Files:
	tobuild 
Log Message:
request build of rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2043
retrieving revision 1.2044
diff -u -r1.2043 -r1.2044
--- tobuild	25 Jul 2005 06:58:11 -0000	1.2043
+++ tobuild	25 Jul 2005 06:58:35 -0000	1.2044
@@ -118,3 +118,4 @@
 oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4
 oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
+oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 06:58:51 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:58:51 -0400
Subject: common tobuild,1.2044,1.2045
Message-ID: <200507250658.j6P6wp9N006982@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6964

Modified Files:
	tobuild 
Log Message:
request build of rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -r1.2044 -r1.2045
--- tobuild	25 Jul 2005 06:58:35 -0000	1.2044
+++ tobuild	25 Jul 2005 06:58:49 -0000	1.2045
@@ -119,3 +119,4 @@
 oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3
+oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 06:59:31 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:59:31 -0400
Subject: common tobuild,1.2045,1.2046
Message-ID: <200507250659.j6P6xV0e007020@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7003

Modified Files:
	tobuild 
Log Message:
request build of rpms/libdnet/devel libdnet-1_10-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2045
retrieving revision 1.2046
diff -u -r1.2045 -r1.2046
--- tobuild	25 Jul 2005 06:58:49 -0000	1.2045
+++ tobuild	25 Jul 2005 06:59:29 -0000	1.2046
@@ -120,3 +120,4 @@
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3
 oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4
+oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 07:00:10 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:00:10 -0400
Subject: common tobuild,1.2046,1.2047
Message-ID: <200507250700.j6P70A1E007108@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7091

Modified Files:
	tobuild 
Log Message:
request build of rpms/libdnet/FC-4 libdnet-1_10-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2046
retrieving revision 1.2047
diff -u -r1.2046 -r1.2047
--- tobuild	25 Jul 2005 06:59:29 -0000	1.2046
+++ tobuild	25 Jul 2005 07:00:08 -0000	1.2047
@@ -121,3 +121,4 @@
 oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3
 oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4
 oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel
+oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 07:00:28 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:00:28 -0400
Subject: common tobuild,1.2047,1.2048
Message-ID: <200507250700.j6P70St4007170@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7153

Modified Files:
	tobuild 
Log Message:
request build of rpms/libdnet/FC-3 libdnet-1_10-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2047
retrieving revision 1.2048
diff -u -r1.2047 -r1.2048
--- tobuild	25 Jul 2005 07:00:08 -0000	1.2047
+++ tobuild	25 Jul 2005 07:00:26 -0000	1.2048
@@ -122,3 +122,4 @@
 oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4
 oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel
 oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4
+oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 07:01:22 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:01:22 -0400
Subject: common tobuild,1.2048,1.2049
Message-ID: <200507250701.j6P71MGV008284@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7967

Modified Files:
	tobuild 
Log Message:
request build of rpms/fish/devel fish-1_12_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2048
retrieving revision 1.2049
diff -u -r1.2048 -r1.2049
--- tobuild	25 Jul 2005 07:00:26 -0000	1.2048
+++ tobuild	25 Jul 2005 07:01:20 -0000	1.2049
@@ -123,3 +123,4 @@
 oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel
 oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4
 oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3
+oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 07:03:17 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:03:17 -0400
Subject: common tobuild,1.2049,1.2050
Message-ID: <200507250703.j6P73mHY008360@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343

Modified Files:
	tobuild 
Log Message:
request build of rpms/fish/FC-3 fish-1_11_1-10_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2049
retrieving revision 1.2050
diff -u -r1.2049 -r1.2050
--- tobuild	25 Jul 2005 07:01:20 -0000	1.2049
+++ tobuild	25 Jul 2005 07:03:15 -0000	1.2050
@@ -124,3 +124,4 @@
 oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4
 oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
+oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 07:05:13 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:05:13 -0400
Subject: common tobuild,1.2050,1.2051
Message-ID: <200507250706.j6P768sZ008394@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8377

Modified Files:
	tobuild 
Log Message:
request build of rpms/fish/FC-4 fish-1_11_1-10_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2050
retrieving revision 1.2051
diff -u -r1.2050 -r1.2051
--- tobuild	25 Jul 2005 07:03:15 -0000	1.2050
+++ tobuild	25 Jul 2005 07:05:11 -0000	1.2051
@@ -125,3 +125,4 @@
 oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3
+oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 08:38:09 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 25 Jul 2005 04:38:09 -0400
Subject: fedora-security/audit fc4,1.30,1.31
Message-ID: <200507250838.j6P8c94X010282@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10265

Modified Files:
	fc4 
Log Message:
Updates for Friday pushes



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fc4	22 Jul 2005 12:02:06 -0000	1.30
+++ fc4	25 Jul 2005 08:38:06 -0000	1.31
@@ -45,6 +45,8 @@
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
+2005-1852 backport (kdenetwork) [since FEDORA-2005-624]
+2005-1849 backport (zlib, fixed 1.2.3) [since FEDORA-2005-626]
 2005-1831 ignore (sudo) unsubstantiated report
 2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
 2005-1768 version (kernel, fixed 2.6.6)



From bugs.michael at gmx.net  Mon Jul 25 10:56:08 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 25 Jul 2005 12:56:08 +0200
Subject: common tobuild,1.2048,1.2049
In-Reply-To: <200507250701.j6P71MGV008284@cvs-int.fedora.redhat.com>
References: <200507250701.j6P71MGV008284@cvs-int.fedora.redhat.com>
Message-ID: <20050725125608.2228b04e.bugs.michael@gmx.net>

On Mon, 25 Jul 2005 03:01:22 -0400, Oliver Falk wrote:

> Author: oliver
> 
> Update of /cvs/extras/common
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7967
> 
> Modified Files:
> 	tobuild 
> Log Message:
> request build of rpms/fish/devel fish-1_12_0-1_fc5 for devel

Hmm... you've added quite some duplicates with your recent batch.

$ grep oliver tobuild | sort
oliver  rpms/bwm-ng/devel       bwm-ng-0_5-5_fc5        devel
oliver  rpms/bwm-ng/devel       bwm-ng-0_5-5_fc5        devel
oliver  rpms/bwm-ng/FC-3        bwm-ng-0_5-5_fc3        fc3
oliver  rpms/bwm-ng/FC-3        bwm-ng-0_5-5_fc3        fc3
oliver  rpms/bwm-ng/FC-4        bwm-ng-0_5-5_fc4        fc4
oliver  rpms/bwm-ng/FC-4        bwm-ng-0_5-5_fc4        fc4
oliver  rpms/fish/devel fish-1_12_0-1_fc5       devel
oliver  rpms/fish/devel fish-1_12_0-1_fc5       devel
oliver  rpms/fish/FC-3  fish-1_11_1-10_fc3      fc3
oliver  rpms/fish/FC-4  fish-1_11_1-10_fc4      fc4
oliver  rpms/icmpdn/devel       icmpdn-0_3-2    devel
oliver  rpms/icmpdn/devel       icmpdn-0_3-2    devel
oliver  rpms/icmpdn/FC-3        icmpdn-0_3-2    fc3
oliver  rpms/icmpdn/FC-3        icmpdn-0_3-2    fc3
oliver  rpms/icmpdn/FC-4        icmpdn-0_3-2    fc4
oliver  rpms/icmpdn/FC-4        icmpdn-0_3-2    fc4
oliver  rpms/libdnet/devel      libdnet-1_10-2_fc5      devel
oliver  rpms/libdnet/devel      libdnet-1_10-2_fc5      devel
oliver  rpms/libdnet/FC-3       libdnet-1_10-2_fc3      fc3
oliver  rpms/libdnet/FC-4       libdnet-1_10-2_fc4      fc4
oliver  rpms/libstatgrab/devel  libstatgrab-0_11_1-3_fc5        devel
oliver  rpms/libstatgrab/FC-3   libstatgrab-0_11_1-3_fc3        fc3
oliver  rpms/libstatgrab/FC-4   libstatgrab-0_11_1-3_fc4        fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 11:16:34 2005
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon, 25 Jul 2005 07:16:34 -0400
Subject: common tobuild,1.2051,1.2052
Message-ID: <200507251116.j6PBGYjd013888@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13871

Modified Files:
	tobuild 
Log Message:
request build of rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2051
retrieving revision 1.2052
diff -u -r1.2051 -r1.2052
--- tobuild	25 Jul 2005 07:05:11 -0000	1.2051
+++ tobuild	25 Jul 2005 11:16:32 -0000	1.2052
@@ -126,3 +126,4 @@
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3
 oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4
+adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 11:18:17 2005
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon, 25 Jul 2005 07:18:17 -0400
Subject: common tobuild,1.2052,1.2053
Message-ID: <200507251118.j6PBIH7M013931@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13914

Modified Files:
	tobuild 
Log Message:
request build of rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2052
retrieving revision 1.2053
diff -u -r1.2052 -r1.2053
--- tobuild	25 Jul 2005 11:16:32 -0000	1.2052
+++ tobuild	25 Jul 2005 11:18:15 -0000	1.2053
@@ -127,3 +127,4 @@
 oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3
 oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4
 adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel
+adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 11:28:22 2005
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon, 25 Jul 2005 07:28:22 -0400
Subject: common tobuild,1.2053,1.2054
Message-ID: <200507251128.j6PBSMGk014125@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14108

Modified Files:
	tobuild 
Log Message:
request build of rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2053
retrieving revision 1.2054
diff -u -r1.2053 -r1.2054
--- tobuild	25 Jul 2005 11:18:15 -0000	1.2053
+++ tobuild	25 Jul 2005 11:28:20 -0000	1.2054
@@ -128,3 +128,4 @@
 oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4
 adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel
 adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3
+adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 15:18:39 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 25 Jul 2005 11:18:39 -0400
Subject: rpms/kyum/devel .cvsignore, 1.4, 1.5 kyum.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200507251518.j6PFId3I019033@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jul 2005 18:07:56 -0000	1.4
+++ .cvsignore	25 Jul 2005 15:18:36 -0000	1.5
@@ -1 +1 @@
-kyum-0.7.3.tar.gz
+kyum-0.7.5.tar.gz


Index: kyum.spec
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kyum.spec	19 Jul 2005 18:07:56 -0000	1.7
+++ kyum.spec	25 Jul 2005 15:18:36 -0000	1.8
@@ -1,13 +1,13 @@
 Name:    kyum
-Version: 0.7.3
+Version: 0.7.5
 Release: 1
 
 Summary: Graphical User Frontend (GUI) for yum
 
 License: GPL
 Group:   Applications/System
-URL:     http://kde-apps.org/content/show.php?content=22185
-Source:  http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz
+URL:     http://www.sourceforge.net/projects/kyum
+Source:  http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz
 Patch1:  kyum-0.6.3-workaround-missing-libfam.la.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,12 @@
 %doc ChangeLog COPYING README AUTHORS
 
 %changelog
+* Mon Jul 25 2005 Jochen Schmitt  0.7.5-1
+- New upstream release
+
+* Thu Jul 21 2005 Jochen Schmitt  0.7.3-2
+- Upstream author has moved the project to sourceforge.net
+
 * Tue Jul 19 2005 Jochen Schmitt  0.7.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Jul 2005 18:07:56 -0000	1.4
+++ sources	25 Jul 2005 15:18:36 -0000	1.5
@@ -1 +1 @@
-8f3436ec802306c2d68b8d574af748be  kyum-0.7.3.tar.gz
+b1ff5c4dfd14145535d344ef346bac74  kyum-0.7.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 15:20:15 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 25 Jul 2005 11:20:15 -0400
Subject: common tobuild,1.2054,1.2055
Message-ID: <200507251520.j6PFKF4W019140@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123

Modified Files:
	tobuild 
Log Message:
request build of rpms/inadyn/devel inadyn-1_95-1 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2054
retrieving revision 1.2055
diff -u -r1.2054 -r1.2055
--- tobuild	25 Jul 2005 11:28:20 -0000	1.2054
+++ tobuild	25 Jul 2005 15:20:13 -0000	1.2055
@@ -129,3 +129,4 @@
 adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel
 adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3
 adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4
+s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 16:29:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 12:29:11 -0400
Subject: owners owners.list,1.27,1.28
Message-ID: <200507251629.j6PGTBxb020426@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
Add lots of missing components (sorted!). Still missing:

  pygsl
  splint
  tcllib




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- owners.list	23 Jul 2005 00:39:39 -0000	1.27
+++ owners.list	25 Jul 2005 16:29:09 -0000	1.28
@@ -105,7 +105,9 @@
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
+Fedora Extras|ddskk|Daredevil SKK - Simple Kana to Kanji conversion program for Emacs|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
 Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -175,6 +177,7 @@
 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|
 Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
+Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gai-pal|GAI Pal applet|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|galculator|GTK 2 based scientific calculator|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -196,6 +199,7 @@
 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|
 Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+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|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|
@@ -318,6 +322,7 @@
 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|
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|koffice|A set of office applications for KDE|than at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -333,14 +338,17 @@
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|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|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|
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libfwbuilder|Firewall Builder API|sgrubb at redhat.com|extras-qa at fedoraproject.org|
@@ -364,10 +372,12 @@
 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|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|
 Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|librsync|Rsync libraries|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|librx|POSIX regexp functions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -416,9 +426,9 @@
 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|python-matplotlib|Python plotting library|orion at cora.nwra.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|
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -429,10 +439,12 @@
 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|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_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|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -443,11 +455,14 @@
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|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|
 Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.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|nethack|A rouge-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|
+Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance.|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -474,10 +489,12 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at kspei.com|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|Package Review|Choose this to request QA on a new package|dkl at redhat.com|dkl at redhat.com|
+Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_mount|A PAM module that can mount volumes for a user session|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
@@ -610,6 +627,8 @@
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+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|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|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|
@@ -648,6 +667,7 @@
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 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-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|
 Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
@@ -658,6 +678,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|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 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|
@@ -789,6 +810,7 @@
 Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|uim|A multilingual input method library|tagoh at redhat.com|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|ulogd|The userspace logging daemon for netfilter|gauret at free.fr|extras-qa at fedoraproject.org|
+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|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 17:06:52 2005
From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon))
Date: Mon, 25 Jul 2005 13:06:52 -0400
Subject: common tobuild,1.2055,1.2056
Message-ID: <200507251707.j6PH7O20021637@cvs-int.fedora.redhat.com>

Author: eyecon

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21615

Modified Files:
	tobuild 
Log Message:



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2055
retrieving revision 1.2056
diff -u -r1.2055 -r1.2056
--- tobuild	25 Jul 2005 15:20:13 -0000	1.2055
+++ tobuild	25 Jul 2005 17:06:47 -0000	1.2056
@@ -42,7 +42,6 @@
 thias	rpms/gkrellm-freq/FC-3	gkrellm-freq-0_1_1-1_fc3	fc3
 thias	rpms/gkrellm-freq/FC-4	gkrellm-freq-0_1_1-1_fc4	fc4
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
-eyecon	rpms/leafnode/FC-4	leafnode-1_11_3-2_fc4	fc4
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 17:17:08 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:17:08 -0400
Subject: rpms/clamav/devel clamav-update.cron, NONE, 1.1 freshclam-sleep,
	NONE, 1.1 freshclam.sysconfig, NONE, 1.1
Message-ID: <200507251717.j6PHH8JY021715@cvs-int.fedora.redhat.com>

Author: ensc

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

Added Files:
	clamav-update.cron freshclam-sleep freshclam.sysconfig 
Log Message:
initial checkin



--- NEW FILE clamav-update.cron ---
## Adjust this line...
MAILTO=root,postmaster,webmaster,clamav

## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
0  */3 * * * root /usr/share/clamav/freshclam-sleep


--- NEW FILE freshclam-sleep ---
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz 
#  
# 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; version 2 of the License.
#  
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#  
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


FRESHCLAM_MOD=$[ 3*60 ]		# 3 hours

f=/etc/sysconfig/freshclam
test ! -e "$f" || . "$f"


case x"$1" in
    (xnow)		FRESHCLAM_DELAY=0;;
    (x|xrandom)		: ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};;
    (*)			FRESHCLAM_DELAY=$1;;
esac

set -e

case $FRESHCLAM_DELAY in
    (disabled-warn)
	echo $"\
WARNING: update of clamav database is disabled; please see
  '$f'  
  for information how to enable the periodic update resp. how to turn
  off this message." >&2
	exit 1
	;;

    (disabled)
	exit 0
	;;

    (*)
	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
	;;
esac


/usr/bin/freshclam --quiet && {
    test -x /usr/sbin/clamav-notify-servers &&  \
	exec /usr/sbin/clamav-notify-servers || \
	:
}


--- NEW FILE freshclam.sysconfig ---
## When changing the periodicity of freshclam runs in the crontab,
## this value must be adjusted also. Its value is the timespan between
## two subsequent freshclam runs in minutes. E.g. for the default
##
## | 0 */3 * * *  ...
##
## crontab line, the value is 180 (minutes).
# FRESHCLAM_MOD=

## A predefined value for the delay in seconds. By default, the value is
## 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:
## 'disabled-warn'  ...  disables the automatic freshclam update and
##                         gives out a warning
## 'disabled'       ...  disables the automatic freshclam silently
# FRESHCLAM_DELAY=


### !!!!! REMOVE ME !!!!!!
### REMOVE ME: By default, the freshclam update is disabled to avoid
### REMOVE ME: network access without prior activation
FRESHCLAM_DELAY=disabled-warn	# REMOVE ME



From fedora-extras-commits at redhat.com  Mon Jul 25 17:19:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:19:24 -0400
Subject: rpms/clamav/devel clamav.spec,1.23,1.24
Message-ID: <200507251719.j6PHJOE9021755@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
- updated to 0.86.2 (SECURITY)
- changed the freshclam updating mechanism (again); now, it consists
  of a crontab which does not need to be changed and a helper script
  (freshclam-sleep). This helper script is configured by
  /etc/sysconfig/freshclam




Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- clamav.spec	25 Jun 2005 18:01:32 -0000	1.23
+++ clamav.spec	25 Jul 2005 17:19:21 -0000	1.24
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.1
-Release:	%release_func 2
+Version:	0.86.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -67,10 +67,13 @@
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
+Source200:	freshclam-sleep
+Source201:	freshclam.sysconfig
+Source202:	clamav-update.cron
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%__chown %__chmod %__sed diffutils
+Requires(post):		%__chown %__chmod
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -204,6 +207,20 @@
 rm -rf "$RPM_BUILD_ROOT" _doc*
 %{__make} DESTDIR="$RPM_BUILD_ROOT" install
 
+function smartsubst() {
+	local tmp
+	local regexp=$1
+	shift
+
+	tmp=$(mktemp /tmp/%name-subst.XXXXXX)
+	for i; do
+		sed -e "$regexp" "$i" >$tmp
+		cmp -s $tmp "$i" || cat $tmp >"$i"
+		rm -f $tmp
+	done
+}
+
+
 %{__install} -d -m755 \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
@@ -230,10 +247,7 @@
 cp -pa _doc_server/*                    $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper         $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
 
-f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
-sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
-cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
-rm -f "$f".tmp
+smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
 
 
 ## prepare the update-files
@@ -241,17 +255,17 @@
 %{__install} -m755 -p %{SOURCE8}	${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers
 touch ${RPM_BUILD_ROOT}%{freshclamlog}
 
-cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
-## Adjust this line...
-MAILTO=root,postmaster,webmaster,%username
-
-## It is ok to execute it as root; freshclam drops privileges and becomes
-## user 'clamav' as soon as possible
-# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+%__install -p -m0755 %SOURCE200		$RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
+%__install -p -m0644 %SOURCE201		$RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam
+%__install -p -m0600 %SOURCE202		$RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update
+
+smartsubst 's!webmaster,clamav!webmaster,%username!g;
+	    s!/usr/share/clamav!%pkgdatadir!g;
+	    s!/usr/bin!%_bindir!g;
+            s!/usr/sbin!%_sbindir!g;' \
+   $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \
+   $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
-## Comment out or remove this line...
-1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
-EOF
 
 %if 0%{!?_without_milter:1}
 #### The milter stuff
@@ -260,6 +274,7 @@
 	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+
 subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
@@ -295,15 +310,6 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
-min=$[ RANDOM % 60 ]
-hour=$[ RANDOM % 3 ]
-tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
-src=%_sysconfdir/cron.d/clamav-update
-%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp
-cmp -s $tmp "$src" || cat "$tmp" >"$src"
-rm -f $tmp
-
-
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -375,9 +381,11 @@
 %defattr(-,root,root,-)
 %_bindir/freshclam
 %_mandir/man1/freshclam*
-%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
-%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
+%pkgdatadir/freshclam-sleep
+%config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
+%config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
+%config(noreplace) %_sysconfdir/cron.d/*
+%config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
 
@@ -414,6 +422,13 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+- updated to 0.86.2 (SECURITY)
+- changed the freshclam updating mechanism (again); now, it consists
+  of a crontab which does not need to be changed and a helper script
+  (freshclam-sleep). This helper script is configured by
+  /etc/sysconfig/freshclam
+
 * Sat Jun 25 2005 Enrico Scholz  - 0.86.1-2
 - updated to 0.86.1
 - fixed randomization in %%post scriptlet: hour should be a range but



From fedora-extras-commits at redhat.com  Mon Jul 25 17:19:40 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:19:40 -0400
Subject: rpms/clamav/devel sources,1.10,1.11
Message-ID: <200507251719.j6PHJesl021778@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources 
Log Message:
version 0.86.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Jun 2005 17:35:47 -0000	1.10
+++ sources	25 Jul 2005 17:19:38 -0000	1.11
@@ -1,2 +1,2 @@
-df7116898cdd80ce56721a91e9cff206  clamav-0.86.1.tar.gz
-dd5b89f732f84112207843748df5218c  clamav-0.86.1.tar.gz.sig
+870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
+7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jul 25 17:40:38 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:40:38 -0400
Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.11, 1.12 TeXmacs.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <200507251740.j6PHecb7021881@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Jul 2005 17:42:44 -0000	1.11
+++ .cvsignore	25 Jul 2005 17:40:36 -0000	1.12
@@ -1 +1 @@
-TeXmacs-1.0.5.5-src.tar.gz
+TeXmacs-1.0.5.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TeXmacs.spec	5 Jul 2005 17:42:44 -0000	1.16
+++ TeXmacs.spec	25 Jul 2005 17:40:36 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		TeXmacs
-Version:	1.0.5.5
+Version:	1.0.5.6
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.5-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.6-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
@@ -125,6 +125,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 25 2005 Gerard Milmeister  - 1.0.5.6
+- New Version 1.0.5.6
+
 * Tue Jul  5 2005 Gerard Milmeister  - 1.0.5.5
 - New Version 1.0.5.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jul 2005 17:42:44 -0000	1.11
+++ sources	25 Jul 2005 17:40:36 -0000	1.12
@@ -1 +1 @@
-492bf5f75791c80d64a727767fedb8bc  TeXmacs-1.0.5.5-src.tar.gz
+09d86d4b8b08baf28303434b72cb8589  TeXmacs-1.0.5.6-src.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 17:41:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:41:04 -0400
Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.17,1.18
Message-ID: <200507251741.j6PHf4A6021934@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	TeXmacs.spec 
Log Message:
new version 1.0.5.6


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TeXmacs.spec	25 Jul 2005 17:40:36 -0000	1.17
+++ TeXmacs.spec	25 Jul 2005 17:41:02 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		TeXmacs
 Version:	1.0.5.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors



From fedora-extras-commits at redhat.com  Mon Jul 25 17:42:08 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:42:08 -0400
Subject: common tobuild,1.2056,1.2057
Message-ID: <200507251742.j6PHg8Hn022007@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21989

Modified Files:
	tobuild 
Log Message:
request build of rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2056
retrieving revision 1.2057
diff -u -r1.2056 -r1.2057
--- tobuild	25 Jul 2005 17:06:47 -0000	1.2056
+++ tobuild	25 Jul 2005 17:42:06 -0000	1.2057
@@ -129,3 +129,4 @@
 adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3
 adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
+gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 17:43:00 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:43:00 -0400
Subject: rpms/TeXmacs/devel .cvsignore, 1.11, 1.12 TeXmacs.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <200507251743.j6PHh0ek022046@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Jul 2005 17:44:10 -0000	1.11
+++ .cvsignore	25 Jul 2005 17:42:58 -0000	1.12
@@ -1 +1 @@
-TeXmacs-1.0.5.5-src.tar.gz
+TeXmacs-1.0.5.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TeXmacs.spec	5 Jul 2005 17:44:10 -0000	1.16
+++ TeXmacs.spec	25 Jul 2005 17:42:58 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		TeXmacs
-Version:	1.0.5.5
-Release:	1%{?dist}
+Version:	1.0.5.6
+Release:	2%{?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.5-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.6-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
@@ -125,6 +125,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 25 2005 Gerard Milmeister  - 1.0.5.6
+- New Version 1.0.5.6
+
 * Tue Jul  5 2005 Gerard Milmeister  - 1.0.5.5
 - New Version 1.0.5.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jul 2005 17:44:10 -0000	1.11
+++ sources	25 Jul 2005 17:42:58 -0000	1.12
@@ -1 +1 @@
-492bf5f75791c80d64a727767fedb8bc  TeXmacs-1.0.5.5-src.tar.gz
+09d86d4b8b08baf28303434b72cb8589  TeXmacs-1.0.5.6-src.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 17:43:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:43:20 -0400
Subject: common tobuild,1.2057,1.2058
Message-ID: <200507251743.j6PHhKP4022110@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22093

Modified Files:
	tobuild 
Log Message:
request build of rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2057
retrieving revision 1.2058
diff -u -r1.2057 -r1.2058
--- tobuild	25 Jul 2005 17:42:06 -0000	1.2057
+++ tobuild	25 Jul 2005 17:43:17 -0000	1.2058
@@ -130,3 +130,4 @@
 adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4
+gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 17:47:56 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:47:56 -0400
Subject: rpms/clamav/FC-3 clamav-update.cron, NONE, 1.1 freshclam-sleep, NONE,
	1.1 freshclam.sysconfig, NONE, 1.1 clamav.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200507251748.j6PHmQoX022308@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec sources 
Added Files:
	clamav-update.cron freshclam-sleep freshclam.sysconfig 
Log Message:
synced with devel/



--- NEW FILE clamav-update.cron ---
## Adjust this line...
MAILTO=root,postmaster,webmaster,clamav

## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
0  */3 * * * root /usr/share/clamav/freshclam-sleep


--- NEW FILE freshclam-sleep ---
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz 
#  
# 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; version 2 of the License.
#  
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#  
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


FRESHCLAM_MOD=$[ 3*60 ]		# 3 hours

f=/etc/sysconfig/freshclam
test ! -e "$f" || . "$f"


case x"$1" in
    (xnow)		FRESHCLAM_DELAY=0;;
    (x|xrandom)		: ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};;
    (*)			FRESHCLAM_DELAY=$1;;
esac

set -e

case $FRESHCLAM_DELAY in
    (disabled-warn)
	echo $"\
WARNING: update of clamav database is disabled; please see
  '$f'  
  for information how to enable the periodic update resp. how to turn
  off this message." >&2
	exit 1
	;;

    (disabled)
	exit 0
	;;

    (*)
	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
	;;
esac


/usr/bin/freshclam --quiet && {
    test -x /usr/sbin/clamav-notify-servers &&  \
	exec /usr/sbin/clamav-notify-servers || \
	:
}


--- NEW FILE freshclam.sysconfig ---
## When changing the periodicity of freshclam runs in the crontab,
## this value must be adjusted also. Its value is the timespan between
## two subsequent freshclam runs in minutes. E.g. for the default
##
## | 0 */3 * * *  ...
##
## crontab line, the value is 180 (minutes).
# FRESHCLAM_MOD=

## A predefined value for the delay in seconds. By default, the value is
## 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:
## 'disabled-warn'  ...  disables the automatic freshclam update and
##                         gives out a warning
## 'disabled'       ...  disables the automatic freshclam silently
# FRESHCLAM_DELAY=


### !!!!! REMOVE ME !!!!!!
### REMOVE ME: By default, the freshclam update is disabled to avoid
### REMOVE ME: network access without prior activation
FRESHCLAM_DELAY=disabled-warn	# REMOVE ME


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clamav.spec	25 Jun 2005 18:01:54 -0000	1.13
+++ clamav.spec	25 Jul 2005 17:47:53 -0000	1.14
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.1
-Release:	%release_func 2
+Version:	0.86.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -67,10 +67,13 @@
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
+Source200:	freshclam-sleep
+Source201:	freshclam.sysconfig
+Source202:	clamav-update.cron
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%__chown %__chmod %__sed diffutils
+Requires(post):		%__chown %__chmod
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -204,6 +207,20 @@
 rm -rf "$RPM_BUILD_ROOT" _doc*
 %{__make} DESTDIR="$RPM_BUILD_ROOT" install
 
+function smartsubst() {
+	local tmp
+	local regexp=$1
+	shift
+
+	tmp=$(mktemp /tmp/%name-subst.XXXXXX)
+	for i; do
+		sed -e "$regexp" "$i" >$tmp
+		cmp -s $tmp "$i" || cat $tmp >"$i"
+		rm -f $tmp
+	done
+}
+
+
 %{__install} -d -m755 \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
@@ -230,10 +247,7 @@
 cp -pa _doc_server/*                    $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper         $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
 
-f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
-sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
-cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
-rm -f "$f".tmp
+smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
 
 
 ## prepare the update-files
@@ -241,17 +255,17 @@
 %{__install} -m755 -p %{SOURCE8}	${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers
 touch ${RPM_BUILD_ROOT}%{freshclamlog}
 
-cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
-## Adjust this line...
-MAILTO=root,postmaster,webmaster,%username
-
-## It is ok to execute it as root; freshclam drops privileges and becomes
-## user 'clamav' as soon as possible
-# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+%__install -p -m0755 %SOURCE200		$RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
+%__install -p -m0644 %SOURCE201		$RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam
+%__install -p -m0600 %SOURCE202		$RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update
+
+smartsubst 's!webmaster,clamav!webmaster,%username!g;
+	    s!/usr/share/clamav!%pkgdatadir!g;
+	    s!/usr/bin!%_bindir!g;
+            s!/usr/sbin!%_sbindir!g;' \
+   $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \
+   $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
-## Comment out or remove this line...
-1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
-EOF
 
 %if 0%{!?_without_milter:1}
 #### The milter stuff
@@ -260,6 +274,7 @@
 	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+
 subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
@@ -295,15 +310,6 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
-min=$[ RANDOM % 60 ]
-hour=$[ RANDOM % 3 ]
-tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
-src=%_sysconfdir/cron.d/clamav-update
-%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp
-cmp -s $tmp "$src" || cat "$tmp" >"$src"
-rm -f $tmp
-
-
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -375,9 +381,11 @@
 %defattr(-,root,root,-)
 %_bindir/freshclam
 %_mandir/man1/freshclam*
-%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
-%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
+%pkgdatadir/freshclam-sleep
+%config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
+%config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
+%config(noreplace) %_sysconfdir/cron.d/*
+%config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
 
@@ -414,6 +422,13 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+- updated to 0.86.2 (SECURITY)
+- changed the freshclam updating mechanism (again); now, it consists
+  of a crontab which does not need to be changed and a helper script
+  (freshclam-sleep). This helper script is configured by
+  /etc/sysconfig/freshclam
+
 * Sat Jun 25 2005 Enrico Scholz  - 0.86.1-2
 - updated to 0.86.1
 - fixed randomization in %%post scriptlet: hour should be a range but


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jun 2005 17:51:53 -0000	1.8
+++ sources	25 Jul 2005 17:47:53 -0000	1.9
@@ -1,2 +1,2 @@
-df7116898cdd80ce56721a91e9cff206  clamav-0.86.1.tar.gz
-dd5b89f732f84112207843748df5218c  clamav-0.86.1.tar.gz.sig
+870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
+7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jul 25 17:47:56 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:47:56 -0400
Subject: rpms/clamav/FC-4 clamav-update.cron, NONE, 1.1 freshclam-sleep, NONE,
	1.1 freshclam.sysconfig, NONE, 1.1 clamav.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <200507251748.j6PHmQW6022312@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec sources 
Added Files:
	clamav-update.cron freshclam-sleep freshclam.sysconfig 
Log Message:
synced with devel/



--- NEW FILE clamav-update.cron ---
## Adjust this line...
MAILTO=root,postmaster,webmaster,clamav

## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
0  */3 * * * root /usr/share/clamav/freshclam-sleep


--- NEW FILE freshclam-sleep ---
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz 
#  
# 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; version 2 of the License.
#  
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#  
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


FRESHCLAM_MOD=$[ 3*60 ]		# 3 hours

f=/etc/sysconfig/freshclam
test ! -e "$f" || . "$f"


case x"$1" in
    (xnow)		FRESHCLAM_DELAY=0;;
    (x|xrandom)		: ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};;
    (*)			FRESHCLAM_DELAY=$1;;
esac

set -e

case $FRESHCLAM_DELAY in
    (disabled-warn)
	echo $"\
WARNING: update of clamav database is disabled; please see
  '$f'  
  for information how to enable the periodic update resp. how to turn
  off this message." >&2
	exit 1
	;;

    (disabled)
	exit 0
	;;

    (*)
	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
	;;
esac


/usr/bin/freshclam --quiet && {
    test -x /usr/sbin/clamav-notify-servers &&  \
	exec /usr/sbin/clamav-notify-servers || \
	:
}


--- NEW FILE freshclam.sysconfig ---
## When changing the periodicity of freshclam runs in the crontab,
## this value must be adjusted also. Its value is the timespan between
## two subsequent freshclam runs in minutes. E.g. for the default
##
## | 0 */3 * * *  ...
##
## crontab line, the value is 180 (minutes).
# FRESHCLAM_MOD=

## A predefined value for the delay in seconds. By default, the value is
## 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:
## 'disabled-warn'  ...  disables the automatic freshclam update and
##                         gives out a warning
## 'disabled'       ...  disables the automatic freshclam silently
# FRESHCLAM_DELAY=


### !!!!! REMOVE ME !!!!!!
### REMOVE ME: By default, the freshclam update is disabled to avoid
### REMOVE ME: network access without prior activation
FRESHCLAM_DELAY=disabled-warn	# REMOVE ME


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- clamav.spec	25 Jun 2005 18:01:46 -0000	1.22
+++ clamav.spec	25 Jul 2005 17:47:54 -0000	1.23
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.1
-Release:	%release_func 2
+Version:	0.86.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -67,10 +67,13 @@
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
+Source200:	freshclam-sleep
+Source201:	freshclam.sysconfig
+Source202:	clamav-update.cron
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%__chown %__chmod %__sed diffutils
+Requires(post):		%__chown %__chmod
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -204,6 +207,20 @@
 rm -rf "$RPM_BUILD_ROOT" _doc*
 %{__make} DESTDIR="$RPM_BUILD_ROOT" install
 
+function smartsubst() {
+	local tmp
+	local regexp=$1
+	shift
+
+	tmp=$(mktemp /tmp/%name-subst.XXXXXX)
+	for i; do
+		sed -e "$regexp" "$i" >$tmp
+		cmp -s $tmp "$i" || cat $tmp >"$i"
+		rm -f $tmp
+	done
+}
+
+
 %{__install} -d -m755 \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
@@ -230,10 +247,7 @@
 cp -pa _doc_server/*                    $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper         $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
 
-f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
-sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
-cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
-rm -f "$f".tmp
+smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
 
 
 ## prepare the update-files
@@ -241,17 +255,17 @@
 %{__install} -m755 -p %{SOURCE8}	${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers
 touch ${RPM_BUILD_ROOT}%{freshclamlog}
 
-cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
-## Adjust this line...
-MAILTO=root,postmaster,webmaster,%username
-
-## It is ok to execute it as root; freshclam drops privileges and becomes
-## user 'clamav' as soon as possible
-# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+%__install -p -m0755 %SOURCE200		$RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
+%__install -p -m0644 %SOURCE201		$RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam
+%__install -p -m0600 %SOURCE202		$RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update
+
+smartsubst 's!webmaster,clamav!webmaster,%username!g;
+	    s!/usr/share/clamav!%pkgdatadir!g;
+	    s!/usr/bin!%_bindir!g;
+            s!/usr/sbin!%_sbindir!g;' \
+   $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \
+   $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
-## Comment out or remove this line...
-1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
-EOF
 
 %if 0%{!?_without_milter:1}
 #### The milter stuff
@@ -260,6 +274,7 @@
 	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+
 subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
@@ -295,15 +310,6 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
-min=$[ RANDOM % 60 ]
-hour=$[ RANDOM % 3 ]
-tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
-src=%_sysconfdir/cron.d/clamav-update
-%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp
-cmp -s $tmp "$src" || cat "$tmp" >"$src"
-rm -f $tmp
-
-
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -375,9 +381,11 @@
 %defattr(-,root,root,-)
 %_bindir/freshclam
 %_mandir/man1/freshclam*
-%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
-%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
+%pkgdatadir/freshclam-sleep
+%config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
+%config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
+%config(noreplace) %_sysconfdir/cron.d/*
+%config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
 
@@ -414,6 +422,13 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+- updated to 0.86.2 (SECURITY)
+- changed the freshclam updating mechanism (again); now, it consists
+  of a crontab which does not need to be changed and a helper script
+  (freshclam-sleep). This helper script is configured by
+  /etc/sysconfig/freshclam
+
 * Sat Jun 25 2005 Enrico Scholz  - 0.86.1-2
 - updated to 0.86.1
 - fixed randomization in %%post scriptlet: hour should be a range but


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Jun 2005 17:51:52 -0000	1.10
+++ sources	25 Jul 2005 17:47:54 -0000	1.11
@@ -1,2 +1,2 @@
-df7116898cdd80ce56721a91e9cff206  clamav-0.86.1.tar.gz
-dd5b89f732f84112207843748df5218c  clamav-0.86.1.tar.gz.sig
+870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
+7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jul 25 17:56:57 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:56:57 -0400
Subject: rpms/clamav/FC-3 clamav.spec,1.14,1.15
Message-ID: <200507251756.j6PHuvHK022440@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
bump release: to fix broken cvs tags


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clamav.spec	25 Jul 2005 17:47:53 -0000	1.14
+++ clamav.spec	25 Jul 2005 17:56:55 -0000	1.15
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -422,7 +422,7 @@
 %endif	# _without_milter
 
 %changelog
-* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists
   of a crontab which does not need to be changed and a helper script



From fedora-extras-commits at redhat.com  Mon Jul 25 17:56:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:56:58 -0400
Subject: rpms/clamav/devel clamav.spec,1.24,1.25
Message-ID: <200507251756.j6PHuw4s022450@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
bump release: to fix broken cvs tags


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- clamav.spec	25 Jul 2005 17:19:21 -0000	1.24
+++ clamav.spec	25 Jul 2005 17:56:56 -0000	1.25
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -422,7 +422,7 @@
 %endif	# _without_milter
 
 %changelog
-* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists
   of a crontab which does not need to be changed and a helper script



From fedora-extras-commits at redhat.com  Mon Jul 25 17:56:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:56:58 -0400
Subject: rpms/clamav/FC-4 clamav.spec,1.23,1.24
Message-ID: <200507251757.j6PHuwIY022446@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
bump release: to fix broken cvs tags


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- clamav.spec	25 Jul 2005 17:47:54 -0000	1.23
+++ clamav.spec	25 Jul 2005 17:56:56 -0000	1.24
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -422,7 +422,7 @@
 %endif	# _without_milter
 
 %changelog
-* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists
   of a crontab which does not need to be changed and a helper script



From fedora-extras-commits at redhat.com  Mon Jul 25 17:57:32 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:57:32 -0400
Subject: common tobuild,1.2058,1.2059
Message-ID: <200507251757.j6PHvWEn022516@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22499

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/devel clamav-0_86_2-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2058
retrieving revision 1.2059
diff -u -r1.2058 -r1.2059
--- tobuild	25 Jul 2005 17:43:17 -0000	1.2058
+++ tobuild	25 Jul 2005 17:57:30 -0000	1.2059
@@ -131,3 +131,4 @@
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4
 gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel
+ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 17:57:53 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 25 Jul 2005 13:57:53 -0400
Subject: common tobuild,1.2059,1.2060
Message-ID: <200507251757.j6PHvr1c022547@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22530

Modified Files:
	tobuild 
Log Message:
request build of rpms/moodss/FC-4 moodss-20_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2059
retrieving revision 1.2060
diff -u -r1.2059 -r1.2060
--- tobuild	25 Jul 2005 17:57:30 -0000	1.2059
+++ tobuild	25 Jul 2005 17:57:51 -0000	1.2060
@@ -132,3 +132,4 @@
 gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4
 gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel
 ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel
+jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 18:00:15 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:15 -0400
Subject: rpms/hdf - New directory
Message-ID: <200507251800.j6PI0FMA022624@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Mon Jul 25 18:00:16 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:16 -0400
Subject: rpms/hdf/devel - New directory
Message-ID: <200507251800.j6PI0GI2022629@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Mon Jul 25 18:00:29 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:29 -0400
Subject: rpms/hdf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507251800.j6PI0TgI022680@cvs-int.fedora.redhat.com>

Author: orion

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 25 18:00:30 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:30 -0400
Subject: rpms/hdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507251800.j6PI0U8A022685@cvs-int.fedora.redhat.com>

Author: orion

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

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


--- NEW 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 Jul 25 18:07:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:07:41 -0400
Subject: rpms/hdf import.log,1.1,1.2
Message-ID: <200507251808.j6PI8B0Y023890@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	import.log 
Log Message:
auto-import hdf-4.2r1-2 on branch devel from hdf-4.2r1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hdf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Jul 2005 18:00:27 -0000	1.1
+++ import.log	25 Jul 2005 18:07:39 -0000	1.2
@@ -0,0 +1 @@
+hdf-4_2r1-2:HEAD:hdf-4.2r1-2.src.rpm:1122314854



From fedora-extras-commits at redhat.com  Mon Jul 25 18:07:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:07:41 -0400
Subject: rpms/hdf/devel hdf-4.2r1-configure.patch, NONE, 1.1 hdf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200507251807.j6PI7fhD023885@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore sources 
Added Files:
	hdf-4.2r1-configure.patch hdf.spec 
Log Message:
auto-import hdf-4.2r1-2 on branch devel from hdf-4.2r1-2.src.rpm

hdf-4.2r1-configure.patch:

--- NEW FILE hdf-4.2r1-configure.patch ---
--- HDF4.2r1/configure.ac.orig	2005-07-15 14:52:14.000000000 -0600
+++ HDF4.2r1/configure.ac	2005-07-15 14:53:35.000000000 -0600
@@ -528,7 +528,7 @@
 dnl ======================================================================
 
 AC_MSG_CHECKING([for math library support])
-AC_TRY_LINK([#include ], [sqrt(37.927)],
+AC_TRY_LINK([#include ], [sinh(37.927)],
             [AC_MSG_RESULT([yes])],
             [AC_MSG_RESULT([no]); LIBS="$LIBS -lm"])
 
--- HDF4.2r1/mfhdf/fortran/config/ftest-linux.f.orig	2005-02-08 20:04:07.000000000 -0700
+++ HDF4.2r1/mfhdf/fortran/config/ftest-linux.f	2005-07-15 15:37:22.000000000 -0600
@@ -138,13 +138,13 @@
       integer*2 shval(2)
       integer i, j, k
       character*31 varnam, attname(2,7), gattnam(2)
-      byte bytval(2)
+      integer*1 bytval(2)
       common /atts/attname, gattnam
       integer*2 svalidrg(2)
       real rvalidrg(2)
       integer lvalidrg(2)
       double precision dvalidrg(2)
-      byte bvalidrg(2)
+      integer*1 bvalidrg(2)
       character*31 gavalue(2), cavalue(2)
       real epsilon
 
@@ -337,7 +337,7 @@
       real flval(2)
       integer lngval(2)
       integer*2 shval(2)
-      byte bytval(2)
+      integer*1 bytval(2)
       integer vartyp, nvdims, vdims(MAXVDIMS), nvatts
 
       character*31 varnam, attname(2,7), gattnam(2)
@@ -346,7 +346,7 @@
       real rvalidrg(2)
       integer lvalidrg(2)
       double precision dvalidrg(2)
-      byte bvalidrg(2)
+      integer*1 bvalidrg(2)
       character*31 gavalue(2), cavalue(2)
       real epsilon
 
@@ -470,7 +470,7 @@
       real rvalidrg(2)
       integer lvalidrg(2)
       double precision dvalidrg(2)
-      byte bvalidrg(2)
+      integer*1 bvalidrg(2)
 
 c     variable ids
       integer  bid, sid, lid, fid, did, cid, chid
@@ -883,7 +883,7 @@
       integer itime, ilev, ilat, ilon
 
 c     arrays of data values to be read
-      byte barray(times), byval(times)
+      integer*1 barray(times), byval(times)
       integer*2 sarray(times), shval(times)
       integer larray(lats)
       real farray(levels, lats, lons, times)
@@ -1009,7 +1009,7 @@
       integer bid, sid, lid, fid, did, cid, chid
       common /vars/bid, sid, lid, fid, did, cid, chid
 
-      byte bvalue
+      integer*1 bvalue
       integer*2 svalue
       integer lvalue
       real fvalue
@@ -1097,7 +1097,7 @@
       integer count(MAXNCDIM)
 
 c     arrays of data values to be written
-      byte barray(times)
+      integer*1 barray(times)
       integer*2 sarray(times)
       integer larray(lats)
       real farray(levels, lats, lons, times)
@@ -1184,7 +1184,7 @@
 
       integer lvalue
       integer*2 svalue
-      byte bvalue
+      integer*1 bvalue
       double precision onethird
       integer bid, sid, lid, fid, did, cid, chid
       common /vars/bid, sid, lid, fid, did, cid, chid


--- NEW FILE hdf.spec ---
Name: hdf
Version: 4.2r1
Release: 2%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD-ish
Group: System Environment/Libraries
URL: http://hdf.ncsa.uiuc.edu/HDF/
Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar
Patch0: hdf-4.2r1-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel
BuildRequires: gcc-gfortran

%description
HDF is a general purpose library and file format for storing scientific data.
HDF can store two primary objects: datasets and groups. A dataset is 
essentially a multidimensional array of data elements, and a group is a 
structure for organizing objects in an HDF file. Using these two basic 
objects, one can create and store almost any kind of scientific data 
structure, such as images, arrays of vectors, and structured and unstructured 
grids. You can also mix and match them in HDF files according to your needs.

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

%description devel
HDF development headers and libraries.

%prep
%setup -q -n HDF%{version}
tar xf %{SOURCE1} --directory mfhdf/hrepack 
mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack
rm -r mfhdf/hrepack/4.2r1-hrepack-patch
%patch0 -p1 -b .orig

%build
autoconf
%configure F77=gfortran FFLAGS=-ffixed-line-length-none
make

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall includedir=${RPM_BUILD_ROOT}%{_includedir}/%{name} \
             libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}
#Don't conflict with netcdf
rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc*

%check
make check

%clean
rm -rf $RPM_BUILD_ROOT

%post

%postun

%files
%defattr(-,root,root,0755)
%doc COPYING MANIFEST README release_notes/*.txt
%{_bindir}/*
%{_mandir}/man1/*.gz

%files devel
%defattr(-,root,root,0755)
%{_includedir}/%{name}/
%{_libdir}/%{name}/

%changelog
* Wed Jul 20 2005 Orion Poplawski  4.2r1-2
- Fix BuildRequires to have autoconf

* Fri Jul 15 2005 Orion Poplawski  4.2r1-1
- inital package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jul 2005 18:00:27 -0000	1.1
+++ .cvsignore	25 Jul 2005 18:07:39 -0000	1.2
@@ -0,0 +1,2 @@
+4.2r1-hrepack-patch.tar
+HDF4.2r1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jul 2005 18:00:27 -0000	1.1
+++ sources	25 Jul 2005 18:07:39 -0000	1.2
@@ -0,0 +1,2 @@
+d172631b6e6f32c4f93f647a09862011  4.2r1-hrepack-patch.tar
+9082c6fa913b9188452fa6c5217e1573  HDF4.2r1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 18:12:24 2005
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Mon, 25 Jul 2005 14:12:24 -0400
Subject: common tobuild,1.2060,1.2061
Message-ID: <200507251812.j6PICO50023950@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23933

Modified Files:
	tobuild 
Log Message:
remove splint


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2060
retrieving revision 1.2061
diff -u -r1.2060 -r1.2061
--- tobuild	25 Jul 2005 17:57:51 -0000	1.2060
+++ tobuild	25 Jul 2005 18:12:22 -0000	1.2061
@@ -43,7 +43,6 @@
 thias	rpms/gkrellm-freq/FC-4	gkrellm-freq-0_1_1-1_fc4	fc4
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
-pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel
 thias	rpms/gkrellm-freq/devel	gkrellm-freq-0_1_1-2_fc5	devel
 bpepple	rpms/freeciv/devel	freeciv-2_0_3-2_fc5	devel
@@ -66,7 +65,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
-pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 18:15:42 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:15:42 -0400
Subject: common tobuild,1.2061,1.2062
Message-ID: <200507251815.j6PIFgiR024024@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24007

Modified Files:
	tobuild 
Log Message:
request build of rpms/hdf/devel hdf-4_2r1-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2061
retrieving revision 1.2062
diff -u -r1.2061 -r1.2062
--- tobuild	25 Jul 2005 18:12:22 -0000	1.2061
+++ tobuild	25 Jul 2005 18:15:40 -0000	1.2062
@@ -131,3 +131,4 @@
 gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel
 ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel
 jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4
+orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 18:22:11 2005
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 25 Jul 2005 14:22:11 -0400
Subject: rpms/flumotion/FC-4 .cvsignore, 1.3, 1.4 flumotion.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200507251822.j6PIMBUQ024076@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	.cvsignore flumotion.spec sources 
Log Message:
update to new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 13:45:56 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:22:09 -0000	1.4
@@ -1 +1 @@
-flumotion-0.1.8.tar.bz2
+flumotion-0.1.9.tar.bz2


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/flumotion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flumotion.spec	20 May 2005 13:48:47 -0000	1.3
+++ flumotion.spec	25 Jul 2005 18:22:09 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           flumotion
-Version:        0.1.8
+Version:        0.1.9{%dist}
 Release:        1
 Summary:        Flumotion - the Fluendo Streaming Server
 
@@ -188,6 +188,11 @@
 %{_datadir}/applications/fedora-flumotion-admin.desktop
 
 %changelog
+* Mon Jul 25 2005 Thomas Vander Stichele 
+- 0.1.9-1
+- new upstream release
+- add dist var
+
 * Fri May 20 2005 Thomas Vander Stichele 
 - 0.1.8-1
 - new upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 13:45:56 -0000	1.3
+++ sources	25 Jul 2005 18:22:09 -0000	1.4
@@ -1 +1 @@
-33367676b24fe3af328ae6cfca8b63ec  flumotion-0.1.8.tar.bz2
+7f2b4abbabd7756d1d689b38fd477d3e  flumotion-0.1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:22:36 2005
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 25 Jul 2005 14:22:36 -0400
Subject: rpms/flumotion/FC-4 flumotion.spec,1.4,1.5
Message-ID: <200507251822.j6PIMaGD024103@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	flumotion.spec 
Log Message:
update to new version


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/flumotion.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flumotion.spec	25 Jul 2005 18:22:09 -0000	1.4
+++ flumotion.spec	25 Jul 2005 18:22:34 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           flumotion
-Version:        0.1.9{%dist}
+Version:        0.1.9%{?dist}
 Release:        1
 Summary:        Flumotion - the Fluendo Streaming Server
 



From fedora-extras-commits at redhat.com  Mon Jul 25 18:23:09 2005
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 25 Jul 2005 14:23:09 -0400
Subject: common tobuild,1.2062,1.2063
Message-ID: <200507251823.j6PIN9IW024165@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24148

Modified Files:
	tobuild 
Log Message:
request build of rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2062
retrieving revision 1.2063
diff -u -r1.2062 -r1.2063
--- tobuild	25 Jul 2005 18:15:40 -0000	1.2062
+++ tobuild	25 Jul 2005 18:23:07 -0000	1.2063
@@ -132,3 +132,4 @@
 ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel
 jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4
 orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel
+thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 18:32:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:32:05 -0400
Subject: owners owners.list,1.28,1.29
Message-ID: <200507251832.j6PIW6QZ024204@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
Add component: splint


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- owners.list	25 Jul 2005 16:29:09 -0000	1.28
+++ owners.list	25 Jul 2005 18:32:03 -0000	1.29
@@ -749,6 +749,7 @@
 Fedora Extras|soundtracker|Sound module composer/player|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
+Fedora Extras|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|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 18:54:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:54:44 -0400
Subject: rpms/galculator/devel .cvsignore, 1.3, 1.4 galculator.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200507251854.j6PIsiNc024369@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore galculator.spec sources 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
- Update to 1.2.5 (also fixes #162018).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2004 00:42:15 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:54:42 -0000	1.4
@@ -1 +1 @@
-galculator-1.2.4.tar.bz2
+galculator-1.2.5.tar.bz2


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galculator.spec	6 Apr 2005 22:11:37 -0000	1.5
+++ galculator.spec	25 Jul 2005 18:54:42 -0000	1.6
@@ -1,13 +1,12 @@
 Name:           galculator
-Version:        1.2.4
-Release:        3
-
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-1.2.4.tar.bz2
+Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
+- Update to 1.2.5 (also fixes #162018).
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Nov 2004 00:42:15 -0000	1.3
+++ sources	25 Jul 2005 18:54:42 -0000	1.4
@@ -1 +1 @@
-a011a3d7063fab63ca371afa3bbde3df  galculator-1.2.4.tar.bz2
+0f58963a7fd99c7aa7cb9900d4645f59  galculator-1.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:54:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:54:38 -0400
Subject: rpms/galculator/FC-3 .cvsignore, 1.3, 1.4 galculator.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200507251855.j6PIt9ds024374@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore galculator.spec sources 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
- Update to 1.2.5 (also fixes #162018).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2004 00:42:15 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:54:36 -0000	1.4
@@ -1 +1 @@
-galculator-1.2.4.tar.bz2
+galculator-1.2.5.tar.bz2


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/galculator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galculator.spec	29 Nov 2004 00:42:15 -0000	1.3
+++ galculator.spec	25 Jul 2005 18:54:36 -0000	1.4
@@ -1,22 +1,22 @@
 Name:           galculator
-Version:        1.2.4
-Release:        2
-Summary:        GTK 2 based scientific calculator.
+Version:        1.2.5
+Release:        1%{?dist}
+Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-1.2.4.tar.bz2
+Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
-BuildRequires:	perl-XML-Parser
+BuildRequires:  perl(XML::Parser)
 
 %description
-galculator is a GTK 2 based scientific calculator with "ordinary" and reverse 
+galculator is a GTK 2 based scientific calculator with "ordinary" and reverse
 polish notation.
 
 
@@ -54,6 +54,12 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
+- Update to 1.2.5 (also fixes #162018).
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Sun Nov 28 2004 Phillip Compton  - 1.2.4-2
 - Spec cleanup, bump release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Nov 2004 00:42:15 -0000	1.3
+++ sources	25 Jul 2005 18:54:36 -0000	1.4
@@ -1 +1 @@
-a011a3d7063fab63ca371afa3bbde3df  galculator-1.2.4.tar.bz2
+0f58963a7fd99c7aa7cb9900d4645f59  galculator-1.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:54:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:54:39 -0400
Subject: rpms/galculator/FC-4 .cvsignore, 1.3, 1.4 galculator.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200507251855.j6PIt9r6024379@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore galculator.spec sources 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
- Update to 1.2.5 (also fixes #162018).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2004 00:42:15 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:54:37 -0000	1.4
@@ -1 +1 @@
-galculator-1.2.4.tar.bz2
+galculator-1.2.5.tar.bz2


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/galculator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galculator.spec	6 Apr 2005 22:11:37 -0000	1.5
+++ galculator.spec	25 Jul 2005 18:54:37 -0000	1.6
@@ -1,13 +1,12 @@
 Name:           galculator
-Version:        1.2.4
-Release:        3
-
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-1.2.4.tar.bz2
+Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
+- Update to 1.2.5 (also fixes #162018).
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Nov 2004 00:42:15 -0000	1.3
+++ sources	25 Jul 2005 18:54:37 -0000	1.4
@@ -1 +1 @@
-a011a3d7063fab63ca371afa3bbde3df  galculator-1.2.4.tar.bz2
+0f58963a7fd99c7aa7cb9900d4645f59  galculator-1.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:56:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:56:20 -0400
Subject: common tobuild,1.2063,1.2064
Message-ID: <200507251856.j6PIuKaK024499@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24482

Modified Files:
	tobuild 
Log Message:
request build of rpms/galculator/devel galculator-1_2_5-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2063
retrieving revision 1.2064
diff -u -r1.2063 -r1.2064
--- tobuild	25 Jul 2005 18:23:07 -0000	1.2063
+++ tobuild	25 Jul 2005 18:56:18 -0000	1.2064
@@ -133,3 +133,4 @@
 jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4
 orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel
 thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4
+mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 18:56:46 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:56:46 -0400
Subject: common tobuild,1.2064,1.2065
Message-ID: <200507251856.j6PIukMj024532@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24515

Modified Files:
	tobuild 
Log Message:
request build of rpms/galculator/FC-4 galculator-1_2_5-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2064
retrieving revision 1.2065
diff -u -r1.2064 -r1.2065
--- tobuild	25 Jul 2005 18:56:18 -0000	1.2064
+++ tobuild	25 Jul 2005 18:56:44 -0000	1.2065
@@ -134,3 +134,4 @@
 orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel
 thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4
 mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel
+mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 18:57:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:57:11 -0400
Subject: common tobuild,1.2065,1.2066
Message-ID: <200507251857.j6PIvBLI024565@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24548

Modified Files:
	tobuild 
Log Message:
request build of rpms/galculator/FC-3 galculator-1_2_5-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2065
retrieving revision 1.2066
diff -u -r1.2065 -r1.2066
--- tobuild	25 Jul 2005 18:56:44 -0000	1.2065
+++ tobuild	25 Jul 2005 18:57:09 -0000	1.2066
@@ -135,3 +135,4 @@
 thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4
 mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel
 mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4
+mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 19:07:06 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:07:06 -0400
Subject: web/html/docs/beta/yum-software-management - New directory
Message-ID: <200507251907.j6PJ76eo025703@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25689/yum-software-management

Log Message:
Directory /cvs/fedora/web/html/docs/beta/yum-software-management added to the repository




From fedora-extras-commits at redhat.com  Mon Jul 25 19:11:13 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:11:13 -0400
Subject: web/html/docs/beta/yum-software-management/stylesheet-images - New
	directory
Message-ID: <200507251911.j6PJBDVR025755@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/beta/yum-software-management/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Mon Jul 25 19:12:48 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:12:48 -0400
Subject: web/html/docs/beta/yum-software-management generated-index.php, NONE,
	1.1 index.php, NONE, 1.1 ln-legalnotice.php, NONE,
	1.1 sn-managing-packages.php, NONE,
	1.1 sn-searching-packages.php, NONE,
	1.1 sn-software-management-concepts.php, NONE,
	1.1 sn-software-management-tools.php, NONE,
	1.1 sn-updating-your-system.php, NONE,
	1.1 sn-using-repositories.php, NONE,
	1.1 sn-yum-installing-frompackage.php, NONE,
	1.1 sn-yum-maintenance.php, NONE, 1.1 sn-yum-proxy-server.php,
	NONE, 1.1
Message-ID: <200507251912.j6PJCmPh025834@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25780

Added Files:
	generated-index.php index.php ln-legalnotice.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:
Beta version for review.


***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-managing-packages.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-searching-packages.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-software-management-concepts.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-software-management-tools.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-updating-your-system.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-using-repositories.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-installing-frompackage.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-maintenance.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-proxy-server.php'



From fedora-extras-commits at redhat.com  Mon Jul 25 19:12:48 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:12:48 -0400
Subject: web/html/docs/beta/yum-software-management/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: <200507251912.j6PJCm62025839@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25780/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:
Beta version for review.



From fedora-extras-commits at redhat.com  Mon Jul 25 19:24:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:24:26 -0400
Subject: extras-buildsys/server ArchJob.py,1.7,1.8
Message-ID: <200507251924.j6PJOQlY025922@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25905/server

Modified Files:
	ArchJob.py 
Log Message:
Fix comment wording


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ArchJob.py	22 Jul 2005 21:35:27 -0000	1.7
+++ ArchJob.py	25 Jul 2005 19:24:24 -0000	1.8
@@ -138,7 +138,7 @@
         if self.status == 'done':
             return
         elif self.status == 'running':
-            # Clients pause before they enter the 'prep' state (which accesses
+            # Builders pause before they enter the 'prep' state (which accesses
             # the repo for this target), and wait for the server to allow them
             # to proceed when the repo is unlocked.
             if self.builder_status == 'downloaded':



From fedora-extras-commits at redhat.com  Mon Jul 25 19:26:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:26:56 -0400
Subject: extras-buildsys/server BuildMaster.py,1.19,1.20
Message-ID: <200507251926.j6PJQuRS025953@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25936/server

Modified Files:
	BuildMaster.py 
Log Message:
Tighten up the SQL a bit


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BuildMaster.py	22 Jul 2005 21:35:27 -0000	1.19
+++ BuildMaster.py	25 Jul 2005 19:26:54 -0000	1.20
@@ -136,7 +136,7 @@
 
     def _restart_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize")')
+        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize") ORDER BY uid')
         self.dbcx.commit()
         jobs = self.curs.fetchall()
 
@@ -260,7 +260,7 @@
         self.dbcx.commit()
 
     def _write_archjob_status_to_db(self, uid, attrdict):
-        self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % uid)
+        self.curs.execute('SELECT uid FROM archjobs WHERE jobid="%s"' % uid)
         self.dbcx.commit()
         if len(self.curs.fetchall()) == 0:
             try:



From fedora-extras-commits at redhat.com  Mon Jul 25 19:37:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 15:37:00 -0400
Subject: devel/meld meld-1.0.0-po_fr.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 meld.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200507251937.j6PJb0Gs026029@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/meld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26003

Modified Files:
	.cvsignore meld.spec sources 
Added Files:
	meld-1.0.0-po_fr.patch 
Log Message:
Updating to non-beta release while investigating #161223.

* Mon Jul 25 2005 Michael Schwendt  - 1.0.0-1
- Update to 1.0.0.
- Include fix for upstream bug #309408.



meld-1.0.0-po_fr.patch:

--- NEW FILE meld-1.0.0-po_fr.patch ---
--- meld-1.0.0.old/po/fr.po	2005-07-03 18:41:20.000000000 -0400
+++ meld-1.0.0/po/fr.po	2005-07-03 18:40:45.000000000 -0400
@@ -15,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../meld.desktop.in.h:1
 msgid "Compare and merge your files."


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/meld/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jun 2005 20:21:36 -0000	1.5
+++ .cvsignore	25 Jul 2005 19:36:58 -0000	1.6
@@ -1 +1 @@
-meld-0.9.6.tar.bz2
+meld-1.0.0.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/devel/meld/meld.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- meld.spec	8 Jun 2005 20:21:36 -0000	1.9
+++ meld.spec	25 Jul 2005 19:36:58 -0000	1.10
@@ -1,13 +1,14 @@
 Name:             meld
-Version:          0.9.6
+Version:          1.0.0
 Release:          1%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
-Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2
+Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
+Patch1:           meld-1.0.0-po_fr.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1 -b .po_fr
 
 
 %build
@@ -82,6 +84,10 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.0.0-1
+- Update to 1.0.0.
+- Include fix for upstream bug #309408.
+
 * Wed Jun  8 2005 Michael Schwendt  - 0.9.6-1
 - Remove unused meld shell script from src.rpm.
 - Add scriptlets for scrollkeeper-update.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/meld/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jun 2005 20:21:36 -0000	1.5
+++ sources	25 Jul 2005 19:36:58 -0000	1.6
@@ -1 +1 @@
-73419987b125c0cfbb1f04cfe454a8e5  meld-0.9.6.tar.bz2
+ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 19:37:33 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:37:33 -0400
Subject: extras-buildsys/server BuildMaster.py,1.20,1.21
Message-ID: <200507251937.j6PJbXZY026091@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26073/server

Modified Files:
	BuildMaster.py 
Log Message:
Fix SQL


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BuildMaster.py	25 Jul 2005 19:26:54 -0000	1.20
+++ BuildMaster.py	25 Jul 2005 19:37:31 -0000	1.21
@@ -260,7 +260,7 @@
         self.dbcx.commit()
 
     def _write_archjob_status_to_db(self, uid, attrdict):
-        self.curs.execute('SELECT uid FROM archjobs WHERE jobid="%s"' % uid)
+        self.curs.execute('SELECT parent_uid FROM archjobs WHERE jobid="%s"' % uid)
         self.dbcx.commit()
         if len(self.curs.fetchall()) == 0:
             try:



From fedora-extras-commits at redhat.com  Mon Jul 25 19:37:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 15:37:48 -0400
Subject: devel/common tobuild,1.2066,1.2067
Message-ID: <200507251937.j6PJbmEG026121@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26101

Modified Files:
	tobuild 
Log Message:
request build of devel/meld meld-1_0_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/devel/common/tobuild,v
retrieving revision 1.2066
retrieving revision 1.2067
diff -u -r1.2066 -r1.2067
--- tobuild	25 Jul 2005 18:57:09 -0000	1.2066
+++ tobuild	25 Jul 2005 19:37:45 -0000	1.2067
@@ -136,3 +136,4 @@
 mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel
 mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4
 mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3
+mschwendt	devel/meld	meld-1_0_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 19:47:17 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:47:17 -0400
Subject: extras-buildsys ChangeLog,1.72,1.73
Message-ID: <200507251947.j6PJllwU026191@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26150

Modified Files:
	ChangeLog 
Log Message:
2005-07-25  Dan Williams 

    * server/CONFIG.py
        - Move stuff around, two new options for admin_emails and success_emails

    * server/BuildMaster.py
      server/PackageJob.py
        - Set endtime when all builds complete or fail, to not include all
            the repo time in the job's build time

    * server/PackageJob.py
      server/UserInterface.py
      server/BuilderManager.py
      server/EmailUtils.py
        - Notify admins when a builder times out
        - Consolidate email sending into one place
        - Notify success_emails when a build job succeeds




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog	23 Jul 2005 00:55:25 -0000	1.72
+++ ChangeLog	25 Jul 2005 19:47:15 -0000	1.73
@@ -1,3 +1,21 @@
+2005-07-25  Dan Williams 
+
+    * server/CONFIG.py
+        - Move stuff around, two new options for admin_emails and success_emails
+
+    * server/BuildMaster.py
+      server/PackageJob.py
+        - Set endtime when all builds complete or fail, to not include all
+            the repo time in the job's build time
+
+    * server/PackageJob.py
+      server/UserInterface.py
+      server/BuilderManager.py
+      server/EmailUtils.py
+        - Notify admins when a builder times out
+        - Consolidate email sending into one place
+        - Notify success_emails when a build job succeeds
+
 2005-07-22  Dan Williams 
 
     * server/UserInterface.py



From fedora-extras-commits at redhat.com  Mon Jul 25 19:47:17 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:47:17 -0400
Subject: extras-buildsys/server EmailUtils.py, NONE, 1.1 BuildMaster.py, 1.21,
	1.22 BuilderManager.py, 1.7, 1.8 CONFIG.py, 1.20,
	1.21 Makefile, 1.5, 1.6 PackageJob.py, 1.13,
	1.14 UserInterface.py, 1.27, 1.28
Message-ID: <200507251947.j6PJlmHo026196@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26150/server

Modified Files:
	BuildMaster.py BuilderManager.py CONFIG.py Makefile 
	PackageJob.py UserInterface.py 
Added Files:
	EmailUtils.py 
Log Message:
2005-07-25  Dan Williams 

    * server/CONFIG.py
        - Move stuff around, two new options for admin_emails and success_emails

    * server/BuildMaster.py
      server/PackageJob.py
        - Set endtime when all builds complete or fail, to not include all
            the repo time in the job's build time

    * server/PackageJob.py
      server/UserInterface.py
      server/BuilderManager.py
      server/EmailUtils.py
        - Notify admins when a builder times out
        - Consolidate email sending into one place
        - Notify success_emails when a build job succeeds




--- NEW FILE EmailUtils.py ---
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Copyright 2005 Dan Williams  and Red Hat, Inc.


import smtplib
from email.MIMEText import MIMEText

# Load in the config
CONFIG_LOCATION = "/etc/plague/server/"
execfile(CONFIG_LOCATION + "CONFIG.py")


def email_result(to, resultstring, subject=None):
    msg = MIMEText(resultstring)
    msg['Subject'] = subject
    msg['From'] = config_opts['email_from']
    msg['To'] = to
    s = smtplib.SMTP()
    s.connect()
    s.sendmail(config_opts['email_from'], [to], msg.as_string())
    s.close()



Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- BuildMaster.py	25 Jul 2005 19:37:31 -0000	1.21
+++ BuildMaster.py	25 Jul 2005 19:47:15 -0000	1.22
@@ -223,7 +223,7 @@
 
             # Update job end time
             try:
-                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (time.time(), uid))
+                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid))
             except sqlite.OperationalError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
             self.dbcx.commit()


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BuilderManager.py	20 Jul 2005 20:50:07 -0000	1.7
+++ BuilderManager.py	25 Jul 2005 19:47:15 -0000	1.8
@@ -22,6 +22,7 @@
 import os
 import threading
 import Builder
+import EmailUtils
 
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")
@@ -147,6 +148,14 @@
         for builder in self.running_builders:
             if not builder.alive():
                 print "Removing builder '%s' because it timed out." % builder.address()
+
+                # Notify admins
+                subject = "Builder Timeout: %s" % builder.address()
+                msg = "The builder '%s' timed out and was removed from the active builder list." % builder.address()
+                for addr in config_opts['admin_emails']:
+                    EmailUtils.email_result(addr, msg, subject)
+
+                # Forget about the builder
                 builder.stop()
                 self.running_builders.remove(builder)
 


Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CONFIG.py	22 Jul 2005 02:54:07 -0000	1.20
+++ CONFIG.py	25 Jul 2005 19:47:15 -0000	1.21
@@ -1,24 +1,52 @@
 # Configuration file for build system server
 
 config_opts = {}
-config_opts['email_from'] = "buildsys at fedoraproject.org"
 config_opts['pkg_cvs_root'] = ":pserver:anonymous at cvs.fedora.redhat.com:/cvs/dist"
 config_opts['pkg_cvs_rsh'] = ""
 config_opts['cvs_cmd'] = "/usr/bin/cvs"
 config_opts['make_cmd'] = "/usr/bin/make"
-config_opts['tmpdir'] = "/tmp"
 config_opts['log_url'] = "http://foo.foo.org/logs/"
 config_opts['guest_allowed'] = True
 
+
+#
+# Directories
+#
+
+# server_work_dir: where logs and finished RPMs are stored
+config_opts['server_work_dir'] = "/rpmbuild"
+
+# repo_dir: repository dir of built RPMs
+config_opts['repo_dir'] = "/repodir"
+
+# tmpdir: where to store temporary stuff, like CVS checkout directories
+config_opts['tmpdir'] = "/tmp"
+
+
+#
+# Email options
+#
+
+# email_from: the address emails from the build server should appear to come from
+config_opts['email_from'] = "buildsys at fedoraproject.org"
+
+# admin_emails: who to email when things go wrong
+config_opts['admin_emails'] = []
+
+# success_email: addresses to send notification of build successes to
+config_opts['success_emails'] = []
+
+
+#
 # SSL options
 #
+
 # ssl_frontend: True = package submitters need SSL to connect to the server
 config_opts['ssl_frontend'] = True
 # ssl_buildclients: True = all communication between server & build client
 # be over an SSL connecction
 config_opts['ssl_builders'] = True
 
-
 SERVER_BASE_DIR = "/etc/plague/server"
 
 # SSL Cert and key bits
@@ -32,14 +60,6 @@
 config_opts['ui_ca_cert'] = SERVER_BASE_DIR + "/certs/fedora-upload-ca.pem"
 
 
-# server_work_dir
-#   - Where logs and finished RPMs are stored
-config_opts['server_work_dir'] = "/rpmbuild"
-
-# repo_dir
-#   - Repository dir of up-to-date RPMs
-config_opts['repo_dir'] = "/repodir"
-
 
 # This option disables pulling from CVS.  Allowing jobs to be submitted
 # as unknown SRPMs from random people may be a security risk, so don't
@@ -55,6 +75,10 @@
 # Further architectures on a per-package basis are configured in each target's
 # package file.  See the config option 'addl_package_arches_dir'.
 #
+# Mapping - our_target: [list of base arches]
+#
+# ex: { 'development' : ['i386', 'x86_64'], '5' : ['i386'] }
+#
 config_opts['targets'] = {  'development' :	['i386'] }
 
 
@@ -86,9 +110,13 @@
 
 # Target Optional Arches
 #
-# These are arches that submitters _may_ build packages on, but packages won't
+# These are arches that packages may build on, but won't
 # be built on these arches by default.
 #
+# Mapping - our_target: [list of optional arches]
+#
+# ex: { 'development' : ['i486', 'i586', 'i686', 'ppc32'] }
+#
 config_opts['target_optional_arches'] = { }
 
 
@@ -113,7 +141,7 @@
 config_opts['addl_package_arches_dir'] = SERVER_BASE_DIR + "/addl_pkg_arches"
 
 
-# Builder Clients
+# Builders
 config_opts['builders'] = [ 'https://127.0.0.1:8888' ]
 
 


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	5 Jul 2005 21:08:03 -0000	1.5
+++ Makefile	25 Jul 2005 19:47:15 -0000	1.6
@@ -10,11 +10,12 @@
 	rm -f *.pyc *.pyo *~ *.bak
 
 FILES = \
-    ArchJob.py \
-    BuilderManager.py \
-    Builder.py \
+	ArchJob.py \
+	BuilderManager.py \
+	Builder.py \
 	BuildMaster.py \
-    PackageJob.py \
+	EmailUtils.py \
+	PackageJob.py \
 	Repo.py \
 	UserInterface.py \
 	User.py


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PackageJob.py	22 Jul 2005 21:35:27 -0000	1.13
+++ PackageJob.py	25 Jul 2005 19:47:15 -0000	1.14
@@ -21,15 +21,12 @@
 import commands
 import threading
 import time
-import popen2
 import rpmUtils
 import exceptions
 import shutil
-import tempfile
-import smtplib
 import copy
-from email.MIMEText import MIMEText
 import string
+import EmailUtils
 import SimpleXMLRPCServer
 import xmlrpclib
 import socket
@@ -124,6 +121,7 @@
         self.hostname = hostname
         self.username = username
         self.starttime = time.time()
+        self.endtime = 0
         self.target = repo.target()
         self.repo = repo
         self.no_cvs = config_opts['use_srpm_not_cvs']
@@ -196,15 +194,14 @@
 
         # Remove arches we don't support from addl_arches
         for arch in addl_arches:
-            # arch_utils is only used to determine which arches to build on by default,
+            # ArchUtils.sub_arches is only used to determine which arches to build on by default,
             # so that if we have an Additional Package Arches file that specifies
             # 'sparcv9' for a package that we don't try to build sparcv9 for that
             # package unless 'sparc' is also listed in our 'targets' config option.
             if ArchUtils.sub_arches.has_key(arch):
                 master_addl_arch = ArchUtils.sub_arches[arch]
                 if master_addl_arch not in buildable_arches:
-                    if master_addl_arch not in opt_arches:
-                        addl_arches.remove(arch)
+                    addl_arches.remove(arch)
 
         ba = hdr['buildarchs']
         exclusive = hdr['exclusivearch'] 
@@ -433,7 +430,7 @@
         resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username)
 
         self._set_cur_stage('killed', resultstring)
-        self.email_result(resultstring)
+        self.email_result(self.username, resultstring)
 
         self._archjobs_lock.acquire()
         for job in self.archjobs.values():
@@ -442,6 +439,7 @@
         self.archjobs = {}
         self._archjobs_lock.release()
 
+        self.endtime = time.time()
         self.bm.notify_job_done(self)
 
     def wake(self):
@@ -471,7 +469,7 @@
             if not self.no_cvs:
                 shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
             subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
-            self.email_result(resultstring=e.args, subject=subj)
+            self.email_result(self.username, resultstring=e.args, subject=subj)
             self._failed(e.args)
         except BuildError, e:
             subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
@@ -479,7 +477,7 @@
             msg = "%s\n\n         Build logs may be found at %s\n\n" % (e.msg, log_url)
             logtail = self._get_log_tail(e.arch)
             msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail)
-            self.email_result(resultstring=msg, subject=subj)
+            self.email_result(self.username, resultstring=msg, subject=subj)
             # Kill remaining jobs on other arches
             self._archjobs_lock.acquire()
             for job in self.archjobs.values():
@@ -523,6 +521,7 @@
 
     def _failed(self, msg=None):
         self._set_cur_stage('failed', msg)
+        self.endtime = time.time()
         self.bm.notify_job_done(self)
         
     def _add_to_repo(self):
@@ -552,6 +551,8 @@
         if len(self.repofiles):
             self.repo.request_copy(self)
 
+        self.endtime = time.time()
+
     def repo_add_callback(self):
         self._set_cur_stage('repodone')
         self.wake()
@@ -562,7 +563,11 @@
 
         log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release)
         resultstring = resultstring + "\n     Build logs may be found at %s\n" % (log_url)
-        self.email_result(resultstring)
+        self.email_result(self.username, resultstring)
+
+        # Notify everyone else who might want to know that the build succeeded
+        for addr in config_opts['success_emails']:
+            self.email_result(addr, resultstring)
 
         self.bm.notify_job_done(self)
 
@@ -610,20 +615,13 @@
         f.close()
         return "".join(lines)
 
-    def email_result(self, resultstring, subject=None):
-        """send 'resultstring' to self.email from self.email_from"""
-        
-        msg = MIMEText(resultstring)
+    def email_result(self, to, resultstring, subject=None):
+        """send 'resultstring' to self.username"""
+
         if not subject:
             name = self.name
             if not name:
                 name = self.package
             subject = 'Build Result: %d - %s on %s' % (self.uid, name, self.target)
-        msg['Subject'] = subject
-        msg['From'] = config_opts['email_from']
-        msg['To'] = self.username
-        s = smtplib.SMTP()
-        s.connect()
-        s.sendmail(config_opts['email_from'], [self.username], msg.as_string())
-        s.close()
+        EmailUtils.email_result(to, resultstring, subject)
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- UserInterface.py	23 Jul 2005 00:55:26 -0000	1.27
+++ UserInterface.py	25 Jul 2005 19:47:15 -0000	1.28
@@ -16,8 +16,7 @@
 
 
 import sqlite
-import smtplib
-from email.MIMEText import MIMEText
+import EmailUtils
 import time
 import sys
 import os
@@ -32,21 +31,6 @@
 execfile(CONFIG_LOCATION + "CONFIG.py")
 
 
-def email_result(email, cvs_tag, resultstring, subject=None):
-    """send 'resultstring' to email"""
-    
-    msg = MIMEText(resultstring)
-    if not subject:
-        subject = 'Build Result: %s' % cvs_tag
-    msg['Subject'] = subject
-    msg['From'] = config_opts['email_from']
-    msg['To'] = email
-    s = smtplib.SMTP()
-    s.connect()
-    s.sendmail(config_opts['email_from'], [email], msg.as_string())
-    s.close()
-
-
 def get_dbcx():
     dbcx = None
     dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3)
@@ -102,6 +86,12 @@
     raise InvalidTargetError()
 
 
+def email_result(email, source, resultstring):
+    """send 'resultstring' to email"""
+    
+    subject = 'Enqueue Result: %s' % source
+    EmailUtils.email_result(email, resultstring, subject)
+
 
 class UserInterface:
     """



From fedora-extras-commits at redhat.com  Mon Jul 25 19:59:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 25 Jul 2005 15:59:19 -0400
Subject: owners owners.list,1.29,1.30
Message-ID: <200507251959.j6PJxJTS026507@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Fix my email address.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- owners.list	25 Jul 2005 18:32:03 -0000	1.29
+++ owners.list	25 Jul 2005 19:59:17 -0000	1.30
@@ -489,7 +489,7 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at kspei.com|extras-qa at fedoraproject.org|
+Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 20:16:35 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 16:16:35 -0400
Subject: owners owners.list,1.30,1.31
Message-ID: <200507252016.j6PKGZAd027710@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	owners.list 
Log Message:
Add hdf



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- owners.list	25 Jul 2005 19:59:17 -0000	1.30
+++ owners.list	25 Jul 2005 20:16:32 -0000	1.31
@@ -273,6 +273,7 @@
 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|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|
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 21:10:02 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Mon, 25 Jul 2005 17:10:02 -0400
Subject: rpms/gcfilms/FC-4 sources,1.5,1.6
Message-ID: <200507252110.j6PLA27H028971@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	sources 
Log Message:
Fixed upstream



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2005 13:15:58 -0000	1.5
+++ sources	25 Jul 2005 21:10:00 -0000	1.6
@@ -1 +1 @@
-91a9c544d1c904928ea0744755078fa8  gcfilms-5.3.tar.gz
+58743009cb2d5a821f33205efa8d4346  gcfilms-5.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 21:10:57 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Mon, 25 Jul 2005 17:10:57 -0400
Subject: common tobuild,1.2067,1.2068
Message-ID: <200507252110.j6PLAvRY029007@cvs-int.fedora.redhat.com>

Author: Tian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28990

Modified Files:
	tobuild 
Log Message:
request build of rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2067
retrieving revision 1.2068
diff -u -r1.2067 -r1.2068
--- tobuild	25 Jul 2005 19:37:45 -0000	1.2067
+++ tobuild	25 Jul 2005 21:10:54 -0000	1.2068
@@ -137,3 +137,4 @@
 mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4
 mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3
 mschwendt	devel/meld	meld-1_0_0-1_fc5	devel
+Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 21:44:53 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 17:44:53 -0400
Subject: extras-buildsys ChangeLog,1.73,1.74
Message-ID: <200507252144.j6PLircI029176@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29134

Modified Files:
	ChangeLog 
Log Message:
2005-07-25  Dan Williams 

    * client/client.py
      server/UserInterface.py
      server/BuildMaster.py
        - Add a "requeue" command to restart a failed or killed job




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	25 Jul 2005 19:47:15 -0000	1.73
+++ ChangeLog	25 Jul 2005 21:44:51 -0000	1.74
@@ -1,5 +1,12 @@
 2005-07-25  Dan Williams 
 
+    * client/client.py
+      server/UserInterface.py
+      server/BuildMaster.py
+        - Add a "requeue" command to restart a failed or killed job
+
+2005-07-25  Dan Williams 
+
     * server/CONFIG.py
         - Move stuff around, two new options for admin_emails and success_emails
 



From fedora-extras-commits at redhat.com  Mon Jul 25 21:44:54 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 17:44:54 -0400
Subject: extras-buildsys/server BuildMaster.py, 1.22, 1.23 UserInterface.py,
	1.28, 1.29
Message-ID: <200507252144.j6PLis4Y029189@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29134/server

Modified Files:
	BuildMaster.py UserInterface.py 
Log Message:
2005-07-25  Dan Williams 

    * client/client.py
      server/UserInterface.py
      server/BuildMaster.py
        - Add a "requeue" command to restart a failed or killed job




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BuildMaster.py	25 Jul 2005 19:47:15 -0000	1.22
+++ BuildMaster.py	25 Jul 2005 21:44:52 -0000	1.23
@@ -111,6 +111,9 @@
         self._done_queue_lock = threading.Lock()
         self._new_queue = []
         self._new_queue_lock = threading.Lock()
+        self._restart_queue = []
+        self._restart_queue_lock = threading.Lock()
+
         self._status_updates = {}
         self._status_updates_lock = threading.Lock()
         self._archjob_status_updates = {}
@@ -127,16 +130,45 @@
         self.curs = self.dbcx.cursor()
         ensure_job_db_tables(self.dbcx)
 
-        self._restart_interrupted_jobs()
+        self._requeue_interrupted_jobs()
 
         threading.Thread.__init__(self)
 
     def __del__(self):
         self.dbcx.close()
 
-    def _restart_interrupted_jobs(self):
+    def _requeue_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize") ORDER BY uid')
+        self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize") ORDER BY uid')
+        self.dbcx.commit()
+        uids = self.curs.fetchall()
+
+        if len(uids) == 0:
+            return
+
+        for item in uids:
+            self.requeue_job(item[0])
+
+    def requeue_job(self, uid):
+        self._restart_queue_lock.acquire()
+        self._restart_queue.append(int(uid))
+        self._restart_queue_lock.release()
+
+    def _start_requeued_jobs(self):
+        uids = ''
+        self._restart_queue_lock.acquire()
+        for uid in self._restart_queue:
+            if len(uids) == 0:
+                uids = uids + "uid=%d" % uid
+            else:
+                uids = uids + " OR uid=%d" % uid
+        self._restart_queue = []
+        self._restart_queue_lock.release()
+
+        if len(uids) == 0:
+            return
+
+        self.curs.execute('SELECT * FROM jobs WHERE %s ORDER BY uid' % uids)
         self.dbcx.commit()
         jobs = self.curs.fetchall()
 
@@ -310,13 +342,13 @@
                     ' cvs_tag, target, buildreq, starttime, endtime, status)' \
                     ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s")' \
                     % (item['email'], item['package'], locator, item['target'], \
-                    item['buildreq'], item['time'], 'waiting'))
+                    item['buildreq'], item['time'], 'initialize'))
             self.dbcx.commit()
 
             # Find the UID
             self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \
                     ' package="%s" AND cvs_tag="%s" AND target="%s" AND' \
-                    ' buildreq="%s" AND starttime=%d AND status="waiting"' \
+                    ' buildreq="%s" AND starttime=%d AND status="initialize"' \
                     % (item['email'], item['package'], locator, item['target'], \
                     item['buildreq'], item['time']))
             self.dbcx.commit()
@@ -349,6 +381,13 @@
         if have_work:
             return True
 
+        self._restart_queue_lock.acquire()
+        if len(self._restart_queue) > 0:
+            have_work = True
+        self._restart_queue_lock.release()
+        if have_work:
+            return True
+
         self._status_updates_lock.acquire()
         if len(self._status_updates) > 0:
             have_work = True
@@ -390,6 +429,7 @@
 
             # Start any new jobs
             self._start_new_jobs()
+            self._start_requeued_jobs()
 
             last_time = time.time()
             while not self._have_work() and time.time() <= last_time + 5:


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- UserInterface.py	25 Jul 2005 19:47:15 -0000	1.28
+++ UserInterface.py	25 Jul 2005 21:44:52 -0000	1.29
@@ -153,6 +153,35 @@
             self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time())
             return (0, "Success: package has been queued.")
 
+    def requeue(self, email, uid):
+        uid = validate_uid(uid)
+        if not uid:
+            return (-1, "Error: Invalid job UID.")
+
+        sql = 'SELECT uid, username, status 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.")
+        curs.execute(sql)
+        job = curs.fetchone()
+        if not job:
+            return (-1, "Error: Invalid job UID.")
+
+        # Ensure matching usernames
+        if job[1] != email:
+            return (-1, "Error: You are not the original submitter for Job %d." % uid)
+
+        # Ensure the job failed or was killed
+        if job[2] != 'failed' and job[2] != 'killed':
+            return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid)
+
+        self._bm.requeue_job(uid)
+        return (0, "Success: Job %d has been requeued." % uid)
+        
+
     def _kill_job(self, email, job, jobid):
         if not job:
             return (-1, "Job %s does not exist." % jobid)
@@ -373,6 +402,11 @@
             return (-1, "Insufficient privileges.")
         return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq)
 
+    def requeue(self, uid):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.own_jobs:
+            return (-1, "Insufficient privileges.")
+        return UserInterface.requeue(self, user.email, uid)
 
     def kill_job(self, email, jobid):
         user = AuthedXMLRPCServer.get_authinfo()



From fedora-extras-commits at redhat.com  Mon Jul 25 21:44:54 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 17:44:54 -0400
Subject: extras-buildsys/client client.py,1.15,1.16
Message-ID: <200507252144.j6PLisqd029182@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29134/client

Modified Files:
	client.py 
Log Message:
2005-07-25  Dan Williams 

    * client/client.py
      server/UserInterface.py
      server/BuildMaster.py
        - Add a "requeue" command to restart a failed or killed job




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- client.py	22 Jul 2005 21:35:27 -0000	1.15
+++ client.py	25 Jul 2005 21:44:52 -0000	1.16
@@ -89,6 +89,20 @@
         print "Package %s enqueued." % package
 
 
+def requeue_job(server, email, uid):
+    try:
+        use_ssl = config.get('Server', 'use_ssl')
+        if use_ssl.lower() == 'true':
+            (err, msg) = server.requeue(uid)
+        else:
+            (err, msg) = server.requeue(email, uid)
+    except socket.error, e:
+        print "Error connecting to build server: '%s'" % e
+        return
+
+    print msg
+
+
 def validate_arg(arg):
     if arg == 'email' or arg == 'status' or arg == 'uid' or arg == 'uid_gt' or arg == 'uid_lt':
         return True
@@ -305,6 +319,9 @@
                 enqueue(server, email, sys.argv[2:])
         except CommandException, e:
             print e.message
+    elif cmd == 'requeue':
+        jobid = sys.argv[2]
+        requeue_job(server, email, jobid)
     elif cmd == 'list':
         list_jobs(server, sys.argv[2:])
     elif cmd == 'detail':



From fedora-extras-commits at redhat.com  Mon Jul 25 22:22:34 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 18:22:34 -0400
Subject: devel/lcms lcms.spec,1.8,1.9
Message-ID: <200507252222.j6PMMYJ8030430@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/lcms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413

Modified Files:
	lcms.spec 
Log Message:
* Tue Jul 26 2005 Michael Schwendt  - 1.14-4
- Change licence to MIT, since that is was recent README.1ST says.



Index: lcms.spec
===================================================================
RCS file: /cvs/extras/devel/lcms/lcms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lcms.spec	22 May 2005 17:22:38 -0000	1.8
+++ lcms.spec	25 Jul 2005 22:22:32 -0000	1.9
@@ -2,11 +2,11 @@
 
 Name:           lcms
 Version:        1.14
-Release:        3
+Release:        4
 Summary:        Color Management System
 
 Group:          Applications/Productivity
-License:        LGPL
+License:        MIT
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-1.14.tar.gz
 Patch0:         lcms-1.14-fc4-swigtype.patch
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Jul 26 2005 Michael Schwendt  - 1.14-4
+- Change licence to MIT, since that is was recent README.1ST says.
+
 * Sun May 22 2005 Michael Schwendt  - 1.14-3
 - Fix FC4 build (#114146).
 



From Christian.Iseli at licr.org  Mon Jul 25 22:51:03 2005
From: Christian.Iseli at licr.org (Christian.Iseli at licr.org)
Date: Tue, 26 Jul 2005 00:51:03 +0200
Subject: APPROVED: scmxx
Message-ID: <200507252251.j6PMp3T2020328@mx3.redhat.com>

Name: scmxx
Summary: Exchange data with Siemens mobile phones
Description:
SCMxx is a console program that allows you to exchange certain types of
data with mobile phones made by Siemens. Some of the data types that can be
exchanged are logos, ring tones, vCalendars, phonebook entries, and short
messages. Other actions like setting the time and dialling a number are also
possible.

Reviewer: Christian Iseli
Maintainer: Andreas Thienemann




From fedora-extras-commits at redhat.com  Tue Jul 26 00:31:20 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 25 Jul 2005 20:31:20 -0400
Subject: owners owners.list,1.31,1.32
Message-ID: <200507260031.j6Q0VKXr000572@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	owners.list 
Log Message:
Taking over from Panu for libxml++



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- owners.list	25 Jul 2005 20:16:32 -0000	1.31
+++ owners.list	26 Jul 2005 00:31:17 -0000	1.32
@@ -400,7 +400,7 @@
 Fedora Extras|libxfce4mcs|Multi-channel settings management support for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfce4util|Utility library for the Xfce4 desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfcegui4|GTK widgets for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Tue Jul 26 00:46:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 20:46:47 -0400
Subject: rpms/leafnode/FC-4 leafnode.spec,1.10,1.11
Message-ID: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	leafnode.spec 
Log Message:
Fix non-UTF-8 in German description (#159587) and modify it a little bit.


Index: leafnode.spec
===================================================================
RCS file: /cvs/extras/rpms/leafnode/FC-4/leafnode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- leafnode.spec	13 Jul 2005 22:35:23 -0000	1.10
+++ leafnode.spec	26 Jul 2005 00:46:45 -0000	1.11
@@ -23,10 +23,10 @@
 newsserver of the ISP.
 
 %description -l de
-Leafnode ist ein offline-Newsserver, der vor allem fr den typischen
-Einzelnutzer-Rechner ohne permanente Internetanbindung geeignet ist.
-Leafnode bezieht automatisch die Newsgroups, die der oder die Nutzer
-regelm???ig lesen, vom Newsserver des Providers.
+Leafnode ist ein offline NNTP Server, der vor allem f??r den typischen
+Einzelnutzerrechner ohne permanente Internetanbindung geeignet ist.
+Leafnode bezieht automatisch die Newsgroups, die vom Nutzer regelm??ssig
+gelesen werden, vom Newsserver des Internet Providers.
 
 %prep
 
@@ -107,7 +107,6 @@
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 
-
 * Thu May 06 2004 Andreas Pfaffeneder  0:1.9.53-0.fdr1
 - Bugfix release
 



From fedora-extras-commits at redhat.com  Tue Jul 26 01:09:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 21:09:20 -0400
Subject: devel/inkscape inkscape-0.41-dgettext.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 inkscape.spec, 1.12, 1.13 sources, 1.5,
	1.6 inkscape-0.41-64bit.patch, 1.2, NONE inkscape-gcc4.patch,
	1.1, NONE
Message-ID: <200507260109.j6Q19Kgb001831@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/inkscape
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1807

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	inkscape-0.41-dgettext.patch 
Removed Files:
	inkscape-0.41-64bit.patch inkscape-gcc4.patch 
Log Message:
* Tue Jul 26 2005 Michael Schwendt  - 0.42-1
- update to 0.42 (also fixes #160326)
- BR gnome-vfs2-devel
- no files left in %_libdir/inkscape
- include French manual page
- GCC4 patch obsolete, 64-bit patch obsolete, dgettext split off


inkscape-0.41-dgettext.patch:

--- NEW FILE inkscape-0.41-dgettext.patch ---
diff -Nur inkscape-0.41-orig/configure inkscape-0.41/configure
--- inkscape-0.41-orig/configure	2005-02-09 04:55:31.000000000 +0100
+++ inkscape-0.41/configure	2005-05-31 14:50:00.000000000 +0200
@@ -20218,7 +20218,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return (int) (long)dgettext ("","")
   ;
   return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/inkscape/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2005 04:46:16 -0000	1.5
+++ .cvsignore	26 Jul 2005 01:09:18 -0000	1.6
@@ -1 +1,2 @@
-inkscape-0.41.tar.bz2
+inkscape-0.42.tar.bz2
+inkscape-0.42.tar.bz2.sig


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/devel/inkscape/inkscape.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- inkscape.spec	31 May 2005 12:56:25 -0000	1.12
+++ inkscape.spec	26 Jul 2005 01:09:18 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           inkscape
-Version:        0.41
-Release:        7
-Summary:        A vector-based drawing program using SVG.
+Version:        0.42
+Release:        1%{?dist}
+Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
-Source0:        http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2
-Patch0: inkscape-gcc4.patch
-Patch1: inkscape-0.41-64bit.patch
+Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
+Patch0:         inkscape-0.41-dgettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -19,6 +18,7 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
+BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libxml2-devel >= 2.4.24
@@ -50,8 +50,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .64bit
+%patch0 -p1 -b .dgettext
 
 
 %build
@@ -96,13 +95,20 @@
 %doc AUTHORS COPYING ChangeLog NEWS README HACKING
 %doc %{_mandir}/man1/*
 %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-%{_libdir}/inkscape/
+%{_mandir}/fr/man1/*
 
 
 %changelog
+* Tue Jul 26 2005 Michael Schwendt  - 0.42-1
+- update to 0.42 (also fixes #160326)
+- BR gnome-vfs2-devel
+- no files left in %%_libdir/inkscape
+- include French manual page
+- GCC4 patch obsolete, 64-bit patch obsolete, dgettext split off
+
 * Tue May 31 2005 Michael Schwendt  - 0.41-7
 - append another 64-bit related patch (dgettext configure check failed)
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/inkscape/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2005 04:46:16 -0000	1.5
+++ sources	26 Jul 2005 01:09:18 -0000	1.6
@@ -1 +1,2 @@
-9b4bbfaae688127dca4c3d816a42b21a  inkscape-0.41.tar.bz2
+4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
+e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig


--- inkscape-0.41-64bit.patch DELETED ---


--- inkscape-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jul 26 01:10:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 21:10:21 -0400
Subject: devel/common tobuild,1.2068,1.2069
Message-ID: <200507260110.j6Q1ALJl001917@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1900

Modified Files:
	tobuild 
Log Message:
request build of devel/inkscape inkscape-0_42-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/devel/common/tobuild,v
retrieving revision 1.2068
retrieving revision 1.2069
diff -u -r1.2068 -r1.2069
--- tobuild	25 Jul 2005 21:10:54 -0000	1.2068
+++ tobuild	26 Jul 2005 01:10:19 -0000	1.2069
@@ -138,3 +138,4 @@
 mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3
 mschwendt	devel/meld	meld-1_0_0-1_fc5	devel
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
+mschwendt	devel/inkscape	inkscape-0_42-1_fc5	devel



From fedora-extras-commits at redhat.com  Tue Jul 26 01:24:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 21:24:43 -0400
Subject: rpms/inkscape/devel inkscape.spec,1.13,1.14
Message-ID: <200507260124.j6Q1OhuH001950@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	inkscape.spec 
Log Message:
typo


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- inkscape.spec	26 Jul 2005 01:09:18 -0000	1.13
+++ inkscape.spec	26 Jul 2005 01:24:41 -0000	1.14
@@ -107,7 +107,7 @@
 - BR gnome-vfs2-devel
 - no files left in %%_libdir/inkscape
 - include French manual page
-- GCC4 patch obsolete, 64-bit patch obsolete, dgettext split off
+- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off
 
 * Tue May 31 2005 Michael Schwendt  - 0.41-7
 - append another 64-bit related patch (dgettext configure check failed)



From fedora-extras-commits at redhat.com  Tue Jul 26 01:42:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 21:42:05 -0400
Subject: web/html/docs/beta/yum-software-management generated-index.php, 1.1,
	1.2 index.php, 1.1, 1.2 ln-legalnotice.php, 1.1,
	1.2 sn-managing-packages.php, 1.1,
	1.2 sn-searching-packages.php, 1.1,
	1.2 sn-software-management-concepts.php, 1.1,
	1.2 sn-software-management-tools.php, 1.1,
	1.2 sn-updating-your-system.php, 1.1,
	1.2 sn-using-repositories.php, 1.1,
	1.2 sn-yum-installing-frompackage.php, 1.1,
	1.2 sn-yum-maintenance.php, 1.1, 1.2 sn-yum-proxy-server.php,
	1.1, 1.2
Message-ID: <200507260142.j6Q1g5PC002029@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999

Modified Files:
	generated-index.php index.php ln-legalnotice.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:
Updates to beta, style and usage mainly.




Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	25 Jul 2005 19:12:46 -0000	1.1
+++ index.php	26 Jul 2005 01:42:03 -0000	1.2
@@ -7,9 +7,9 @@
 
 ?>
 
-
    Software Management with yum -
-    BETA DOCUMENT
       Next
    Software Management with yum -
-    BETA DOCUMENT
    Stuart Ellis
    Copyright © 2005 Stuart Ellis
    Revision History
    Revision 0.42005-06-01StuartEllis
    
+
    Software Management with yum - BETA
+      DOCUMENT
       Next
    Software Management with yum - BETA
+      DOCUMENT
    Stuart Ellis
    Copyright © 2005 Stuart Ellis
    Revision History
    Revision 0.42005-06-01StuartEllis
    
           
    
             Initial import into CVS.
           
    
@@ -17,6 +17,10 @@
           
    
             Updated for Fedora Core 4.
           
    
+        
    Revision 0.62005-07-25PaulWFrields
    
+          
    
+            Edited for style and usage; BETA publication.
+          
    
         
    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 Repositor!
 ies
    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 f!
 or Pac
es 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
    1. I!
 ntrodu
on
    [Note]DRAFT
    
     This is a draft version of the document. It is subject to change at any time
     and may not have been tested for technical accuracy yet. If you find any
@@ -59,7 +63,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
@@ -68,11 +72,11 @@
       
     man yum
 man yum.conf
-
    
+

    Other useful yum resources on the Internet include:

    - Web home page + Project web site

    http://linux.duke.edu/projects/yum/

    Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/ln-legalnotice.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ln-legalnotice.php 25 Jul 2005 19:12:46 -0000 1.1 +++ ln-legalnotice.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

    - yum-software-management-0.5.0 (2005-07-19) + yum-software-management-0.6 (2005-07-25)

    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: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-managing-packages.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-managing-packages.php 25 Jul 2005 19:12:46 -0000 1.1 +++ sn-managing-packages.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -7,35 +7,25 @@ ?> -

    4. Managing Software with yum
    Prev   Next

    4. Managing Software with yum

    - The yum utility may modify the software on your - system in three ways: +

    4. Managing Software with yum
    Prev   Next

    4. Managing Software with yum

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

    • - It may install new software from repositories or a package - file. + To install new software from repositories or a package file

    • - It may update existing software on your system. + To update existing software on your system

    • - It may remove unwanted software from your system. + To remove unwanted software from your system

    To use yum, specify a function and one or more packages or package groups. Each section below gives some examples. -

    [Tip]Package Names

    - You may use any of the following formats to specify a package in - a yum operation: name, - name.architecture, - name-version, - name-version-release, - name-version-release.architecture, and - epoch:name-version-release.architecture. -

    - To use the repositories yum downloads data - files from each of the configured repositories. On a slow - connection, it may take several seconds to download the required - files for each package. +

    + yum downloads data files from each of the + configured repositories. On a slow connection, it may take several + seconds to download the required files for each package.

    During operation, yum first determines the best set of actions to produce the required result, and displays the @@ -44,8 +34,8 @@ additional packages in addition to the package that you specified. These actions may be necessary to resolve software dependencies.

    - This is an example of the transaction for installing - tsclient: + This is an example of the transaction for installing + tsclient: 

     =============================================================================
  Package                 Arch       Version          Repository        Size
@@ -63,24 +53,27 @@
 Total download size: 355 k
 Is this ok [y/N]:

    Example 1. Format of yum Transaction Reports

    - Review the list of changes, and then press y to - accept and begin the process. If you press N or - Enter, yum does not download - or change any packages. + Review the list of changes, and then press + y + to accept and begin the process. If you press + N + or + Enter + , yum does not download or change any packages.

    [Note]Package Versions

    The yum utility only displays and uses the - newest version of each package, unless you specify an older - version. + newest version of each package, unless you specify an older + version.

    [Tip]Downloads are Cached

    The yum utility keeps Downloaded data files - and packages for reuse. You may copy packages from the - repository cache directories under - /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

    + and packages for reuse. You may copy packages from the + repository cache directories under + /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

    To install the package tsclient, enter the - command: + command: 

     su -c 'yum install tsclient'

    @@ -98,10 +91,12 @@ prompted.

    [Important]New Services Require Activation

    When you install a service, Fedora does not activate or start - it. To configure a new service to run on bootup, choose - Desktop->System Settings->Server Settings->Services, or use the chkconfig - and service command-line utilities. -

    4.2. Updating Software with yum

    + it. To configure a new service to run on bootup, choose + Desktop->System + Settings->Server Settings->Services, or use the + chkconfig and service + command-line utilities. +

    4.2. Updating Software with yum

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

    @@ -112,8 +107,8 @@
         prompted.
       
    [Important]New Software Versions Require Reloading
    
           If a piece of software is in use when you update it, the old
-	  version remains active until the software is restarted. Kernel
-	  updates take effect when you reboot the system.
+          version remains active until the software is restarted. Kernel
+          updates take effect when you reboot the system.
         
    
         To update all of the packages in the package group
         MySQL Database, enter the command:
@@ -125,9 +120,9 @@
         prompted.
       
    [Note]Updating the Entire System
    
           To update all of the packages on your Fedora system, use the
-	  commands described in
+          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. Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-searching-packages.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-searching-packages.php 25 Jul 2005 19:12:46 -0000 1.1 +++ sn-searching-packages.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -7,24 +7,24 @@ ?> -

    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 installed and available packages.

    [Note]Searches are not Case-sensitive

    The search and list options of - yum are not case-sensitive. A query for - palmpilot automatically finds - PalmPilot packages. + yum are not case-sensitive. A query for + palmpilot automatically finds + PalmPilot packages.

    The format of the results depends upon the option. If the query produces no information, there are no packages matching the criteria.

    5.1. Searching by Package Name and Attributes

    To search for a specific package by name, use the - list function. To search for the package - tsclient, use the command: + list function. To search for the package + tsclient, use the command: 

     su -c 'yum list tsclient'

    @@ -33,8 +33,8 @@ prompted.

    To make your queries more specific, add other package - attributes. To search for version 0.132 of the application, use - the command: + attributes. To search for version 0.132 of the application, use + the command: 

     su -c 'yum list tsclient-0.132'

    5.2. Advanced Searches

    @@ -42,9 +42,9 @@ search or provides options.

    The search option checks the names, - descriptions, summaries and listed package maintainers of all of - the available packages to find those that match. For example, to - search for all packages that relate to PalmPilots, type: + descriptions, summaries and listed package maintainers of all of + the available packages to find those that match. For example, to + search for all packages that relate to PalmPilots, type: 

     su -c 'yum search PalmPilot'

    @@ -64,8 +64,8 @@ su -c 'yum provides libneon'

    To search for all packages that either provide a MTA (Mail - Transport Agent) service, or include files with - mta in their name: + Transport Agent) service, or include files with + mta in their name: 

     su -c 'yum provides MTA'

    @@ -73,22 +73,22 @@ root account.

    [Tip]Wildcards and Regular Expressions

    You may use the standard wildcard characters in search - criteria: ? to represent any one character, - and * to mean zero or more characters. Use - Perl or Python regular expressions to carry out more complex - queries. + criteria: ? to represent any one character, + and * to mean zero or more characters. Use + Perl or Python regular expressions to carry out more complex + queries.

    5.3. Understanding Matches

    Searches with yum show all of the packages - that match your criteria. Packages must meet the terms of the - search exactly to be considered matches, unless you use - wildcards or a regular expression. + that match your criteria. Packages must meet the terms of the + search exactly to be considered matches, unless you use + wildcards or a regular expression.

    For example, a search query for shadowutils - or shadow-util would not produce the - package shadow-utils. This package would - match and be shown if the query was either - shadow-util? or - Shadow*. + or shadow-util would not produce the + package shadow-utils. This package would + match and be shown if the query was either + shadow-util? or + Shadow*.

    Prev Up Next
    4. Managing Software with yum Home 6. Updating Your System with yum
    -
    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 - files, icons, documentation and management scripts. Management - applications use these files to safely locate, install, update - and remove software. For example, the Fedora installation process - uses the packages supplied with Fedora Core to build or upgrade a - system to your requirements. + files called RPM packages. Each package + is a compressed archive containing product information, program + files, icons, documentation and management scripts. Management + applications use these files to safely locate, install, update + and remove software. For example, the Fedora installation process + uses the packages supplied with Fedora Core to build or upgrade a + system to your requirements.

    Packages also include a digital signature to prove their source. - Software management utilities verify this digital signature by - using a GPG public key. The - yum and rpm utilities - 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

    + Software management utilities verify this digital signature by + using a GPG public key. The + yum and rpm utilities + 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

    A repository is a prepared directory or web site that contains software packages and index files. Software management utilities such as yum automatically locate and obtain the correct RPM packages from these repositories. This method frees you from having to - manually find and install new applications or updates. You may + manually find and install new applications or updates. You may use a single command to update all system software, or search for new software by specifying criteria. In each case the management utility connects to the configured repositories and checks their indexes to find the correct packages.

    The package management utilities in Fedora Core are already configured - to use the network of repositories maintained by the Fedora Project. These - repositories contain the software included with Fedora Core and a large - selection of additional software known as Fedora Extras. Third-party - software developers also provide repositories for their Fedora - compatible packages. + to use the network of repositories maintained by the Fedora Project. These + repositories contain the software included with Fedora Core and a large + selection of additional software known as Fedora Extras. Third-party + software developers also provide repositories for their Fedora + compatible packages.

    [Note]All Fedora Packages are Open Source Software

    All of the software provided by the Fedora Project is open source - software. You may download and install software from the Fedora Project - network of repositories on as many systems as desired. -

    + software. You may download and install software from the Fedora Project + network of repositories on as many systems as desired. +

    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 - groups, or provide their packages as additional groups. + provided by the Fedora repositories to manage related packages as + sets. Some third-party repositories add packages to these + groups, or provide their packages as additional groups.

    [Note]Available Package Groups

    To view a list of all of the available package groups for your - Fedora system, run the command yum - grouplist. + Fedora system, run the command su -c 'yum + grouplist'.

    Use repositories to ensure that you always receive current - versions of software. If several versions of the same package - are available, your management utility automatically selects the - latest version. + versions of software. If several versions of the same package + are available, your management utility automatically selects the + latest version.

    [Caution]Installing Software not from a Repository

    - Install software using manual methods only when you are - confident there is no repository which can currently provide - it. You may have to manage that software with manual methods, - instead of with Fedora software management utilities. -

    + Install software using manual methods only when you are + confident there is no repository which can currently provide + it. You may have to manage that software with manual methods, + instead of with Fedora software management utilities. +

    The yum commands shown in this document use - repositories as package sources. Refer to + repositories as package sources. Refer to Section 9, “Manually Installing Software” for details of - using yum to install software from a - package file. -

    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 - library, the package which contains that library is a - dependency. To properly install a - package, Fedora must first satisfy its dependencies. The - dependency information for a RPM package is stored within the - RPM file. + using yum to install software from a + package file. +

    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 + library, the package which contains that library is a + dependency. To properly install a + package, Fedora must first satisfy its dependencies. The + dependency information for a RPM package is stored within the + RPM file.

    The yum utility uses package dependency data - to ensure all its requirements are met during installation. The - yum utility automatically installs packages - for any required software not already present on your system. If - a new application has requirements that conflict with existing - software, yum aborts without making any - changes to your system. -

    2.4. Understanding Package Names

    + to ensure that all of requirements for an application are met + during installation. It automatically installs the packages for + any dependencies not already present on your system. If a new + application has requirements that conflict with existing + software, yum aborts without making any + changes to your system. +

    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: + pieces of information. This is the full name of the + tsclient package supplied with Fedora Core: 

     tsclient-0.132-4.i386.rpm

    - These naming conventions are valid for the file shown above: + Management utilities refer to packages with one of three + formats:

    • Package name: tsclient

    • Package name with version and release numbers: - tsclient-0.132-4 + tsclient-0.132-4

    • Package name with hardware architecture: - tsclient.i386 + tsclient.i386

    - Use only the name of the package with yum, - except when the exact version or type is necessary. When exactly is that required? I fixed the - sentence structure but the meaning is obscure here. Tell the - reader the full story here. [PWF] For example, use - name-version to specify the exact version - of the application. The package listings provided by - yum use the format - name.architecture to specify the type of - computer for which the package is intended. + For clarity, yum itself lists packages in the + format name.architecture. Repositories also + commonly store packages in separate directories by architecture. + In each case, the hardware architecture specified for the + package is the minimum type of machine + required to use the package. +

    + i386 +

    + Suitable for any current Intel-compatible computer +

    + noarch +

    + Compatible with all computer architectures +

    + ppc +

    + Suitable for PowerPC systems, such as Apple Power + Macintosh +

    + x86_64 +

    + Suitable for 64-bit Intel-compatible processors, such as + Opterons +

    + Some software may be optimized for particular types of + Intel-compatible machine. Separate packages may be provided for + i386, i586, + i686 and x86_64 computers. A + machine with at least an Intel Pentium, VIA C3 or compatible CPU + may use i586 packages. Computers with an Intel + Pentium Pro and above, or a current model of AMD chip, may use + i686 packages.

    - The hardware architecture is the minimum - type of machine required for that specific package. Packages - with architecture i386 run on any current - Intel-compatible computer. Packages for PowerPC systems, such as - Apple Power Macintosh, are indicated with ppc. - Packages for systems with 64-bit processors such as Opterons are - indicated with x86_64. Packages specified as - noarch have no architecture requirement. + Use the short name of the package for yum + commands. This causes yum to automatically + select the most recent package in the repositories that matches + the hardware architecture of your computer.

    - Some software may be optimized for particular types of - Intel-compatible machine. Separate packages may be provided for - i386, i586, - i686 and x86_64 computers. A - machine with at least an Intel Pentium, VIA C3 or compatible CPU - may use i586 packages. Computers with an Intel - Pentium Pro and above, or a current model of AMD chip, may use - i686 packages. -

    Prev Up Next
    Software Management with yum - - BETA DOCUMENT Home 3. Software Management Tools in Fedora Core
    + Specify a package with other name formats to override the + default behavior and force yum to use the + package that matches that version or architecture. Only override + yum when you know that the default package + selection has a bug or other fault that makes it unsuitable for + installation. +

    [Tip]Package Names

    + You may use any of the following formats to specify a package + in a yum operation: + name, + name.architecture, + name-version, + name-version-release, + name-version-release.architecture, + and + epoch:name-version-release.architecture. +

    Prev Up Next
    Software Management with yum - BETA + DOCUMENT Home 3. Software Management Tools in Fedora Core
    -
    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. @@ -21,9 +21,10 @@

    Fedora Core also includes system-config-packages. To run this - application from the graphical interface, select - Desktop->System Settings->Add/Remove Applications. Unlike up2date and - yum, + application from the graphical interface, select Desktop->System + Settings->Add/Remove + Applications. Unlike + up2date and yum, system-config-packages installs software packages from your Fedora Core installation discs only, and does not use repositories. This application is used on systems that do @@ -38,9 +39,9 @@ software.

    [Caution]Current Package Versions

    The up2date and - yum utilities ensure that you have the most - recent version of software packages. Other methods do not - guarantee that the packages are current. + yum utilities ensure that you have the most + recent version of software packages. Other methods do not + guarantee that the packages are current.

    Prev Up Next
    2. Software Management Concepts Home 4. Managing Software with yum
    -
    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.

    @@ -15,11 +15,12 @@ 

     su -c 'yum update'

    - At the prompt, enter the root password. -

    6.1. Automatically Updating Your System

    + At the prompt, enter the + root password. +

    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: + scripts to perform full system updates every day. To activate + automatic daily updates, enter this command: 

     su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start'

    @@ -27,12 +28,12 @@ root account.

    [Note]How Daily Updates are Run

    There is no separate yum service that runs - on your system. The command given above enables the control - script /etc/rc.d/init.d/yum. This control - script activates the script - /etc/cron.daily/yum.cron, which causes - the cron service to perform the system - update automatically each day. + on your system. The command given above enables the control + script /etc/rc.d/init.d/yum. This control + script activates the script + /etc/cron.daily/yum.cron, which causes + the cron service to perform the system + update automatically each day.

    Prev Up Next
    5. Searching for Packages with yum Home 7. Using Other Software Repositories
    -
    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.

    [Note]Fedora Extras Repositories for Previous Versions of Fedora Core

    You must manually configure Fedora 3 systems to use Fedora Extras, using - the instructions at http://fedora.redhat.com/projects/extras/. For - additional packages for Fedora 1 and Fedora 2, refer to http://www.fedora.us/. + the instructions at + http://fedora.redhat.com/projects/extras/. For + additional packages for Fedora 1 and Fedora 2, refer to + http://www.fedora.us/.

    If the Fedora Project does not provide a specific software package, the manufacturer of the software may provide or recommend a separate repository. Members of the community also maintain repositories to provide packages for Fedora systems. Third-party repositories provide information on their web sites. -

    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 @@ -31,9 +33,9 @@ .repo.

    You must have root - access to add a file to the definitions directory. To copy the - definition file example.repo, type this - command: + access to add a file to the definitions directory. To copy the + definition file example.repo, type this + command: 

     su -c 'cp example.repo /etc/yum.repos.d/'

    @@ -41,25 +43,25 @@ root account.

    The configuration file for each repository should include a - gpgkey setting. This setting specifies the - location of a public key that verifies the packages provided by - that repository. This public key is automatically imported the - first time you install software from the repository. If the - configuration file provided does not include this setting, refer - to Section 7.2, “Manually Authorizing Package Sources”. + gpgkey setting. This setting specifies the + location of a public key that verifies the packages provided by + that repository. This public key is automatically imported the + first time you install software from the repository. If the + configuration file provided does not include this setting, refer + to Section 7.2, “Manually Authorizing Package Sources”.

    [Note]Repositories and up2date Channels

    Starting with Fedora 4, yum repositories are - automatically used as up2date - channels. On Fedora 3 and earlier systems, you must manually - configure up2date to use these - channels. To do so, edit the - /etc/sysconfig/rhn/sources file. -

    7.2. Manually Authorizing Package Sources

    + automatically used as up2date + channels. On Fedora 3 and earlier systems, you must manually + configure up2date to use these + channels. To do so, edit the + /etc/sysconfig/rhn/sources file. +

    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 - GPG-PUB-KEY.asc, type the following - command: + keyring, use the import feature of the + rpm utility. To import the file + GPG-PUB-KEY.asc, type the following + command: 

     su -c 'rpm --import GPG-PUB-KEY.asc'

    @@ -72,33 +74,33 @@ use this command: 

     su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc'
-

    7.3. Understanding Repository Compatibility

    +

    7.3. Understanding Repository Compatibility

    The Fedora Extras project provides packages which are built to the same - standards as Fedora Core packages. Third-party packages should be - compatible with these official packages, unless the provider - specifically states otherwise. + standards as Fedora Core packages. Third-party packages should be + compatible with these official packages, unless the provider + specifically states otherwise.

    Refer to the web site of the repository for information on - package compatibility before you add it as a package source. - Repositories often provide packages specifically intended for - use with packages supplied by other repositories. In some cases, - separate third-party repository providers may each offer - different versions of the same software. This situation may - prevent you from safely using those repositories together on - your Fedora system. + package compatibility before you add it as a package source. + Repositories often provide packages specifically intended for + use with packages supplied by other repositories. In some cases, + separate third-party repository providers may each offer + different versions of the same software. This situation may + prevent you from safely using those repositories together on + your Fedora system.

    Packages built for one version of Fedora are usually not - compatible with other versions of Fedora. The web site of the - provider should specifically state which versions of Fedora they - support. + compatible with other versions of Fedora. The web site of the + provider should specifically state which versions of Fedora they + support.

    [Tip]Old Versions of yum and Current Repositories

    The data format for repository indexes changed with version - 2.1 of yum. This was the version supplied - with Fedora 3. Repository providers should specify the versions - of Fedora that they support. To confirm that an unlabeled - repository is compatible with current versions of - yum, check that it has a sub-directory - called repodata/. + 2.1 of yum. This was the version supplied + with Fedora 3. Repository providers should specify the versions + of Fedora that they support. To confirm that an unlabeled + repository is compatible with current versions of + yum, check that it has a sub-directory + called repodata/.

    Prev Up Next
    6. Updating Your System with yum Home 8. Maintaining yum
    -
    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 install new software, unless the software is only available as a package. In these cases, use the localinstall @@ -24,7 +24,8 @@ 

     su -c 'yum localinstall tsclient-0.132-4.i386.rpm'

    - At the prompt, enter the root password. + At the prompt, enter the + root password.

    [Important]Meeting Dependencies

    You must ensure that all of the dependencies are already installed on your system, because yum cannot Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-yum-maintenance.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-yum-maintenance.php 25 Jul 2005 19:12:46 -0000 1.1 +++ sn-yum-maintenance.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -14,24 +14,24 @@ 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 - this setting. + yum from using that repository. The + yum utility ignores any definition file with + this setting.

    To completely remove access to a repository:

    1. Delete the relevant file from - /etc/yum.repos.d/. + /etc/yum.repos.d/.

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

    8.2. Clearing the yum Caches

    + /var/cache/yum/. +

    8.2. Clearing the yum Caches

    By design, yum does not automatically delete - any of the packages or package data files it downloads, so they - may be reused in future operations. To purge the header files, - use this command: + any of the packages or package data files it downloads, so they + may be reused in future operations. To purge the header files, + use this command: 

     su -c 'yum clean headers'

    @@ -41,11 +41,11 @@ su -c 'yum clean packages'

    When using these commands, at the prompt, enter the password for - the root account. + the root account.

    [Note]Purged Files

    Package management operations download header files and - packages as required, and automatically replace any deleted - files needed for the operation. + packages as required, and automatically replace any deleted + files needed for the operation.

    Prev Up Next
    7. Using Other Software Repositories Home 9. Manually Installing Software
    -
    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 is connected to the Internet through a web proxy server, specify the proxy server details in /etc/yum.conf. The proxy setting must specify the proxy server as a complete URL, including the TCP port number. If your proxy server requires a username and - password, specify these by adding - proxy_username and - proxy_password settings. + password, specify these by adding proxy_username + and proxy_password settings.

    The settings below enable yum to use the proxy - server mycache.mydomain.com, connecting - to port 3128, with the username yum-user and the password - qwerty. + server + mycache.mydomain.com, + connecting to port 3128, with the username + yum-user and the + password qwerty. 

     # The proxy server - proxy server:port number
 proxy=http://mycache.mydomain.com:3128
@@ -30,16 +31,17 @@
 proxy_password=qwerty

    Example 2. Configuration File Settings for Using A Proxy Server

    [Note]Global Settings

    If you define a proxy server in - /etc/yum.conf, all - users connect to the proxy server with those details when using - yum. + /etc/yum.conf, all + users connect to the proxy server with those details when using + yum.

    To enable proxy access for a specific user, add the lines in the example box below to the user's shell profile. For the default bash shell, the profile is the file ~/.bash_profile. The settings below enable - yum to use the proxy server mycache.mydomain.com, connecting - to port 3128. + yum to use the proxy server + mycache.mydomain.com, + connecting to port 3128. 

     # The Web proxy server used by this account
 http_proxy="http://mycache.mydomain.com:3128"
@@ -47,21 +49,19 @@

    Example 3. Profile Settings for Using a Proxy Server

    If the proxy server requires a username and password, add these to the URL. To include the username - yum-user and the password - qwerty, add these settings: + yum-user and the + password qwerty, add these settings: 

     # The Web proxy server, with the username and password for this account
 http_proxy="http://yum-user:qwerty at mycache.mydomain.com:3128"
 export http_proxy
-

    Example 4. Profile Settings for a Secured Proxy Server

    From fedora-extras-commits at redhat.com Wed Jul 27 06:18:00 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 02:18:00 -0400 Subject: common tobuild,1.2088,1.2089 Message-ID: <200507270618.j6R6I0xl011888@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11871 Modified Files: tobuild Log Message: remove more completed builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2088 retrieving revision 1.2089 diff -u -r1.2088 -r1.2089 --- tobuild 27 Jul 2005 06:11:24 -0000 1.2088 +++ tobuild 27 Jul 2005 06:17:58 -0000 1.2089 @@ -74,7 +74,6 @@ mschwendt devel/freeze freeze-2_5_0-4 devel mschwendt devel/tetex-lgrind tetex-lgrind-3_67-7 devel mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 -mschwendt rpms/tetex-lgrind/FC-3 tetex-lgrind-3_67-4_1 fc3 Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel @@ -107,8 +106,6 @@ nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel -ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel -oliver rpms/fish/FC-3 fish-1_12_0-1_fc3 fc3 oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 06:21:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 02:21:38 -0400 Subject: extras-buildsys/server UserInterface.py,1.30,1.31 Message-ID: <200507270621.j6R6Lc2S011918@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11901/server Modified Files: UserInterface.py Log Message: Don't require admin bit to list builders Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- UserInterface.py 26 Jul 2005 17:47:24 -0000 1.30 +++ UserInterface.py 27 Jul 2005 06:21:36 -0000 1.31 @@ -467,8 +467,6 @@ def list_builders(self): user = AuthedXMLRPCServer.get_authinfo() - if not user or not user.server_admin: - return (-1, "Insufficient privileges.") return UserInterface.list_builders(self) From fedora-extras-commits at redhat.com Wed Jul 27 06:59:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 02:59:35 -0400 Subject: extras-buildsys/www job.psp,1.1,1.2 Message-ID: <200507270659.j6R6xZlk012417@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12400/www Modified Files: job.psp Log Message: Beautify log display Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- job.psp 23 Jul 2005 00:55:31 -0000 1.1 +++ job.psp 27 Jul 2005 06:59:33 -0000 1.2 @@ -67,6 +67,7 @@ if job.has_key('result_msg') and job['result_msg'] and len(job['result_msg']): import urllib result_msg = urllib.unquote(str(job['result_msg'])) + result_msg = result_msg.replace("\n", "
    ") %>     <% From fedora-extras-commits at redhat.com Wed Jul 27 07:25:37 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 03:25:37 -0400 Subject: extras-buildsys/www job.psp,1.2,1.3 Message-ID: <200507270726.j6R7Q86W013664@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13632 Modified Files: job.psp Log Message: More pretty printing of log messages, patch from Ignacio Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- job.psp 27 Jul 2005 06:59:33 -0000 1.2 +++ job.psp 27 Jul 2005 07:25:35 -0000 1.3 @@ -67,7 +67,7 @@ if job.has_key('result_msg') and job['result_msg'] and len(job['result_msg']): import urllib result_msg = urllib.unquote(str(job['result_msg'])) - result_msg = result_msg.replace("\n", "
    ") + result_msg = "

    "+result_msg.replace("\n", "

    ")+"

    " %>     <% From fedora-extras-commits at redhat.com Wed Jul 27 07:25:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 03:25:38 -0400 Subject: extras-buildsys/www/css style.css,1.3,1.4 Message-ID: <200507270726.j6R7Q8eI013667@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13632/css Modified Files: style.css Log Message: More pretty printing of log messages, patch from Ignacio Index: style.css =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- style.css 23 Jul 2005 00:55:32 -0000 1.3 +++ style.css 27 Jul 2005 07:25:36 -0000 1.4 @@ -314,3 +314,8 @@ font-weight: normal; } +p.result { + margin-left: 2em; + text-indent: -2em; + margin-bottom: -1em; +} From fedora-extras-commits at redhat.com Wed Jul 27 07:54:57 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 27 Jul 2005 03:54:57 -0400 Subject: rpms/libcdio/FC-4 libcdio.spec,1.10,1.11 Message-ID: <200507270754.j6R7svSB013723@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13706 Modified Files: libcdio.spec Log Message: building without dependency on libcddb Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcdio.spec 26 Jul 2005 11:58:19 -0000 1.10 +++ libcdio.spec 27 Jul 2005 07:54:55 -0000 1.11 @@ -1,6 +1,6 @@ Name: libcdio Version: 0.75 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia @@ -10,7 +10,7 @@ Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libcddb-devel >= 0.9.4 +#BuildRequires: libcddb-devel >= 0.9.4 BuildRequires: pkgconfig BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig @@ -93,6 +93,9 @@ %changelog +* Wed Jul 27 2005 Adrian Reber - 0.75-3 +- Rebuilt without libcddb dependency (#164270) + * Tue Jul 26 2005 Adrian Reber - 0.75-2 - Rebuilt From fedora-extras-commits at redhat.com Wed Jul 27 07:55:24 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 27 Jul 2005 03:55:24 -0400 Subject: common tobuild,1.2089,1.2090 Message-ID: <200507270755.j6R7tONA013790@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13773 Modified Files: tobuild Log Message: request build of rpms/libcdio/FC-4 libcdio-0_75-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2089 retrieving revision 1.2090 diff -u -r1.2089 -r1.2090 --- tobuild 27 Jul 2005 06:17:58 -0000 1.2089 +++ tobuild 27 Jul 2005 07:55:22 -0000 1.2090 @@ -109,3 +109,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 +adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 08:02:23 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:02:23 -0400 Subject: common tobuild,1.2090,1.2091 Message-ID: <200507270802.j6R82roR015160@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15131 Modified Files: tobuild Log Message: request build of rpms/scim/FC-3 scim-1_4_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2090 retrieving revision 1.2091 diff -u -r1.2090 -r1.2091 --- tobuild 27 Jul 2005 07:55:22 -0000 1.2090 +++ tobuild 27 Jul 2005 08:02:16 -0000 1.2091 @@ -110,3 +110,4 @@ mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 +ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 08:05:04 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:05:04 -0400 Subject: common tobuild,1.2091,1.2092 Message-ID: <200507270805.j6R85RBi015201@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15178 Modified Files: tobuild Log Message: request build of rpms/scim/FC-4 scim-1_4_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2091 retrieving revision 1.2092 diff -u -r1.2091 -r1.2092 --- tobuild 27 Jul 2005 08:02:16 -0000 1.2091 +++ tobuild 27 Jul 2005 08:05:00 -0000 1.2092 @@ -111,3 +111,4 @@ oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 +ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 08:08:05 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:08:05 -0400 Subject: rpms/scim-tables/FC-3 scim-tables.spec,1.2,1.3 Message-ID: <200507270808.j6R88ZLw015352@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15335 Modified Files: scim-tables.spec Log Message: Rebuild for scim-1.4.0 Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tables.spec 25 Jun 2005 15:11:53 -0000 1.2 +++ scim-tables.spec 27 Jul 2005 08:08:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -158,10 +158,13 @@ %changelog +* 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 - Fix download URL -* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 +* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 - Initial packaging for Fedora Extras. * Wed Jan 5 2005 James Su From fedora-extras-commits at redhat.com Wed Jul 27 08:09:40 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:09:40 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.2,1.3 Message-ID: <200507270809.j6R89eLj015385@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15363 Modified Files: scim-tables.spec Log Message: Rebuild for scim-1.4.0 Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tables.spec 25 Jun 2005 15:10:43 -0000 1.2 +++ scim-tables.spec 27 Jul 2005 08:09:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -158,10 +158,13 @@ %changelog +* 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 - Fix download URL -* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 +* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 - Initial packaging for Fedora Extras. * Wed Jan 5 2005 James Su From fedora-extras-commits at redhat.com Wed Jul 27 08:12:50 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:12:50 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.2,1.3 Message-ID: <200507270813.j6R8DVOD015686@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15669 Modified Files: scim-pinyin.spec Log Message: Rebuild for scim-1.4.0 Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-pinyin.spec 21 Jun 2005 01:34:49 -0000 1.2 +++ scim-pinyin.spec 27 Jul 2005 08:12:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -57,7 +57,10 @@ %changelog -* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 +* Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 +- Rebuild for scim-1.4.0 + +* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 - minor change on the files section * Mon Jun 20 2005 Jens Petersen - 0.5.0-2 From fedora-extras-commits at redhat.com Wed Jul 27 08:14:22 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:14:22 -0400 Subject: rpms/scim-pinyin/FC-3 scim-pinyin.spec,1.2,1.3 Message-ID: <200507270814.j6R8EMvp015740@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15723 Modified Files: scim-pinyin.spec Log Message: Rebuild for scim-1.4.0 Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-3/scim-pinyin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-pinyin.spec 21 Jun 2005 01:34:22 -0000 1.2 +++ scim-pinyin.spec 27 Jul 2005 08:14:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -57,7 +57,10 @@ %changelog -* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 +* Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 +- Rebuild for scim-1.4.0 + +* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 - minor change on the files section * Mon Jun 20 2005 Jens Petersen - 0.5.0-2 From fedora-extras-commits at redhat.com Wed Jul 27 08:30:04 2005 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 27 Jul 2005 04:30:04 -0400 Subject: devel/lincvs lincvs.spec,1.9,1.10 Message-ID: <200507270830.j6R8U4JJ015854@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/lincvs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15837 Modified Files: lincvs.spec Log Message: fix minor typo Index: lincvs.spec =================================================================== RCS file: /cvs/extras/devel/lincvs/lincvs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lincvs.spec 25 May 2005 21:32:12 -0000 1.9 +++ lincvs.spec 27 Jul 2005 08:30:02 -0000 1.10 @@ -17,7 +17,7 @@ Requires: cvs >= 0:1.9.0 %description -LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible. +LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows to load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible. To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version. From fedora-extras-commits at redhat.com Wed Jul 27 08:42:01 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:42:01 -0400 Subject: rpms/nedit - New directory Message-ID: <200507270842.j6R8g13R015924@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15904/nedit Log Message: Directory /cvs/extras/rpms/nedit added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 08:42:02 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:42:02 -0400 Subject: rpms/nedit/devel - New directory Message-ID: <200507270842.j6R8g2ao015929@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15904/nedit/devel Log Message: Directory /cvs/extras/rpms/nedit/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 08:43:14 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:43:14 -0400 Subject: rpms/nedit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507270843.j6R8hEXg015985@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15954 Added Files: Makefile import.log Log Message: Setup of module nedit --- NEW FILE Makefile --- # Top level Makefile for module nedit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 27 08:43:14 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:43:14 -0400 Subject: rpms/nedit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507270843.j6R8hEOr015990@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15954/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nedit --- NEW 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 Jul 27 08:46:31 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:46:31 -0400 Subject: rpms/nedit import.log,1.1,1.2 Message-ID: <200507270847.j6R8l1Be016107@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16055 Modified Files: import.log Log Message: auto-import nedit-5.5-3 on branch devel from nedit-5.5-3.src.rpm initial nedit Fedora Extras import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nedit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jul 2005 08:43:12 -0000 1.1 +++ import.log 27 Jul 2005 08:46:29 -0000 1.2 @@ -0,0 +1 @@ +nedit-5_5-3:HEAD:nedit-5.5-3.src.rpm:1122453723 From fedora-extras-commits at redhat.com Wed Jul 27 08:46:31 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:46:31 -0400 Subject: rpms/nedit/devel nedit-5.4-makefiles.patch, NONE, 1.1 nedit-5.4-security.patch, NONE, 1.1 nedit-5.5-motif223.patch, NONE, 1.1 nedit-5.5-utf8.patch, NONE, 1.1 nedit-5.5-varfix.patch, NONE, 1.1 nedit-icon.png, NONE, 1.1 nedit.desktop, NONE, 1.1 nedit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507270846.j6R8kV4c016098@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16055/devel Modified Files: .cvsignore sources Added Files: nedit-5.4-makefiles.patch nedit-5.4-security.patch nedit-5.5-motif223.patch nedit-5.5-utf8.patch nedit-5.5-varfix.patch nedit-icon.png nedit.desktop nedit.spec Log Message: auto-import nedit-5.5-3 on branch devel from nedit-5.5-3.src.rpm initial nedit Fedora Extras import nedit-5.4-makefiles.patch: --- NEW FILE nedit-5.4-makefiles.patch --- --- nedit-5.4/makefiles/Makefile.linux.makefiles 2003-05-20 02:27:56.000000000 +0200 +++ nedit-5.4/makefiles/Makefile.linux 2004-03-17 15:28:40.000000000 +0100 @@ -1,5 +1,5 @@ # $Id: Makefile.linux,v 1.11 2003/05/20 00:27:56 n8gray Exp $ -CC=cc +CC=gcc AR=ar # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS @@ -17,11 +17,11 @@ # To test if the Motif library exports the runtime version # add -DHAVE__XMVERSIONSTRING to CFLAGS # -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD +CFLAGS=$(RPM_OPT_FLAGS) -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD ARFLAGS=-urs -LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm +LIBS= -L/usr/X11R6/$(LIB) -lXm -Xmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm include Makefile.common nedit-5.4-security.patch: --- NEW FILE nedit-5.4-security.patch --- --- nedit-5.4/source/file.c.security 2003-09-28 16:18:12.000000000 +0200 +++ nedit-5.4/source/file.c 2004-03-17 15:25:31.000000000 +0100 @@ -1218,7 +1218,7 @@ */ void PrintString(const char *string, int length, Widget parent, const char *jobName) { - char tmpFileName[L_tmpnam]; /* L_tmpnam defined in stdio.h */ + char *tmpFileName=strdup("/tmp/neditXXXXXX"); FILE *fp; int fd; @@ -1229,14 +1229,10 @@ 1. Create a filename 2. Open the file with the O_CREAT|O_EXCL flags So all an attacker can do is a DoS on the print function. */ - tmpnam(tmpFileName); + fd = mkstemp(tmpFileName); /* open the temporary file */ -#ifdef VMS - if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL) -#else - if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL) -#endif /* VMS */ + if ((fp = fdopen(fd, "w")) == NULL) { DialogF(DF_WARN, parent, 1, "Error while Printing", "Unable to write file for printing:\n%s", "Dismiss", @@ -1250,7 +1246,7 @@ /* write to the file */ #ifdef IBM_FWRITE_BUG - write(fileno(fp), string, length); + write(fd, string, length); #else fwrite(string, sizeof(char), length, fp); #endif @@ -1260,6 +1256,7 @@ "%s not printed:\n%s", "Dismiss", jobName, errorString()); fclose(fp); /* should call close(fd) in turn! */ remove(tmpFileName); + free(tmpFileName); return; } @@ -1270,6 +1267,7 @@ "Error closing temp. print file:\n%s", "Dismiss", errorString()); remove(tmpFileName); + free(tmpFileName); return; } @@ -1281,6 +1279,7 @@ PrintFile(parent, tmpFileName, jobName); remove(tmpFileName); #endif /*VMS*/ + free(tmpFileName); return; } nedit-5.5-motif223.patch: --- NEW FILE nedit-5.5-motif223.patch --- --- nedit-5.5/util/check_lin_tif.c.motif223 2004-07-21 13:32:07.000000000 +0200 +++ nedit-5.5/util/check_lin_tif.c 2004-12-27 10:06:36.378060568 +0100 @@ -255,6 +255,11 @@ int main() { exit(0); } + /* Check for Open Motif 2.2.3 and up */ + if (!force_bad && XmVERSION == 2 && XmREVISION == 2 && XmUPDATE_LEVEL > 2) { + exit(0); + } + /* Check for the dreaded Open Motif 2.2.2 (some variants of which claim to be 2.2.3, but the version string gives them away). */ if (force_bad || nedit-5.5-utf8.patch: --- NEW FILE nedit-5.5-utf8.patch --- --- nedit-5.5/source/nedit.c.utf8 2004-09-02 10:49:56.000000000 +0200 +++ nedit-5.5/source/nedit.c 2004-12-27 09:59:40.997208056 +0100 @@ -90,6 +90,7 @@ static int checkDoMacroArg(const char *m static String neditLanguageProc(Display *dpy, String xnl, XtPointer closure); static void maskArgvKeywords(int argc, char **argv, const char **maskArgs); static void unmaskArgvKeywords(int argc, char **argv, const char **maskArgs); +static void changeLocaleIfUTF8(void); static void patchResourcesForVisual(void); static void patchResourcesForKDEbug(void); static void patchLocaleForMotif(void); @@ -392,6 +393,8 @@ int main(int argc, char **argv) /* Save the command which was used to invoke nedit for restart command */ ArgV0 = argv[0]; + changeLocaleIfUTF8(); + /* Set locale for C library, X, and Motif input functions. Reverts to "C" if requested locale not available. */ XtSetLanguageProc(NULL, neditLanguageProc, NULL); @@ -1035,6 +1038,32 @@ static String neditLanguageProc(Display return setlocale(LC_ALL, NULL); /* re-query in case overwritten */ } +static void changeLocaleIfUTF8(void) +{ + char *locale; + + locale = getenv("LANG"); + if (!locale) { + locale = setlocale(LC_ALL, NULL); + } + + if (locale) { + char *ptr; + + ptr = strstr(locale, ".UTF-8"); + if (ptr) { + fprintf(stderr, "nedit: the current locale is utf8 (%s)\n", locale); + + ptr[0] = '\0'; + + setenv("LC_ALL", locale, 1); + locale = setlocale(LC_ALL, locale); + + fprintf(stderr, "nedit: changed locale to non-utf8 (%s)\n", locale); + } + } +} + static int sortAlphabetical(const void* k1, const void* k2) { const char* key1 = *(const char**)k1; nedit-5.5-varfix.patch: --- NEW FILE nedit-5.5-varfix.patch --- --- nedit-5.5/source/server.c.varfix 2004-07-21 13:32:05.000000000 +0200 +++ nedit-5.5/source/server.c 2005-01-12 11:12:08.989922248 +0100 @@ -340,7 +340,7 @@ static void processServerCommandString(c char *fullname, filename[MAXPATHLEN], pathname[MAXPATHLEN]; char *doCommand, *geometry, *langMode, *inPtr; int editFlags, stringLen = strlen(string); - int lineNum, createFlag, readFlag, iconicFlag, lastIconic = 0, tabbed; + int lineNum, createFlag, readFlag, iconicFlag, lastIconic = 0, tabbed = 0; int fileLen, doLen, lmLen, geomLen, charsRead, itemsRead; WindowInfo *window, *lastFile = NULL; long currentDesktop = QueryCurrentDesktop(TheDisplay, --- NEW FILE nedit.desktop --- [Desktop Entry] Encoding=UTF-8 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Comment=Text Editor Comment[bg]=Nedit ???????????????? Comment[ca]=Editor Nedit Comment[cs]=Editor Nedit Comment[eo]=redaktilo Nedit Comment[et]=Tekstiredaktor Nedit Comment[fi]=Nedit-editori Comment[fr]=??diteur Nedit Comment[hu]=Nedit sz??vegszerkeszt?? Comment[is]=Nedit-ritill Comment[mk]=Nedit - ?????????? ?? ?????????? ???????????????? Comment[pt]=Editor Nedit Comment[ro]=Editorul Nedit Comment[ru]=???????????????? Nedit Comment[sk]=Editor Nedit Comment[sl]=Urejevalnik Nedit Comment[uk]=???????????????? Nedit Name=Nedit Name[et]=Tekstiredaktor Nedit Name[ru]=NEdit Exec=nedit %f Icon=nedit-icon.png Path= Type=Application Terminal=false --- NEW FILE nedit.spec --- %define desktop_file 1 %if %{desktop_file} %define desktop_file_utils_version 0.2.93 %endif Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 Release: 3 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png Patch0: nedit-5.4-security.patch Patch1: nedit-5.4-makefiles.patch Patch2: nedit-5.5-utf8.patch Patch3: nedit-5.5-motif223.patch Patch4: nedit-5.5-varfix.patch URL: http://nedit.org License: distributable Group: Applications/Editors BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openmotif-devel >= 2.2.3 %if %{desktop_file} BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} %endif %description NEdit is a GUI text editor for the X Window System and Motif. NEdit is very easy to use, especially if you are familiar with the Macintosh(TM) or Microsoft(TM) Windows(TM) style of interface. %prep %setup -q %patch0 -p1 -b .security %patch1 -p1 -b .makefiles %patch2 -p1 -b .utf8 %patch3 -p1 -b .motif223 %patch4 -p1 -b .varfix %build make linux LIB=%{_lib} %install rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1 install -s -m 755 source/nedit source/nc $RPM_BUILD_ROOT%{_prefix}/X11R6/bin install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/nedit.1x install -m 644 doc/nc.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/nc.1x mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/applnk/Applications %if %{desktop_file} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/applications desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_prefix}/share/applications \ --add-category "Application;Development;X-Fedora" \ $RPM_BUILD_ROOT/etc/X11/applnk/Applications/nedit.desktop %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc doc/nedit.doc README ReleaseNotes %{_prefix}/X11R6/man/*/* %{_prefix}/X11R6/bin/* %if %{desktop_file} %{_prefix}/share/applications/* %{_datadir}/pixmaps/nedit-icon.png %else %config /etc/X11/applnk/Applications/nedit.desktop %endif %changelog * Mon Jan 20 2005 Jindrich Novy 5.5-3 - prepare the spec and desktop file for Extras inclusion * Wed Jan 12 2005 Jindrich Novy 5.5-2 - fix usage of uninitialized variable (#144790) * Mon Dec 27 2004 Jindrich Novy 5.5-1 - new version 5.5 * Mon Sep 20 2004 Jindrich Novy - added nedit icon to be present in menus #131601 - updated spec to put it to the right place - icon made by Joor Loohuis (joor at users.sourceforge.net) - the icon processed by Peter Vrabec (pvrabec at usu.cz) * Tue Jun 15 2004 Elliot Lee - rebuilt * Wed Mar 17 2004 Thomas Woerner 5.4-1 - new version 5.4 * Fri Feb 13 2004 Elliot Lee - rebuilt * Fri Dec 5 2003 Tim Waugh - Don't explicitly require openmotif, since rpm does library dependencies automatically. - Binary package doesn't require desktop-file-install. * Fri Dec 5 2003 Tim Waugh 5.3-6 - Add ugly hack to work around openmotif's lack of UTF-8 support (bug #75189). - Back-port 5.4RC2 fix for uninitialized variable (bug #110898). * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed Jan 22 2003 Tim Powers - rebuilt * Fri Nov 8 2002 Tim Waugh 5.3-3 - Handle X11 libdir issue. * Tue Oct 22 2002 Tim Waugh 5.3-2 - Remove original desktop file when installing. - Fix desktop file icon (bug #61677). * Wed Jul 24 2002 Karsten Hopp - 5.3 - use desktop-file-utils (#69461) - redo all patches * Fri Jun 21 2002 Tim Powers - automated rebuild * Thu May 23 2002 Tim Powers - automated rebuild * Fri Mar 22 2002 Tim Powers - rebuilt against openmotif-2.2.2 * Fri Mar 1 2002 Than Ngo 1.2-1 - update to 1.2 - cleanup patch files * Thu Jan 17 2002 Than Ngo 5.1.1-13 - rebuild against openmotif * Wed Jan 09 2002 Tim Powers - automated rebuild * Thu Oct 25 2001 Bill Nottingham - 0 != NULL. lather, rinse, repeat. (#54943) * Mon Aug 20 2001 Bernhard Rosenkraenzer - Fix crash while printing (#45149) I still think removing the package would be the better fix, though. * Sun Jun 10 2001 Than Ngo - requires lesstif-devel * Tue May 22 2001 Tim Powers - patched to use lesstif * Fri Apr 27 2001 Bernhard Rosenkraenzer - Fix security bug, use mkstemp() * Fri Oct 13 2000 Preston Brown - .desktop file added * Mon Jul 24 2000 Prospector - rebuilt * Mon Jul 10 2000 Tim Powers - rebuilt * Sat Jun 17 2000 Than Ngo - rebuilt against openmotif-2.1.30 - use PRM macros * Tue May 16 2000 Tim Powers - updated to 5.1.1 - updated URL and source location * Wed Aug 18 1999 Tim Powers - excludearch alpha * Mon Jul 19 1999 Tim Powers - rebuilt for 6.1 * Thu Apr 15 1999 Michael Maher - built package for 6.0 * Wed Oct 14 1998 Michael Maher - built package for 5.2 * Thu May 21 1998 Cristian Gafton - upgraded to 5.0.2 * Thu Nov 20 1997 Otto Hammersmith - added wmconfig * Mon Nov 17 1997 Otto Hammersmith - added changelog - fixed src url - added URL tag Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Jul 2005 08:43:12 -0000 1.1 +++ .cvsignore 27 Jul 2005 08:46:29 -0000 1.2 @@ -0,0 +1 @@ +nedit-5.5-src.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Jul 2005 08:43:12 -0000 1.1 +++ sources 27 Jul 2005 08:46:29 -0000 1.2 @@ -0,0 +1 @@ +48cb3dce52d44988f3a4d7c6f47b6bbe nedit-5.5-src.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 27 08:47:20 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 27 Jul 2005 04:47:20 -0400 Subject: fedora-security/audit fc4,1.31,1.32 Message-ID: <200507270847.j6R8lLfa016135@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16118 Modified Files: fc4 Log Message: Updates from Mitre Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fc4 25 Jul 2005 08:38:06 -0000 1.31 +++ fc4 27 Jul 2005 08:47:18 -0000 1.32 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20050714 -Up to date FC4 as of 20050714 +Up to date CVE as of CVE email 20050726 +Up to date FC4 as of 20050726 ** are items that need attention +2005-2370 backport (kdenetwork) [since FEDORA-2005-624] +2005-2369 backport (kdenetwork) [since FEDORA-2005-624] +2005-2368 VULNERABLE (vim) 2005-2355 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] From fedora-extras-commits at redhat.com Wed Jul 27 08:51:29 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:51:29 -0400 Subject: rpms/nedit/devel nedit.spec,1.1,1.2 Message-ID: <200507270851.j6R8pTbn016190@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16173 Modified Files: nedit.spec Log Message: initial extras build Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nedit.spec 27 Jul 2005 08:46:29 -0000 1.1 +++ nedit.spec 27 Jul 2005 08:51:27 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 3 +Release: 4 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -76,6 +76,9 @@ %endif %changelog +* Wed Jul 27 2005 Jindrich Novy 5.5-4 +- initial Extras built + * Mon Jan 20 2005 Jindrich Novy 5.5-3 - prepare the spec and desktop file for Extras inclusion From fedora-extras-commits at redhat.com Wed Jul 27 08:52:10 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:52:10 -0400 Subject: common tobuild,1.2092,1.2093 Message-ID: <200507270852.j6R8qALD016254@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16237 Modified Files: tobuild Log Message: request build of rpms/nedit/devel nedit-5_5-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2092 retrieving revision 1.2093 diff -u -r1.2092 -r1.2093 --- tobuild 27 Jul 2005 08:05:00 -0000 1.2092 +++ tobuild 27 Jul 2005 08:52:08 -0000 1.2093 @@ -112,3 +112,4 @@ adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 +jnovy rpms/nedit/devel nedit-5_5-4 devel From fedora-extras-commits at redhat.com Wed Jul 27 09:25:41 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 27 Jul 2005 05:25:41 -0400 Subject: rpms/flumotion/FC-4 flumotion.spec,1.5,1.6 Message-ID: <200507270925.j6R9PfPH017437@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17420 Modified Files: flumotion.spec Log Message: geez, could I be any more stupid ? Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-4/flumotion.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flumotion.spec 25 Jul 2005 18:22:34 -0000 1.5 +++ flumotion.spec 27 Jul 2005 09:25:39 -0000 1.6 @@ -1,6 +1,6 @@ Name: flumotion -Version: 0.1.9%{?dist} -Release: 1 +Version: 0.1.9 +Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet From fedora-extras-commits at redhat.com Wed Jul 27 09:26:39 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 27 Jul 2005 05:26:39 -0400 Subject: common tobuild,1.2093,1.2094 Message-ID: <200507270926.j6R9Qd9N017499@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17482 Modified Files: tobuild Log Message: request build of rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2093 retrieving revision 1.2094 diff -u -r1.2093 -r1.2094 --- tobuild 27 Jul 2005 08:52:08 -0000 1.2093 +++ tobuild 27 Jul 2005 09:26:37 -0000 1.2094 @@ -113,3 +113,4 @@ ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 jnovy rpms/nedit/devel nedit-5_5-4 devel +thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 12:05:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 08:05:12 -0400 Subject: devel/common tobuild,1.2094,1.2095 Message-ID: <200507271205.j6RC5hwg021144@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21127 Modified Files: tobuild Log Message: modify build requests to appear like they were done from within an rpms/ module checkout Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2094 retrieving revision 1.2095 diff -u -r1.2094 -r1.2095 --- tobuild 27 Jul 2005 09:26:37 -0000 1.2094 +++ tobuild 27 Jul 2005 12:04:48 -0000 1.2095 @@ -36,7 +36,7 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 -mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel +mschwendt rpms/sylpheed/devel sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel @@ -70,9 +70,9 @@ bpepple rpms/liferea/FC-4 liferea-0_9_4-1_fc4 fc4 orion rpms/pytz/devel pytz-2005i-2 devel scop rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 fc4 -mschwendt devel/cksfv cksfv-1_3-4 devel -mschwendt devel/freeze freeze-2_5_0-4 devel -mschwendt devel/tetex-lgrind tetex-lgrind-3_67-7 devel +mschwendt rpms/cksfv/devel cksfv-1_3-4 devel +mschwendt rpms/freeze/devel freeze-2_5_0-4 devel +mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 @@ -100,14 +100,14 @@ thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 -mschwendt devel/meld meld-1_0_0-1_fc5 devel +mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 -mschwendt devel/inkscape inkscape-0_42-1_fc5 devel +mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 -mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel +mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 13:18:16 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 27 Jul 2005 09:18:16 -0400 Subject: rpms/umfpack/devel umfpack.spec,1.1,1.2 Message-ID: <200507271318.j6RDIGXs022469@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/umfpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22452 Modified Files: umfpack.spec Log Message: Add missing build requirement. Index: umfpack.spec =================================================================== RCS file: /cvs/extras/rpms/umfpack/devel/umfpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- umfpack.spec 20 Jul 2005 16:57:00 -0000 1.1 +++ umfpack.spec 27 Jul 2005 13:18:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: umfpack Version: 4.4 -Release: 1 +Release: 2 Summary: Routines for solving unsymmetric sparse linear systems Group: System Environment/Libraries @@ -25,6 +25,7 @@ Summary: Development headers and files for UMFPACK Group: Development/Libraries Requires: %{name} = %{version}-%{release} +BuildRequires: blas %description devel The umfpack-devel package contains files needed for developing @@ -97,5 +98,8 @@ %{_libdir}/lib*.so %changelog +* Wed Jul 27 2005 Quentin Spencer 4.4-2 +- Add blas to BuildRequires. + * Wed Jul 20 2005 Quentin Spencer 4.4-1 - First version. From fedora-extras-commits at redhat.com Wed Jul 27 13:21:42 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 27 Jul 2005 09:21:42 -0400 Subject: common tobuild,1.2095,1.2096 Message-ID: <200507271321.j6RDLgrS022542@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524 Modified Files: tobuild Log Message: request build of rpms/umfpack/devel umfpack-4_4-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2095 retrieving revision 1.2096 diff -u -r1.2095 -r1.2096 --- tobuild 27 Jul 2005 12:04:48 -0000 1.2095 +++ tobuild 27 Jul 2005 13:21:40 -0000 1.2096 @@ -114,3 +114,4 @@ ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 jnovy rpms/nedit/devel nedit-5_5-4 devel thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 +qspencer rpms/umfpack/devel umfpack-4_4-2 devel From fedora-extras-commits at redhat.com Wed Jul 27 13:28:20 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 09:28:20 -0400 Subject: owners owners.list,1.34,1.35 Message-ID: <200507271328.j6RDSKbX022581@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22564 Modified Files: owners.list Log Message: Transfer kphone and ktrack to dgilmore Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- owners.list 27 Jul 2005 01:43:49 -0000 1.34 +++ owners.list 27 Jul 2005 13:28:17 -0000 1.35 @@ -327,9 +327,9 @@ Fedora Extras|koffice|A set of office applications for KDE|than at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org| -Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|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|ivazquez at ivazquez.net|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| Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 27 14:42:19 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 27 Jul 2005 10:42:19 -0400 Subject: rpms/mhonarc/devel .cvsignore, 1.5, 1.6 mhonarc.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507271442.j6REgJS3023905@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/mhonarc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23884 Modified Files: .cvsignore mhonarc.spec sources Log Message: - version 2.5.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2005 15:09:00 -0000 1.5 +++ .cvsignore 27 Jul 2005 14:42:16 -0000 1.6 @@ -1 +1 @@ -MHonArc-2.6.14.tar.bz2 +MHonArc-2.6.15.tar.bz2 Index: mhonarc.spec =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mhonarc.spec 23 Jul 2005 15:09:00 -0000 1.9 +++ mhonarc.spec 27 Jul 2005 14:42:16 -0000 1.10 @@ -1,12 +1,12 @@ Name: mhonarc -Version: 2.6.14 +Version: 2.6.15 Release: 1%{?dist} Summary: Perl mail-to-HTML converter Group: Applications/Internet License: GPL URL: http://www.mhonarc.org/ -Source: http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.14.tar.bz2 +Source: http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.15.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -50,6 +50,9 @@ %changelog +* Wed Jul 27 2005 Aurelien Bompard 2.6.15-1 +- version 2.6.15 + * Sat Jul 23 2005 Aurelien Bompard 2.6.14-1 - version 2.6.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jul 2005 15:09:00 -0000 1.5 +++ sources 27 Jul 2005 14:42:16 -0000 1.6 @@ -1 +1 @@ -c0565ec34a4cfaaee9cbfa76fe817539 MHonArc-2.6.14.tar.bz2 +4617930d593288d1714c3b1f91029314 MHonArc-2.6.15.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 27 14:43:43 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 27 Jul 2005 10:43:43 -0400 Subject: rpms/mhonarc/devel mhonarc.spec,1.10,1.11 Message-ID: <200507271443.j6REhhLp023960@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/mhonarc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23943 Modified Files: mhonarc.spec Log Message: - rebuild to fix make tag mistake Index: mhonarc.spec =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mhonarc.spec 27 Jul 2005 14:42:16 -0000 1.10 +++ mhonarc.spec 27 Jul 2005 14:43:41 -0000 1.11 @@ -1,6 +1,6 @@ Name: mhonarc Version: 2.6.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl mail-to-HTML converter Group: Applications/Internet @@ -50,6 +50,9 @@ %changelog +* Wed Jul 27 2005 Aurelien Bompard 2.6.15-2 +- rebuild + * Wed Jul 27 2005 Aurelien Bompard 2.6.15-1 - version 2.6.15 From fedora-extras-commits at redhat.com Wed Jul 27 14:44:45 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 27 Jul 2005 10:44:45 -0400 Subject: common tobuild,1.2096,1.2097 Message-ID: <200507271444.j6REijsU024043@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24026 Modified Files: tobuild Log Message: request build of rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2096 retrieving revision 1.2097 diff -u -r1.2096 -r1.2097 --- tobuild 27 Jul 2005 13:21:40 -0000 1.2096 +++ tobuild 27 Jul 2005 14:44:43 -0000 1.2097 @@ -115,3 +115,4 @@ jnovy rpms/nedit/devel nedit-5_5-4 devel thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 qspencer rpms/umfpack/devel umfpack-4_4-2 devel +abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 16:30:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 27 Jul 2005 12:30:42 -0400 Subject: common tobuild,1.2097,1.2098 Message-ID: <200507271630.j6RGUgCB026525@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503 Modified Files: tobuild Log Message: cleanup of my failed builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2097 retrieving revision 1.2098 diff -u -r1.2097 -r1.2098 --- tobuild 27 Jul 2005 14:44:43 -0000 1.2097 +++ tobuild 27 Jul 2005 16:30:39 -0000 1.2098 @@ -3,15 +3,12 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 -adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 18:07:25 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 27 Jul 2005 14:07:25 -0400 Subject: extras-buildsys ChangeLog,1.76,1.77 Message-ID: <200507271807.j6RI7Pfk028990@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28937 Modified Files: ChangeLog Log Message: 2005-07-27 Jeremy Katz * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ChangeLog 26 Jul 2005 23:38:51 -0000 1.76 +++ ChangeLog 27 Jul 2005 18:07:23 -0000 1.77 @@ -1,3 +1,7 @@ +2005-07-27 Jeremy Katz + + * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 + 2005-07-26 Dan Williams - www/config.psp From fedora-extras-commits at redhat.com Wed Jul 27 18:07:06 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 27 Jul 2005 14:07:06 -0400 Subject: extras-buildsys/builder builder.py,1.25,1.26 Message-ID: <200507271807.j6RI7ZNX028995@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28937/builder Modified Files: builder.py Log Message: 2005-07-27 Jeremy Katz * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- builder.py 22 Jul 2005 21:35:26 -0000 1.25 +++ builder.py 27 Jul 2005 18:06:46 -0000 1.26 @@ -425,7 +425,7 @@ def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = resolve_buildroot_name(target, 'ppc') self.buildarch = buildarch - self.arch_command = '' + self.arch_command = '/usr/bin/setarch ppc32' BuilderMock.__init__(self, uniqid, target, srpm_url) class PPC64Arch(BuilderMock): From fedora-extras-commits at redhat.com Wed Jul 27 18:13:14 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 14:13:14 -0400 Subject: common tobuild,1.2098,1.2099 Message-ID: <200507271813.j6RIDE9u029240@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223 Modified Files: tobuild Log Message: clean up succeeded or bad builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2098 retrieving revision 1.2099 diff -u -r1.2098 -r1.2099 --- tobuild 27 Jul 2005 16:30:39 -0000 1.2098 +++ tobuild 27 Jul 2005 18:13:12 -0000 1.2099 @@ -5,8 +5,6 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel -scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 -scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 @@ -45,11 +43,8 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel -tagoh rpms/apel/devel apel-10_6-8_fc5 devel qspencer rpms/umfpack/devel umfpack-4_4-1 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 -thias rpms/cdlabelgen/FC-4 cdlabelgen-3_5_0-1_fc4 fc4 -thias rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 devel icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel @@ -94,7 +89,6 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel -thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 18:27:17 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 27 Jul 2005 14:27:17 -0400 Subject: common tobuild,1.2099,1.2100 Message-ID: <200507271827.j6RIRHBe029730@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29713 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2099 retrieving revision 1.2100 diff -u -r1.2099 -r1.2100 --- tobuild 27 Jul 2005 18:13:12 -0000 1.2099 +++ tobuild 27 Jul 2005 18:27:15 -0000 1.2100 @@ -43,7 +43,6 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel -qspencer rpms/umfpack/devel umfpack-4_4-1 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 18:46:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 14:46:26 -0400 Subject: common tobuild,1.2100,1.2101 Message-ID: <200507271846.j6RIkQS5029786@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29767 Modified Files: tobuild Log Message: gcfiles source not updated - removing Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2100 retrieving revision 1.2101 diff -u -r1.2100 -r1.2101 --- tobuild 27 Jul 2005 18:27:15 -0000 1.2100 +++ tobuild 27 Jul 2005 18:46:24 -0000 1.2101 @@ -65,7 +65,6 @@ mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 -Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 19:38:16 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 15:38:16 -0400 Subject: common tobuild,1.2101,1.2102 Message-ID: <200507271938.j6RJcGai031056@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31039 Modified Files: tobuild Log Message: remove failed build Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2101 retrieving revision 1.2102 diff -u -r1.2101 -r1.2102 --- tobuild 27 Jul 2005 18:46:24 -0000 1.2101 +++ tobuild 27 Jul 2005 19:38:14 -0000 1.2102 @@ -41,7 +41,6 @@ byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 -roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 19:38:55 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 15:38:55 -0400 Subject: rpms/monotone/devel monotone.spec,1.1,1.2 Message-ID: <200507271938.j6RJctjR031084@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31067 Modified Files: monotone.spec Log Message: - Include monotone-nav.el too. - Add BuildRequires on cvs so the test suite can run. Index: monotone.spec =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- monotone.spec 18 Jul 2005 23:53:09 -0000 1.1 +++ monotone.spec 27 Jul 2005 19:38:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: monotone Version: 0.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -21,6 +21,9 @@ %define bundled_sqlite no %endif +# The test suite needs cvs. +BuildRequires: cvs + BuildRequires: emacs Requires(post): /sbin/install-info @@ -52,8 +55,8 @@ lispdir=%{buildroot}/%{_datadir}/emacs/site-lisp mkdir -p ${lispdir} -%{__install} -c -m 0444 contrib/monotone.el ${lispdir}/monotone.el -emacs -batch -f batch-byte-compile ${lispdir}/monotone.el +%{__install} -c -m 0444 contrib/monotone*.el ${lispdir} +emacs -batch -f batch-byte-compile ${lispdir} %clean rm -rf %{buildroot} @@ -78,9 +81,13 @@ %{_bindir}/monotone %{_infodir}/monotone.info* %{_mandir}/man1/monotone.1* -%{_datadir}/emacs/site-lisp/monotone.el* +%{_datadir}/emacs/site-lisp/monotone*.el* %changelog +* Wed Jul 27 2005 Roland McGrath - 0.21-2 +- Include monotone-nav.el too. +- Add BuildRequires on cvs so the test suite can run. + * Mon Jul 18 2005 Roland McGrath - 0.21-1 - Updated for 0.21 release. - Install Emacs support. From fedora-extras-commits at redhat.com Wed Jul 27 19:39:43 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 15:39:43 -0400 Subject: common tobuild,1.2102,1.2103 Message-ID: <200507271939.j6RJdhG0031153@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31136 Modified Files: tobuild Log Message: request build of rpms/monotone/devel monotone-0_21-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2102 retrieving revision 1.2103 diff -u -r1.2102 -r1.2103 --- tobuild 27 Jul 2005 19:38:14 -0000 1.2102 +++ tobuild 27 Jul 2005 19:39:41 -0000 1.2103 @@ -104,3 +104,4 @@ thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel +roland rpms/monotone/devel monotone-0_21-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 20:11:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:11:43 -0400 Subject: rpms/wesnoth/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wesnoth.spec, 1.5, 1.6 Message-ID: <200507272012.j6RKCD4k000455@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397/FC-3 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jul 2005 17:22:31 -0000 1.4 +++ .cvsignore 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -wesnoth-0.9.3.tar.gz +wesnoth-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jul 2005 17:22:31 -0000 1.4 +++ sources 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz +b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wesnoth.spec 22 Jul 2005 17:22:31 -0000 1.5 +++ wesnoth.spec 27 Jul 2005 20:11:41 -0000 1.6 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 +- update to 0.9.4 + * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 From fedora-extras-commits at redhat.com Wed Jul 27 20:11:44 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:11:44 -0400 Subject: rpms/wesnoth/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wesnoth.spec, 1.9, 1.10 Message-ID: <200507272012.j6RKCEY1000460@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397/FC-4 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jul 2005 17:21:31 -0000 1.4 +++ .cvsignore 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -wesnoth-0.9.3.tar.gz +wesnoth-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jul 2005 17:21:31 -0000 1.4 +++ sources 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz +b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wesnoth.spec 22 Jul 2005 17:21:31 -0000 1.9 +++ wesnoth.spec 27 Jul 2005 20:11:41 -0000 1.10 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 +- update to 0.9.4 + * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 From fedora-extras-commits at redhat.com Wed Jul 27 20:11:44 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:11:44 -0400 Subject: rpms/wesnoth/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wesnoth.spec, 1.13, 1.14 Message-ID: <200507272012.j6RKCEvr000463@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397/devel Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jul 2005 10:07:50 -0000 1.5 +++ .cvsignore 27 Jul 2005 20:11:42 -0000 1.6 @@ -1 +1 @@ -wesnoth-0.9.3.tar.gz +wesnoth-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jul 2005 10:07:50 -0000 1.5 +++ sources 27 Jul 2005 20:11:42 -0000 1.6 @@ -1 +1 @@ -833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz +b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wesnoth.spec 22 Jul 2005 17:20:06 -0000 1.13 +++ wesnoth.spec 27 Jul 2005 20:11:42 -0000 1.14 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 +- update to 0.9.4 + * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 From fedora-extras-commits at redhat.com Wed Jul 27 20:15:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:15:08 -0400 Subject: common tobuild,1.2103,1.2104 Message-ID: <200507272015.j6RKF8PV000763@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv744 Modified Files: tobuild Log Message: request build of rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2103 retrieving revision 1.2104 diff -u -r1.2103 -r1.2104 --- tobuild 27 Jul 2005 19:39:41 -0000 1.2103 +++ tobuild 27 Jul 2005 20:15:06 -0000 1.2104 @@ -105,3 +105,4 @@ qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel +mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 20:15:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:15:32 -0400 Subject: common tobuild,1.2104,1.2105 Message-ID: <200507272015.j6RKFWfN000796@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv779 Modified Files: tobuild Log Message: request build of rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2104 retrieving revision 1.2105 diff -u -r1.2104 -r1.2105 --- tobuild 27 Jul 2005 20:15:06 -0000 1.2104 +++ tobuild 27 Jul 2005 20:15:30 -0000 1.2105 @@ -106,3 +106,4 @@ abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 +mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 20:51:08 2005 From: fedora-extras-commits at redhat.com (Christian Jodar (Tian)) Date: Wed, 27 Jul 2005 16:51:08 -0400 Subject: rpms/gcfilms/devel sources,1.3,1.4 Message-ID: <200507272051.j6RKp8s4001507@cvs-int.fedora.redhat.com> Author: Tian Update of /cvs/extras/rpms/gcfilms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1478 Modified Files: sources Log Message: New upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Jun 2005 16:58:41 -0000 1.3 +++ sources 27 Jul 2005 20:51:06 -0000 1.4 @@ -1 +1 @@ -5b8954427e264998b8078bc0a0b1be6f gcfilms-5.2.tar.gz +58743009cb2d5a821f33205efa8d4346 gcfilms-5.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 27 22:18:12 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:18:12 -0400 Subject: rpms/scim/FC-4 scim.spec,1.5,1.6 Message-ID: <200507272218.j6RMICLH004370@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4337 Modified Files: scim.spec Log Message: Fix the permission of %{_libdir}/scim-1.0 Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim.spec 26 Jul 2005 08:15:19 -0000 1.5 +++ scim.spec 27 Jul 2005 22:18:10 -0000 1.6 @@ -43,7 +43,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm @@ -137,6 +137,7 @@ %changelog * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release +- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 22:18:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:18:02 -0400 Subject: rpms/scim/FC-3 scim.spec,1.5,1.6 Message-ID: <200507272218.j6RMIW3e004406@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4335 Modified Files: scim.spec Log Message: Fix the permission of %{_libdir}/scim-1.0 Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim.spec 26 Jul 2005 06:34:08 -0000 1.5 +++ scim.spec 27 Jul 2005 22:17:53 -0000 1.6 @@ -43,7 +43,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm @@ -137,6 +137,7 @@ %changelog * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release +- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 22:20:10 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:20:10 -0400 Subject: rpms/scim/FC-3 scim.spec,1.6,1.7 Message-ID: <200507272220.j6RMKAE2004433@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4416 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim.spec 27 Jul 2005 22:17:53 -0000 1.6 +++ scim.spec 27 Jul 2005 22:20:08 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -135,9 +135,11 @@ #-------------------------------------------------- %changelog +* Thr Jul 28 2005 Jens Petersen -1.4.0-2 +- create scim-1.0 dirs to be accessible (Jens Petersen) + * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release -- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 22:21:12 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:21:12 -0400 Subject: rpms/scim/FC-3 scim.spec,1.7,1.8 Message-ID: <200507272221.j6RMLCY8004458@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4441 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim.spec 27 Jul 2005 22:20:08 -0000 1.7 +++ scim.spec 27 Jul 2005 22:21:10 -0000 1.8 @@ -135,7 +135,7 @@ #-------------------------------------------------- %changelog -* Thr Jul 28 2005 Jens Petersen -1.4.0-2 +* Thu Jul 28 2005 Jens Petersen -1.4.0-2 - create scim-1.0 dirs to be accessible (Jens Petersen) * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 From fedora-extras-commits at redhat.com Wed Jul 27 22:21:53 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:21:53 -0400 Subject: rpms/scim/FC-4 scim.spec,1.6,1.7 Message-ID: <200507272221.j6RMLrDV004511@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim.spec 27 Jul 2005 22:18:10 -0000 1.6 +++ scim.spec 27 Jul 2005 22:21:51 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -135,9 +135,11 @@ #-------------------------------------------------- %changelog +* Thu Jul 28 2005 Jens Petersen -1.4.0-2 +- create scim-1.0 dirs to be accessible (Jens Petersen) + * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release -- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 23:16:01 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:16:01 -0400 Subject: common tobuild,1.2105,1.2106 Message-ID: <200507272316.j6RNG1Pm006161@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6144 Modified Files: tobuild Log Message: request build of rpms/notecase/FC-3 notecase-1_0_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2105 retrieving revision 1.2106 diff -u -r1.2105 -r1.2106 --- tobuild 27 Jul 2005 20:15:30 -0000 1.2105 +++ tobuild 27 Jul 2005 23:15:58 -0000 1.2106 @@ -107,3 +107,4 @@ roland rpms/monotone/devel monotone-0_21-2_fc5 devel mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 +ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 23:16:12 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:16:12 -0400 Subject: common tobuild,1.2106,1.2107 Message-ID: <200507272316.j6RNGCqH006194@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177 Modified Files: tobuild Log Message: request build of rpms/notecase/FC-4 notecase-1_0_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2106 retrieving revision 1.2107 diff -u -r1.2106 -r1.2107 --- tobuild 27 Jul 2005 23:15:58 -0000 1.2106 +++ tobuild 27 Jul 2005 23:16:09 -0000 1.2107 @@ -108,3 +108,4 @@ mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 +ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 23:16:21 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:16:21 -0400 Subject: common tobuild,1.2107,1.2108 Message-ID: <200507272316.j6RNGLO9006227@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6210 Modified Files: tobuild Log Message: request build of rpms/notecase/devel notecase-1_0_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2107 retrieving revision 1.2108 diff -u -r1.2107 -r1.2108 --- tobuild 27 Jul 2005 23:16:09 -0000 1.2107 +++ tobuild 27 Jul 2005 23:16:19 -0000 1.2108 @@ -109,3 +109,4 @@ mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 +ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 23:17:45 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:17:45 -0400 Subject: common tobuild,1.2108,1.2109 Message-ID: <200507272317.j6RNHj92006268@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6251 Modified Files: tobuild Log Message: request build of rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2108 retrieving revision 1.2109 diff -u -r1.2108 -r1.2109 --- tobuild 27 Jul 2005 23:16:19 -0000 1.2108 +++ tobuild 27 Jul 2005 23:17:42 -0000 1.2109 @@ -110,3 +110,4 @@ ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel +ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 23:17:55 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:17:55 -0400 Subject: common tobuild,1.2109,1.2110 Message-ID: <200507272317.j6RNHtGB006301@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6284 Modified Files: tobuild Log Message: request build of rpms/leafpad/devel leafpad-0_8_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2109 retrieving revision 1.2110 diff -u -r1.2109 -r1.2110 --- tobuild 27 Jul 2005 23:17:42 -0000 1.2109 +++ tobuild 27 Jul 2005 23:17:52 -0000 1.2110 @@ -111,3 +111,4 @@ ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 +ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 23:38:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 19:38:32 -0400 Subject: common tobuild,1.2110,1.2111 Message-ID: <200507272338.j6RNcWfv006344@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327 Modified Files: tobuild Log Message: request build of rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2110 retrieving revision 1.2111 diff -u -r1.2110 -r1.2111 --- tobuild 27 Jul 2005 23:17:52 -0000 1.2110 +++ tobuild 27 Jul 2005 23:38:30 -0000 1.2111 @@ -112,3 +112,4 @@ ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel +mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 23:47:00 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 27 Jul 2005 19:47:00 -0400 Subject: rpms/abiword/devel .cvsignore, 1.5, 1.6 abiword.spec, 1.8, 1.9 sources, 1.5, 1.6 abiword-2.2.8-mailmerge.patch, 1.1, NONE Message-ID: <200507272347.j6RNl15l006417@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396 Modified Files: .cvsignore abiword.spec sources Removed Files: abiword-2.2.8-mailmerge.patch Log Message: Update to 2.2.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2005 18:45:27 -0000 1.5 +++ .cvsignore 27 Jul 2005 23:46:58 -0000 1.6 @@ -1 +1 @@ -abiword-2.2.8.tar.bz2 +abiword-2.2.9.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abiword.spec 6 Jun 2005 20:32:04 -0000 1.8 +++ abiword.spec 27 Jul 2005 23:46:58 -0000 1.9 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.8 -Release: 2 +Version: 2.2.9 +Release: 1 Epoch: 1 Group: Applications/Editors License: GPL @@ -40,7 +40,6 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.2.6-desktop.patch -Patch2: abiword-2.2.8-mailmerge.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -50,7 +49,6 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .mailmerge %build cd abi @@ -129,6 +127,10 @@ %{_datadir}/icons/*png %changelog +* Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1 +- Update to 2.2.9 +- Drop the mailmerge patch again + * Sun Jun 6 2005 Marc Maurer - 1:2.2.8-2 - Fix build with mailmerge patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2005 18:45:27 -0000 1.5 +++ sources 27 Jul 2005 23:46:58 -0000 1.6 @@ -1 +1 @@ -f6f58e6ea4720ca635ede7b7f13cf156 abiword-2.2.8.tar.bz2 +17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 --- abiword-2.2.8-mailmerge.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 27 23:54:03 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 19:54:03 -0400 Subject: common tobuild,1.2111,1.2112 Message-ID: <200507272354.j6RNs3aK006631@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6614 Modified Files: tobuild Log Message: request build of rpms/monotone/FC-4 monotone-0_21-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2111 retrieving revision 1.2112 diff -u -r1.2111 -r1.2112 --- tobuild 27 Jul 2005 23:38:30 -0000 1.2111 +++ tobuild 27 Jul 2005 23:54:01 -0000 1.2112 @@ -113,3 +113,4 @@ ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel +roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 23:55:11 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 27 Jul 2005 19:55:11 -0400 Subject: common tobuild,1.2112,1.2113 Message-ID: <200507272355.j6RNtBvU006677@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6660 Modified Files: tobuild Log Message: request build of rpms/abiword/devel abiword-2_2_9-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2112 retrieving revision 1.2113 diff -u -r1.2112 -r1.2113 --- tobuild 27 Jul 2005 23:54:01 -0000 1.2112 +++ tobuild 27 Jul 2005 23:55:09 -0000 1.2113 @@ -114,3 +114,4 @@ ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 +uwog rpms/abiword/devel abiword-2_2_9-1 devel From fedora-extras-commits at redhat.com Thu Jul 28 00:01:27 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 27 Jul 2005 20:01:27 -0400 Subject: common tobuild,1.2113,1.2114 Message-ID: <200507280001.j6S01Rwk007854@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7828 Modified Files: tobuild Log Message: request build of rpms/istanbul/devel istanbul-0_1_1-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2113 retrieving revision 1.2114 diff -u -r1.2113 -r1.2114 --- tobuild 27 Jul 2005 23:55:09 -0000 1.2113 +++ tobuild 28 Jul 2005 00:01:25 -0000 1.2114 @@ -115,3 +115,4 @@ mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel +jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel From fedora-extras-commits at redhat.com Thu Jul 28 00:53:42 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 27 Jul 2005 20:53:42 -0400 Subject: web/html/docs/beta/yum-software-management generated-index.php, 1.2, 1.3 index.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 sn-managing-packages.php, 1.2, 1.3 sn-searching-packages.php, 1.2, 1.3 sn-software-management-concepts.php, 1.2, 1.3 sn-software-management-tools.php, 1.2, 1.3 sn-updating-your-system.php, 1.2, 1.3 sn-using-repositories.php, 1.2, 1.3 sn-yum-installing-frompackage.php, 1.2, 1.3 sn-yum-maintenance.php, 1.2, 1.3 sn-yum-proxy-server.php, 1.2, 1.3 Message-ID: <200507280053.j6S0rg3f007972@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/beta/yum-software-management In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7940 Modified Files: generated-index.php index.php ln-legalnotice.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: New beta version, - Clarify wording on effect of purging caches - Explicitly list Fedora repositories - Amended explanation of use of wildcards in searches - Revised section on Repository Compatibility. - Style fix in Advanced Search section. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 26 Jul 2005 01:42:03 -0000 1.2 +++ index.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -63,7 +63,7 @@ root password. The example terminal commands use su -c to provide this facility. -

    [Note]The http_proxy Environment - Variable

    +

    Example 4. Profile Settings for a Secured Proxy Server

    [Note]The http_proxy Environment Variable

    The http_proxy environment variable is also - used by curl and other utilities. Although - yum itself may use - http_proxy in either upper-case or - lower-case, curl requires the name of the - variable to be in lower-case. + used by curl and other utilities. Although + yum itself may use + http_proxy in either upper-case or + lower-case, curl requires the name of the + variable to be in lower-case.

    Prev Up Next
    9. Manually Installing Software Home Index
    Author: ryo Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8075 Modified Files: .cvsignore scim-anthy.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Jul 2005 03:29:30 -0000 1.4 +++ .cvsignore 26 Jul 2005 06:15:43 -0000 1.5 @@ -1 +1 @@ -scim-anthy-0.5.1.tar.gz +scim-anthy-0.5.2.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-anthy.spec 9 Jul 2005 03:53:16 -0000 1.6 +++ scim-anthy.spec 26 Jul 2005 06:15:43 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,6 +45,9 @@ %changelog +* Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 +- update to 0.5.2 release + * Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jul 2005 03:53:16 -0000 1.5 +++ sources 26 Jul 2005 06:15:43 -0000 1.6 @@ -1 +1 @@ -53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz +f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 06:24:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 26 Jul 2005 02:24:12 -0400 Subject: common tobuild,1.2069,1.2070 Message-ID: <200507260624.j6Q6OCuD008138@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8121 Modified Files: tobuild Log Message: Remove obsolete build requests. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2069 retrieving revision 1.2070 diff -u -r1.2069 -r1.2070 --- tobuild 26 Jul 2005 01:10:19 -0000 1.2069 +++ tobuild 26 Jul 2005 06:24:10 -0000 1.2070 @@ -34,7 +34,6 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 -corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 06:34:10 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 02:34:10 -0400 Subject: rpms/scim/FC-3 .cvsignore, 1.3, 1.4 scim.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507260634.j6Q6YAkb008406@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8385 Modified Files: .cvsignore scim.spec sources Log Message: Update to 1.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 May 2005 02:34:31 -0000 1.3 +++ .cvsignore 26 Jul 2005 06:34:08 -0000 1.4 @@ -1 +1 @@ -scim-1.2.3.tar.gz +scim-1.4.0.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim.spec 20 Jun 2005 14:33:06 -0000 1.4 +++ scim.spec 26 Jul 2005 06:34:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -36,17 +36,17 @@ %build -%configure +%configure --disable-static --disable-ld-version-script make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la -find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f +find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel desktop-file-install \ @@ -132,13 +132,24 @@ %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc +#-------------------------------------------------- %changelog -* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 -- Remove one of doubled capplets for setup. +* Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 +- update to 1.4.0 release -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 -- Update packaging for Fedora Extras +* Sat Jul 9 2005 Jens Petersen - 1.3.3-1 +- update to 1.3.3 release +- disable linking with version-scripts for now since they cause some problems +- disable building of static libs + +* Tue Jul 5 2005 Jens Petersen - 1.3.2-1 +- update to 1.3.2 test release +- don't set xinput.d script executable +- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +- update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 - Initial packaging for Fedora Extras @@ -159,3 +170,120 @@ * Sat Jun 19 2004 James Su - Added /usr/libexec/scim-launcher. - Remove setup module for SocketFrontEnd and SocketIMEngine. + +* Mon Mar 8 2004 James Su +- Added scim-config-agent. + +* Thu Oct 30 2003 James Su +- Added Simplified Chinese User Manual. + +* Wed Sep 03 2003 James Su +- cleanup spec. + +* Tue Sep 02 2003 James Su +- upto 0.8.0 + +* Tue Jul 29 2003 James Su +- updated to include scim-panel-gtk. + +* Thu Jun 19 2003 James Su +- updated to include scim-setup and its modules. + +* Thu Apr 3 2003 James Su +- added suite package, which includes all necessary components of SCIM. + +* Tue Mar 25 2003 James Su +- updated to v0.4.0 + +* Wed Feb 26 2003 James Su +- implemented dynamic adjust feature for generic table module. +- fixed key handling bug in generic table module. + +* Mon Feb 10 2003 James Su +- Replaced highlight_start and highlight_end in scim_server + and scim_frontend with AttributeList (scim_attributes.h) +- Moved icons/* to data/icons and gtkstringview.* to + utils/ + +* Thu Jan 2 2003 James Su +- updated configure.ac and Makefile.am +- ready to release 0.3.0 + +* Tue Nov 12 2002 James Su +- merged signal system from libinti. +- implemented namespace scim. +- implemented referenced object. +- version 0.3.0 + +* Tue Nov 05 2002 James Su +- minor fixes for table IM module. + +* Mon Nov 04 2002 James Su +- More IMdkit memory leak fixes. +- Table input method bugfixes. +- version 0.2.2 + +* Fri Nov 01 2002 James Su +- improved table input method. +- actually fixed the memleaks within IMdkit. +- pumped the version to 0.2.1 + +* Thu Oct 31 2002 James Su +- fixed some memory leaks in IMdkit +- reduced memory usage. +- upgraded to libtool-1.4.3 + +* Tue Oct 29 2002 James Su +- finished Generic Table input server module. +- fixed several bugs in scim-lib. + +* Thu Oct 10 2002 James Su +- used gettext to support i18n message. +- added release info to lib name. + +* Mon Sep 30 2002 James Su +- version 0.1.4 +- added Embedded Lookup Table style into X11 FrontEnd. +- use wchar_t instead of unsigned long if __STDC_ISO_10646__ defined. + +* Sun Sep 22 2002 James Su +- version 0.1.3 +- config button of X11 FrontEnd was disabled. + +* Fri Sep 6 2002 James Su +- simplified the utilities and lookup table interface. + +* Wed Aug 21 2002 James Su +- version 0.1.2 +- added configuration options to disable modules. +- enhanced X11 FrontEnd. + +* Sun Aug 11 2002 James Su +- version 0.1.1 +- X11 FrontEnd was enhanced. + +* Sat Aug 10 2002 James Su +- version 0.1.0 +- many bugfixes. +- Help window of X11 FrontEnd was implemented. +- scim can exit cleanly. + +* Fri Aug 2 2002 James Su +- SCIM 0.0.13. +- Minor bugfixes. + +* Mon Jul 29 2002 James Su +- SCIM 0.0.12. +- Minor bugfixes. + +* Sun Jul 28 2002 James Su +- SCIM 0.0.11. +- Minor bugfixes. + +* Sun Jul 21 2002 James Su +- SCIM 0.0.10. +- Added Simple Config module. + +* Sat Jun 22 2002 James Su +- first public release of SCIM. + Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 May 2005 02:34:31 -0000 1.3 +++ sources 26 Jul 2005 06:34:08 -0000 1.4 @@ -1 +1 @@ -9031648718cbeb10aea879726f0e9d5b scim-1.2.3.tar.gz +9af14f5dc73435affb36b116ad77b53e scim-1.4.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 06:34:48 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 02:34:48 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.4,1.5 Message-ID: <200507260634.j6Q6YmOB008429@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8412 Modified Files: scim-anthy.spec Log Message: Update to 0.5.2 Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-anthy.spec 30 Jun 2005 13:15:35 -0000 1.4 +++ scim-anthy.spec 26 Jul 2005 06:34:46 -0000 1.5 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.5.0 +Version: 0.5.2 Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input @@ -45,6 +45,12 @@ %changelog +* Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 +- update to 0.5.2 release + +* Sat Jul 9 2005 Jens Petersen - 0.5.1-2 +- update to 0.5.1 release + * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 - update to 0.5.0 release From fedora-extras-commits at redhat.com Tue Jul 26 06:35:15 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 02:35:15 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.6,1.7 Message-ID: <200507260635.j6Q6ZFqe008452@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435 Modified Files: scim-anthy.spec Log Message: Update to 0.5.2 Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-anthy.spec 9 Jul 2005 03:51:00 -0000 1.6 +++ scim-anthy.spec 26 Jul 2005 06:35:12 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,6 +45,9 @@ %changelog +* Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 +- update to 0.5.2 release + * Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release From fedora at tqmcube.com Tue Jul 26 02:54:05 2005 From: fedora at tqmcube.com (David Cary Hart) Date: Mon, 25 Jul 2005 22:54:05 -0400 Subject: rpms/leafnode/FC-4 leafnode.spec,1.10,1.11 In-Reply-To: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com> References: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com> Message-ID: <1122346445.11458.62.camel@dch.TQMcube.com> On Mon, 2005-07-25 at 20:46 -0400, Michael Schwendt wrote: > Author: mschwendt > > Update of /cvs/extras/rpms/leafnode/FC-4 > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv596 > > Modified Files: > leafnode.spec > Log Message: > Fix non-UTF-8 in German description (#159587) and modify it a little bit. > > > Index: leafnode.spec Vielen Dank Sir. I received a successful build notice and removed it from "tobuild." Do I now "make build" again? BTW, I requested a review on a new package (bld) today. I sure hope that I'm following the procedure correctly. -- Tired of spam? Do YOUR part: http://www.BoulderPledge.org Our DNSRBL - Eliminate Spam: http://www.TQMcube.com/spam_trap.htm RBLDNSD HowTo: http://www.TQMcube.com/rbldnsd.htm Multi-RBL Check: http://www.TQMcube.com/rblcheck.htm From skvidal at phy.duke.edu Tue Jul 26 07:28:36 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Tue, 26 Jul 2005 03:28:36 -0400 Subject: rpms/leafnode/FC-4 leafnode.spec,1.10,1.11 In-Reply-To: <1122346445.11458.62.camel@dch.TQMcube.com> References: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com> <1122346445.11458.62.camel@dch.TQMcube.com> Message-ID: <1122362916.9641.19.camel@cutter> On Mon, 2005-07-25 at 22:54 -0400, David Cary Hart wrote: > On Mon, 2005-07-25 at 20:46 -0400, Michael Schwendt wrote: > > Author: mschwendt > > > > Update of /cvs/extras/rpms/leafnode/FC-4 > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv596 > > > > Modified Files: > > leafnode.spec > > Log Message: > > Fix non-UTF-8 in German description (#159587) and modify it a little bit. > > > > > > Index: leafnode.spec > > Vielen Dank Sir. > > I received a successful build notice and removed it from "tobuild." Do I > now "make build" again? > > BTW, I requested a review on a new package (bld) today. I sure hope that > I'm following the procedure correctly. requesting a new build is fine. And thank you for removing your completed build from the queue. The procedure is in flux for the moment so don't worry about it too much. -sv From fedora-extras-commits at redhat.com Tue Jul 26 08:15:21 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:15:21 -0400 Subject: rpms/scim/FC-4 scim.spec,1.4,1.5 Message-ID: <200507260815.j6Q8FL63011380@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11363 Modified Files: scim.spec Log Message: Update to 1.4.0 Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim.spec 21 Jun 2005 00:10:42 -0000 1.4 +++ scim.spec 26 Jul 2005 08:15:19 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -36,17 +36,17 @@ %build -%configure +%configure --disable-static --disable-ld-version-script make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la -find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f +find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel desktop-file-install \ @@ -132,13 +132,24 @@ %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc +#-------------------------------------------------- %changelog -* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 -- Remove one of doubled capplets for setup. +* Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 +- update to 1.4.0 release -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 -- Update packaging for Fedora Extras +* Sat Jul 9 2005 Jens Petersen - 1.3.3-1 +- update to 1.3.3 release +- disable linking with version-scripts for now since they cause some problems +- disable building of static libs + +* Tue Jul 5 2005 Jens Petersen - 1.3.2-1 +- update to 1.3.2 test release +- don't set xinput.d script executable +- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +- update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 - Initial packaging for Fedora Extras @@ -159,3 +170,120 @@ * Sat Jun 19 2004 James Su - Added /usr/libexec/scim-launcher. - Remove setup module for SocketFrontEnd and SocketIMEngine. + +* Mon Mar 8 2004 James Su +- Added scim-config-agent. + +* Thu Oct 30 2003 James Su +- Added Simplified Chinese User Manual. + +* Wed Sep 03 2003 James Su +- cleanup spec. + +* Tue Sep 02 2003 James Su +- upto 0.8.0 + +* Tue Jul 29 2003 James Su +- updated to include scim-panel-gtk. + +* Thu Jun 19 2003 James Su +- updated to include scim-setup and its modules. + +* Thu Apr 3 2003 James Su +- added suite package, which includes all necessary components of SCIM. + +* Tue Mar 25 2003 James Su +- updated to v0.4.0 + +* Wed Feb 26 2003 James Su +- implemented dynamic adjust feature for generic table module. +- fixed key handling bug in generic table module. + +* Mon Feb 10 2003 James Su +- Replaced highlight_start and highlight_end in scim_server + and scim_frontend with AttributeList (scim_attributes.h) +- Moved icons/* to data/icons and gtkstringview.* to + utils/ + +* Thu Jan 2 2003 James Su +- updated configure.ac and Makefile.am +- ready to release 0.3.0 + +* Tue Nov 12 2002 James Su +- merged signal system from libinti. +- implemented namespace scim. +- implemented referenced object. +- version 0.3.0 + +* Tue Nov 05 2002 James Su +- minor fixes for table IM module. + +* Mon Nov 04 2002 James Su +- More IMdkit memory leak fixes. +- Table input method bugfixes. +- version 0.2.2 + +* Fri Nov 01 2002 James Su +- improved table input method. +- actually fixed the memleaks within IMdkit. +- pumped the version to 0.2.1 + +* Thu Oct 31 2002 James Su +- fixed some memory leaks in IMdkit +- reduced memory usage. +- upgraded to libtool-1.4.3 + +* Tue Oct 29 2002 James Su +- finished Generic Table input server module. +- fixed several bugs in scim-lib. + +* Thu Oct 10 2002 James Su +- used gettext to support i18n message. +- added release info to lib name. + +* Mon Sep 30 2002 James Su +- version 0.1.4 +- added Embedded Lookup Table style into X11 FrontEnd. +- use wchar_t instead of unsigned long if __STDC_ISO_10646__ defined. + +* Sun Sep 22 2002 James Su +- version 0.1.3 +- config button of X11 FrontEnd was disabled. + +* Fri Sep 6 2002 James Su +- simplified the utilities and lookup table interface. + +* Wed Aug 21 2002 James Su +- version 0.1.2 +- added configuration options to disable modules. +- enhanced X11 FrontEnd. + +* Sun Aug 11 2002 James Su +- version 0.1.1 +- X11 FrontEnd was enhanced. + +* Sat Aug 10 2002 James Su +- version 0.1.0 +- many bugfixes. +- Help window of X11 FrontEnd was implemented. +- scim can exit cleanly. + +* Fri Aug 2 2002 James Su +- SCIM 0.0.13. +- Minor bugfixes. + +* Mon Jul 29 2002 James Su +- SCIM 0.0.12. +- Minor bugfixes. + +* Sun Jul 28 2002 James Su +- SCIM 0.0.11. +- Minor bugfixes. + +* Sun Jul 21 2002 James Su +- SCIM 0.0.10. +- Added Simple Config module. + +* Sat Jun 22 2002 James Su +- first public release of SCIM. + From fedora-extras-commits at redhat.com Tue Jul 26 08:16:08 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:16:08 -0400 Subject: rpms/scim-anthy/FC-3 sources,1.3,1.4 Message-ID: <200507260816.j6Q8G8Yj011437@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11386 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2005 13:15:35 -0000 1.3 +++ sources 26 Jul 2005 08:16:06 -0000 1.4 @@ -1 +1 @@ -1e220a07404668f876d727b6e23a9ae0 scim-anthy-0.5.0.tar.gz +f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 08:17:16 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:17:16 -0400 Subject: rpms/scim-anthy/FC-4 sources,1.5,1.6 Message-ID: <200507260817.j6Q8HGUr011460@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11443 Modified Files: sources Log Message: Modify "sources" (I've forgetten to change this) Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jul 2005 03:51:00 -0000 1.5 +++ sources 26 Jul 2005 08:17:14 -0000 1.6 @@ -1 +1 @@ -53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz +f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 08:18:11 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:18:11 -0400 Subject: rpms/scim/FC-4 sources,1.3,1.4 Message-ID: <200507260818.j6Q8IBDN011486@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11469 Modified Files: sources Log Message: Modify "sources" Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 May 2005 01:35:21 -0000 1.3 +++ sources 26 Jul 2005 08:18:09 -0000 1.4 @@ -1 +1 @@ -9031648718cbeb10aea879726f0e9d5b scim-1.2.3.tar.gz +9af14f5dc73435affb36b116ad77b53e scim-1.4.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 10:07:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 06:07:48 -0400 Subject: devel/common tobuild,1.2070,1.2071 Message-ID: <200507261007.j6QA7ns3013970@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13953 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2070 retrieving revision 1.2071 diff -u -r1.2070 -r1.2071 --- tobuild 26 Jul 2005 06:24:10 -0000 1.2070 +++ tobuild 26 Jul 2005 10:07:46 -0000 1.2071 @@ -1,6 +1,8 @@ # this is the build control file. the format is # user repo tag target status # +ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel +anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 @@ -80,7 +82,6 @@ scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel scop rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 fc4 scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder-0_27-2_fc3 fc3 scop rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel @@ -128,7 +129,6 @@ s4504kr rpms/inadyn/devel inadyn-1_95-1 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel -ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 11:43:34 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:43:34 -0400 Subject: rpms/cd-discid/devel cd-discid.spec,1.3,1.4 Message-ID: <200507261143.j6QBhYqc015184@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/cd-discid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15167 Modified Files: cd-discid.spec Log Message: install proper man page (#164105, fix by Paul W. Frields) Index: cd-discid.spec =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/cd-discid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cd-discid.spec 6 Apr 2005 22:11:33 -0000 1.3 +++ cd-discid.spec 26 Jul 2005 11:43:32 -0000 1.4 @@ -1,7 +1,7 @@ Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 -Release: 3 +Release: 4 Group: Applications/Multimedia License: GPL @@ -24,7 +24,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 cd-discid.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 26 2005 Nils Philippsen +- install proper man page (#164105, fix by Paul W. Frields) + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 26 11:46:38 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:46:38 -0400 Subject: common tobuild,1.2071,1.2072 Message-ID: <200507261146.j6QBkcP7015256@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15239 Modified Files: tobuild Log Message: request build of rpms/cd-discid/devel cd-discid-0_9-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2071 retrieving revision 1.2072 diff -u -r1.2071 -r1.2072 --- tobuild 26 Jul 2005 10:07:46 -0000 1.2071 +++ tobuild 26 Jul 2005 11:46:36 -0000 1.2072 @@ -138,3 +138,4 @@ mschwendt devel/meld meld-1_0_0-1_fc5 devel Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/inkscape inkscape-0_42-1_fc5 devel +nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel From fedora-extras-commits at redhat.com Tue Jul 26 11:55:46 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:55:46 -0400 Subject: rpms/cd-discid/FC-4 cd-discid.spec,1.3,1.4 Message-ID: <200507261155.j6QBtkZA015329@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/cd-discid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15307 Modified Files: cd-discid.spec Log Message: install proper man page (#164105, fix by Paul W. Frields) Index: cd-discid.spec =================================================================== RCS file: /cvs/extras/rpms/cd-discid/FC-4/cd-discid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cd-discid.spec 6 Apr 2005 22:11:33 -0000 1.3 +++ cd-discid.spec 26 Jul 2005 11:55:44 -0000 1.4 @@ -1,7 +1,7 @@ Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 -Release: 3 +Release: 3.fc4.1 Group: Applications/Multimedia License: GPL @@ -24,7 +24,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 cd-discid.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 26 2005 Nils Philippsen +- install proper man page (#164105, fix by Paul W. Frields) + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 26 11:56:15 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:56:15 -0400 Subject: common tobuild,1.2072,1.2073 Message-ID: <200507261156.j6QBuFRo015393@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15376 Modified Files: tobuild Log Message: request build of rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2072 retrieving revision 1.2073 diff -u -r1.2072 -r1.2073 --- tobuild 26 Jul 2005 11:46:36 -0000 1.2072 +++ tobuild 26 Jul 2005 11:56:13 -0000 1.2073 @@ -139,3 +139,4 @@ Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/inkscape inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel +nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 11:56:24 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:56:24 -0400 Subject: rpms/libcdio/devel libcdio.spec,1.11,1.12 Message-ID: <200507261156.j6QBuOQA015416@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15399 Modified Files: libcdio.spec Log Message: * Tue Jul 26 2005 Adrian Reber - 0.75-2 - Rebuilt Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcdio.spec 15 Jul 2005 06:30:22 -0000 1.11 +++ libcdio.spec 26 Jul 2005 11:56:22 -0000 1.12 @@ -1,6 +1,6 @@ Name: libcdio Version: 0.75 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia @@ -93,6 +93,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 0.75-2 +- Rebuilt + * Thu Jul 14 2005 Adrian Reber - 0.75-1 - Updated to 0.75. From fedora-extras-commits at redhat.com Tue Jul 26 11:56:55 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:56:55 -0400 Subject: common tobuild,1.2073,1.2074 Message-ID: <200507261156.j6QButYs015478@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15461 Modified Files: tobuild Log Message: request build of rpms/libcdio/devel libcdio-0_75-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2073 retrieving revision 1.2074 diff -u -r1.2073 -r1.2074 --- tobuild 26 Jul 2005 11:56:13 -0000 1.2073 +++ tobuild 26 Jul 2005 11:56:52 -0000 1.2074 @@ -140,3 +140,4 @@ mschwendt devel/inkscape inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 +adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 26 11:58:21 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:58:21 -0400 Subject: rpms/libcdio/FC-4 .cvsignore, 1.5, 1.6 libcdio.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507261158.j6QBwLeZ015516@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15495 Modified Files: .cvsignore libcdio.spec sources Log Message: * Tue Jul 26 2005 Adrian Reber - 0.75-2 - Rebuilt Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Jun 2005 11:23:51 -0000 1.5 +++ .cvsignore 26 Jul 2005 11:58:19 -0000 1.6 @@ -1,2 +1,2 @@ -libcdio-0.74.tar.gz -libcdio-0.74.tar.gz.sig +libcdio-0.75.tar.gz +libcdio-0.75.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libcdio.spec 5 Jun 2005 11:23:51 -0000 1.9 +++ libcdio.spec 26 Jul 2005 11:58:19 -0000 1.10 @@ -1,13 +1,13 @@ Name: libcdio -Version: 0.74 +Version: 0.75 Release: 2%{?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.74.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.74.tar.gz.sig +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libcddb-devel >= 0.9.4 @@ -93,6 +93,12 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 0.75-2 +- Rebuilt + +* Thu Jul 14 2005 Adrian Reber - 0.75-1 +- Updated to 0.75. + * Fri Jun 03 2005 Adrian Reber - 0.74-2 - Updated to 0.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Jun 2005 11:23:51 -0000 1.5 +++ sources 26 Jul 2005 11:58:19 -0000 1.6 @@ -1,2 +1,2 @@ -2b1b03d96a992d171ebf2b13bcdcd866 libcdio-0.74.tar.gz -8dddd44a78d1eda7bdeac0afc30d6ba8 libcdio-0.74.tar.gz.sig +628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz +3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig From fedora-extras-commits at redhat.com Tue Jul 26 11:58:51 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:58:51 -0400 Subject: common tobuild,1.2074,1.2075 Message-ID: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15561 Modified Files: tobuild Log Message: request build of rpms/libcdio/FC-4 libcdio-0_75-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2074 retrieving revision 1.2075 diff -u -r1.2074 -r1.2075 --- tobuild 26 Jul 2005 11:56:52 -0000 1.2074 +++ tobuild 26 Jul 2005 11:58:48 -0000 1.2075 @@ -141,3 +141,4 @@ nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 12:08:31 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:08:31 -0400 Subject: rpms/scmxx - New directory Message-ID: <200507261208.j6QC8Vx5016839@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16815/scmxx Log Message: Directory /cvs/extras/rpms/scmxx added to the repository From fedora-extras-commits at redhat.com Tue Jul 26 12:08:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:08:32 -0400 Subject: rpms/scmxx/devel - New directory Message-ID: <200507261208.j6QC8WlZ016842@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16815/scmxx/devel Log Message: Directory /cvs/extras/rpms/scmxx/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 26 12:09:03 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:03 -0400 Subject: rpms/scmxx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507261209.j6QC937Y016890@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863 Added Files: Makefile import.log Log Message: Setup of module scmxx --- NEW FILE Makefile --- # Top level Makefile for module scmxx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 26 12:09:04 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:04 -0400 Subject: rpms/scmxx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507261209.j6QC94ZX016895@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scmxx --- NEW 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 Jul 26 12:09:46 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:46 -0400 Subject: rpms/scmxx import.log,1.1,1.2 Message-ID: <200507261210.j6QCAHMF016967@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932 Modified Files: import.log Log Message: auto-import scmxx-0.8.0-1 on branch devel from scmxx-0.8.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scmxx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Jul 2005 12:09:01 -0000 1.1 +++ import.log 26 Jul 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +scmxx-0_8_0-1:HEAD:scmxx-0.8.0-1.src.rpm:1122379768 From fedora-extras-commits at redhat.com Tue Jul 26 12:09:47 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:47 -0400 Subject: rpms/scmxx/devel scmxx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507261209.j6QC9lgo016962@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932/devel Modified Files: .cvsignore sources Added Files: scmxx.spec Log Message: auto-import scmxx-0.8.0-1 on branch devel from scmxx-0.8.0-1.src.rpm --- NEW FILE scmxx.spec --- Summary: exchange data with Siemens mobile phones Summary(de): Datenaustausch mit Siemens-Handys Summary(it): Scambia dati con telefonini Siemens Name: scmxx Version: 0.8.0 Release: 1 Group: console Copyright: GPL Vendor: Hendrik Sattler Url: http://www.hendrik-sattler.de/scmxx Packager: Hendrik Sattler Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description SCMxx is a console program that allows you to exchange certain types of data with mobile phones made by Siemens. Some of the data types that can be exchanged are logos, ring tones, vCalendars, phonebook entries, and short messages. Other actions like setting the time and dialling a number are also possible. SCMxx works with the following models: S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 and probably others. It basically uses the AT command set published by Siemens (with some other, additional resources). See the website %{url} for details. %description -l de SCMxx ist ein Konsolenprogramm das es erm?glicht, bestimmte Daten mit Handys von Siemens auszutauschen. Einige der Daten, die transferiert werden k?nnen, sind Logos, Klingelt?ne, vCalendars, Telefonbucheintr?ge, und Kurznachrichten. Andere Aktionen wie das Setzen der Zeit und da W?hlen von Rufnummer ist ebenso m?glich. SCMxx kann mit folgenden Modellen umgehen: S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 und eventuell anderen. Es wird haupts?chlich das von Siemens ver?ffentlichte AT-Kommando-Set (zusammen mit anderen, zus?tzlichen Resourcen) verwendet. Weitere Details finden man auf der Webseite %{url}. %description -l it SCMxx ?? un programma da console che ti permette di scambiare alcuti tipi di dati con telefonini Siemens. Questi dati possono essere loghi, suonerie, vCalendars, record dell'agenda telefonica e sms. E' anche possibile modificare l'ora o comporre un numero. SCMxx funziona con i modelli seguenti: S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 e probabilmente altri. Si basa sul set di comandi AT pubblicati da Siemens (e su altre risorse aggiuntive). Visita il sito %{url} per dettagli. %prep %setup -q %build %configure %{__make} %install %{__make} install DESTDIR=$RPM_BUILD_ROOT %clean %{__make} distclean %files %defattr(-,root,root) %doc AUTHORS BUGS CHANGELOG INSTALL README TODO TRANSLATION examples docs/*.txt %attr(0755,-,-) %{_bindir}/%{name} %attr(0644,-,-) %{_mandir}/man1/%{name}.1* %attr(0644,-,-) %{_mandir}/*/man1/%{name}.1* %attr(0644,-,-) %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo %changelog * Tue Aug 24 2004 Hendrik Sattler - install all translation of the manpage - install all gettext files - reformat and extend description - add german summary and german description - use default configure command instead of custom invocation - remove x-flag from all non-executable files - remove old url from Source0 field * Mon Nov 18 2002 Hendrik Sattler - added manpage to package * Sat Jul 1 2002 Hendrik Sattler - changed defattr, so dirs get their x-flag * Sat May 14 2002 Hendrik Sattler - extensive usage of environment variables in the spec file - moved/renamed files in docdir * Sat Feb 9 2002 Petr Kri?tof - RPM spec update * Sat Nov 17 2001 Hendrik Sattler - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scmxx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Jul 2005 12:09:02 -0000 1.1 +++ .cvsignore 26 Jul 2005 12:09:45 -0000 1.2 @@ -0,0 +1 @@ +scmxx-0.8.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scmxx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Jul 2005 12:09:02 -0000 1.1 +++ sources 26 Jul 2005 12:09:45 -0000 1.2 @@ -0,0 +1 @@ +21de1f98864e296da2cb6b424112361c scmxx-0.8.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:11:20 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:11:20 -0400 Subject: rpms/libcddb/FC-3 libcddb.spec,1.7,1.8 sources,1.4,1.5 Message-ID: <200507261211.j6QCBK1T017064@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018/FC-3 Modified Files: libcddb.spec sources Log Message: libcddb: updated to 1.2.0 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libcddb.spec 21 Jul 2005 18:24:32 -0000 1.7 +++ libcddb.spec 26 Jul 2005 12:11:18 -0000 1.8 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ -Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.gz +Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig libcdio-devel >= 0.67 @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-1 +- Updated to 1.2.0 + * Thu Jul 21 2005 Dams - 1.1.0-1 - Updated to 1.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 18:24:32 -0000 1.4 +++ sources 26 Jul 2005 12:11:18 -0000 1.5 @@ -1 +1 @@ -c15ee69fcb9459c9450e8140cdef0952 libcddb-1.1.0.tar.gz +1a3e46d2f0691d1308614ad494bb9e62 libcddb-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:11:21 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:11:21 -0400 Subject: rpms/libcddb/FC-4 .cvsignore, 1.4, 1.5 libcddb.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <200507261211.j6QCBLvZ017072@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018/FC-4 Modified Files: .cvsignore libcddb.spec sources Log Message: libcddb: updated to 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Jul 2005 18:24:32 -0000 1.4 +++ .cvsignore 26 Jul 2005 12:11:19 -0000 1.5 @@ -1 +1 @@ -libcddb-1.1.0.tar.gz +libcddb-1.2.0.tar.bz2 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcddb.spec 21 Jul 2005 18:24:32 -0000 1.11 +++ libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ -Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.gz +Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig libcdio-devel >= 0.67 @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-1 +- Updated to 1.2.0 + * Thu Jul 21 2005 Dams - 1.1.0-1 - Updated to 1.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 18:24:32 -0000 1.4 +++ sources 26 Jul 2005 12:11:19 -0000 1.5 @@ -1 +1 @@ -c15ee69fcb9459c9450e8140cdef0952 libcddb-1.1.0.tar.gz +1a3e46d2f0691d1308614ad494bb9e62 libcddb-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:11:21 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:11:21 -0400 Subject: rpms/libcddb/devel libcddb.spec,1.11,1.12 sources,1.4,1.5 Message-ID: <200507261211.j6QCBLI2017079@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018/devel Modified Files: libcddb.spec sources Log Message: libcddb: updated to 1.2.0 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcddb.spec 21 Jul 2005 18:24:33 -0000 1.11 +++ libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ -Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.gz +Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig libcdio-devel >= 0.67 @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-1 +- Updated to 1.2.0 + * Thu Jul 21 2005 Dams - 1.1.0-1 - Updated to 1.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 18:24:33 -0000 1.4 +++ sources 26 Jul 2005 12:11:19 -0000 1.5 @@ -1 +1 @@ -c15ee69fcb9459c9450e8140cdef0952 libcddb-1.1.0.tar.gz +1a3e46d2f0691d1308614ad494bb9e62 libcddb-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:13:01 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:13:01 -0400 Subject: common tobuild,1.2075,1.2076 Message-ID: <200507261213.j6QCD121017189@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17172 Modified Files: tobuild Log Message: request build of rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2075 retrieving revision 1.2076 diff -u -r1.2075 -r1.2076 --- tobuild 26 Jul 2005 11:58:48 -0000 1.2075 +++ tobuild 26 Jul 2005 12:12:59 -0000 1.2076 @@ -142,3 +142,4 @@ nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 12:13:06 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:13:06 -0400 Subject: rpms/scmxx/devel scmxx.spec,1.1,1.2 Message-ID: <200507261213.j6QCD6Cc017208@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17168 Modified Files: scmxx.spec Log Message: checked in correct specfile Index: scmxx.spec =================================================================== RCS file: /cvs/extras/rpms/scmxx/devel/scmxx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scmxx.spec 26 Jul 2005 12:09:45 -0000 1.1 +++ scmxx.spec 26 Jul 2005 12:13:04 -0000 1.2 @@ -1,93 +1,47 @@ -Summary: exchange data with Siemens mobile phones -Summary(de): Datenaustausch mit Siemens-Handys -Summary(it): Scambia dati con telefonini Siemens -Name: scmxx -Version: 0.8.0 -Release: 1 -Group: console -Copyright: GPL -Vendor: Hendrik Sattler -Url: http://www.hendrik-sattler.de/scmxx -Packager: Hendrik Sattler -Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Summary: Exchange data with Siemens mobile phones +Name: scmxx +Version: 0.8.0 +Release: 1%{?dist} +Group: Applications/Communications +License: GPL +URL: http://www.hendrik-sattler.de/scmxx +Source0: http://dl.sourceforge.net/scmxx/scmxx-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libxslt-devel %description - SCMxx is a console program that allows you to exchange certain types of - data with mobile phones made by Siemens. Some of the data types that can be - exchanged are logos, ring tones, vCalendars, phonebook entries, and short - messages. Other actions like setting the time and dialling a number are also - possible. SCMxx works with the following models: - S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 and probably others. - It basically uses the AT command set published by Siemens (with some other, - additional resources). - See the website %{url} for details. - -%description -l de - SCMxx ist ein Konsolenprogramm das es erm?glicht, bestimmte Daten mit Handys - von Siemens auszutauschen. Einige der Daten, die transferiert werden k?nnen, - sind Logos, Klingelt?ne, vCalendars, Telefonbucheintr?ge, und - Kurznachrichten. Andere Aktionen wie das Setzen der Zeit und da W?hlen von - Rufnummer ist ebenso m?glich. SCMxx kann mit folgenden Modellen umgehen: - S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 und eventuell anderen. - Es wird haupts?chlich das von Siemens ver?ffentlichte AT-Kommando-Set - (zusammen mit anderen, zus?tzlichen Resourcen) verwendet. - Weitere Details finden man auf der Webseite %{url}. - -%description -l it - SCMxx ?? un programma da console che ti permette di scambiare alcuti tipi di - dati con telefonini Siemens. Questi dati possono essere loghi, suonerie, - vCalendars, record dell'agenda telefonica e sms. E' anche possibile modificare - l'ora o comporre un numero. SCMxx funziona con i modelli seguenti: - S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 e probabilmente altri. - Si basa sul set di comandi AT pubblicati da Siemens (e su altre risorse - aggiuntive). - Visita il sito %{url} per dettagli. - +SCMxx is a console program that allows you to exchange certain types of +data with mobile phones made by Siemens. Some of the data types that can be +exchanged are logos, ring tones, vCalendars, phonebook entries, and short +messages. Other actions like setting the time and dialling a number are also +possible. %prep %setup -q %build -%configure +%configure \ + --with-device=/dev/ttyS0 \ + --with-baudrate=115200 %{__make} %install -%{__make} install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +%find_lang %{name} %clean -%{__make} distclean +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS BUGS CHANGELOG INSTALL README TODO TRANSLATION examples docs/*.txt -%attr(0755,-,-) %{_bindir}/%{name} -%attr(0644,-,-) %{_mandir}/man1/%{name}.1* -%attr(0644,-,-) %{_mandir}/*/man1/%{name}.1* -%attr(0644,-,-) %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo +%doc AUTHORS BUGS LICENSE CHANGELOG README +%{_bindir}/scmxx +%{_mandir}/man1/scmxx.1.gz +%lang(de) %{_mandir}/de/man1/scmxx.1.gz +%lang(it) %{_mandir}/it/man1/scmxx.1.gz +%lang(ru) %{_mandir}/ru/man1/scmxx.1.gz %changelog -* Tue Aug 24 2004 Hendrik Sattler -- install all translation of the manpage -- install all gettext files -- reformat and extend description -- add german summary and german description -- use default configure command instead of custom invocation -- remove x-flag from all non-executable files -- remove old url from Source0 field - -* Mon Nov 18 2002 Hendrik Sattler -- added manpage to package - -* Sat Jul 1 2002 Hendrik Sattler -- changed defattr, so dirs get their x-flag - -* Sat May 14 2002 Hendrik Sattler -- extensive usage of environment variables in the spec file -- moved/renamed files in docdir - -* Sat Feb 9 2002 Petr Kri?tof -- RPM spec update - -* Sat Nov 17 2001 Hendrik Sattler -- Initial RPM release +* Tue Jul 14 2005 Andreas Thienemann 0.8.0-1 +- Initial specfile From fedora-extras-commits at redhat.com Tue Jul 26 12:13:49 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:13:49 -0400 Subject: owners owners.list,1.32,1.33 Message-ID: <200507261213.j6QCDovZ017231@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17214 Modified Files: owners.list Log Message: Added scmxx Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- owners.list 26 Jul 2005 00:31:17 -0000 1.32 +++ owners.list 26 Jul 2005 12:13:47 -0000 1.33 @@ -722,6 +722,7 @@ Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scim|Smart Common Input Method|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|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|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Jul 26 12:16:49 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:16:49 -0400 Subject: common tobuild,1.2076,1.2077 Message-ID: <200507261216.j6QCGoGv017300@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17283 Modified Files: tobuild Log Message: request build of rpms/scmxx/devel scmxx-0_8_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2076 retrieving revision 1.2077 diff -u -r1.2076 -r1.2077 --- tobuild 26 Jul 2005 12:12:59 -0000 1.2076 +++ tobuild 26 Jul 2005 12:16:47 -0000 1.2077 @@ -143,3 +143,4 @@ adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 +ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel From rc040203 at freenet.de Tue Jul 26 12:23:03 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Tue, 26 Jul 2005 14:23:03 +0200 Subject: rpms/scmxx/devel scmxx.spec,1.1,1.2 In-Reply-To: <200507261213.j6QCD6Cc017208@cvs-int.fedora.redhat.com> References: <200507261213.j6QCD6Cc017208@cvs-int.fedora.redhat.com> Message-ID: <1122380583.4264.245.camel@mccallum.corsepiu.local> On Tue, 2005-07-26 at 08:13 -0400, Andreas Thienemann wrote: > Author: ixs > Index: scmxx.spec > -%configure > +%configure \ > + --with-device=/dev/ttyS0 \ > + --with-baudrate=115200 Why these deviations from the defaults? I would prefer not to mess around with them, because any deviation from defaults causes more troubles than they help. Ralf From paul at city-fan.org Tue Jul 26 12:31:21 2005 From: paul at city-fan.org (Paul Howarth) Date: Tue, 26 Jul 2005 13:31:21 +0100 Subject: common tobuild,1.2074,1.2075 In-Reply-To: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> References: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> Message-ID: <42E62D19.6070904@city-fan.org> Adrian Reber (adrian) wrote: > Author: adrian > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15561 > > Modified Files: > tobuild > Log Message: > request build of rpms/libcdio/FC-4 libcdio-0_75-2_fc4 for fc4 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2074 > retrieving revision 1.2075 > diff -u -r1.2074 -r1.2075 > --- tobuild 26 Jul 2005 11:56:52 -0000 1.2074 > +++ tobuild 26 Jul 2005 11:58:48 -0000 1.2075 > @@ -141,3 +141,4 @@ > nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel > nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 > adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel > +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 You might need to bump and rebuild again if builds are going in-order now, as a build of libcddb 1.2.0 has just been requested by anvil. Paul. From bugs.michael at gmx.net Tue Jul 26 12:42:56 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Tue, 26 Jul 2005 14:42:56 +0200 Subject: libcddb/libcdio (was: Re: common tobuild,1.2074,1.2075) In-Reply-To: <42E62D19.6070904@city-fan.org> References: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> <42E62D19.6070904@city-fan.org> Message-ID: <20050726144256.23d65c9e.bugs.michael@gmx.net> On Tue, 26 Jul 2005 13:31:21 +0100, Paul Howarth wrote: > Adrian Reber (adrian) wrote: > > --- tobuild 26 Jul 2005 11:56:52 -0000 1.2074 > > +++ tobuild 26 Jul 2005 11:58:48 -0000 1.2075 > > @@ -141,3 +141,4 @@ > > nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel > > nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 > > adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel > > +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 > > You might need to bump and rebuild again if builds are going in-order > now, as a build of libcddb 1.2.0 has just been requested by anvil. Only if libcddb 1.1.0 and 1.2.0 are ABI-incompatible (or if libcdio 0.75 strictly requires the API of libcddb 1.2.0). Because libcddb 1.1.0 has been built and published before. The FE4 repository seems to be broken currently, so a build libcddb/libcdio ought to get some priority. From rc040203 at freenet.de Tue Jul 26 13:24:06 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Tue, 26 Jul 2005 15:24:06 +0200 Subject: rpms/libcdio/FC-4 .cvsignore, 1.5, 1.6 libcdio.spec, 1.9, 1.10 sources, 1.5, 1.6 In-Reply-To: <200507261158.j6QBwLeZ015516@cvs-int.fedora.redhat.com> References: <200507261158.j6QBwLeZ015516@cvs-int.fedora.redhat.com> Message-ID: <1122384246.4264.247.camel@mccallum.corsepiu.local> On Tue, 2005-07-26 at 07:58 -0400, Adrian Reber wrote: > Author: adrian > Index: libcdio.spec > =================================================================== > RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v > retrieving revision 1.9 > retrieving revision 1.10 > diff -u -r1.9 -r1.10 > --- libcdio.spec 5 Jun 2005 11:23:51 -0000 1.9 > +++ libcdio.spec 26 Jul 2005 11:58:19 -0000 1.10 > @@ -1,13 +1,13 @@ > Name: libcdio > -Version: 0.74 > +Version: 0.75 > Release: 2%{?dist} You should reset %release when incrementing %version. Ralf From fedora-extras-commits at redhat.com Tue Jul 26 13:38:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:38:02 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.5,1.6 Message-ID: <200507261338.j6QDc2AN018781@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18764 Modified Files: scim-anthy.spec Log Message: Add "anthy" in the requires section Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-anthy.spec 26 Jul 2005 06:34:46 -0000 1.5 +++ scim-anthy.spec 26 Jul 2005 13:38:00 -0000 1.6 @@ -9,6 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Reqires: anthy BuildRequires: scim-devel anthy-devel %description From fedora-extras-commits at redhat.com Tue Jul 26 13:38:43 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:38:43 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.6,1.7 Message-ID: <200507261338.j6QDch37018825@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-anthy.spec 26 Jul 2005 13:38:00 -0000 1.6 +++ scim-anthy.spec 26 Jul 2005 13:38:41 -0000 1.7 @@ -9,7 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Reqires: anthy +Requires: anthy BuildRequires: scim-devel anthy-devel %description From fedora-extras-commits at redhat.com Tue Jul 26 13:39:41 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:39:41 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.7,1.8 Message-ID: <200507261339.j6QDdfjv018879@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18861 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-anthy.spec 26 Jul 2005 13:38:41 -0000 1.7 +++ scim-anthy.spec 26 Jul 2005 13:39:39 -0000 1.8 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Jul 26 13:40:52 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:40:52 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.7,1.8 Message-ID: <200507261340.j6QDeqOu018936@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18919 Modified Files: scim-anthy.spec Log Message: Add "anthy" into the requires section Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-anthy.spec 26 Jul 2005 06:35:12 -0000 1.7 +++ scim-anthy.spec 26 Jul 2005 13:40:50 -0000 1.8 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,6 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: anthy BuildRequires: scim-devel anthy-devel %description From fedora-extras-commits at redhat.com Tue Jul 26 14:53:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 10:53:03 -0400 Subject: devel/common tobuild,1.2077,1.2078 Message-ID: <200507261453.j6QEr3Kh022083@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22053 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2077 retrieving revision 1.2078 diff -u -r1.2077 -r1.2078 --- tobuild 26 Jul 2005 12:16:47 -0000 1.2077 +++ tobuild 26 Jul 2005 14:53:01 -0000 1.2078 @@ -3,6 +3,9 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 +adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 @@ -74,7 +77,6 @@ thias rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 devel icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel -anvil rpms/libcddb/FC-4 libcddb-1_1_0-1_fc4 fc4 scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel @@ -140,7 +142,4 @@ mschwendt devel/inkscape inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 -adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel -adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 26 14:57:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 10:57:42 -0400 Subject: devel/common tobuild,1.2078,1.2079 Message-ID: <200507261457.j6QEvg4A022174@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2078 retrieving revision 1.2079 diff -u -r1.2078 -r1.2079 --- tobuild 26 Jul 2005 14:53:01 -0000 1.2078 +++ tobuild 26 Jul 2005 14:57:39 -0000 1.2079 @@ -3,8 +3,8 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 15:29:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 11:29:28 -0400 Subject: common tobuild,1.2079,1.2080 Message-ID: <200507261529.j6QFTSYX023382@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23365 Modified Files: tobuild Log Message: better order Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2079 retrieving revision 1.2080 diff -u -r1.2079 -r1.2080 --- tobuild 26 Jul 2005 14:57:39 -0000 1.2079 +++ tobuild 26 Jul 2005 15:29:26 -0000 1.2080 @@ -3,8 +3,8 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 15:45:35 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Tue, 26 Jul 2005 11:45:35 -0400 Subject: common tobuild,1.2080,1.2081 Message-ID: <200507261545.j6QFjZqK023477@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23460 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-3 clamav-0_86_2-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2080 retrieving revision 1.2081 diff -u -r1.2080 -r1.2081 --- tobuild 26 Jul 2005 15:29:26 -0000 1.2080 +++ tobuild 26 Jul 2005 15:45:33 -0000 1.2081 @@ -143,3 +143,4 @@ nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel +ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 15:46:05 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Tue, 26 Jul 2005 11:46:05 -0400 Subject: common tobuild,1.2081,1.2082 Message-ID: <200507261546.j6QFk5bQ023539@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23522 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-4 clamav-0_86_2-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2081 retrieving revision 1.2082 diff -u -r1.2081 -r1.2082 --- tobuild 26 Jul 2005 15:45:33 -0000 1.2081 +++ tobuild 26 Jul 2005 15:46:03 -0000 1.2082 @@ -144,3 +144,4 @@ nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 +ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 From johnp at redhat.com Tue Jul 26 15:10:25 2005 From: johnp at redhat.com (John (J5) Palmieri) Date: Tue, 26 Jul 2005 11:10:25 -0400 Subject: APPROVED: istanbul Message-ID: <1122390625.15788.27.camel@remedyz.boston.redhat.com> Name: istanbul Summary: Desktop Session Recorder Description: Istanbul is a desktop session recorder. You can use it to record your desktop session and then play it back for demos, tutorials and presentations. Sessions are recorded to ogg theora files for later playback. Reviewer: John (J5) Palmieri Maintainer:Jeff Spaleta From fedora-extras-commits at redhat.com Tue Jul 26 16:28:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 12:28:08 -0400 Subject: devel/hping2 hping2-cflags.patch, NONE, 1.1 hping2-getifnamedebug.patch, NONE, 1.1 hping2.spec, 1.6, 1.7 Message-ID: <200507261628.j6QGS8gT024824@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/hping2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24801 Modified Files: hping2.spec Added Files: hping2-cflags.patch hping2-getifnamedebug.patch Log Message: * Tue Jul 26 2005 Michael Schwendt - 2.0.0-0.5.rc3 - Fix "local variable used before set" (#149776). - Use rpm optflags. hping2-cflags.patch: --- NEW FILE hping2-cflags.patch --- diff -Nur hping2-rc3-orig/Makefile.in hping2-rc3/Makefile.in --- hping2-rc3-orig/Makefile.in 2004-05-03 11:29:39.000000000 +0200 +++ hping2-rc3/Makefile.in 2005-07-26 18:26:15.000000000 +0200 @@ -9,7 +9,7 @@ CC= gcc AR=/usr/bin/ar RANLIB=/usr/bin/ranlib -CCOPT= -O2 -Wall @PCAP_INCLUDE@ +CCOPT= $(CFLAGS) -Wall @PCAP_INCLUDE@ DEBUG= -g #uncomment the following if you need libpcap based build under linux #(not raccomanded) hping2-getifnamedebug.patch: --- NEW FILE hping2-getifnamedebug.patch --- diff -Nur hping2-rc3-orig/getifname.c hping2-rc3/getifname.c --- hping2-rc3-orig/getifname.c 2004-05-03 10:55:53.000000000 +0200 +++ hping2-rc3/getifname.c 2005-07-26 18:23:34.000000000 +0200 @@ -60,7 +60,7 @@ known_output_if = 1; if (opt_debug) printf("DEBUG: Output interface address: %s\n", - inet_ntoa(sa.sin_addr)); + inet_ntoa(output_if_addr.sin_addr)); } else { fprintf(stderr, "Warning: Unable to guess the output " "interface\n"); Index: hping2.spec =================================================================== RCS file: /cvs/extras/devel/hping2/hping2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hping2.spec 6 Apr 2005 22:12:01 -0000 1.6 +++ hping2.spec 26 Jul 2005 16:28:06 -0000 1.7 @@ -1,7 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.4.rc3 - +Release: 0.5.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -10,6 +9,8 @@ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch Patch1: hping2-x86_64.patch +Patch2: hping2-getifnamedebug.patch +Patch3: hping2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -23,6 +24,8 @@ %setup -q -n hping2-rc3 %patch0 -p0 %patch1 -p0 +%patch2 -p1 -b .getifnamedebug +%patch3 -p1 -b .cflags %build %configure --force-libpcap @@ -49,6 +52,10 @@ %{_mandir}/man8/* %changelog +* Tue Jul 26 2005 Michael Schwendt - 2.0.0-0.5.rc3 +- Fix "local variable used before set" (#149776). +- Use rpm optflags. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 26 16:28:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 12:28:59 -0400 Subject: devel/common tobuild,1.2082,1.2083 Message-ID: <200507261628.j6QGSx4M024883@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24866 Modified Files: tobuild Log Message: request build of devel/hping2 hping2-2_0_0-0_5_rc3 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2082 retrieving revision 1.2083 diff -u -r1.2082 -r1.2083 --- tobuild 26 Jul 2005 15:46:03 -0000 1.2082 +++ tobuild 26 Jul 2005 16:28:56 -0000 1.2083 @@ -145,3 +145,4 @@ ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 +mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel From fedora-extras-commits at redhat.com Tue Jul 26 17:22:48 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:22:48 -0400 Subject: rpms/fish/FC-3 .cvsignore, 1.2, 1.3 fish.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507261722.j6QHMmWM027288@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267 Modified Files: .cvsignore fish.spec sources Log Message: * Upload Axels latest fish Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 +++ .cvsignore 26 Jul 2005 17:22:46 -0000 1.3 @@ -1 +1 @@ -fish-1.11.1.tar.bz2 +fish-1.12.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/fish.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fish.spec 1 Jul 2005 11:11:11 -0000 1.3 +++ fish.spec 26 Jul 2005 17:22:46 -0000 1.4 @@ -1,17 +1,17 @@ -Summary: A friendly interactive shell -Name: fish +Summary: A friendly interactive shell +Name: fish -Version: 1.11.1 -Release: 10%{?dist} +Version: 1.12.0 +Release: 1%{?dist} -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -65,20 +65,19 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 -- Added dist macro to the release -- Small spec beautifying +* Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 +- 1.12.0 -* Thu Jun 30 2005 Michael Schwendt - 1.11.1-9 +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way -* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 11:03:18 -0000 1.2 +++ sources 26 Jul 2005 17:22:46 -0000 1.3 @@ -1 +1 @@ -b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 +8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 17:23:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:23:11 -0400 Subject: common tobuild,1.2083,1.2084 Message-ID: <200507261723.j6QHNBYK027351@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27334 Modified Files: tobuild Log Message: request build of rpms/fish/FC-3 fish-1_12_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2083 retrieving revision 1.2084 diff -u -r1.2083 -r1.2084 --- tobuild 26 Jul 2005 16:28:56 -0000 1.2083 +++ tobuild 26 Jul 2005 17:23:09 -0000 1.2084 @@ -146,3 +146,4 @@ ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel +oliver rpms/fish/FC-3 fish-1_12_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 17:23:48 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:23:48 -0400 Subject: rpms/fish/FC-4 .cvsignore, 1.2, 1.3 fish.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507261724.j6QHOIMI027399@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27375 Modified Files: .cvsignore fish.spec sources Log Message: * Upload Axels latest fish Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 +++ .cvsignore 26 Jul 2005 17:23:45 -0000 1.3 @@ -1 +1 @@ -fish-1.11.1.tar.bz2 +fish-1.12.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/fish.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fish.spec 1 Jul 2005 11:11:11 -0000 1.3 +++ fish.spec 26 Jul 2005 17:23:45 -0000 1.4 @@ -1,17 +1,17 @@ -Summary: A friendly interactive shell -Name: fish +Summary: A friendly interactive shell +Name: fish -Version: 1.11.1 -Release: 10%{?dist} +Version: 1.12.0 +Release: 1%{?dist} -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -65,20 +65,19 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 -- Added dist macro to the release -- Small spec beautifying +* Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 +- 1.12.0 -* Thu Jun 30 2005 Michael Schwendt - 1.11.1-9 +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way -* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 11:03:18 -0000 1.2 +++ sources 26 Jul 2005 17:23:45 -0000 1.3 @@ -1 +1 @@ -b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 +8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 17:24:36 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:24:36 -0400 Subject: common tobuild,1.2084,1.2085 Message-ID: <200507261724.j6QHOaH2027461@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27444 Modified Files: tobuild Log Message: request build of rpms/fish/FC-4 fish-1_12_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2084 retrieving revision 1.2085 diff -u -r1.2084 -r1.2085 --- tobuild 26 Jul 2005 17:23:09 -0000 1.2084 +++ tobuild 26 Jul 2005 17:24:34 -0000 1.2085 @@ -147,3 +147,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-3 fish-1_12_0-1_fc3 fc3 +oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 17:47:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 13:47:26 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.23, 1.24 PackageJob.py, 1.14, 1.15 UserInterface.py, 1.29, 1.30 Message-ID: <200507261747.j6QHlQxb027560@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510/server Modified Files: BuildMaster.py PackageJob.py UserInterface.py Log Message: 2005-07-26 Dan Williams - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- BuildMaster.py 25 Jul 2005 21:44:52 -0000 1.23 +++ BuildMaster.py 26 Jul 2005 17:47:24 -0000 1.24 @@ -97,6 +97,9 @@ class BuildMaster(threading.Thread): + + MAX_CHECKOUT_JOBS = 5 + def __init__(self, hostname, builder_manager): self.builder_manager = builder_manager self.hostname = hostname @@ -113,6 +116,9 @@ self._new_queue_lock = threading.Lock() self._restart_queue = [] self._restart_queue_lock = threading.Lock() + self._checkout_wait_queue = [] + self._checkout_num = 0 + self._checkout_wait_queue_lock = threading.Lock() self._status_updates = {} self._status_updates_lock = threading.Lock() @@ -139,7 +145,7 @@ 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!="killed" AND status!="initialize") ORDER BY uid') + self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed") ORDER BY uid') self.dbcx.commit() uids = self.curs.fetchall() @@ -239,6 +245,28 @@ self._archjob_status_updates[lcl_uid] = lcl_attrdict self._archjob_status_updates_lock.release() + def queue_checkout_wait(self, job): + self._checkout_wait_queue_lock.acquire() + self._checkout_wait_queue.append(job) + self._checkout_wait_queue_lock.release() + + def notify_checkout_done(self, job): + self._checkout_wait_queue_lock.acquire() + self._checkout_num = self._checkout_num - 1 + self._checkout_wait_queue_lock.release() + + def _process_checkout_wait_jobs(self): + self._checkout_wait_queue_lock.acquire() + + # We allow only 5 jobs at a time in checkout stage + allowed_jobs = min(self.MAX_CHECKOUT_JOBS - self._checkout_num, len(self._checkout_wait_queue)) + for i in range(allowed_jobs): + job = self._checkout_wait_queue[i] + self._checkout_num = self._checkout_num + 1 + job.checkout_wait_done_callback() + self._checkout_wait_queue = self._checkout_wait_queue[allowed_jobs:] + self._checkout_wait_queue_lock.release() + def notify_job_done(self, job): self._done_queue_lock.acquire() self._done_queue.append(job) @@ -374,38 +402,41 @@ def _have_work(self): have_work = False - self._new_queue_lock.acquire() - if len(self._new_queue) > 0: - have_work = True - self._new_queue_lock.release() - if have_work: - return True - self._restart_queue_lock.acquire() - if len(self._restart_queue) > 0: - have_work = True - self._restart_queue_lock.release() - if have_work: - return True + if not have_work: + self._new_queue_lock.acquire() + if len(self._new_queue) > 0: + have_work = True + self._new_queue_lock.release() + + if not have_work: + self._restart_queue_lock.acquire() + if len(self._restart_queue) > 0: + have_work = True + self._restart_queue_lock.release() + + if not have_work: + self._checkout_wait_queue_lock.acquire() + if (self._checkout_num < self.MAX_CHECKOUT_JOBS) and len(self._checkout_wait_queue) > 0: + have_work = True + self._checkout_wait_queue_lock.release() - self._status_updates_lock.acquire() - if len(self._status_updates) > 0: - have_work = True - self._status_updates_lock.release() - if have_work: - return True + if not have_work: + self._status_updates_lock.acquire() + if len(self._status_updates) > 0: + have_work = True + self._status_updates_lock.release() - self._archjob_status_updates_lock.acquire() - if len(self._archjob_status_updates) > 0: - have_work = True - self._archjob_status_updates_lock.release() - if have_work: - return True + if not have_work: + self._archjob_status_updates_lock.acquire() + if len(self._archjob_status_updates) > 0: + have_work = True + self._archjob_status_updates_lock.release() - if self.builder_manager.have_work(): - return True + if not have_work and self.builder_manager.have_work(): + have_work = True - return False + return have_work def get_job(self, uid): self._building_jobs_lock.acquire() @@ -427,6 +458,9 @@ # Clean up jobs that have finished self._process_finished_jobs() + # Let a few jobs through the checkout_wait gate if needed + self._process_checkout_wait_jobs() + # Start any new jobs self._start_new_jobs() self._start_requeued_jobs() Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PackageJob.py 25 Jul 2005 19:47:15 -0000 1.14 +++ PackageJob.py 26 Jul 2005 17:47:24 -0000 1.15 @@ -91,7 +91,7 @@ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] + stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] if stage in stages: return True return False @@ -116,7 +116,6 @@ self.epoch = None self.ver = None self.release = None - pjc = PackageJobController(self, 'initialize', 'waiting') self.hostname = hostname self.username = username @@ -129,13 +128,15 @@ self.stage_dir = None self.srpm_path = None self.srpm_http_path = None - # Deal with straight SRPM builds - if self.no_cvs and self.curstage is 'initialize': - self._set_cur_stage('make_srpm') self.repofiles = {} self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() + + first_stage = 'initialize' + if self.no_cvs == True: + first_stage = 'make_srpm' + pjc = PackageJobController(self, first_stage, 'waiting') pjc.start() def get_cur_stage(self): @@ -259,9 +260,13 @@ os.makedirs(stage_dir) return stage_dir - + def checkout_wait_done_callback(self): + self._set_cur_stage('checkout_wait_done') + self.wake() + def _checkout(self): self._set_cur_stage('checkout') + err_msg = None # Create the temporary checkout directory dirname = "%s-%s-%d" % (self.uid, self.cvs_tag, time.time()) @@ -275,19 +280,23 @@ debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: - msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) - raise PrepError(msg) - - # Just in case the 'common' directory didn't come along for the ride, - # get it from CVS - pkg_path = os.path.join(self.checkout_tmpdir, self.package) - if not os.path.exists(os.path.join(pkg_path, "common")): - cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd']) - debugprint("%d: Running %s" % (self.uid, cmd)) - s, o = commands.getstatusoutput(cmd) - if s != 0: - msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) - raise PrepError(msg) + err_msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) + else: + # Just in case the 'common' directory didn't come along for the ride, + # get it from CVS + pkg_path = os.path.join(self.checkout_tmpdir, self.package) + if not os.path.exists(os.path.join(pkg_path, "common")): + cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd']) + debugprint("%d: Running %s" % (self.uid, cmd)) + s, o = commands.getstatusoutput(cmd) + if s != 0: + err_msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) + + self.bm.notify_checkout_done(self) + + if err_msg: + raise PrepError(err_msg) + def _make_srpm(self): self._set_cur_stage('make_srpm') @@ -450,6 +459,11 @@ try: wait = False if self.curstage == 'initialize': + self.bm.queue_checkout_wait(self) + self._set_cur_stage('checkout_wait') + elif self.curstage == 'checkout_wait': + wait = True + elif self.curstage == 'checkout_wait_done': self._checkout() elif self.curstage == 'checkout': self._make_srpm() Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- UserInterface.py 25 Jul 2005 21:44:52 -0000 1.29 +++ UserInterface.py 26 Jul 2005 17:47:24 -0000 1.30 @@ -39,12 +39,10 @@ def validate_email(email): + safe_list = ['@', '_', '-', '.', '+'] for c in email: # For now, legal characters are '@_-.+' plus alphanumeric - if (c == '@') or (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): - pass - else: - print "Bad char is '%s'" % c + if not (c in safe_list) and not c.isalnum(): return False return True @@ -59,6 +57,20 @@ return None return uid +def validate_package_name(name): + safe_list = ['_', '-', '+'] + for c in name: + if not (c in safe_list) and not c.isalnum(): + return False + return True + +def validate_cvs_tag(tag): + safe_list = ['-', '_', '.', ':', '~', '[', ']'] + for c in tag: + if not (c in safe_list) and not c.isalnum(): + return False + return True + class InvalidTargetError(exceptions.Exception): pass @@ -111,6 +123,16 @@ "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target)) return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.") + if not validate_package_name(package): + email_result(email, cvs_tag, "Error setting up build for %s on "\ + "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (cvs_tag, target, package)) + return (-1, "The package name contained an illegal character.") + + if not validate_cvs_tag(cvs_tag): + email_result(email, cvs_tag, "Error setting up build for %s on "\ + "%s: The CVS tag '%s' contained an illegal character. Submit a bug report?" % (package, target, cvs_tag)) + return (-1, "The CVS tag contained an illegal character.") + try: real_target = resolve_target(target) except InvalidTargetError: @@ -130,6 +152,11 @@ "%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target)) return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.") + if not validate_package_name(package): + email_result(email, srpm_file, "Error setting up build for %s on "\ + "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (package, target, package)) + return (-1, "The package name contained an illegal character.") + # We limit the database field to 255 chars if len(srpm_file) > 255: email_result(email, srpm_file, "Error setting up build for %s on "\ From fedora-extras-commits at redhat.com Tue Jul 26 17:47:20 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 13:47:20 -0400 Subject: extras-buildsys ChangeLog,1.74,1.75 Message-ID: <200507261747.j6QHloZX027564@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510 Modified Files: ChangeLog Log Message: 2005-07-26 Dan Williams - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- ChangeLog 25 Jul 2005 21:44:51 -0000 1.74 +++ ChangeLog 26 Jul 2005 17:47:18 -0000 1.75 @@ -1,3 +1,9 @@ +2005-07-26 Dan Williams + + - Throttle CVS checkouts to 5 jobs at a time + - Validate package and cvs_tag inputs to enqueue functions since they + get passed directly to commands.getstatusoutput() + 2005-07-25 Dan Williams * client/client.py From fedora-extras-commits at redhat.com Tue Jul 26 17:47:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 13:47:21 -0400 Subject: extras-buildsys/common FileDownloader.py,1.13,1.14 Message-ID: <200507261747.j6QHlpY2027567@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510/common Modified Files: FileDownloader.py Log Message: 2005-07-26 Dan Williams - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- FileDownloader.py 21 Jul 2005 14:36:49 -0000 1.13 +++ FileDownloader.py 26 Jul 2005 17:47:19 -0000 1.14 @@ -70,9 +70,10 @@ raise FileNameError("Extension was not allowed.") # FIXME: what other validation can we do here? + safe_list = ['_', '-', '.', '+'] for c in filename: # For now, legal characters are '_-.' plus alphanumeric - if (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): + if c in safe_list or c.isalnum(): pass else: raise FileNameError("Illegal character '%s' encountered." % c) From fedora-extras-commits at redhat.com Tue Jul 26 20:12:18 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:12:18 -0400 Subject: mock Makefile,1.4,1.5 Message-ID: <200507262012.j6QKCm8h031267@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31235 Modified Files: Makefile Log Message: fix Makefile Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 14 Jul 2005 18:00:26 -0000 1.4 +++ Makefile 26 Jul 2005 20:12:16 -0000 1.5 @@ -20,6 +20,7 @@ install: mkdir -p $(DESTDIR)/usr/bin/ + mkdir -p $(DESTDIR)/usr/libexec install -m 755 mock.py $(DESTDIR)/usr/bin/mock install -m 755 mock-yum $(DESTDIR)/usr/libexec/mock-yum mkdir -p $(DESTDIR)/var/lib/mock From fedora-extras-commits at redhat.com Tue Jul 26 20:12:19 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:12:19 -0400 Subject: mock/etc Makefile,1.2,1.3 Message-ID: <200507262012.j6QKCnC9031270@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31235/etc Modified Files: Makefile Log Message: fix Makefile Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/etc/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 12 Jun 2005 23:23:47 -0000 1.2 +++ Makefile 26 Jul 2005 20:12:16 -0000 1.3 @@ -10,6 +10,6 @@ install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \ done for arch in i386 ppc x86_64 ; do \ - ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-development-$$arch-core.cfg; \ + ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-devel-$$arch-core.cfg; \ done From fedora-extras-commits at redhat.com Tue Jul 26 20:16:23 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:16:23 -0400 Subject: mock mock.spec,1.10,1.11 Message-ID: <200507262016.j6QKGN9b031308@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279 Modified Files: mock.spec Log Message: make file fix and update spec file Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mock.spec 27 Jun 2005 03:43:11 -0000 1.10 +++ mock.spec 26 Jul 2005 20:16:21 -0000 1.11 @@ -46,6 +46,7 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} +%{_libexecdir}/mock-yum %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so From fedora-extras-commits at redhat.com Tue Jul 26 20:16:24 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:16:24 -0400 Subject: mock/etc Makefile,1.3,1.4 Message-ID: <200507262016.j6QKGOdK031314@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279/etc Modified Files: Makefile Log Message: make file fix and update spec file Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/etc/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 26 Jul 2005 20:12:16 -0000 1.3 +++ Makefile 26 Jul 2005 20:16:22 -0000 1.4 @@ -10,6 +10,6 @@ install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \ done for arch in i386 ppc x86_64 ; do \ - ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-devel-$$arch-core.cfg; \ + ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-development-$$arch-core.cfg; \ done From fedora-extras-commits at redhat.com Tue Jul 26 20:17:31 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:17:31 -0400 Subject: mock mock.py,1.22,1.23 mock.spec,1.11,1.12 Message-ID: <200507262017.j6QKHVZm031345@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31326 Modified Files: mock.py mock.spec Log Message: bump version number to 0.4 Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mock.py 21 Jul 2005 14:40:44 -0000 1.22 +++ mock.py 26 Jul 2005 20:17:29 -0000 1.23 @@ -28,7 +28,7 @@ from optparse import OptionParser -__VERSION__ = '0.3' +__VERSION__ = '0.4' def error(msg): print >> sys.stderr, msg Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 26 Jul 2005 20:16:21 -0000 1.11 +++ mock.spec 26 Jul 2005 20:17:29 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.3 +Version: 0.4 Release: 1 License: GPL Group: Development/Tools From fedora-extras-commits at redhat.com Tue Jul 26 20:36:43 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:36:43 -0400 Subject: mock mock.py,1.23,1.24 Message-ID: <200507262036.j6QKahZZ031384@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31367 Modified Files: mock.py Log Message: fix exception handling Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mock.py 26 Jul 2005 20:17:29 -0000 1.23 +++ mock.py 26 Jul 2005 20:36:41 -0000 1.24 @@ -25,6 +25,7 @@ import shutil import types import grp +from exceptions import Exception from optparse import OptionParser @@ -36,31 +37,31 @@ class Error(Exception): def __init__(self, msg): - exceptions.Exception.__init__(self) + Exception.__init__(self) self.msg = msg self.resultcode = 1 class YumError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 30 class PkgError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 40 class BuildError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 10 class RootError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 20 From fedora-extras-commits at redhat.com Tue Jul 26 21:12:35 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 26 Jul 2005 17:12:35 -0400 Subject: web/html/docs/release-notes/fc4/errata index.php, 1.5, 1.6 ld-txt-fedora-desktop-screenshot.php, 1.4, 1.5 Message-ID: <200507262112.j6QLCZ2b032614@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/errata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32595 Modified Files: index.php ld-txt-fedora-desktop-screenshot.php Log Message: Language more inline with project goals. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/fc4/errata/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.php 22 Jul 2005 09:08:09 -0000 1.5 +++ index.php 26 Jul 2005 21:12:33 -0000 1.6 @@ -30,35 +30,35 @@
    3. Introduction and Technical Release Notes
    4. Hardware Requirements
    -
    4.1. CPU Requirements
    -
    4.2. Hard Disk Space Requirements
    -
    4.3. Memory Requirements
    +
    4.1. CPU Requirements
    +
    4.2. Hard Disk Space Requirements
    +
    4.3. Memory Requirements
    4.4. PPC Hardware Requirements
    5. Overview of This Release
    6. Installation-Related Notes
    6.1. PPC Installation Notes
    -
    6.2. Anaconda Notes
    -
    6.3. Installation-Related Issues
    +
    6.2. Anaconda Notes
    +
    6.3. Installation-Related Issues
    -
    7. Package-Specific Notes
    +
    7. Package-Specific Notes
    7.1. Basic Components
    -
    7.1.1. Fedora Extras Repository
    +
    7.1.1. Fedora Extras Repository
    7.1.2. Audit Daemon auditd and Log Files
    7.1.3. LinuxThreads versus NPTL
    -
    7.1.4. Enabling the slocate Database
    -
    7.1.5. Stricter Controls in openssh
    +
    7.1.4. Enabling the slocate Database
    +
    7.1.5. Stricter Controls in openssh
    7.1.6. Perl Binary Compat Symlinks
    7.1.7. Server and System Configuration Tools
    -
    7.1.8. Java Package Recommendations
    +
    7.1.8. Java Package Recommendations
    7.2. Core
    -
    7.2.1. yum
    +
    7.2.1. yum
    7.2.2. Linux Kernel
    @@ -68,8 +68,8 @@ Development Tools
    7.3.1. GCC Compiler Collection
    -
    7.4. Language Support
    -
    7.4.1. The IIIMF Input System
    +
    7.4. Language Support
    +
    7.4.1. The IIIMF Input System
    7.5. Web Servers
    7.5.1. mod_perl
    @@ -346,8 +346,8 @@

    The unofficial http://fedorafaq.org provides useful answers on commonly asked questions. However, these are - completely unsupported by the Fedora Project. The Fedora Project recommends using free - and open source software alternatives whenever possible. + completely unsupported by the Fedora Project. The Fedora Project encourages using free + and open source software..

    The binary only drivers can be acquired from the vendors. You can @@ -383,7 +383,7 @@ produced for the Fedora Project.

    - RELEASE-NOTES-FC4 (2005-07-22-T04:20-0700) + RELEASE-NOTES-FC4 (2005-07-26-T16:20-0700)

    Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux @@ -488,7 +488,7 @@

    -4.1.??CPU Requirements

    +4.1.??CPU Requirements

    This section lists the CPU specifications required by Fedora Core @@ -532,7 +532,7 @@

    -4.2.??Hard Disk Space Requirements

    +4.2.??Hard Disk Space Requirements

    This section lists the disk space required to install Fedora Core @@ -595,7 +595,7 @@

    -4.3.??Memory Requirements

    +4.3.??Memory Requirements

    This section lists the memory required to install Fedora Core @@ -1078,7 +1078,7 @@

    -6.2.??Anaconda Notes

    +6.2.??Anaconda Notes
      @@ -1141,7 +1141,7 @@

      -6.3.??Installation-Related Issues

      +6.3.??Installation-Related Issues
      @@ -1241,7 +1241,7 @@

      -7.??Package-Specific Notes

      +7.??Package-Specific Notes

    @@ -1263,7 +1263,7 @@

    -7.1.1.??Fedora Extras Repository

    +7.1.1.??Fedora Extras Repository

    @@ -1405,7 +1405,7 @@

    -7.1.4.??Enabling the slocate Database

    +7.1.4.??Enabling the slocate Database

    @@ -1419,7 +1419,7 @@

    -7.1.5.??Stricter Controls in openssh

    +7.1.5.??Stricter Controls in openssh

    @@ -1505,7 +1505,7 @@

    -7.1.8.??Java Package Recommendations

    +7.1.8.??Java Package Recommendations

    @@ -1536,7 +1536,7 @@

    -7.2.1.??yum

    +7.2.1.??yum

    @@ -2030,7 +2030,7 @@

    -7.4.??Language Support

    +7.4.??Language Support

    @@ -2040,7 +2040,7 @@

    -7.4.1.??The IIIMF Input System

    +7.4.1.??The IIIMF Input System

    From fedora-extras-commits at redhat.com Tue Jul 26 21:13:37 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 26 Jul 2005 17:13:37 -0400 Subject: web/html/docs/release-notes index.php,1.6,1.7 Message-ID: <200507262113.j6QLDbX1032682@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32665 Modified Files: index.php Log Message: Updating date for errata update. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.php 24 Jul 2005 15:52:56 -0000 1.6 +++ index.php 26 Jul 2005 21:13:35 -0000 1.7 @@ -24,7 +24,7 @@

  • Fedora Core 4
  • Fedora Core 3
    • From fedora-extras-commits at redhat.com Tue Jul 26 23:38:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:38:59 -0400 Subject: extras-buildsys/www/template main.psp,1.1,1.2 Message-ID: <200507262338.j6QNcx76002843@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/www/template Modified Files: main.psp Log Message: 2005-07-26 Dan Williams - www/config.psp www/templates/main.psp - Move config-type stuff for SSL to config.psp Index: main.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main.psp 21 Jul 2005 04:07:55 -0000 1.1 +++ main.psp 26 Jul 2005 23:38:57 -0000 1.2 @@ -5,11 +5,12 @@ from OpenSSL import SSL certs = {} -certs['key_and_cert'] = "/var/www/certs/fedora.cert" -certs['ca_cert'] = "/var/www/certs/fedora-upload-ca.cert" -certs['peer_ca_cert'] = "/var/www/certs/fedora-server-ca.cert" +certs['key_and_cert'] = config_opts['user_cert'] +certs['ca_cert'] = config_opts['user_ca_cert'] +certs['peer_ca_cert'] = config_opts['server_ca_cert'] -server = XMLRPCServerProxy.PlgXMLRPCServerProxy("https://flare.boston.redhat.com:8887", certs) +hostname_string = "https://%s:8887" % config_opts['server'] +server = XMLRPCServerProxy.PlgXMLRPCServerProxy(hostname_string, certs) action = 'status' user_email = '' From fedora-extras-commits at redhat.com Tue Jul 26 23:38:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:38:53 -0400 Subject: extras-buildsys ChangeLog,1.75,1.76 Message-ID: <200507262339.j6QNdNpk002846@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796 Modified Files: ChangeLog Log Message: 2005-07-26 Dan Williams - www/config.psp www/templates/main.psp - Move config-type stuff for SSL to config.psp Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ChangeLog 26 Jul 2005 17:47:18 -0000 1.75 +++ ChangeLog 26 Jul 2005 23:38:51 -0000 1.76 @@ -1,5 +1,11 @@ 2005-07-26 Dan Williams + - www/config.psp + www/templates/main.psp + - Move config-type stuff for SSL to config.psp + +2005-07-26 Dan Williams + - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() From fedora-extras-commits at redhat.com Tue Jul 26 23:38:54 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:38:54 -0400 Subject: extras-buildsys/www config.psp,1.1,1.2 Message-ID: <200507262339.j6QNdOlC002849@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/www Modified Files: config.psp Log Message: 2005-07-26 Dan Williams - www/config.psp www/templates/main.psp - Move config-type stuff for SSL to config.psp Index: config.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/config.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.psp 21 Jul 2005 04:07:54 -0000 1.1 +++ config.psp 26 Jul 2005 23:38:52 -0000 1.2 @@ -1,6 +1,13 @@ <% config_opts = {} config_opts['system_name'] = "Fedora Extras Build System" -config_opts['base_url'] = "http://127.0.0.1/" +config_opts['server'] = "127.0.0.1" + +# SSL Cert and key bits +# MUST be full path to cert +CERT_BASE_DIR = '/var/www/certs/' +config_opts['user_cert'] = CERT_BASE_DIR + "fedora.cert" +config_opts['user_ca_cert'] = CERT_BASE_DIR + "fedora-upload-ca.cert" +config_opts['server_ca_cert'] = CERT_BASE_DIR + "fedora-server-ca.cert" %> From fedora-extras-commits at redhat.com Tue Jul 26 23:42:19 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:42:19 -0400 Subject: extras-buildsys/www/template head.psp,1.3,1.4 main.psp,1.2,1.3 Message-ID: <200507262342.j6QNgJSV002879@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2860/www/template Modified Files: head.psp main.psp Log Message: Include config.psp earlier Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- head.psp 23 Jul 2005 00:55:37 -0000 1.3 +++ head.psp 26 Jul 2005 23:42:17 -0000 1.4 @@ -1,4 +1,3 @@ -<%@ include file="config.psp"%> <% import time Index: main.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.psp 26 Jul 2005 23:38:57 -0000 1.2 +++ main.psp 26 Jul 2005 23:42:17 -0000 1.3 @@ -1,3 +1,4 @@ +<%@ include file="config.psp"%> <% import time import os From fedora-extras-commits at redhat.com Wed Jul 27 01:28:26 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:26 -0400 Subject: rpms/istanbul - New directory Message-ID: <200507270128.j6R1SQhd005369@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349/istanbul Log Message: Directory /cvs/extras/rpms/istanbul added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 01:28:26 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:26 -0400 Subject: rpms/istanbul/devel - New directory Message-ID: <200507270128.j6R1SQIN005374@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349/istanbul/devel Log Message: Directory /cvs/extras/rpms/istanbul/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 01:28:40 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:40 -0400 Subject: rpms/istanbul Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507270128.j6R1SejI005425@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394 Added Files: Makefile import.log Log Message: Setup of module istanbul --- NEW FILE Makefile --- # Top level Makefile for module istanbul all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 27 01:28:40 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:40 -0400 Subject: rpms/istanbul/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507270128.j6R1SeY5005430@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module istanbul --- NEW 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 Jul 27 01:29:13 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:29:13 -0400 Subject: rpms/istanbul import.log,1.1,1.2 Message-ID: <200507270129.j6R1TDIo005489@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5458 Modified Files: import.log Log Message: auto-import istanbul-0.1.1-4 on branch devel from istanbul-0.1.1-4.src.rpm initial import of istanbul Index: import.log =================================================================== RCS file: /cvs/extras/rpms/istanbul/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jul 2005 01:28:37 -0000 1.1 +++ import.log 27 Jul 2005 01:29:11 -0000 1.2 @@ -0,0 +1 @@ +istanbul-0_1_1-4:HEAD:istanbul-0.1.1-4.src.rpm:1122427747 From fedora-extras-commits at redhat.com Wed Jul 27 01:29:13 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:29:13 -0400 Subject: rpms/istanbul/devel istanbul.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507270129.j6R1TD2f005495@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5458/devel Modified Files: .cvsignore sources Added Files: istanbul.spec Log Message: auto-import istanbul-0.1.1-4 on branch devel from istanbul-0.1.1-4.src.rpm initial import of istanbul --- NEW FILE istanbul.spec --- %define gstreamer_version 0.8.7 %define gstreamer_plugins_version 0.8.9 %define pygtk2_version 2.6.0 %define pyver %(python -c 'import sys ; print sys.version[:3]') %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")} Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 Release: 4 License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul Source: http://http://live.hujjat.org/istanbul-%{version}.tar.bz2 #Patch0: istanbul-0.1.0-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pygtk2 >= %{pygtk2_version} Requires: gnome-desktop >= 2.6.0 Requires: gstreamer >= %gstreamer_version Requires: gstreamer-plugins >= %gstreamer_plugins_version Requires: gstreamer-python BuildRequires: python, python-devel BuildRequires: desktop-file-utils BuildRequires: gstreamer-plugins-devel >= %gstreamer_plugins_version BuildRequires: gstreamer-python-devel, gtk2-devel #BuildRequires: gstreamer-devel >= %gstreamer_version #BuildRequires: automake, autoconf #BuildRequires: gnome-common %description Istanbul is a desktop session recorder. You can use it to record your desktop session and then play it back for demos, tutorials and presentations. Sessions are recorded to ogg theora files for later playback. #%package devel #Summary: Libraries/include files for Istanbul. #Group: Development/Libraries #Requires: %{name} = %{version}-%{release} %prep %setup -q %build #aclocal #automake #autoconf %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/istanbul/extern/pytrayicon/*.la desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora-Extra \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop #%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT #%post #%postun #%files -f %{name}.lang %files %defattr(-,root,root,-) #%doc AUTHORS COPYING ChangeLog NEWS README %doc COPYING ChangeLog %{_bindir}/%{name} %{_datadir}/applications/gnome-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/prefs.glade %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* %dir %{python_sitelib}/%{name}/extern %{python_sitelib}/%{name}/extern/*.py* %dir %{python_sitelib}/%{name}/extern/pytrayicon %{python_sitelib}/%{name}/extern/pytrayicon/*.py* %{python_sitelib}/%{name}/extern/pytrayicon/*.so* %dir %{python_sitelib}/%{name}/main %{python_sitelib}/%{name}/main/*.py* %dir %{python_sitelib}/%{name}/configure %{python_sitelib}/%{name}/configure/*.py* %changelog * Thu Jul 21 2005 Jef Spaleta - 0.1.1-4 - minor specfile cleanup * Wed Jul 20 2005 Jef Spaleta - 0.1.1-3 - minor specfile cleanup * Tue Jul 19 2005 Jef Spaleta - 0.1.1-2 - added gtk2-devel and python-devel BuildRequires - removed the python-abi requires because rpm in fc4+ catches this now * Fri Jul 01 2005 John (J5) Palmieri - 0.1.1-1 - upgrade to upstream 0.1.1 - remove pythondir patch * Wed Jun 29 2005 John (J5) Palmieri - 0.1.0-2 - Cleanup the spec file * Wed Jun 29 2005 John (J5) Palmieri - 0.1.0-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Jul 2005 01:28:38 -0000 1.1 +++ .cvsignore 27 Jul 2005 01:29:11 -0000 1.2 @@ -0,0 +1 @@ +istanbul-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Jul 2005 01:28:38 -0000 1.1 +++ sources 27 Jul 2005 01:29:11 -0000 1.2 @@ -0,0 +1 @@ +360f0225c916e81eed459e9915caf317 istanbul-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 27 01:43:51 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:43:51 -0400 Subject: owners owners.list,1.33,1.34 Message-ID: <200507270143.j6R1hpcD005574@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5557 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- owners.list 26 Jul 2005 12:13:47 -0000 1.33 +++ owners.list 27 Jul 2005 01:43:49 -0000 1.34 @@ -305,6 +305,7 @@ Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| 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|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| From fedora-extras-commits at redhat.com Wed Jul 27 05:48:14 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 01:48:14 -0400 Subject: common tobuild,1.2085,1.2086 Message-ID: <200507270548.j6R5mEFq010620@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10603 Modified Files: tobuild Log Message: cleanup successful builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2085 retrieving revision 1.2086 diff -u -r1.2085 -r1.2086 --- tobuild 26 Jul 2005 17:24:34 -0000 1.2085 +++ tobuild 27 Jul 2005 05:48:12 -0000 1.2086 @@ -7,43 +7,29 @@ anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel -jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 -scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 -ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel -ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 -oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 -awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel -tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel -awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 -oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 -thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 -thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel @@ -52,26 +38,21 @@ bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 smccann rpms/proj/devel proj-4_4_9-1_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 -mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 -oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 -thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel tagoh rpms/apel/devel apel-10_6-8_fc5 devel qspencer rpms/umfpack/devel umfpack-4_4-1 devel -mfleming rpms/mod_security/FC-3 mod_security-1_8_7-4_fc3 fc3 mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 thias rpms/cdlabelgen/FC-4 cdlabelgen-3_5_0-1_fc4 fc4 thias rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 devel @@ -84,7 +65,6 @@ scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel scop rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 fc4 scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -scop rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder-0_27-2_fc3 fc3 scop rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 @@ -100,12 +80,10 @@ mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 mschwendt rpms/tetex-lgrind/FC-3 tetex-lgrind-3_67-4_1 fc3 Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_3-1_fc3 fc3 abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 fc4 abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel -ixs rpms/perl-Crypt-CBC/FC-3 perl-Crypt-CBC-2_14-2_fc3 fc3 ixs rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC-2_14-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel @@ -113,17 +91,11 @@ bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel -oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 -oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 -oliver rpms/icmpdn/devel icmpdn-0_3-2 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel -oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/libdnet/FC-4 libdnet-1_10-2_fc4 fc4 -oliver rpms/libdnet/FC-3 libdnet-1_10-2_fc3 fc3 oliver rpms/fish/devel fish-1_12_0-1_fc5 devel -oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel adalloz rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 05:50:06 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 01:50:06 -0400 Subject: common tobuild,1.2086,1.2087 Message-ID: <200507270550.j6R5o6Rx010653@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10636 Modified Files: tobuild Log Message: remove duplicated builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2086 retrieving revision 1.2087 diff -u -r1.2086 -r1.2087 --- tobuild 27 Jul 2005 05:48:12 -0000 1.2086 +++ tobuild 27 Jul 2005 05:50:04 -0000 1.2087 @@ -31,7 +31,6 @@ oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 -oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel @@ -39,12 +38,10 @@ bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel -oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 -oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel @@ -73,7 +70,6 @@ bpepple rpms/liferea/FC-4 liferea-0_9_4-1_fc4 fc4 orion rpms/pytz/devel pytz-2005i-2 devel scop rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 fc4 -Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/cksfv cksfv-1_3-4 devel mschwendt devel/freeze freeze-2_5_0-4 devel mschwendt devel/tetex-lgrind tetex-lgrind-3_67-7 devel @@ -92,7 +88,6 @@ mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel -oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/libdnet/FC-4 libdnet-1_10-2_fc4 fc4 oliver rpms/fish/devel fish-1_12_0-1_fc5 devel @@ -100,7 +95,6 @@ adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel adalloz rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 fc3 adalloz rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 fc4 -s4504kr rpms/inadyn/devel inadyn-1_95-1 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 06:11:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 02:11:26 -0400 Subject: common tobuild,1.2087,1.2088 Message-ID: <200507270611.j6R6BQKc011824@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11807 Modified Files: tobuild Log Message: remove more completed builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2087 retrieving revision 1.2088 diff -u -r1.2087 -r1.2088 --- tobuild 27 Jul 2005 05:50:04 -0000 1.2087 +++ tobuild 27 Jul 2005 06:11:24 -0000 1.2088 @@ -93,7 +93,6 @@ oliver rpms/fish/devel fish-1_12_0-1_fc5 devel oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel -adalloz rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 fc3 adalloz rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 fc4 gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel @@ -102,7 +101,6 @@ thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 -mschwendt rpms/galculator/FC-3 galculator-1_2_5-1_fc3 fc3 mschwendt devel/meld meld-1_0_0-1_fc5 devel Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/inkscape inkscape-0_42-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 06:14:02 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 02:14:02 -0400 Subject: extras-buildsys/www index.psp,1.3,1.4 Message-ID: <200507270614.j6R6E2UG011848@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11831 Modified Files: index.psp Log Message: fix joblinks for waiting jobs following building jobs Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.psp 23 Jul 2005 00:55:31 -0000 1.3 +++ index.psp 27 Jul 2005 06:14:00 -0000 1.4 @@ -91,6 +91,8 @@ import os source = os.path.basename(source) # endif + + joblink = job_link(job['uid']) %>
    <%=job['uid']%>
    Result:"<%=result_msg%>"
    Result:"<%=result_msg%>"

    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 @@ -72,7 +72,7 @@ 

     man yum
 man yum.conf
-

    +

    Other useful yum resources on the Internet include:

    Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 26 Jul 2005 01:42:03 -0000 1.2 +++ ln-legalnotice.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

    - yum-software-management-0.6 (2005-07-25) + yum-software-management-0.6.1 (2005-07-27)

    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: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-managing-packages.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-managing-packages.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-managing-packages.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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 three ways:

    @@ -23,16 +23,11 @@ packages or package groups. Each section below gives some examples.

    - yum downloads data files from each of the - configured repositories. On a slow connection, it may take several - seconds to download the required files for each package. -

    During operation, yum first determines the best set of actions to produce the required result, and displays the transaction for you to approve. The yum utility - may prompt you to approve installation, update, or removal of - additional packages in addition to the package that you specified. - These actions may be necessary to resolve software dependencies. + may prompt you to approve the installation, update, or removal of + additional packages, in order to resolve software dependencies.

    This is an example of the transaction for installing tsclient: @@ -65,13 +60,13 @@ newest version of each package, unless you specify an older version.

    [Tip]Downloads are Cached

    - The yum utility keeps Downloaded data files + The yum utility keeps downloaded data files and packages for reuse. You may copy packages from the repository cache directories under /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: 

    @@ -96,7 +91,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: 

    @@ -122,7 +117,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. Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-searching-packages.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-searching-packages.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-searching-packages.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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 @@ -32,14 +32,20 @@ root account when prompted.

    - To make your queries more specific, add other package - attributes. To search for version 0.132 of the application, use - the command: + To make your queries more precise, specify packages with a name + that include other attributes, such as version or hardware + architecture. To search for version 0.132 of the application, + use the command: 

     su -c 'yum list tsclient-0.132'
-

    5.2. Advanced Searches

    - If you do not know the name of the package, use either the +

    [Note]Valid Package Attributes

    + Refer to Section 2.4, “Understanding Package Names” for information + on package name formats and the attributes that they include. +

    5.2. Advanced Searches

    + If you do not know the name of the package, use the search or provides options. + Alternatively, you may use wild cards and regular expressions + with any yum search option.

    The search option checks the names, descriptions, summaries and listed package maintainers of all of @@ -71,12 +77,20 @@

    For each command, at the prompt enter the password for the root account. -

    [Tip]Wildcards and Regular Expressions

    - You may use the standard wildcard characters in search - criteria: ? to represent any one character, - and * to mean zero or more characters. Use - Perl or Python regular expressions to carry out more complex - queries. +

    + Use the standard wildcard characters to run any search option + with a partial word or name: ? to represent any + one character, and * to mean zero or more + characters. Always add the escape character (\) + before wildcards. +

    + To list all packages with names that begin with + tsc, type: + 

    +su -c 'yum list tsc\*'
+
    [Tip]Regular Expressions

    + Use Perl or Python regular expressions to carry out more + complex queries.

    5.3. Understanding Matches

    Searches with yum show all of the packages that match your criteria. Packages must meet the terms of the @@ -87,8 +101,8 @@ or shadow-util would not produce the package shadow-utils. This package would match and be shown if the query was either - shadow-util? or - Shadow*. + shadow-util\? or + Shadow\*.

    Prev Up Next
    4. Managing Software with yum Home 6. Updating Your System with yum
    -
    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 @@ -37,16 +37,23 @@ checks their indexes to find the correct packages.

    The package management utilities in Fedora Core are already configured - to use the network of repositories maintained by the Fedora Project. These - repositories contain the software included with Fedora Core and a large - selection of additional software known as Fedora Extras. Third-party - software developers also provide repositories for their Fedora - compatible packages. -

    [Note]All Fedora Packages are Open Source Software

    + to use a network of servers that provide three repositories: +

    • + The packages that make up Fedora Core, as it is released on disc +

    • + Updated versions of Fedora Core software +

    • + A large selection of additional software, known as Fedora Extras +

    [Note]All Fedora Packages are Open Source Software

    All of the software provided by the Fedora Project is open source software. You may download and install software from the Fedora Project network of repositories on as many systems as desired. -

    +

    + Third-party software developers also provide repositories for + 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 @@ -71,7 +78,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 @@ -88,15 +95,15 @@ 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: 

     tsclient-0.132-4.i386.rpm

    - Management utilities refer to packages with one of three - formats: + Management utilities commonly refer to packages with one of + three formats:

    • Package name: tsclient

    • Index: sn-software-management-tools.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-software-management-tools.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-software-management-tools.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-software-management-tools.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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/beta/yum-software-management/sn-updating-your-system.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-updating-your-system.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-updating-your-system.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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/beta/yum-software-management/sn-using-repositories.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-using-repositories.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-using-repositories.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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. @@ -23,7 +23,7 @@ repository. Members of the community also maintain repositories to provide packages for Fedora systems. Third-party repositories provide information on their web sites. -

      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 @@ -56,7 +56,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 @@ -74,21 +74,23 @@ use this command: 

       su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc'
-

      7.3. Understanding Repository Compatibility

      - The Fedora Extras project provides packages which are built to the same - standards as Fedora Core packages. Third-party packages should be - compatible with these official packages, unless the provider +

      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 specifically states otherwise.

      - Refer to the web site of the repository for information on + Always read the web site of the repository for information on package compatibility before you add it as a package source. - Repositories often provide packages specifically intended for - use with packages supplied by other repositories. In some cases, - separate third-party repository providers may each offer - different versions of the same software. This situation may - prevent you from safely using those repositories together on - your Fedora system. -

      + Separate repository providers may offer different and + incompatible versions of the same software. In some cases, + third-party repositories may also include alternative packages + for software provided by Fedora Project repositories that are not + compatible with other Fedora packages. +

      [Caution]Incompatible Repositories

      + If you use incompatible repositories yum + operations may fail. +

      Packages built for one version of Fedora are usually not compatible with other versions of Fedora. The web site of the provider should specifically state which versions of Fedora they Index: sn-yum-installing-frompackage.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-yum-installing-frompackage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-yum-installing-frompackage.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-yum-installing-frompackage.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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 install new software, unless the software is only available as a package. In these cases, use the localinstall Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-yum-maintenance.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-yum-maintenance.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-yum-maintenance.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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,11 +27,11 @@

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

    8.2. Clearing the yum Caches

    - By design, yum does not automatically delete - any of the packages or package data files it downloads, so they - may be reused in future operations. To purge the header files, - use this command: +

    8.2. Clearing the yum Caches

    + By default, yum retains the packages and + package data files that it downloads, so they may be reused in + future operations without being downloaded again. To purge the + package data files, use this command: 

     su -c 'yum clean headers'

    @@ -42,11 +42,11 @@

    When using these commands, at the prompt, enter the password for the root account. -

    [Note]Purged Files

    - Package management operations download header files and - packages as required, and automatically replace any deleted - files needed for the operation. -

    Prev Up Next
    7. Using Other Software Repositories Home 9. Manually Installing Software
    +

    + Purging cached files causes those files to downloaded again the + next time that they are required. This increases the amount of + time required to complete the operation. +

    Prev Up Next
    7. Using Other Software Repositories Home 9. Manually Installing Software
    -
    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 is connected to the Internet through a web proxy server, specify the proxy server details in From fedora-extras-commits at redhat.com Thu Jul 28 02:09:38 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Wed, 27 Jul 2005 22:09:38 -0400 Subject: common tobuild,1.2114,1.2115 Message-ID: <200507280209.j6S29ctE010428@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10391 Modified Files: tobuild Log Message: cleanup successful build Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2114 retrieving revision 1.2115 diff -u -r1.2114 -r1.2115 --- tobuild 28 Jul 2005 00:01:25 -0000 1.2114 +++ tobuild 28 Jul 2005 02:09:36 -0000 1.2115 @@ -81,7 +81,6 @@ oliver rpms/fish/devel fish-1_12_0-1_fc5 devel oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel -adalloz rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 fc4 gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 02:29:34 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Wed, 27 Jul 2005 22:29:34 -0400 Subject: common tobuild,1.2115,1.2116 Message-ID: <200507280229.j6S2TYLc010511@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10491 Modified Files: tobuild Log Message: libxml++ built on fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2115 retrieving revision 1.2116 diff -u -r1.2115 -r1.2116 --- tobuild 28 Jul 2005 02:09:36 -0000 1.2115 +++ tobuild 28 Jul 2005 02:29:32 -0000 1.2116 @@ -43,7 +43,6 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 -icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel From jpo at di.uminho.pt Thu Jul 28 04:23:43 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Thu, 28 Jul 2005 05:23:43 +0100 Subject: APPROVED: perl-Test-MockModule Message-ID: <42E85DCF.5050108@di.uminho.pt> Name : perl-Test-MockModule Version : 0.05 Release : 3 Summary : Override subroutines in a module for unit testing Maintainer: Tom Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Thu Jul 28 04:24:58 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Thu, 28 Jul 2005 05:24:58 +0100 Subject: APPROVED: perl-SQL-Abstract Message-ID: <42E85E1A.1000900@di.uminho.pt> Name : perl-SQL-Abstract Version : 1.19 Release : 2 Summary : Generate SQL from Perl data structures Maintainer: Tom Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Thu Jul 28 04:26:07 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Thu, 28 Jul 2005 05:26:07 +0100 Subject: APPROVED: perl-Exporter-Lite Message-ID: <42E85E5F.4060106@di.uminho.pt> Name : perl-Exporter-Lite Version : 0.01 Release : 2 Summary : Lightweight exporting of variables Maintainer: Tom Callaway Reviewer: Jose Pedro Oliveira -- 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 Thu Jul 28 05:29:19 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 28 Jul 2005 01:29:19 -0400 Subject: common tobuild,1.2116,1.2117 Message-ID: <200507280529.j6S5TJnq014188@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2116 retrieving revision 1.2117 diff -u -r1.2116 -r1.2117 --- tobuild 28 Jul 2005 02:29:32 -0000 1.2116 +++ tobuild 28 Jul 2005 05:29:17 -0000 1.2117 @@ -18,7 +18,6 @@ oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel -tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 05:31:15 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 28 Jul 2005 01:31:15 -0400 Subject: common tobuild,1.2117,1.2118 Message-ID: <200507280531.j6S5VF5M014226@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14209 Modified Files: tobuild Log Message: Removing successful builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2117 retrieving revision 1.2118 diff -u -r1.2117 -r1.2118 --- tobuild 28 Jul 2005 05:29:17 -0000 1.2117 +++ tobuild 28 Jul 2005 05:31:13 -0000 1.2118 @@ -26,7 +26,6 @@ thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel -mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 @@ -41,7 +40,6 @@ thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel -mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 07:06:11 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:06:11 -0400 Subject: rpms/libcddb/devel libcddb.spec,1.12,1.13 Message-ID: <200507280706.j6S76BJr016620@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570/devel Modified Files: libcddb.spec Log Message: libcddb: release bumped for rebuild against new libcdio Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 +++ libcddb.spec 28 Jul 2005 07:06:09 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-2 +- Rebuild against new libcdio + * Tue Jul 26 2005 Dams - 1.2.0-1 - Updated to 1.2.0 From fedora-extras-commits at redhat.com Thu Jul 28 07:05:48 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:05:48 -0400 Subject: rpms/libcddb/FC-3 libcddb.spec,1.8,1.9 Message-ID: <200507280706.j6S76MIh016623@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570/FC-3 Modified Files: libcddb.spec Log Message: libcddb: release bumped for rebuild against new libcdio Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libcddb.spec 26 Jul 2005 12:11:18 -0000 1.8 +++ libcddb.spec 28 Jul 2005 07:05:30 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-2 +- Rebuild against new libcdio + * Tue Jul 26 2005 Dams - 1.2.0-1 - Updated to 1.2.0 From fedora-extras-commits at redhat.com Thu Jul 28 07:05:54 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:05:54 -0400 Subject: rpms/libcddb/FC-4 libcddb.spec,1.12,1.13 Message-ID: <200507280706.j6S76cPp016626@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570/FC-4 Modified Files: libcddb.spec Log Message: libcddb: release bumped for rebuild against new libcdio Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 +++ libcddb.spec 28 Jul 2005 07:05:49 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-2 +- Rebuild against new libcdio + * Tue Jul 26 2005 Dams - 1.2.0-1 - Updated to 1.2.0 From fedora-extras-commits at redhat.com Thu Jul 28 07:08:00 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:08:00 -0400 Subject: common tobuild,1.2118,1.2119 Message-ID: <200507280708.j6S780Ev016719@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16702 Modified Files: tobuild Log Message: request build of rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2118 retrieving revision 1.2119 diff -u -r1.2118 -r1.2119 --- tobuild 28 Jul 2005 05:31:13 -0000 1.2118 +++ tobuild 28 Jul 2005 07:07:58 -0000 1.2119 @@ -111,3 +111,4 @@ roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel +anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 07:08:25 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:08:25 -0400 Subject: common tobuild,1.2119,1.2120 Message-ID: <200507280708.j6S78PPj016781@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16764 Modified Files: tobuild Log Message: request build of rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2119 retrieving revision 1.2120 diff -u -r1.2119 -r1.2120 --- tobuild 28 Jul 2005 07:07:58 -0000 1.2119 +++ tobuild 28 Jul 2005 07:08:23 -0000 1.2120 @@ -112,3 +112,4 @@ uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 07:09:53 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 28 Jul 2005 03:09:53 -0400 Subject: common tobuild,1.2120,1.2121 Message-ID: <200507280709.j6S79rBM016814@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16797 Modified Files: tobuild Log Message: cleanup old entries Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2120 retrieving revision 1.2121 diff -u -r1.2120 -r1.2121 --- tobuild 28 Jul 2005 07:08:23 -0000 1.2120 +++ tobuild 28 Jul 2005 07:09:51 -0000 1.2121 @@ -3,68 +3,44 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 -ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel -ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel -oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel -corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 -oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 -thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 -thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel -bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt rpms/sylpheed/devel sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel -mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 -oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 -byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel -thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel -scop rpms/rpmlint/FC-4 rpmlint-0_70-4_fc4 fc4 scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel -scop rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 fc4 scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -scop rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -bpepple rpms/liferea/FC-4 liferea-0_9_4-1_fc4 fc4 orion rpms/pytz/devel pytz-2005i-2 devel -scop rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 fc4 mschwendt rpms/cksfv/devel cksfv-1_3-4 devel mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel -mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 -abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel -abompard rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 fc4 abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel -ixs rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC-2_14-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel @@ -73,30 +49,17 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel -oliver rpms/libdnet/FC-4 libdnet-1_10-2_fc4 fc4 oliver rpms/fish/devel fish-1_12_0-1_fc5 devel -oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel -gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel -jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel -mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel -Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel -nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel -ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel -oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 -adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 -ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 -ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 jnovy rpms/nedit/devel nedit-5_5-4 devel -thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 07:39:15 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 03:39:15 -0400 Subject: rpms/libcdio/FC-3 .cvsignore, 1.4, 1.5 libcdio.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200507280739.j6S7dFe1016902@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16881 Modified Files: .cvsignore libcdio.spec sources Log Message: update to 0.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Apr 2005 18:49:42 -0000 1.4 +++ .cvsignore 28 Jul 2005 07:39:13 -0000 1.5 @@ -1 +1,2 @@ -libcdio-0.73.tar.gz +libcdio-0.75.tar.gz +libcdio-0.75.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/libcdio.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libcdio.spec 24 Apr 2005 18:49:42 -0000 1.5 +++ libcdio.spec 28 Jul 2005 07:39:13 -0000 1.6 @@ -1,16 +1,16 @@ Name: libcdio -Version: 0.73 -Release: 1 -Epoch: 0 +Version: 0.75 +Release: 3%{?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.73.tar.gz +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libcddb-devel >= 0:0.9.4 +#BuildRequires: libcddb-devel >= 0.9.4 BuildRequires: pkgconfig BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig @@ -25,7 +25,7 @@ %package devel Summary: Header files and static libraries for %{name} Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel @@ -93,11 +93,28 @@ %changelog -* Sun Apr 24 2005 Ville Skytt?? - 0:0.73-1 -- Updated to 0.73 (Adrian Reber). +* Wed Jul 27 2005 Adrian Reber - 0.75-3 +- Rebuilt without libcddb dependency (#164270) + +* Tue Jul 26 2005 Adrian Reber - 0.75-2 +- Rebuilt + +* Thu Jul 14 2005 Adrian Reber - 0.75-1 +- Updated to 0.75. + +* Fri Jun 03 2005 Adrian Reber - 0.74-2 +- Updated to 0.74. + +* Sun Apr 24 2005 Ville Skytt?? - 0.73-2 - BuildRequire ncurses-devel (for cdda-player and cd-paranoia). - Run test suite during build. - Install Japanese man pages. + +* Sun Apr 24 2005 Adrian Reber - 0.73-1 +- Updated to 0.73. + +* Fri Mar 18 2005 Ville Skytt?? - 0.70-2 +- Fix FC4 build (#151468). - Build with dependency tracking disabled. * Sun Sep 5 2004 Marius L. J??hndal - 0:0.70-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Apr 2005 18:49:42 -0000 1.4 +++ sources 28 Jul 2005 07:39:13 -0000 1.5 @@ -1 +1,2 @@ -50eae24f732232c28d391a4dd563321f libcdio-0.73.tar.gz +628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz +3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig From fedora-extras-commits at redhat.com Thu Jul 28 07:40:11 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 03:40:11 -0400 Subject: common tobuild,1.2121,1.2122 Message-ID: <200507280740.j6S7eBom016964@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16947 Modified Files: tobuild Log Message: request build of rpms/libcdio/FC-3 libcdio-0_75-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2121 retrieving revision 1.2122 diff -u -r1.2121 -r1.2122 --- tobuild 28 Jul 2005 07:09:51 -0000 1.2121 +++ tobuild 28 Jul 2005 07:40:09 -0000 1.2122 @@ -76,3 +76,4 @@ jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 anvil rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 fc4 +adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 08:20:05 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 28 Jul 2005 04:20:05 -0400 Subject: common tobuild,1.2122,1.2123 Message-ID: <200507280820.j6S8K5Nw018753@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18736 Modified Files: tobuild Log Message: remove finished builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2122 retrieving revision 1.2123 diff -u -r1.2122 -r1.2123 --- tobuild 28 Jul 2005 07:40:09 -0000 1.2122 +++ tobuild 28 Jul 2005 08:20:03 -0000 1.2123 @@ -66,14 +66,10 @@ mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 -ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel -ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel -anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 fc4 adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 09:30:23 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 28 Jul 2005 05:30:23 -0400 Subject: fedora-security/audit fc4,1.32,1.33 Message-ID: <200507280930.j6S9UNTK020063@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20046 Modified Files: fc4 Log Message: Correct CVE name and add Firefox issue from yesterdays CVE batch Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fc4 27 Jul 2005 08:47:18 -0000 1.32 +++ fc4 28 Jul 2005 09:30:21 -0000 1.33 @@ -1,12 +1,13 @@ -Up to date CVE as of CVE email 20050726 -Up to date FC4 as of 20050726 +Up to date CVE as of CVE email 20050727 +Up to date FC4 as of 20050727 ** are items that need attention +2005-2395 ** firefox 2005-2370 backport (kdenetwork) [since FEDORA-2005-624] 2005-2369 backport (kdenetwork) [since FEDORA-2005-624] 2005-2368 VULNERABLE (vim) -2005-2355 backport (fetchmail) [since FEDORA-2005-613] +2005-2335 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606] From fedora-extras-commits at redhat.com Thu Jul 28 10:12:49 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 28 Jul 2005 06:12:49 -0400 Subject: common tobuild,1.2123,1.2124 Message-ID: <200507281012.j6SACnrS021335@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21318 Modified Files: tobuild Log Message: request build of rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2123 retrieving revision 1.2124 diff -u -r1.2123 -r1.2124 --- tobuild 28 Jul 2005 08:20:03 -0000 1.2123 +++ tobuild 28 Jul 2005 10:12:47 -0000 1.2124 @@ -73,3 +73,4 @@ uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 +ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 10:13:14 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 28 Jul 2005 06:13:14 -0400 Subject: common tobuild,1.2124,1.2125 Message-ID: <200507281013.j6SADECF021397@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21380 Modified Files: tobuild Log Message: request build of rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2124 retrieving revision 1.2125 diff -u -r1.2124 -r1.2125 --- tobuild 28 Jul 2005 10:12:47 -0000 1.2124 +++ tobuild 28 Jul 2005 10:13:12 -0000 1.2125 @@ -74,3 +74,4 @@ jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 +ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 10:50:31 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 06:50:31 -0400 Subject: rpms/libcddb/FC-3 libcddb.spec,1.9,1.10 Message-ID: <200507281050.j6SAoVNw021511@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcddb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21494 Modified Files: libcddb.spec Log Message: Rebuild against new libcdio (again) Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libcddb.spec 28 Jul 2005 07:05:30 -0000 1.9 +++ libcddb.spec 28 Jul 2005 10:50:29 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 1.2.0-3 +- Rebuild against new libcdio (again) + * Tue Jul 26 2005 Dams - 1.2.0-2 - Rebuild against new libcdio From fedora-extras-commits at redhat.com Thu Jul 28 10:57:36 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 06:57:36 -0400 Subject: rpms/libcddb/FC-4 libcddb.spec,1.13,1.14 Message-ID: <200507281057.j6SAvaOm021583@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcddb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21566 Modified Files: libcddb.spec Log Message: Rebuild against new libcdio (again) Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libcddb.spec 28 Jul 2005 07:05:49 -0000 1.13 +++ libcddb.spec 28 Jul 2005 10:57:34 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 1.2.0-3 +- Rebuild against new libcdio (again) + * Tue Jul 26 2005 Dams - 1.2.0-2 - Rebuild against new libcdio From fedora-extras-commits at redhat.com Thu Jul 28 10:58:01 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 06:58:01 -0400 Subject: rpms/libcddb/devel libcddb.spec,1.13,1.14 Message-ID: <200507281058.j6SAw1oX021635@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21618 Modified Files: libcddb.spec Log Message: Rebuild against new libcdio (again) Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libcddb.spec 28 Jul 2005 07:06:09 -0000 1.13 +++ libcddb.spec 28 Jul 2005 10:57:59 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 1.2.0-3 +- Rebuild against new libcdio (again) + * Tue Jul 26 2005 Dams - 1.2.0-2 - Rebuild against new libcdio From fedora-extras-commits at redhat.com Thu Jul 28 12:06:53 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 08:06:53 -0400 Subject: rpms/clamav/devel freshclam-sleep,1.1,1.2 Message-ID: <200507281206.j6SC6rlm024028@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24002 Modified Files: freshclam-sleep Log Message: Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] Index: freshclam-sleep =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/freshclam-sleep,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freshclam-sleep 25 Jul 2005 17:17:06 -0000 1.1 +++ freshclam-sleep 28 Jul 2005 12:06:36 -0000 1.2 @@ -44,7 +44,8 @@ ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac From fedora-extras-commits at redhat.com Thu Jul 28 12:10:30 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 08:10:30 -0400 Subject: rpms/clamav/devel clamav-notify-servers,1.1,1.2 Message-ID: <200507281210.j6SCAURn024102@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24085 Modified Files: clamav-notify-servers Log Message: added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav-notify-servers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-notify-servers 8 Nov 2004 04:10:52 -0000 1.1 +++ clamav-notify-servers 28 Jul 2005 12:10:28 -0000 1.2 @@ -23,6 +23,9 @@ ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue From fedora-extras-commits at redhat.com Thu Jul 28 12:47:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 28 Jul 2005 08:47:15 -0400 Subject: devel/common tobuild,1.2125,1.2126 Message-ID: <200507281247.j6SClF4T024235@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24218 Modified Files: tobuild Log Message: clean up successful builds Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2125 retrieving revision 1.2126 diff -u -r1.2125 -r1.2126 --- tobuild 28 Jul 2005 10:13:12 -0000 1.2125 +++ tobuild 28 Jul 2005 12:47:12 -0000 1.2126 @@ -63,8 +63,6 @@ qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel -mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 -mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 12:50:30 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 08:50:30 -0400 Subject: common tobuild,1.2126,1.2127 Message-ID: <200507281250.j6SCoUD8024264@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24247 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2126 retrieving revision 1.2127 diff -u -r1.2126 -r1.2127 --- tobuild 28 Jul 2005 12:47:12 -0000 1.2126 +++ tobuild 28 Jul 2005 12:50:28 -0000 1.2127 @@ -70,6 +70,5 @@ roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel -adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 14:03:01 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 28 Jul 2005 10:03:01 -0400 Subject: mock/etc fedora-3-i386-core.cfg, 1.2, 1.3 fedora-3-x86_64-core.cfg, 1.2, 1.3 fedora-4-i386-core.cfg, 1.2, 1.3 fedora-4-ppc-core.cfg, 1.2, 1.3 fedora-4-x86_64-core.cfg, 1.2, 1.3 fedora-5-i386-core.cfg, 1.1, 1.2 fedora-5-ppc-core.cfg, 1.1, 1.2 fedora-5-x86_64-core.cfg, 1.1, 1.2 Message-ID: <200507281403.j6SE3W4T026804@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26774 Modified Files: fedora-3-i386-core.cfg fedora-3-x86_64-core.cfg fedora-4-i386-core.cfg fedora-4-ppc-core.cfg fedora-4-x86_64-core.cfg fedora-5-i386-core.cfg fedora-5-ppc-core.cfg fedora-5-x86_64-core.cfg Log Message: update the local path Index: fedora-3-i386-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-3-i386-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-3-i386-core.cfg 19 May 2005 14:24:40 -0000 1.2 +++ fedora-3-i386-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -50,7 +50,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/3/ +baseurl=http://extras64.linux.duke.edu/plague-results/3/ """ Index: fedora-3-x86_64-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-3-x86_64-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-3-x86_64-core.cfg 19 May 2005 14:24:40 -0000 1.2 +++ fedora-3-x86_64-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -51,7 +51,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/3/ +baseurl=http://extras64.linux.duke.edu/plague-results/3/ """ Index: fedora-4-i386-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-i386-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-4-i386-core.cfg 16 Jun 2005 20:07:52 -0000 1.2 +++ fedora-4-i386-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -53,7 +53,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/4/ +baseurl=http://extras64.linux.duke.edu/plague-results/4/ """ Index: fedora-4-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-4-ppc-core.cfg 16 Jun 2005 20:07:52 -0000 1.2 +++ fedora-4-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -51,7 +51,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/4/ +baseurl=http://extras64.linux.duke.edu/plague-results/4/ """ Index: fedora-4-x86_64-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-x86_64-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-4-x86_64-core.cfg 16 Jun 2005 20:07:52 -0000 1.2 +++ fedora-4-x86_64-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -54,7 +54,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/4/ +baseurl=http://extras64.linux.duke.edu/plague-results/4/ """ Index: fedora-5-i386-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-5-i386-core.cfg 12 Jun 2005 23:23:47 -0000 1.1 +++ fedora-5-i386-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 @@ -47,7 +47,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/development/ +baseurl=http://extras64.linux.duke.edu/plague-results/development/ """ Index: fedora-5-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-5-ppc-core.cfg 12 Jun 2005 23:23:47 -0000 1.1 +++ fedora-5-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 @@ -46,7 +46,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/development/ +baseurl=http://extras64.linux.duke.edu/plague-results/development/ """ Index: fedora-5-x86_64-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-5-x86_64-core.cfg 12 Jun 2005 23:23:47 -0000 1.1 +++ fedora-5-x86_64-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 @@ -48,7 +48,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/development/ +baseurl=http://extras64.linux.duke.edu/plague-results/development/ """ From fedora-extras-commits at redhat.com Thu Jul 28 14:19:56 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 28 Jul 2005 10:19:56 -0400 Subject: rpms/notecase/FC-3 notecase.spec,1.10,1.11 Message-ID: <200507281419.j6SEJun8026931@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26914 Modified Files: notecase.spec Log Message: Minor fix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-3/notecase.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- notecase.spec 23 Jul 2005 07:53:24 -0000 1.10 +++ notecase.spec 28 Jul 2005 14:19:54 -0000 1.11 @@ -8,7 +8,7 @@ URL: http://notecase.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip Patch: notecase-0.8.9-unix2dos.patch -Patch1: notecase-0.8.9-paths.patch +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 From jamatos at fc.up.pt Thu Jul 28 14:36:27 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:36:27 +0100 Subject: APPROVED: pytz Message-ID: <200507281536.28110.jamatos@fc.up.pt> Name: pytz Summary: World Timezone Definitions for Python pytz brings the Olson tz database into Python. This library allows accurate and cross platform timezone calculations using Python 2.3 or higher. It also solves the issue of ambiguous times at the end of daylight savings, which you can read more about in the Python Library Reference (datetime.tzinfo). -- Jos? Ab?lio From jamatos at fc.up.pt Thu Jul 28 14:38:44 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:38:44 +0100 Subject: APPROVED: python-dateutil Message-ID: <200507281538.44891.jamatos@fc.up.pt> Name: python-dateutil Summary: Powerful extensions to the standard datetime module The dateutil module provides powerful extensions to the standard datetime module available in Python 2.3+. [I thought I sent this before but I never saw it here...] -- Jos? Ab?lio From jamatos at fc.up.pt Thu Jul 28 14:42:06 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:42:06 +0100 Subject: APPROVED: python-dateutil In-Reply-To: <200507281538.44891.jamatos@fc.up.pt> References: <200507281538.44891.jamatos@fc.up.pt> Message-ID: <200507281542.06241.jamatos@fc.up.pt> On Thursday 28 July 2005 15:38, Jose' Matos wrote: > Name: python-dateutil > Summary: Powerful extensions to the standard datetime module > > The dateutil module provides powerful extensions to the standard datetime > module available in Python 2.3+. > > [I thought I sent this before but I never saw it here...] Reviewer: Jos? Matos Packager: Orion Poplawski -- Jos? Ab?lio From jamatos at fc.up.pt Thu Jul 28 14:42:08 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:42:08 +0100 Subject: APPROVED: pytz In-Reply-To: <200507281536.28110.jamatos@fc.up.pt> References: <200507281536.28110.jamatos@fc.up.pt> Message-ID: <200507281542.08248.jamatos@fc.up.pt> On Thursday 28 July 2005 15:36, Jose' Matos wrote: > Name: pytz > Summary: World Timezone Definitions for Python > > pytz brings the Olson tz database into Python. This library allows > accurate and cross platform timezone calculations using Python 2.3 or > higher. It also solves the issue of ambiguous times at the end of > daylight savings, which you can read more about in the Python Library > Reference > (datetime.tzinfo). Reviewer: Jos? Matos Packager: Orion Poplawski -- Jos? Ab?lio From fedora-extras-commits at redhat.com Thu Jul 28 14:54:05 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Thu, 28 Jul 2005 10:54:05 -0400 Subject: common tobuild,1.2127,1.2128 Message-ID: <200507281454.j6SEs5sE027104@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27087 Modified Files: tobuild Log Message: request build of rpms/scim/FC-3 scim-1_4_0-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2127 retrieving revision 1.2128 diff -u -r1.2127 -r1.2128 --- tobuild 28 Jul 2005 12:50:28 -0000 1.2127 +++ tobuild 28 Jul 2005 14:54:03 -0000 1.2128 @@ -72,3 +72,4 @@ jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 +ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 14:54:35 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Thu, 28 Jul 2005 10:54:35 -0400 Subject: common tobuild,1.2128,1.2129 Message-ID: <200507281454.j6SEsZnm027141@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27124 Modified Files: tobuild Log Message: request build of rpms/scim/FC-4 scim-1_4_0-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2128 retrieving revision 1.2129 diff -u -r1.2128 -r1.2129 --- tobuild 28 Jul 2005 14:54:03 -0000 1.2128 +++ tobuild 28 Jul 2005 14:54:33 -0000 1.2129 @@ -73,3 +73,4 @@ ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 +ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 15:26:12 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:26:12 -0400 Subject: rpms/pptp/devel pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE Message-ID: <200507281526.j6SFQCZk028439@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28418 Modified Files: pptp.spec sources .cvsignore Removed Files: pptp-cvs20050331.patch Log Message: * Thu Jul 28 2005 Paul Howarth 1.7.0-1 - new upstream version 1.7.0 - remove patch, included upstream - edit Makefile to prevent attempted chown in %install - remove redundant %attr tag in %files - honour $RPM_OPT_FLAGS - ensure directories have correct permissions Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/pptp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pptp.spec 27 May 2005 14:49:16 -0000 1.3 +++ pptp.spec 28 Jul 2005 15:26:10 -0000 1.4 @@ -1,13 +1,12 @@ Name: pptp -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPL URL: http://pptpclient.sourceforge.net/ Source0: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-cvs20050331.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2 @@ -19,10 +18,10 @@ %prep %setup -q -%patch0 -p1 +%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile %build -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install %{__rm} -rf $RPM_BUILD_ROOT @@ -32,26 +31,34 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP -%attr(755,root,root) %{_sbindir}/pptp +%{_sbindir}/pptp %{_mandir}/man8/pptp.8* # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog -* Fri May 27 2005 Paul Howarth 1.6.0-5%{?dist} +* Thu Jul 28 2005 Paul Howarth 1.7.0-1 +- new upstream version 1.7.0 +- remove patch, included upstream +- edit Makefile to prevent attempted chown in %%install +- remove redundant %%attr tag in %%files +- honour $RPM_OPT_FLAGS +- ensure directories have correct permissions + +* Fri May 27 2005 Paul Howarth 1.6.0-5 - bump and rebuild -* Tue May 17 2005 Paul Howarth 1.6.0-4%{?dist} +* Tue May 17 2005 Paul Howarth 1.6.0-4 - rebuild with dist tags -* Tue May 10 2005 Paul Howarth 1.6.0-3%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-3 - fix URL for SOURCE0 not to point to a specific sf.net mirror -* Tue May 10 2005 Paul Howarth 1.6.0-2%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-2 - Weed out documentation useful only to developers - Add dist tag - Use full URL for SOURCE0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 May 2005 14:29:42 -0000 1.2 +++ sources 28 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz +0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 May 2005 14:29:42 -0000 1.2 +++ .cvsignore 28 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -pptp-1.6.0.tar.gz +pptp-1.7.0.tar.gz --- pptp-cvs20050331.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 28 15:35:12 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:35:12 -0400 Subject: rpms/clamav/devel clamav.spec,1.25,1.26 Message-ID: <200507281535.j6SFZCB7028572@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555 Modified Files: clamav.spec Log Message: - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] - added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- clamav.spec 25 Jul 2005 17:56:56 -0000 1.25 +++ clamav.spec 28 Jul 2005 15:35:10 -0000 1.26 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists From fedora-extras-commits at redhat.com Thu Jul 28 15:37:18 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 28 Jul 2005 11:37:18 -0400 Subject: common tobuild,1.2129,1.2130 Message-ID: <200507281537.j6SFbIWP028640@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28623 Modified Files: tobuild Log Message: request build of rpms/pygsl/devel pygsl-0_3_2-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2129 retrieving revision 1.2130 diff -u -r1.2129 -r1.2130 --- tobuild 28 Jul 2005 14:54:33 -0000 1.2129 +++ tobuild 28 Jul 2005 15:37:16 -0000 1.2130 @@ -74,3 +74,4 @@ ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 +jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 15:37:22 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:37:22 -0400 Subject: rpms/clamav/FC-3 clamav-notify-servers, 1.1, 1.2 clamav.spec, 1.15, 1.16 freshclam-sleep, 1.1, 1.2 Message-ID: <200507281537.j6SFbqve028685@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/FC-3 Modified Files: clamav-notify-servers clamav.spec freshclam-sleep Log Message: synced with devel/ Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav-notify-servers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-notify-servers 8 Nov 2004 04:10:52 -0000 1.1 +++ clamav-notify-servers 28 Jul 2005 15:37:20 -0000 1.2 @@ -23,6 +23,9 @@ ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- clamav.spec 25 Jul 2005 17:56:55 -0000 1.15 +++ clamav.spec 28 Jul 2005 15:37:20 -0000 1.16 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists Index: freshclam-sleep =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/freshclam-sleep,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freshclam-sleep 25 Jul 2005 17:47:53 -0000 1.1 +++ freshclam-sleep 28 Jul 2005 15:37:20 -0000 1.2 @@ -44,7 +44,8 @@ ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac From fedora-extras-commits at redhat.com Thu Jul 28 15:37:23 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:37:23 -0400 Subject: rpms/clamav/FC-4 clamav-notify-servers, 1.1, 1.2 clamav.spec, 1.24, 1.25 freshclam-sleep, 1.1, 1.2 Message-ID: <200507281537.j6SFbreY028690@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/FC-4 Modified Files: clamav-notify-servers clamav.spec freshclam-sleep Log Message: synced with devel/ Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav-notify-servers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-notify-servers 8 Nov 2004 04:10:52 -0000 1.1 +++ clamav-notify-servers 28 Jul 2005 15:37:20 -0000 1.2 @@ -23,6 +23,9 @@ ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- clamav.spec 25 Jul 2005 17:56:56 -0000 1.24 +++ clamav.spec 28 Jul 2005 15:37:21 -0000 1.25 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists Index: freshclam-sleep =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/freshclam-sleep,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freshclam-sleep 25 Jul 2005 17:47:54 -0000 1.1 +++ freshclam-sleep 28 Jul 2005 15:37:21 -0000 1.2 @@ -44,7 +44,8 @@ ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac From fedora-extras-commits at redhat.com Thu Jul 28 15:38:10 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:38:10 -0400 Subject: common tobuild,1.2130,1.2131 Message-ID: <200507281538.j6SFcAY9028721@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28704 Modified Files: tobuild Log Message: request build of rpms/pptp/devel pptp-1_7_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2130 retrieving revision 1.2131 diff -u -r1.2130 -r1.2131 --- tobuild 28 Jul 2005 15:37:16 -0000 1.2130 +++ tobuild 28 Jul 2005 15:38:08 -0000 1.2131 @@ -75,3 +75,4 @@ ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel +pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 15:38:37 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:38:37 -0400 Subject: common tobuild,1.2131,1.2132 Message-ID: <200507281538.j6SFcbXJ028785@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28766 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-3 clamav-0_86_2-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2131 retrieving revision 1.2132 diff -u -r1.2131 -r1.2132 --- tobuild 28 Jul 2005 15:38:08 -0000 1.2131 +++ tobuild 28 Jul 2005 15:38:35 -0000 1.2132 @@ -76,3 +76,4 @@ ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel +ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 15:39:06 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:39:06 -0400 Subject: common tobuild,1.2132,1.2133 Message-ID: <200507281539.j6SFd6Tv028853@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28834 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-4 clamav-0_86_2-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2132 retrieving revision 1.2133 diff -u -r1.2132 -r1.2133 --- tobuild 28 Jul 2005 15:38:35 -0000 1.2132 +++ tobuild 28 Jul 2005 15:39:04 -0000 1.2133 @@ -77,3 +77,4 @@ jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 +ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 15:40:43 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:40:43 -0400 Subject: rpms/pptp/FC-4 pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE Message-ID: <200507281540.j6SFehLj028889@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28868 Modified Files: pptp.spec sources .cvsignore Removed Files: pptp-cvs20050331.patch Log Message: resync with devel Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/pptp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pptp.spec 27 May 2005 14:49:16 -0000 1.3 +++ pptp.spec 28 Jul 2005 15:40:40 -0000 1.4 @@ -1,13 +1,12 @@ Name: pptp -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPL URL: http://pptpclient.sourceforge.net/ Source0: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-cvs20050331.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2 @@ -19,10 +18,10 @@ %prep %setup -q -%patch0 -p1 +%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile %build -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install %{__rm} -rf $RPM_BUILD_ROOT @@ -32,26 +31,34 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP -%attr(755,root,root) %{_sbindir}/pptp +%{_sbindir}/pptp %{_mandir}/man8/pptp.8* # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog -* Fri May 27 2005 Paul Howarth 1.6.0-5%{?dist} +* Thu Jul 28 2005 Paul Howarth 1.7.0-1 +- new upstream version 1.7.0 +- remove patch, included upstream +- edit Makefile to prevent attempted chown in %%install +- remove redundant %%attr tag in %%files +- honour $RPM_OPT_FLAGS +- ensure directories have correct permissions + +* Fri May 27 2005 Paul Howarth 1.6.0-5 - bump and rebuild -* Tue May 17 2005 Paul Howarth 1.6.0-4%{?dist} +* Tue May 17 2005 Paul Howarth 1.6.0-4 - rebuild with dist tags -* Tue May 10 2005 Paul Howarth 1.6.0-3%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-3 - fix URL for SOURCE0 not to point to a specific sf.net mirror -* Tue May 10 2005 Paul Howarth 1.6.0-2%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-2 - Weed out documentation useful only to developers - Add dist tag - Use full URL for SOURCE0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 May 2005 14:29:42 -0000 1.2 +++ sources 28 Jul 2005 15:40:40 -0000 1.3 @@ -1 +1 @@ -9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz +0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 May 2005 14:29:42 -0000 1.2 +++ .cvsignore 28 Jul 2005 15:40:40 -0000 1.3 @@ -1 +1 @@ -pptp-1.6.0.tar.gz +pptp-1.7.0.tar.gz --- pptp-cvs20050331.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 28 15:41:24 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:41:24 -0400 Subject: common tobuild,1.2133,1.2134 Message-ID: <200507281541.j6SFfO0K028951@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28934 Modified Files: tobuild Log Message: request build of rpms/pptp/FC-4 pptp-1_7_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2133 retrieving revision 1.2134 diff -u -r1.2133 -r1.2134 --- tobuild 28 Jul 2005 15:39:04 -0000 1.2133 +++ tobuild 28 Jul 2005 15:41:22 -0000 1.2134 @@ -78,3 +78,4 @@ pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 +pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 15:42:41 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:42:41 -0400 Subject: rpms/pptp/FC-3 pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE Message-ID: <200507281542.j6SFgfSx028998@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28977 Modified Files: pptp.spec sources .cvsignore Removed Files: pptp-cvs20050331.patch Log Message: resync with devel Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/pptp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pptp.spec 27 May 2005 14:50:34 -0000 1.3 +++ pptp.spec 28 Jul 2005 15:42:39 -0000 1.4 @@ -1,13 +1,12 @@ Name: pptp -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPL URL: http://pptpclient.sourceforge.net/ Source0: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-cvs20050331.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2 @@ -19,10 +18,10 @@ %prep %setup -q -%patch0 -p1 +%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile %build -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install %{__rm} -rf $RPM_BUILD_ROOT @@ -32,26 +31,34 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP -%attr(755,root,root) %{_sbindir}/pptp +%{_sbindir}/pptp %{_mandir}/man8/pptp.8* # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog -* Fri May 27 2005 Paul Howarth 1.6.0-5%{?dist} +* Thu Jul 28 2005 Paul Howarth 1.7.0-1 +- new upstream version 1.7.0 +- remove patch, included upstream +- edit Makefile to prevent attempted chown in %%install +- remove redundant %%attr tag in %%files +- honour $RPM_OPT_FLAGS +- ensure directories have correct permissions + +* Fri May 27 2005 Paul Howarth 1.6.0-5 - bump and rebuild -* Tue May 17 2005 Paul Howarth 1.6.0-4%{?dist} +* Tue May 17 2005 Paul Howarth 1.6.0-4 - rebuild with dist tags -* Tue May 10 2005 Paul Howarth 1.6.0-3%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-3 - fix URL for SOURCE0 not to point to a specific sf.net mirror -* Tue May 10 2005 Paul Howarth 1.6.0-2%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-2 - Weed out documentation useful only to developers - Add dist tag - Use full URL for SOURCE0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 May 2005 14:29:42 -0000 1.2 +++ sources 28 Jul 2005 15:42:39 -0000 1.3 @@ -1 +1 @@ -9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz +0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 May 2005 14:29:42 -0000 1.2 +++ .cvsignore 28 Jul 2005 15:42:39 -0000 1.3 @@ -1 +1 @@ -pptp-1.6.0.tar.gz +pptp-1.7.0.tar.gz --- pptp-cvs20050331.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 28 15:43:18 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:43:18 -0400 Subject: common tobuild,1.2134,1.2135 Message-ID: <200507281543.j6SFhI3q029060@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29043 Modified Files: tobuild Log Message: request build of rpms/pptp/FC-3 pptp-1_7_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2134 retrieving revision 1.2135 diff -u -r1.2134 -r1.2135 --- tobuild 28 Jul 2005 15:41:22 -0000 1.2134 +++ tobuild 28 Jul 2005 15:43:16 -0000 1.2135 @@ -79,3 +79,4 @@ ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 +pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 16:28:03 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 28 Jul 2005 12:28:03 -0400 Subject: common tobuild,1.2135,1.2136 Message-ID: <200507281628.j6SGS3aZ030464@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30447 Modified Files: tobuild Log Message: request build of rpms/moodss/devel moodss-20_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2135 retrieving revision 1.2136 diff -u -r1.2135 -r1.2136 --- tobuild 28 Jul 2005 15:43:16 -0000 1.2135 +++ tobuild 28 Jul 2005 16:28:01 -0000 1.2136 @@ -80,3 +80,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 +jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 16:31:32 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 28 Jul 2005 12:31:32 -0400 Subject: common tobuild,1.2136,1.2137 Message-ID: <200507281631.j6SGVWOK030539@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30522 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2136 retrieving revision 1.2137 diff -u -r1.2136 -r1.2137 --- tobuild 28 Jul 2005 16:28:01 -0000 1.2136 +++ tobuild 28 Jul 2005 16:31:30 -0000 1.2137 @@ -81,3 +81,4 @@ pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 17:54:01 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 13:54:01 -0400 Subject: common tobuild,1.2138,1.2139 Message-ID: <200507281754.j6SHs179031823@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804 Modified Files: tobuild Log Message: use plague for splint Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2138 retrieving revision 1.2139 diff -u -r1.2138 -r1.2139 --- tobuild 28 Jul 2005 17:51:32 -0000 1.2138 +++ tobuild 28 Jul 2005 17:53:58 -0000 1.2139 @@ -82,4 +82,3 @@ pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -pnasrat rpms/splint/FC-4 splint-3_1_1-9_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 17:51:34 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 13:51:34 -0400 Subject: common tobuild,1.2137,1.2138 Message-ID: <200507281751.j6SHpY7q031779@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31762 Modified Files: tobuild Log Message: request build of rpms/splint/FC-4 splint-3_1_1-9_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2137 retrieving revision 1.2138 diff -u -r1.2137 -r1.2138 --- tobuild 28 Jul 2005 16:31:30 -0000 1.2137 +++ tobuild 28 Jul 2005 17:51:32 -0000 1.2138 @@ -82,3 +82,4 @@ pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +pnasrat rpms/splint/FC-4 splint-3_1_1-9_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 19:04:30 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 28 Jul 2005 15:04:30 -0400 Subject: rpms/cln/FC-4 cln-1.1.9-string.patch,NONE,1.1 cln.spec,1.8,1.9 Message-ID: <200507281905.j6SJ540G001785@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/cln/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1765 Modified Files: cln.spec Added Files: cln-1.1.9-string.patch Log Message: Patched sources to fix compile problem that appears in gcc 4.0.1. cln-1.1.9-string.patch: --- NEW FILE cln-1.1.9-string.patch --- *** include/cln/string.h.~1~ 2004-06-23 16:04:49.000000000 -0500 --- include/cln/string.h 2005-06-13 10:09:34.000000000 -0500 *************** *** 10,15 **** --- 10,17 ---- namespace cln { + class cl_string; + // General, reference counted and garbage collected strings. struct cl_heap_string : public cl_heap { private: Index: cln.spec =================================================================== RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cln.spec 27 May 2005 11:01:22 -0000 1.8 +++ cln.spec 28 Jul 2005 19:04:05 -0000 1.9 @@ -1,12 +1,13 @@ Name: cln Version: 1.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Class Library for Numbers Group: System Environment/Libraries License: GPL URL: http://www.ginac.de/CLN/ Source0: ftp://ftpthep.physik.uni-mainz.de/pub/gnu/%{name}-%{version}.tar.bz2 +Patch0: cln-1.1.9-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -33,6 +34,7 @@ %prep %setup -q +%patch0 -p0 %build %configure @@ -78,6 +80,9 @@ %exclude %{_libdir}/*.la %changelog +* Thu Jul 28 2005 Quentin Spencer 1.1.9-4 +- Patched include/cln/string.h to correctly compile on gcc-c++-4.0.1 + * Fri May 27 2005 Quentin Spencer 1.1.9-3 - Added gmp-devel to Requires for devel From fedora-extras-commits at redhat.com Thu Jul 28 19:08:54 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 28 Jul 2005 15:08:54 -0400 Subject: common tobuild,1.2139,1.2140 Message-ID: <200507281908.j6SJ8sY9001916@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1895 Modified Files: tobuild Log Message: request build of rpms/cln/FC-4 cln-1_1_9-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2139 retrieving revision 1.2140 diff -u -r1.2139 -r1.2140 --- tobuild 28 Jul 2005 17:53:58 -0000 1.2139 +++ tobuild 28 Jul 2005 19:08:52 -0000 1.2140 @@ -82,3 +82,4 @@ pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 19:12:48 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 15:12:48 -0400 Subject: rpms/splint/FC-4 splint.spec,1.2,1.3 Message-ID: <200507281912.j6SJCmgI001950@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/splint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1933 Modified Files: splint.spec Log Message: Parallel builds seem to fail Index: splint.spec =================================================================== RCS file: /cvs/extras/rpms/splint/FC-4/splint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- splint.spec 29 Jun 2005 22:40:59 -0000 1.2 +++ splint.spec 28 Jul 2005 19:12:46 -0000 1.3 @@ -1,6 +1,6 @@ Name: splint Version: 3.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -23,7 +23,8 @@ %build %configure -make %{?_smp_mflags} +# Parallel builds seem to fail +make %install rm -rf $RPM_BUILD_ROOT @@ -42,6 +43,9 @@ %changelog +* Thu Jul 28 2005 Paul Nasrat - 3.1.1-10 +- Turn off parallel builds + * Wed Jun 29 2005 Jose Pedro Oliveira - 3.1.1-9 - Dist tag added. - Specfile reformatted (compliance with the Fedora Extras template). From fedora-extras-commits at redhat.com Thu Jul 28 19:13:22 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 15:13:22 -0400 Subject: rpms/splint/devel splint.spec,1.2,1.3 Message-ID: <200507281913.j6SJDMp5002008@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/splint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1991 Modified Files: splint.spec Log Message: sync Index: splint.spec =================================================================== RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- splint.spec 29 Jun 2005 22:40:59 -0000 1.2 +++ splint.spec 28 Jul 2005 19:13:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: splint Version: 3.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -23,7 +23,8 @@ %build %configure -make %{?_smp_mflags} +# Parallel builds seem to fail +make %install rm -rf $RPM_BUILD_ROOT @@ -42,6 +43,9 @@ %changelog +* Thu Jul 28 2005 Paul Nasrat - 3.1.1-10 +- Turn off parallel builds + * Wed Jun 29 2005 Jose Pedro Oliveira - 3.1.1-9 - Dist tag added. - Specfile reformatted (compliance with the Fedora Extras template). From fedora-extras-commits at redhat.com Thu Jul 28 19:52:58 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:52:58 -0400 Subject: rpms/python-dateutil - New directory Message-ID: <200507281952.j6SJqxOQ002196@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2176/python-dateutil Log Message: Directory /cvs/extras/rpms/python-dateutil added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 19:52:59 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:52:59 -0400 Subject: rpms/python-dateutil/devel - New directory Message-ID: <200507281953.j6SJqxSj002201@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2176/python-dateutil/devel Log Message: Directory /cvs/extras/rpms/python-dateutil/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 19:53:11 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:11 -0400 Subject: rpms/python-dateutil Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507281953.j6SJrBNi002248@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2221 Added Files: Makefile import.log Log Message: Setup of module python-dateutil --- NEW FILE Makefile --- # Top level Makefile for module python-dateutil all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 28 19:53:12 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:12 -0400 Subject: rpms/python-dateutil/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507281953.j6SJrCuv002253@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2221/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-dateutil --- NEW 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 Jul 28 19:53:30 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:30 -0400 Subject: rpms/python-dateutil import.log,1.1,1.2 Message-ID: <200507281954.j6SJs0Wh002319@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2285 Modified Files: import.log Log Message: auto-import python-dateutil-1.0-1 on branch devel from python-dateutil-1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-dateutil/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jul 2005 19:53:09 -0000 1.1 +++ import.log 28 Jul 2005 19:53:28 -0000 1.2 @@ -0,0 +1 @@ +python-dateutil-1_0-1:HEAD:python-dateutil-1.0-1.src.rpm:1122580405 From fedora-extras-commits at redhat.com Thu Jul 28 19:53:30 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:30 -0400 Subject: rpms/python-dateutil/devel python-dateutil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507281954.j6SJs1wd002323@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2285/devel Modified Files: .cvsignore sources Added Files: python-dateutil.spec Log Message: auto-import python-dateutil-1.0-1 on branch devel from python-dateutil-1.0-1.src.rpm --- NEW FILE python-dateutil.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dateutil Version: 1.0 Release: 1%{?dist} Summary: Powerful extensions to the standard datetime module Group: Development/Languages License: Python Software Foundation License URL: https://moin.conectiva.com.br/DateUtil #Source0: https://moin.conectiva.com.br/DateUtil?action=AttachFile&do=get&target=python-dateutil-%{version}.tar.bz2 Source0: python-dateutil-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python %description The dateutil module provides powerful extensions to the standard datetime module available in Python 2.3+. %prep %setup -q %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc example.py LICENSE NEWS README %{python_sitelib}/dateutil/ %changelog * Thu Jul 28 2005 Orion Poplawski 1.0-1 - Update to 1.0 * Tue Jul 05 2005 Orion Poplawski 0.9-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-dateutil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2005 19:53:10 -0000 1.1 +++ .cvsignore 28 Jul 2005 19:53:28 -0000 1.2 @@ -0,0 +1 @@ +python-dateutil-1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-dateutil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2005 19:53:10 -0000 1.1 +++ sources 28 Jul 2005 19:53:28 -0000 1.2 @@ -0,0 +1 @@ +764659b7b763fa551a5fbcec96d86d6d python-dateutil-1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 28 20:09:24 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:09:24 -0400 Subject: owners owners.list,1.35,1.36 Message-ID: <200507282009.j6SK9ODA003602@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3584 Modified Files: owners.list Log Message: Add python-dateutil Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- owners.list 27 Jul 2005 13:28:17 -0000 1.35 +++ owners.list 28 Jul 2005 20:09:22 -0000 1.36 @@ -659,6 +659,7 @@ Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-crypto|A cryptography library for Python|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|python-dateutil|Powerful extensions to the standard datetime module|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-dialog|Python interface to the Unix dialog utility|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|python-docutils|A system for processing plaintext documentation|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 28 20:11:07 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:11:07 -0400 Subject: rpms/pytz/devel pytz.spec,1.1,1.2 Message-ID: <200507282011.j6SKB7bx003633@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/pytz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3615 Modified Files: pytz.spec Log Message: Add %{?dist} Index: pytz.spec =================================================================== RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytz.spec 22 Jul 2005 20:58:39 -0000 1.1 +++ pytz.spec 28 Jul 2005 20:11:04 -0000 1.2 @@ -2,7 +2,7 @@ Name: pytz Version: 2005i -Release: 2 +Release: 2{%dist} Summary: World Timezone Definitions for Python Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 28 20:11:42 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:11:42 -0400 Subject: rpms/pytz/devel pytz.spec,1.2,1.3 Message-ID: <200507282011.j6SKBgrD003690@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/pytz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673 Modified Files: pytz.spec Log Message: Fix %{?dist} typo Index: pytz.spec =================================================================== RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pytz.spec 28 Jul 2005 20:11:04 -0000 1.2 +++ pytz.spec 28 Jul 2005 20:11:40 -0000 1.3 @@ -2,7 +2,7 @@ Name: pytz Version: 2005i -Release: 2{%dist} +Release: 2%{?dist} Summary: World Timezone Definitions for Python Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 28 20:12:10 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:12:10 -0400 Subject: common tobuild,1.2140,1.2141 Message-ID: <200507282012.j6SKCAme003742@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3725/common Modified Files: tobuild Log Message: Remove pytz Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2140 retrieving revision 1.2141 diff -u -r1.2140 -r1.2141 --- tobuild 28 Jul 2005 19:08:52 -0000 1.2140 +++ tobuild 28 Jul 2005 20:12:08 -0000 1.2141 @@ -35,7 +35,6 @@ scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -orion rpms/pytz/devel pytz-2005i-2 devel mschwendt rpms/cksfv/devel cksfv-1_3-4 devel mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel From fedora-extras-commits at redhat.com Thu Jul 28 20:13:20 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:13:20 -0400 Subject: rpms/pytz/FC-4 pytz.spec,1.1,1.2 Message-ID: <200507282013.j6SKDKjx003769@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/pytz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3752 Modified Files: pytz.spec Log Message: Add %{?dist} Index: pytz.spec =================================================================== RCS file: /cvs/extras/rpms/pytz/FC-4/pytz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytz.spec 22 Jul 2005 20:58:39 -0000 1.1 +++ pytz.spec 28 Jul 2005 20:13:18 -0000 1.2 @@ -2,7 +2,7 @@ Name: pytz Version: 2005i -Release: 2 +Release: 2%{?dist} Summary: World Timezone Definitions for Python Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 28 20:19:52 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:19:52 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.2,1.3 Message-ID: <200507282019.j6SKJquH003843@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3825 Modified Files: python-matplotlib.spec Log Message: - BuildRequires: pytz, python-dateutil - use upstream - Don't use INSTALLED_FILES, list dirs - Fix execute permissions Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-matplotlib.spec 1 Jul 2005 16:15:16 -0000 1.2 +++ python-matplotlib.spec 28 Jul 2005 20:19:50 -0000 1.3 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.82 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel BuildRequires: python-numeric, pygtk2-devel, gtk2-devel +BuildRequires: pytz, python-dateutil %description Matplotlib is a pure python plotting library with the goal of making @@ -28,22 +29,29 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT +chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py +chmod -x $RPM_BUILD_ROOT%{_datadir}/matplotlib/*.svg %clean rm -rf $RPM_BUILD_ROOT - -%files -f INSTALLED_FILES +%files %defattr(-,root,root,-) %doc README license/LICENSE license/LICENSE_enthought.txt -%doc license/LICENSE_PAINT license/LICENSE_PIL license/PYTZ_LICENSE.txt +%doc license/LICENSE_PAINT license/LICENSE_PIL %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS %doc NUMARRAY_ISSUES PKG-INFO TODO -%dir %{python_sitearch}/matplotlib -%dir %{_datadir}/matplotlib +%{python_sitearch}/matplotlib/ +%{python_sitearch}/pylab.py* +%{_datadir}/matplotlib/ %changelog +* Tue Jul 05 2005 Orion Poplawski 0.82-4 +- BuildRequires: pytz, python-dateutil - use upstream +- Don't use INSTALLED_FILES, list dirs +- Fix execute permissions + * Fri Jul 01 2005 Orion Poplawski 0.82-3 - Use %{python_sitearch} From fedora-extras-commits at redhat.com Thu Jul 28 20:39:23 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:39:23 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.3,1.4 Message-ID: <200507282039.j6SKdN68003934@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3917 Modified Files: python-matplotlib.spec Log Message: - New upstream version matplotlib 0.83.1 Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-matplotlib.spec 28 Jul 2005 20:19:50 -0000 1.3 +++ python-matplotlib.spec 28 Jul 2005 20:39:21 -0000 1.4 @@ -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.82 -Release: 4%{?dist} +Version: 0.83.1 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -47,6 +47,9 @@ %{_datadir}/matplotlib/ %changelog +* Thu Jul 28 2005 Orion Poplawski 0.83.1-1 +- New upstream version matplotlib 0.83.1 + * Tue Jul 05 2005 Orion Poplawski 0.82-4 - BuildRequires: pytz, python-dateutil - use upstream - Don't use INSTALLED_FILES, list dirs From fedora-extras-commits at redhat.com Thu Jul 28 20:40:02 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:40:02 -0400 Subject: rpms/python-matplotlib/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200507282040.j6SKe3Tq003988@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3969 Modified Files: .cvsignore sources Log Message: New source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2005 21:40:07 -0000 1.2 +++ .cvsignore 28 Jul 2005 20:40:00 -0000 1.3 @@ -1 +1 @@ -matplotlib-0.82.tar.gz +matplotlib-0.83.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2005 21:40:07 -0000 1.2 +++ sources 28 Jul 2005 20:40:00 -0000 1.3 @@ -1 +1 @@ -a5ef59a9eed934708eedef5a0125d8d8 matplotlib-0.82.tar.gz +6142d63cafd8a4a2ed0c94d772c68611 matplotlib-0.83.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 28 20:54:24 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:24 -0400 Subject: rpms/at-poke - New directory Message-ID: <200507282054.j6SKsOCX004161@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4141/at-poke Log Message: Directory /cvs/extras/rpms/at-poke added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 20:54:24 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:24 -0400 Subject: rpms/at-poke/devel - New directory Message-ID: <200507282054.j6SKsOwu004166@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4141/at-poke/devel Log Message: Directory /cvs/extras/rpms/at-poke/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 20:54:38 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:38 -0400 Subject: rpms/at-poke/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507282054.j6SKscwV004222@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4188/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module at-poke --- NEW 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 Jul 28 20:54:38 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:38 -0400 Subject: rpms/at-poke Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507282054.j6SKschB004217@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4188 Added Files: Makefile import.log Log Message: Setup of module at-poke --- NEW FILE Makefile --- # Top level Makefile for module at-poke all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 28 20:54:45 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:54:45 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.4,1.5 Message-ID: <200507282054.j6SKsjVO004250@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4199 Modified Files: python-matplotlib.spec Log Message: Botched tag Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-matplotlib.spec 28 Jul 2005 20:39:21 -0000 1.4 +++ python-matplotlib.spec 28 Jul 2005 20:54:42 -0000 1.5 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.83.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -47,6 +47,9 @@ %{_datadir}/matplotlib/ %changelog +* Thu Jul 28 2005 Orion Poplawski 0.83.1-2 +- Bump rel to fix botched tag + * Thu Jul 28 2005 Orion Poplawski 0.83.1-1 - New upstream version matplotlib 0.83.1 From fedora-extras-commits at redhat.com Thu Jul 28 20:55:04 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:55:04 -0400 Subject: rpms/at-poke import.log,1.1,1.2 Message-ID: <200507282055.j6SKtY8M004352@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312 Modified Files: import.log Log Message: auto-import at-poke-0.2.2-1 on branch devel from at-poke-0.2.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/at-poke/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jul 2005 20:54:36 -0000 1.1 +++ import.log 28 Jul 2005 20:55:02 -0000 1.2 @@ -0,0 +1 @@ +at-poke-0_2_2-1:HEAD:at-poke-0.2.2-1.src.rpm:1122584098 From fedora-extras-commits at redhat.com Thu Jul 28 20:55:05 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:55:05 -0400 Subject: rpms/at-poke/devel at-poke-0.2.2-lvalue.patch, NONE, 1.1 at-poke-0.2.2-weakref.patch, NONE, 1.1 at-poke.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507282055.j6SKtZEU004356@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312/devel Modified Files: .cvsignore sources Added Files: at-poke-0.2.2-lvalue.patch at-poke-0.2.2-weakref.patch at-poke.spec Log Message: auto-import at-poke-0.2.2-1 on branch devel from at-poke-0.2.2-1.src.rpm at-poke-0.2.2-lvalue.patch: --- NEW FILE at-poke-0.2.2-lvalue.patch --- --- at-poke-0.2.2/src/accessible-tree-model.c.lvalue 2005-07-26 22:26:55.000000000 -0400 +++ at-poke-0.2.2/src/accessible-tree-model.c 2005-07-26 22:31:07.000000000 -0400 @@ -113,7 +113,7 @@ return make_iter_invalid (iter); iter->stamp = ACCESSIBLE_TREE_MODEL (model)->stamp; - ITER_NODE (iter) = node; + iter->user_data = node; iter->user_data2 = NULL; iter->user_data3 = NULL; at-poke-0.2.2-weakref.patch: --- NEW FILE at-poke-0.2.2-weakref.patch --- --- at-poke-0.2.2/src/poke.c.weakref 2005-07-26 23:46:10.000000000 -0400 +++ at-poke-0.2.2/src/poke.c 2005-07-26 23:48:31.000000000 -0400 @@ -1591,6 +1591,7 @@ poker->window = glade_xml_get_widget ( poker->xml, "poker_window"); + g_object_add_weak_pointer (G_OBJECT (poker->window), (gpointer *) &(poker->window)); closure = g_cclosure_new ( G_CALLBACK (root_died_cb), poker, NULL); --- NEW FILE at-poke.spec --- Summary: A tool for poking things Name: at-poke Version: 0.2.2 Release: 1 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch1: at-poke-0.2.2-lvalue.patch Patch2: at-poke-0.2.2-weakref.patch Requires: libgail-gnome BuildRequires: libgail-gnome-devel BuildRequires: gtk2-devel %description at-poke is a simple tool for introspecting applications using the GNOME accessibility framework. %prep %setup -q %patch1 -p1 -b .lvalue %patch2 -p1 -b .weakref %configure %build make %install rm -rf $RPM_BUILD_ROOT %makeinstall %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/at-poke %{_datadir}/at-poke/at-poke.glade2 %changelog * Tue Jul 26 2005 - poke-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/at-poke/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2005 20:54:36 -0000 1.1 +++ .cvsignore 28 Jul 2005 20:55:03 -0000 1.2 @@ -0,0 +1 @@ +at-poke-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/at-poke/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2005 20:54:36 -0000 1.1 +++ sources 28 Jul 2005 20:55:03 -0000 1.2 @@ -0,0 +1 @@ +17874a3340dfc3ec289018fb5545833f at-poke-0.2.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 28 21:31:39 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 17:31:39 -0400 Subject: common tobuild,1.2141,1.2142 Message-ID: <200507282131.j6SLVdp4005616@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5599 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2141 retrieving revision 1.2142 diff -u -r1.2141 -r1.2142 --- tobuild 28 Jul 2005 20:12:08 -0000 1.2141 +++ tobuild 28 Jul 2005 21:31:36 -0000 1.2142 @@ -82,3 +82,4 @@ jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 +jrb rpms/at-poke/devel at-poke-0_2_2-1 devel From fedora-extras-commits at redhat.com Thu Jul 28 21:43:35 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 17:43:35 -0400 Subject: extras-buildsys plague.spec,1.18,1.19 Message-ID: <200507282143.j6SLhZ86005673@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5644 Modified Files: plague.spec Log Message: fix the stuff in #164325 * add the builder user in the spec file * create /srv/plague_builder, make it owned by the builder * listen on all interfaces by default * make default cert hostname based Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- plague.spec 16 Jul 2005 16:48:05 -0000 1.18 +++ plague.spec 28 Jul 2005 21:43:33 -0000 1.19 @@ -40,6 +40,7 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(pre): /usr/sbin/useradd %description builder The Plague builder does the actual RPM package building on slave machines. @@ -79,6 +80,7 @@ install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server +mkdir -p /srv/plague_builder %clean @@ -95,6 +97,9 @@ /sbin/chkconfig --del plague-server fi +%pre builder +/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || : + %post builder /sbin/chkconfig --add plague-builder /sbin/service plague-builder condrestart >> /dev/null || : @@ -131,6 +136,7 @@ %dir %{_sysconfdir}/%{name}/builder/certs %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder %{_initrddir}/%{name}-builder +%attr(0755, plague-builder, plague-builder) /srv/plague_builder %files client %defattr(-, root, root) From fedora-extras-commits at redhat.com Thu Jul 28 21:43:35 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 17:43:35 -0400 Subject: extras-buildsys/builder CONFIG.py,1.7,1.8 Message-ID: <200507282143.j6SLhZL0005679@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5644/builder Modified Files: CONFIG.py Log Message: fix the stuff in #164325 * add the builder user in the spec file * create /srv/plague_builder, make it owned by the builder * listen on all interfaces by default * make default cert hostname based Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CONFIG.py 22 Jul 2005 02:54:01 -0000 1.7 +++ CONFIG.py 28 Jul 2005 21:43:33 -0000 1.8 @@ -8,7 +8,7 @@ config_opts['ssl_buildserver'] = True config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 -config_opts['hostname'] = 'localhost' +config_opts['hostname'] = '' # if this is blank, we bind to all interfaces # distro and repo # @@ -40,16 +40,18 @@ BUILDER_DIR = "/etc/plague/builder" +import socket +hn = socket.gethostname() # SSL Certs and keys # MUST be full path to cert -config_opts['builder_key_and_cert'] = BUILDER_DIR + "/certs/builder_key_and_cert.pem" +config_opts['builder_key_and_cert'] = "%s/certs/%s.pem" %(BUILDER_DIR, hn) config_opts['ca_cert'] = BUILDER_DIR + "/certs/ca_cert.pem" # Where to keep SRPMs to build and the finished products # and logs. # WARNING: this directory is world-readable via HTTP! -config_opts['builder_work_dir'] = "/tmp/builder_work" +config_opts['builder_work_dir'] = "/srv/plague_builder" # User to drop privilege level to since we can't run mock as root, # but we have to run the HTTP server as root so it can chroot -config_opts['builder_user'] = "builder" +config_opts['builder_user'] = "plague-builder" From fedora-extras-commits at redhat.com Thu Jul 28 21:46:07 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 17:46:07 -0400 Subject: extras-buildsys ChangeLog,1.77,1.78 plague.spec,1.19,1.20 Message-ID: <200507282146.j6SLk7FH005706@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5687 Modified Files: ChangeLog plague.spec Log Message: use rpm_build_root Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- ChangeLog 27 Jul 2005 18:07:23 -0000 1.77 +++ ChangeLog 28 Jul 2005 21:46:05 -0000 1.78 @@ -1,3 +1,10 @@ +2005-07-28 Jeremy Katz + + * plague.spec: Create builder user and work dir in -build package + + * builder/CONFIG.py: Set builder cert by hostname. + Listen on all interfaces. + 2005-07-27 Jeremy Katz * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plague.spec 28 Jul 2005 21:43:33 -0000 1.19 +++ plague.spec 28 Jul 2005 21:46:05 -0000 1.20 @@ -80,7 +80,7 @@ install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server -mkdir -p /srv/plague_builder +mkdir -p $RPM_BUILD_ROOT/srv/plague_builder %clean From fedora-extras-commits at redhat.com Thu Jul 28 21:58:23 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 17:58:23 -0400 Subject: common tobuild,1.2142,1.2143 Message-ID: <200507282158.j6SLwNRo005773@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5755 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-1 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2142 retrieving revision 1.2143 diff -u -r1.2142 -r1.2143 --- tobuild 28 Jul 2005 21:31:36 -0000 1.2142 +++ tobuild 28 Jul 2005 21:58:21 -0000 1.2143 @@ -83,3 +83,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel +jrb rpms/at-poke/devel at-poke-0_2_2-1 development From fedora-extras-commits at redhat.com Thu Jul 28 23:06:34 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 19:06:34 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.5,1.6 Message-ID: <200507282306.j6SN6YXa008216@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8196 Modified Files: python-matplotlib.spec Log Message: Escape macros in changelog Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-matplotlib.spec 28 Jul 2005 20:54:42 -0000 1.5 +++ python-matplotlib.spec 28 Jul 2005 23:06:28 -0000 1.6 @@ -59,7 +59,7 @@ - Fix execute permissions * Fri Jul 01 2005 Orion Poplawski 0.82-3 -- Use %{python_sitearch} +- Use %%{python_sitearch} * Thu Jun 30 2005 Orion Poplawski 0.82-2 - Rename to python-matplotlib From fedora-extras-commits at redhat.com Thu Jul 28 23:26:50 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 28 Jul 2005 19:26:50 -0400 Subject: common tobuild,1.2143,1.2144 Message-ID: <200507282326.j6SNQok4008340@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8323/common Modified Files: tobuild Log Message: Remove devel build. I built it with plague-client instead. tobuild is dead, long live plague-client! Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2143 retrieving revision 1.2144 diff -u -r1.2143 -r1.2144 --- tobuild 28 Jul 2005 21:58:21 -0000 1.2143 +++ tobuild 28 Jul 2005 23:26:48 -0000 1.2144 @@ -40,7 +40,6 @@ mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel -jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 03:41:31 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 23:41:31 -0400 Subject: devel/common Makefile.common,1.26,1.27 Message-ID: <200507290341.j6T3fVcA013378@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13361 Modified Files: Makefile.common Log Message: add a make plague target... this will be what make build does soon... Index: Makefile.common =================================================================== RCS file: /cvs/extras/devel/common/Makefile.common,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile.common 28 Jun 2005 17:02:52 -0000 1.26 +++ Makefile.common 29 Jul 2005 03:41:29 -0000 1.27 @@ -324,6 +324,14 @@ cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\ popd >/dev/null) +plague: $(COMMON_DIR)/branches + @if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed"; exit 1; fi + @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi + + @cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\ + if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1; fi + /usr/bin/plague-client build $(NAME) $(TAG) $(TARGET) + # "make new | less" to see what has changed since the last tag was assigned new: From fedora-extras-commits at redhat.com Fri Jul 29 04:42:15 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 00:42:15 -0400 Subject: rpms/seahorse import.log,1.5,1.6 Message-ID: <200507290442.j6T4gFfe014679@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14648 Modified Files: import.log Log Message: auto-import seahorse-0.7.9-1.fc4 on branch FC-4 from seahorse-0.7.9-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/seahorse/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 5 May 2005 22:37:05 -0000 1.5 +++ import.log 29 Jul 2005 04:42:13 -0000 1.6 @@ -2,3 +2,4 @@ seahorse-0_7_3-0_fdr_5_1:HEAD:seahorse-0.7.3-0.fdr.5.1.src.rpm:1099891226 seahorse-0_7_3-0_fdr_5_2:HEAD:seahorse-0.7.3-0.fdr.5.2.src.rpm:1099891232 seahorse-0_7_7-1:HEAD:seahorse-0.7.7-1.src.rpm:1115332650 +seahorse-0_7_9-1_fc4:FC-4:seahorse-0.7.9-1.fc4.src.rpm:1122612107 From fedora-extras-commits at redhat.com Fri Jul 29 04:42:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 00:42:16 -0400 Subject: rpms/seahorse/FC-4 .cvsignore, 1.4, 1.5 seahorse.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200507290442.j6T4gGvV014687@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14648/FC-4 Modified Files: .cvsignore seahorse.spec sources Log Message: auto-import seahorse-0.7.9-1.fc4 on branch FC-4 from seahorse-0.7.9-1.fc4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 May 2005 22:37:05 -0000 1.4 +++ .cvsignore 29 Jul 2005 04:42:14 -0000 1.5 @@ -1 +1 @@ -seahorse-0.7.7.tar.gz +seahorse-0.7.9.tar.gz Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/seahorse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- seahorse.spec 26 May 2005 01:29:00 -0000 1.12 +++ seahorse.spec 29 Jul 2005 04:42:14 -0000 1.13 @@ -1,11 +1,11 @@ Name: seahorse -Version: 0.7.7 -Release: 3 +Version: 0.7.9 +Release: 1%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.7.tar.gz +Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -99,14 +99,17 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_bindir}/* -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* %{_datadir}/applications/*.desktop %{_datadir}/control-center-2.0/capplets/*.desktop -%{_datadir}/gnome/help/%{name} +%dir %{_datadir}/gnome/help/%{name} +%{_datadir}/gnome/help/%{name}/* %{_datadir}/mime-info/seahorse.keys %{_datadir}/mime-info/seahorse.mime %{_datadir}/mime/packages/* -%{_datadir}/omf/%{name} +%dir %{_datadir}/omf/%{name} +%{_datadir}/omf/%{name}/* %{_datadir}/pixmaps/* %{_libdir}/libseahorse-internal* %{_libdir}/gedit-2/plugins/* @@ -115,6 +118,9 @@ %changelog +* Thu Jul 28 2005 Seth Vidal - 0.7.9-1 +- 0.7.9 + * Wed May 25 2005 Jeremy Katz - 0.7.7-3 - make sure all files are included - BR nautilus-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 May 2005 22:37:05 -0000 1.4 +++ sources 29 Jul 2005 04:42:14 -0000 1.5 @@ -1 +1 @@ -babee15dbe6b5652b20ae0d1b0b04962 seahorse-0.7.7.tar.gz +58d5ba77ea99b5c11fbd9feadfbd3f87 seahorse-0.7.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 05:11:15 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 29 Jul 2005 01:11:15 -0400 Subject: mock/etc fedora-4-ppc-core.cfg, 1.3, 1.4 fedora-5-ppc-core.cfg, 1.2, 1.3 Message-ID: <200507290511.j6T5BFVW016019@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/etc Modified Files: fedora-4-ppc-core.cfg fedora-5-ppc-core.cfg Log Message: exclude ppc64 packages in ppc configs. this fixes building of ppc stuff on a ppc64 host Index: fedora-4-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-4-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 +++ fedora-4-ppc-core.cfg 29 Jul 2005 05:11:13 -0000 1.4 @@ -29,6 +29,7 @@ obsoletes=1 gpgcheck=0 assumeyes=1 +exclude=*.ppc64 # repos Index: fedora-5-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-5-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 +++ fedora-5-ppc-core.cfg 29 Jul 2005 05:11:13 -0000 1.3 @@ -29,6 +29,7 @@ obsoletes=1 gpgcheck=0 assumeyes=1 +exclude=*.ppc64 # repos From fedora-extras-commits at redhat.com Fri Jul 29 05:14:33 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:14:33 -0400 Subject: extras-buildsys ChangeLog,1.78,1.79 Message-ID: <200507290514.j6T5EXDi016059@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030 Modified Files: ChangeLog Log Message: server/UserInterface.py Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- ChangeLog 28 Jul 2005 21:46:05 -0000 1.78 +++ ChangeLog 29 Jul 2005 05:14:31 -0000 1.79 @@ -1,3 +1,8 @@ +2005-07-29 Seth Vidal + * server/UserInterface.py - fix resolved target to succeed if a match + comes from the client_target_map + also simplify the function a bit. + 2005-07-28 Jeremy Katz * plague.spec: Create builder user and work dir in -build package From fedora-extras-commits at redhat.com Fri Jul 29 05:14:34 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:14:34 -0400 Subject: extras-buildsys/server UserInterface.py,1.31,1.32 Message-ID: <200507290514.j6T5EYws016065@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030/server Modified Files: UserInterface.py Log Message: server/UserInterface.py Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- UserInterface.py 27 Jul 2005 06:21:36 -0000 1.31 +++ UserInterface.py 29 Jul 2005 05:14:31 -0000 1.32 @@ -76,28 +76,22 @@ def resolve_target(target): client_target_map = config_opts['client_target_map'] + target_dict = config_opts['targets'] - # Resolve aliases first resolved_target = target done = True for master_target in client_target_map.keys(): + if not target_dict.has_key(master_target): # make sure we build it + continue # if not, move along + for alias in client_target_map[master_target]: if resolved_target.lower() == alias.lower(): - resolved_target = master_target - done = True - break - if done: - break - - # Make sure we actually build the resolved target - target_dict = config_opts['targets'] - for master_target in target_dict.keys(): - if resolved_target.lower() == master_target.lower(): - return master_target + return master_target raise InvalidTargetError() + def email_result(email, source, resultstring): """send 'resultstring' to email""" From fedora-extras-commits at redhat.com Fri Jul 29 05:16:59 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Fri, 29 Jul 2005 01:16:59 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.14,1.15 Message-ID: <200507290516.j6T5Gxg7016091@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074 Modified Files: galeon.spec Log Message: galeon:bumped released Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- galeon.spec 24 Jul 2005 14:49:43 -0000 1.14 +++ galeon.spec 29 Jul 2005 05:16:57 -0000 1.15 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -101,6 +101,9 @@ %changelog +* Fri Jul 29 2005 Dams - 1.3.21-11 +- Bumped released + * Sun Jul 24 2005 Dams - 1.3.21-10 - Bumped release because build server didnt built my previous request From fedora-extras-commits at redhat.com Fri Jul 29 05:25:25 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:25:25 -0400 Subject: extras-buildsys ChangeLog,1.79,1.80 Message-ID: <200507290525.j6T5PPru016182@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153 Modified Files: ChangeLog Log Message: despam Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- ChangeLog 29 Jul 2005 05:14:31 -0000 1.79 +++ ChangeLog 29 Jul 2005 05:25:22 -0000 1.80 @@ -1,4 +1,7 @@ 2005-07-29 Seth Vidal + * www/index.psp - despam email addresses + +2005-07-29 Seth Vidal * server/UserInterface.py - fix resolved target to succeed if a match comes from the client_target_map also simplify the function a bit. From fedora-extras-commits at redhat.com Fri Jul 29 05:25:25 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:25:25 -0400 Subject: extras-buildsys/www index.psp,1.4,1.5 Message-ID: <200507290525.j6T5PPbr016188@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153/www Modified Files: index.psp Log Message: despam Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.psp 27 Jul 2005 06:14:00 -0000 1.4 +++ index.psp 29 Jul 2005 05:25:23 -0000 1.5 @@ -65,6 +65,7 @@ # endif joblink = job_link(job['uid']) + username = job['username'].replace('@', ' ') %> <%=job['uid']%> @@ -72,7 +73,7 @@ <%=source%> <%=job['status']%> <%=job['target']%> - <%=job['username']%> + <%=username%> <% i = i + 1 @@ -93,6 +94,7 @@ # endif joblink = job_link(job['uid']) + username = job['username'].replace('@', ' ') %> <%=job['uid']%> @@ -100,7 +102,7 @@ <%=source%> <%=job['status']%> <%=job['target']%> - <%=job['username']%> + <%=username%> <% i = i + 1 From fedora-extras-commits at redhat.com Fri Jul 29 05:27:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 01:27:18 -0400 Subject: extras-buildsys ChangeLog,1.80,1.81 Message-ID: <200507290527.j6T5RmCB016236@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16204 Modified Files: ChangeLog Log Message: 2005-07-29 Dan Williams * www/job.psp - Line up arch jobs - Only show build times for successful jobs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ChangeLog 29 Jul 2005 05:25:22 -0000 1.80 +++ ChangeLog 29 Jul 2005 05:27:16 -0000 1.81 @@ -1,3 +1,9 @@ +2005-07-29 Dan Williams + + * www/job.psp + - Line up arch jobs + - Only show build times for successful jobs + 2005-07-29 Seth Vidal * www/index.psp - despam email addresses From fedora-extras-commits at redhat.com Fri Jul 29 05:27:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 01:27:18 -0400 Subject: extras-buildsys/www job.psp,1.3,1.4 Message-ID: <200507290527.j6T5RmbZ016239@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16204/www Modified Files: job.psp Log Message: 2005-07-29 Dan Williams * www/job.psp - Line up arch jobs - Only show build times for successful jobs Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- job.psp 27 Jul 2005 07:25:35 -0000 1.3 +++ job.psp 29 Jul 2005 05:27:16 -0000 1.4 @@ -88,29 +88,23 @@ - - + -<% - colspan = '' - if aj['endtime'] == 0: - colspan = 'colspan="2"' - #endif -%> - + <% # endif %> From fedora-extras-commits at redhat.com Fri Jul 29 05:43:47 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:43:47 -0400 Subject: rpms/seahorse import.log,1.6,1.7 Message-ID: <200507290543.j6T5hlHm016319@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16288 Modified Files: import.log Log Message: auto-import seahorse-0.7.9-1.fc4 on branch devel from seahorse-0.7.9-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/seahorse/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 29 Jul 2005 04:42:13 -0000 1.6 +++ import.log 29 Jul 2005 05:43:45 -0000 1.7 @@ -3,3 +3,4 @@ seahorse-0_7_3-0_fdr_5_2:HEAD:seahorse-0.7.3-0.fdr.5.2.src.rpm:1099891232 seahorse-0_7_7-1:HEAD:seahorse-0.7.7-1.src.rpm:1115332650 seahorse-0_7_9-1_fc4:FC-4:seahorse-0.7.9-1.fc4.src.rpm:1122612107 +seahorse-0_7_9-1_fc4:HEAD:seahorse-0.7.9-1.fc4.src.rpm:1122615798 From fedora-extras-commits at redhat.com Fri Jul 29 05:43:47 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:43:47 -0400 Subject: rpms/seahorse/devel .cvsignore, 1.4, 1.5 seahorse.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200507290543.j6T5hlZk016327@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16288/devel Modified Files: .cvsignore seahorse.spec sources Log Message: auto-import seahorse-0.7.9-1.fc4 on branch devel from seahorse-0.7.9-1.fc4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 May 2005 22:37:05 -0000 1.4 +++ .cvsignore 29 Jul 2005 05:43:45 -0000 1.5 @@ -1 +1 @@ -seahorse-0.7.7.tar.gz +seahorse-0.7.9.tar.gz Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- seahorse.spec 26 May 2005 01:29:00 -0000 1.12 +++ seahorse.spec 29 Jul 2005 05:43:45 -0000 1.13 @@ -1,11 +1,11 @@ Name: seahorse -Version: 0.7.7 -Release: 3 +Version: 0.7.9 +Release: 1%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.7.tar.gz +Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -99,14 +99,17 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_bindir}/* -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* %{_datadir}/applications/*.desktop %{_datadir}/control-center-2.0/capplets/*.desktop -%{_datadir}/gnome/help/%{name} +%dir %{_datadir}/gnome/help/%{name} +%{_datadir}/gnome/help/%{name}/* %{_datadir}/mime-info/seahorse.keys %{_datadir}/mime-info/seahorse.mime %{_datadir}/mime/packages/* -%{_datadir}/omf/%{name} +%dir %{_datadir}/omf/%{name} +%{_datadir}/omf/%{name}/* %{_datadir}/pixmaps/* %{_libdir}/libseahorse-internal* %{_libdir}/gedit-2/plugins/* @@ -115,6 +118,9 @@ %changelog +* Thu Jul 28 2005 Seth Vidal - 0.7.9-1 +- 0.7.9 + * Wed May 25 2005 Jeremy Katz - 0.7.7-3 - make sure all files are included - BR nautilus-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 May 2005 22:37:05 -0000 1.4 +++ sources 29 Jul 2005 05:43:45 -0000 1.5 @@ -1 +1 @@ -babee15dbe6b5652b20ae0d1b0b04962 seahorse-0.7.7.tar.gz +58d5ba77ea99b5c11fbd9feadfbd3f87 seahorse-0.7.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 05:50:55 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 01:50:55 -0400 Subject: rpms/scim/devel README, NONE, 1.1 Makefile, 1.1, NONE scim.spec, 1.8, NONE sources, 1.6, NONE xinput-scim, 1.3, NONE Message-ID: <200507290550.j6T5ot6J016468@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16452 Added Files: README Removed Files: Makefile scim.spec sources xinput-scim Log Message: scim moved to Core for FC5 --- NEW FILE README --- scim has moved to Fedora Core for FC5. --- Makefile DELETED --- --- scim.spec DELETED --- --- sources DELETED --- --- xinput-scim DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 06:05:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:05:05 -0400 Subject: extras-buildsys/client client.py,1.16,1.17 Message-ID: <200507290606.j6T668tB017640@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587/client Modified Files: client.py Log Message: 2005-07-29 Dan Williams * server/BuilderManager.py server/BuildMaster.py server/UserInterface.py client/client.py - Add admin-only pause/unpause commands to the server Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- client.py 25 Jul 2005 21:44:52 -0000 1.16 +++ client.py 29 Jul 2005 06:05:03 -0000 1.17 @@ -227,6 +227,18 @@ except socket.error, e: print "Error connecting to build server: '%s'" % e +def pause(server, paused): + """ + Pause or unpause the build server + """ + + try: + (e, msg) = server.pause(paused) + print msg + except socket.error, e: + print "Error connecting to build server: '%s'" % e + + def getXMLRPCServerProxy(use_ssl): """ @@ -292,6 +304,8 @@ print " kill " print " update_builders" print " list_builders" + print " pause" + print " unpause" print "" sys.exit(1) @@ -336,6 +350,10 @@ update_builders(server, email) elif cmd == 'list_builders': list_builders(server, email) + elif cmd == 'pause': + pause(server, True) + elif cmd == 'unpause': + pause(server, False) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Fri Jul 29 06:04:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:04:33 -0400 Subject: extras-buildsys ChangeLog,1.81,1.82 Message-ID: <200507290606.j6T668CT017641@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587 Modified Files: ChangeLog Log Message: 2005-07-29 Dan Williams * server/BuilderManager.py server/BuildMaster.py server/UserInterface.py client/client.py - Add admin-only pause/unpause commands to the server Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- ChangeLog 29 Jul 2005 05:27:16 -0000 1.81 +++ ChangeLog 29 Jul 2005 06:04:31 -0000 1.82 @@ -1,5 +1,13 @@ 2005-07-29 Dan Williams + * server/BuilderManager.py + server/BuildMaster.py + server/UserInterface.py + client/client.py + - Add admin-only pause/unpause commands to the server + +2005-07-29 Dan Williams + * www/job.psp - Line up arch jobs - Only show build times for successful jobs From fedora-extras-commits at redhat.com Fri Jul 29 06:05:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:05:39 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.24, 1.25 BuilderManager.py, 1.8, 1.9 UserInterface.py, 1.32, 1.33 Message-ID: <200507290606.j6T66ABl017643@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587/server Modified Files: BuildMaster.py BuilderManager.py UserInterface.py Log Message: 2005-07-29 Dan Williams * server/BuilderManager.py server/BuildMaster.py server/UserInterface.py client/client.py - Add admin-only pause/unpause commands to the server Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- BuildMaster.py 26 Jul 2005 17:47:24 -0000 1.24 +++ BuildMaster.py 29 Jul 2005 06:05:37 -0000 1.25 @@ -104,6 +104,7 @@ self.builder_manager = builder_manager self.hostname = hostname self.should_stop = False + self._paused = False self.repos = {} for target in config_opts['targets'].keys(): repo = Repo.Repo(target, builder_manager) @@ -403,23 +404,24 @@ def _have_work(self): have_work = False - if not have_work: - self._new_queue_lock.acquire() - if len(self._new_queue) > 0: - have_work = True - self._new_queue_lock.release() - - if not have_work: - self._restart_queue_lock.acquire() - if len(self._restart_queue) > 0: - have_work = True - self._restart_queue_lock.release() - - if not have_work: - self._checkout_wait_queue_lock.acquire() - if (self._checkout_num < self.MAX_CHECKOUT_JOBS) and len(self._checkout_wait_queue) > 0: - have_work = True - self._checkout_wait_queue_lock.release() + if not self._paused: + if not have_work: + self._new_queue_lock.acquire() + if len(self._new_queue) > 0: + have_work = True + self._new_queue_lock.release() + + if not have_work: + self._restart_queue_lock.acquire() + if len(self._restart_queue) > 0: + have_work = True + self._restart_queue_lock.release() + + if not have_work: + self._checkout_wait_queue_lock.acquire() + if (self._checkout_num < self.MAX_CHECKOUT_JOBS) and len(self._checkout_wait_queue) > 0: + have_work = True + self._checkout_wait_queue_lock.release() if not have_work: self._status_updates_lock.acquire() @@ -433,8 +435,8 @@ have_work = True self._archjob_status_updates_lock.release() - if not have_work and self.builder_manager.have_work(): - have_work = True + if not have_work and self.builder_manager.have_work(self._paused): + have_work = True return have_work @@ -447,23 +449,30 @@ self._building_jobs_lock.release() return ret_job + def pause(self, paused): + self._paused = paused + + def is_paused(self): + return self._paused + def run(self): while self.should_stop == False: # Write update status for jobs to the database self._save_job_status() - if self.builder_manager.have_work(): - self.builder_manager.process() + if self.builder_manager.have_work(self._paused): + self.builder_manager.process(self._paused) # Clean up jobs that have finished self._process_finished_jobs() - # Let a few jobs through the checkout_wait gate if needed - self._process_checkout_wait_jobs() - - # Start any new jobs - self._start_new_jobs() - self._start_requeued_jobs() + if not self._paused: + # Let a few jobs through the checkout_wait gate if needed + self._process_checkout_wait_jobs() + + # Start any new jobs + self._start_new_jobs() + self._start_requeued_jobs() last_time = time.time() while not self._have_work() and time.time() <= last_time + 5: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BuilderManager.py 25 Jul 2005 19:47:15 -0000 1.8 +++ BuilderManager.py 29 Jul 2005 06:05:37 -0000 1.9 @@ -129,19 +129,19 @@ return builder_list - def have_work(self): + def have_work(self, paused): avail = False for builder in self.running_builders: if builder.available(): avail = True - if len(self._queue) > 0 and avail: + if not paused and len(self._queue) > 0 and avail: return True return self._have_work def builder_gone(self): self._have_work = True - def process(self): + def process(self, paused): self._have_work = False # Deal with dead/unreachable builders @@ -159,6 +159,10 @@ builder.stop() self.running_builders.remove(builder) + # Don't queue any new jobs if we are paused + if paused: + return + # Deal with new arch jobs self._queue_lock.acquire() new_jobs = {} Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- UserInterface.py 29 Jul 2005 05:14:31 -0000 1.32 +++ UserInterface.py 29 Jul 2005 06:05:37 -0000 1.33 @@ -404,6 +404,16 @@ target_dict = config_opts['targets'] return target_dict.keys() + def pause(self, paused): + s = "paused" + if not paused: + s = "unpaused" + if paused == self._bm.is_paused(): + return (-1, "Error: system is already %s." % s) + else: + self._bm.pause(paused) + return (0, "Success, system %s." % s) + class UserInterfaceSSLAuth(UserInterface): """ @@ -469,6 +479,13 @@ return UserInterface.targets(self) + def pause(self, paused): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.server_admin: + return (-1, "Insufficient privileges.") + return UserInterface.pause(self, paused) + + class UserInterfaceNoAuth(UserInterface): """ Allow all operations, NULL authentication From fedora-extras-commits at redhat.com Fri Jul 29 06:09:13 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:09:13 -0400 Subject: extras-buildsys/client client.py,1.17,1.18 Message-ID: <200507290609.j6T69D3v017724@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17695/client Modified Files: client.py Log Message: Add an is_paused command so you can actually figure out if stuff is paused or not Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- client.py 29 Jul 2005 06:05:03 -0000 1.17 +++ client.py 29 Jul 2005 06:09:11 -0000 1.18 @@ -239,6 +239,19 @@ print "Error connecting to build server: '%s'" % e +def is_paused(server): + """ + Pause or unpause the build server + """ + + try: + if server.is_paused(): + print "The build server is paused." + else: + print "The build server is _not_ paused." + except socket.error, e: + print "Error connecting to build server: '%s'" % e + def getXMLRPCServerProxy(use_ssl): """ @@ -354,6 +367,8 @@ pause(server, True) elif cmd == 'unpause': pause(server, False) + elif cmd == 'is_paused': + is_paused(server) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Fri Jul 29 06:09:13 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:09:13 -0400 Subject: extras-buildsys/server UserInterface.py,1.33,1.34 Message-ID: <200507290609.j6T69DqM017730@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17695/server Modified Files: UserInterface.py Log Message: Add an is_paused command so you can actually figure out if stuff is paused or not Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- UserInterface.py 29 Jul 2005 06:05:37 -0000 1.33 +++ UserInterface.py 29 Jul 2005 06:09:11 -0000 1.34 @@ -414,6 +414,9 @@ self._bm.pause(paused) return (0, "Success, system %s." % s) + def is_paused(self): + return self._bm.is_paused() + class UserInterfaceSSLAuth(UserInterface): """ From fedora-extras-commits at redhat.com Fri Jul 29 06:17:46 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 02:17:46 -0400 Subject: common tobuild,1.2144,1.2145 Message-ID: <200507290618.j6T6IG9i017778@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761 Modified Files: tobuild Log Message: remove old and wrong Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2144 retrieving revision 1.2145 diff -u -r1.2144 -r1.2145 --- tobuild 28 Jul 2005 23:26:48 -0000 1.2144 +++ tobuild 29 Jul 2005 06:17:41 -0000 1.2145 @@ -2,7 +2,6 @@ # user repo tag target status # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel @@ -65,8 +64,6 @@ ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel -roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 -uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 @@ -82,4 +79,3 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel -jrb rpms/at-poke/devel at-poke-0_2_2-1 development From fedora-extras-commits at redhat.com Fri Jul 29 06:55:58 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:55:58 -0400 Subject: extras-buildsys/www builders.psp,1.3,1.4 Message-ID: <200507290655.j6T6tw7m018747@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18730/www Modified Files: builders.psp Log Message: Don't show addtorepo jobs on builders Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- builders.psp 23 Jul 2005 00:55:31 -0000 1.3 +++ builders.psp 29 Jul 2005 06:55:56 -0000 1.4 @@ -68,6 +68,7 @@ for aj in archjobs: if aj['builder_addr'] == addr: joblink = job_link(job['uid']) + if aj['status'] != 'done': %> <% + # endif # endif # endfor # endfor From fedora-extras-commits at redhat.com Fri Jul 29 07:07:35 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:07:35 -0400 Subject: extras-buildsys/server UserInterface.py,1.34,1.35 Message-ID: <200507290707.j6T77ZjW019926@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19885/server Modified Files: UserInterface.py Log Message: allow server_admins to requeue anyone's jobs Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- UserInterface.py 29 Jul 2005 06:09:11 -0000 1.34 +++ UserInterface.py 29 Jul 2005 07:07:32 -0000 1.35 @@ -174,7 +174,7 @@ self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time()) return (0, "Success: package has been queued.") - def requeue(self, email, uid): + def requeue(self, uid): uid = validate_uid(uid) if not uid: return (-1, "Error: Invalid job UID.") @@ -191,10 +191,6 @@ if not job: return (-1, "Error: Invalid job UID.") - # Ensure matching usernames - if job[1] != email: - return (-1, "Error: You are not the original submitter for Job %d." % uid) - # Ensure the job failed or was killed if job[2] != 'failed' and job[2] != 'killed': return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid) @@ -440,7 +436,28 @@ user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: return (-1, "Insufficient privileges.") - return UserInterface.requeue(self, user.email, uid) + + uid = validate_uid(uid) + if not uid: + return (-1, "Error: Invalid job UID.") + + sql = 'SELECT uid, username, status 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.") + curs.execute(sql) + job = curs.fetchone() + if not job: + return (-1, "Error: Invalid job UID.") + + # Ensure matching usernames + if job[1] != user.email and not user.server_admin: + return (-1, "Error: You are not the original submitter for Job %d." % uid) + + return UserInterface.requeue(self, user, uid) def kill_job(self, email, jobid): user = AuthedXMLRPCServer.get_authinfo() From fedora-extras-commits at redhat.com Fri Jul 29 07:13:54 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:13:54 -0400 Subject: extras-buildsys/client client.py,1.18,1.19 Message-ID: <200507290713.j6T7Dsbb020004@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19975/client Modified Files: client.py Log Message: allow admin users to requeue any job Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- client.py 29 Jul 2005 06:09:11 -0000 1.18 +++ client.py 29 Jul 2005 07:13:52 -0000 1.19 @@ -91,11 +91,7 @@ def requeue_job(server, email, uid): try: - use_ssl = config.get('Server', 'use_ssl') - if use_ssl.lower() == 'true': - (err, msg) = server.requeue(uid) - else: - (err, msg) = server.requeue(email, uid) + server.requeue(uid) except socket.error, e: print "Error connecting to build server: '%s'" % e return From fedora-extras-commits at redhat.com Fri Jul 29 07:13:55 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:13:55 -0400 Subject: extras-buildsys/server UserInterface.py,1.35,1.36 Message-ID: <200507290714.j6T7Dt9q020010@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19975/server Modified Files: UserInterface.py Log Message: allow admin users to requeue any job Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- UserInterface.py 29 Jul 2005 07:07:32 -0000 1.35 +++ UserInterface.py 29 Jul 2005 07:13:53 -0000 1.36 @@ -457,7 +457,7 @@ if job[1] != user.email and not user.server_admin: return (-1, "Error: You are not the original submitter for Job %d." % uid) - return UserInterface.requeue(self, user, uid) + return UserInterface.requeue(self, uid) def kill_job(self, email, jobid): user = AuthedXMLRPCServer.get_authinfo() From fedora-extras-commits at redhat.com Fri Jul 29 07:16:07 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:16:07 -0400 Subject: extras-buildsys/client client.py,1.19,1.20 Message-ID: <200507290716.j6T7G7I7020042@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20025/client Modified Files: client.py Log Message: I'm a dumbass Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- client.py 29 Jul 2005 07:13:52 -0000 1.19 +++ client.py 29 Jul 2005 07:16:05 -0000 1.20 @@ -91,7 +91,7 @@ def requeue_job(server, email, uid): try: - server.requeue(uid) + (e, msg) = server.requeue(uid) except socket.error, e: print "Error connecting to build server: '%s'" % e return From fedora-extras-commits at redhat.com Fri Jul 29 08:05:55 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 29 Jul 2005 04:05:55 -0400 Subject: common tobuild,1.2145,1.2146 Message-ID: <200507290806.j6T86QdI021920@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21898 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2145 retrieving revision 1.2146 diff -u -r1.2145 -r1.2146 --- tobuild 29 Jul 2005 06:17:41 -0000 1.2145 +++ tobuild 29 Jul 2005 08:05:28 -0000 1.2146 @@ -11,7 +11,6 @@ ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel -tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 09:53:35 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 05:53:35 -0400 Subject: rpms/scim/FC-4 scim.spec,1.7,1.8 xinput-scim,1.1,1.2 Message-ID: <200507290953.j6T9rZ3D023842@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23823 Modified Files: scim.spec xinput-scim Log Message: - sync with Core - drop the old Chinese manual from docs for now - update -devel description - add doc subpackage for devel documentation - don't set xinput.d script executable - no need to set XMODIFIERS explicitly in xinput.d script Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim.spec 27 Jul 2005 22:21:51 -0000 1.7 +++ scim.spec 29 Jul 2005 09:53:33 -0000 1.8 @@ -1,5 +1,6 @@ Name: scim Version: 1.4.0 +# must be less than the release number of scim in Core Release: 2%{?dist} Summary: Smart Common Input Method platform @@ -10,7 +11,7 @@ Source1: xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: %{_bindir}/update-gtk-immodules +PreReq: %{_bindir}/update-gtk-immodules BuildRequires: gtk2-devel, desktop-file-utils %description @@ -25,10 +26,16 @@ Requires: gtk2-devel %description devel -The scim-devel package includes the static libraries and header files -for the scim package. -Install scim-devel if you want to develop programs which will use -scim. +The scim-devel package includes the header files for the scim package. +Install scim-devel if you want to develop programs which will use scim. + + +%package doc +Summary: Smart Common Input Method platform documentation +Group: Development/Libraries + +%description doc +SCIM development documentation files generated from the sourcecode. %prep @@ -43,9 +50,10 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install + mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} -# Kill all .a and .la +# remove .la files find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel @@ -59,16 +67,9 @@ # remove capplet rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop -# install user manual -mkdir -p docs/dist/manual/zh_CN/figures/ -cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ -cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ - # install xinput config file. mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d -install -pm 755 %{SOURCE1} \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim - +install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim %find_lang %{name} @@ -80,39 +81,18 @@ %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW -do - %{_sbindir}/alternatives --install \ - %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc \ - %{_sysconfdir}/X11/xinit/xinput.d/scim 85 -done - %{_bindir}/update-gtk-immodules %{_target_platform} %postun /sbin/ldconfig -if [ "$1" = "0" ] -then - for llcc in ja_JP ko_KR zh_CN zh_TW - do - %{_sbindir}/alternatives --remove \ - xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-$llcc` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] - then - %{_sbindir}/alternatives --auto xinput-$llcc - fi - done -fi - %{_bindir}/update-gtk-immodules %{_target_platform} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog TODO -%doc docs/dist/manual/zh_CN %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d/scim @@ -126,16 +106,26 @@ %files devel %defattr(-,root,root,-) -%doc docs/html %doc docs/developers %{_includedir}/scim-1.0 %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc -#-------------------------------------------------- +%files doc +%defattr(-,root,root,-) +%doc docs/html + %changelog -* Thu Jul 28 2005 Jens Petersen -1.4.0-2 +* Fri Jul 29 2005 Jens Petersen +- sync with Core + - drop the old Chinese manual from docs for now + - update -devel description + - add doc subpackage for devel documentation + - don't set xinput.d script executable + - no need to set XMODIFIERS explicitly in xinput.d script + +* Thu Jul 28 2005 Ryo Dairiki - 1.4.0-2 - create scim-1.0 dirs to be accessible (Jens Petersen) * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 @@ -151,7 +141,10 @@ - don't set xinput.d script executable - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 +- Remove one of doubled capplets for setup. + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 - update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/xinput-scim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xinput-scim 19 May 2005 08:12:37 -0000 1.1 +++ xinput-scim 29 Jul 2005 09:53:33 -0000 1.2 @@ -1,4 +1,3 @@ -XMODIFIERS=@im=SCIM XIM=SCIM XIM_PROGRAM=scim XIM_ARGS="-d" From fedora-extras-commits at redhat.com Fri Jul 29 09:55:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 05:55:35 -0400 Subject: devel/common tobuild,1.2146,1.2147 Message-ID: <200507290955.j6T9tZNY023875@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23858 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2146 retrieving revision 1.2147 diff -u -r1.2146 -r1.2147 --- tobuild 29 Jul 2005 08:05:28 -0000 1.2146 +++ tobuild 29 Jul 2005 09:55:33 -0000 1.2147 @@ -16,11 +16,9 @@ ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel -mschwendt rpms/sylpheed/devel sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel -mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel @@ -33,7 +31,6 @@ scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -mschwendt rpms/cksfv/devel cksfv-1_3-4 devel mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel @@ -50,7 +47,6 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel -mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 09:56:35 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 05:56:35 -0400 Subject: rpms/scim/FC-4 scim.spec,1.8,1.9 Message-ID: <200507290956.j6T9uZc1023900@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23881 Modified Files: scim.spec Log Message: add changelog entry for removal of xinput.d alternatives to IMEs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim.spec 29 Jul 2005 09:53:33 -0000 1.8 +++ scim.spec 29 Jul 2005 09:56:33 -0000 1.9 @@ -119,6 +119,7 @@ %changelog * Fri Jul 29 2005 Jens Petersen - sync with Core + - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now - update -devel description - add doc subpackage for devel documentation From fedora-extras-commits at redhat.com Fri Jul 29 09:56:40 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 05:56:40 -0400 Subject: devel/common tobuild,1.2147,1.2148 Message-ID: <200507290956.j6T9ueSF023921@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23904 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2147 retrieving revision 1.2148 diff -u -r1.2147 -r1.2148 --- tobuild 29 Jul 2005 09:55:33 -0000 1.2147 +++ tobuild 29 Jul 2005 09:56:38 -0000 1.2148 @@ -31,8 +31,6 @@ scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -mschwendt rpms/freeze/devel freeze-2_5_0-4 devel -mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel From fedora-extras-commits at redhat.com Fri Jul 29 10:08:05 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 06:08:05 -0400 Subject: common tobuild,1.2148,1.2149 Message-ID: <200507291008.j6TA85Ae025090@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25063 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2148 retrieving revision 1.2149 diff -u -r1.2148 -r1.2149 --- tobuild 29 Jul 2005 09:56:38 -0000 1.2148 +++ tobuild 29 Jul 2005 10:08:03 -0000 1.2149 @@ -37,7 +37,6 @@ bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel -pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 10:24:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 06:24:54 -0400 Subject: devel/common tobuild,1.2149,1.2150 Message-ID: <200507291024.j6TAOsKQ025194@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25175 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2149 retrieving revision 1.2150 diff -u -r1.2149 -r1.2150 --- tobuild 29 Jul 2005 10:08:03 -0000 1.2149 +++ tobuild 29 Jul 2005 10:24:51 -0000 1.2150 @@ -44,7 +44,6 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel -mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel From fedora-extras-commits at redhat.com Fri Jul 29 10:35:01 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 06:35:01 -0400 Subject: devel/inkscape inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 inkscape.spec, 1.14, 1.15 inkscape-0.41-dgettext.patch, 1.1, NONE Message-ID: <200507291035.j6TAZ1v8025269@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/inkscape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249 Modified Files: inkscape.spec Added Files: inkscape-0.42-gettext-x86_64.patch Removed Files: inkscape-0.41-dgettext.patch Log Message: * Fri Jul 29 2005 Michael Schwendt - 0.42-2 - Extend ngettext/dgettext patch for x86_64 build. inkscape-0.42-gettext-x86_64.patch: --- NEW FILE inkscape-0.42-gettext-x86_64.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-07-29 12:34:14.000000000 +0200 @@ -21344,7 +21344,7 @@ int main () { -return (int) ngettext ("","", 1) +return (int)(long) ngettext ("","", 1) ; return 0; } @@ -21402,7 +21402,7 @@ int main () { -return (int) dgettext ("","") +return (int)(long) dgettext ("","") ; return 0; } Index: inkscape.spec =================================================================== RCS file: /cvs/extras/devel/inkscape/inkscape.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- inkscape.spec 26 Jul 2005 01:24:41 -0000 1.14 +++ inkscape.spec 29 Jul 2005 10:34:59 -0000 1.15 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.42 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 -Patch0: inkscape-0.41-dgettext.patch +Patch0: inkscape-0.42-gettext-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -102,6 +102,9 @@ %changelog +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + * Tue Jul 26 2005 Michael Schwendt - 0.42-1 - update to 0.42 (also fixes #160326) - BR gnome-vfs2-devel --- inkscape-0.41-dgettext.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 11:07:16 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 07:07:16 -0400 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.4, 1.5 scim-anthy.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200507291107.j6TB7kjb026563@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26509 Modified Files: .cvsignore scim-anthy.spec sources Log Message: update to 0.5.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Jul 2005 03:26:51 -0000 1.4 +++ .cvsignore 29 Jul 2005 11:07:13 -0000 1.5 @@ -1 +1 @@ -scim-anthy-0.5.1.tar.gz +scim-anthy-0.5.3.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-anthy.spec 26 Jul 2005 13:40:50 -0000 1.8 +++ scim-anthy.spec 29 Jul 2005 11:07:14 -0000 1.9 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,7 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anthy +Requires: anthy BuildRequires: scim-devel anthy-devel %description @@ -46,6 +46,9 @@ %changelog +* Fri Jul 29 2005 Jens Petersen - 0.5.3-1 +- update to 0.5.3 release + * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jul 2005 08:17:14 -0000 1.6 +++ sources 29 Jul 2005 11:07:14 -0000 1.7 @@ -1 +1 @@ -f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz +ba42960652a82cd594f443d8275184f9 scim-anthy-0.5.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 11:12:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 07:12:18 -0400 Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.3, 1.4 scim-anthy.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200507291112.j6TBCIIP026641@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26620 Modified Files: .cvsignore scim-anthy.spec sources Log Message: - sync with FC-4 - update to 0.5.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2005 13:15:35 -0000 1.3 +++ .cvsignore 29 Jul 2005 11:12:16 -0000 1.4 @@ -1 +1 @@ -scim-anthy-0.5.0.tar.gz +scim-anthy-0.5.3.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-anthy.spec 26 Jul 2005 13:39:39 -0000 1.8 +++ scim-anthy.spec 29 Jul 2005 11:12:16 -0000 1.9 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,7 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anthy +Requires: anthy BuildRequires: scim-devel anthy-devel %description @@ -46,6 +46,9 @@ %changelog +* Fri Jul 29 2005 Jens Petersen - 0.5.3-1 +- update to 0.5.3 release + * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Jul 2005 08:16:06 -0000 1.4 +++ sources 29 Jul 2005 11:12:16 -0000 1.5 @@ -1 +1 @@ -f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz +ba42960652a82cd594f443d8275184f9 scim-anthy-0.5.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 11:17:17 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 29 Jul 2005 07:17:17 -0400 Subject: rpms/abiword/FC-4 abiword.spec, 1.8, 1.9 abiword-2.2.8-mailmerge.patch, 1.1, NONE Message-ID: <200507291117.j6TBHHvh026722@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26705 Modified Files: abiword.spec Removed Files: abiword-2.2.8-mailmerge.patch Log Message: Update to 2.2.9 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abiword.spec 6 Jun 2005 22:30:37 -0000 1.8 +++ abiword.spec 29 Jul 2005 11:17:15 -0000 1.9 @@ -2,7 +2,7 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.8 +Version: 2.2.9 Release: 1%{?dist} Epoch: 1 Group: Applications/Editors @@ -40,7 +40,6 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.2.6-desktop.patch -Patch2: abiword-2.2.8-mailmerge.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -50,7 +49,6 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .mailmerge %build cd abi @@ -129,6 +127,10 @@ %{_datadir}/icons/*png %changelog +* Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1.fc4 +- Update to 2.2.9 +- Drop the mailmerge patch again + * Sun Jun 6 2005 Marc Maurer - 1:2.2.8-1.fc4 - Update to 2.2.8 - Fix build with mailmerge patch --- abiword-2.2.8-mailmerge.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 11:31:34 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 29 Jul 2005 07:31:34 -0400 Subject: rpms/abiword/FC-4 abiword.spec,1.9,1.10 Message-ID: <200507291131.j6TBVYkj026842@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26824 Modified Files: abiword.spec Log Message: Bump build nr Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abiword.spec 29 Jul 2005 11:17:15 -0000 1.9 +++ abiword.spec 29 Jul 2005 11:31:32 -0000 1.10 @@ -4,7 +4,7 @@ Name: abiword Version: 2.2.9 Release: 1%{?dist} -Epoch: 1 +Epoch: 2 Group: Applications/Editors License: GPL Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 11:33:28 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 29 Jul 2005 07:33:28 -0400 Subject: rpms/abiword/FC-4 .cvsignore, 1.5, 1.6 abiword.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200507291133.j6TBXSTS026877@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26856 Modified Files: .cvsignore abiword.spec sources Log Message: Add 2.2.9 sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2005 22:22:01 -0000 1.5 +++ .cvsignore 29 Jul 2005 11:33:26 -0000 1.6 @@ -1 +1 @@ -abiword-2.2.8.tar.bz2 +abiword-2.2.9.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- abiword.spec 29 Jul 2005 11:31:32 -0000 1.10 +++ abiword.spec 29 Jul 2005 11:33:26 -0000 1.11 @@ -3,8 +3,8 @@ Summary: The AbiWord word processor Name: abiword Version: 2.2.9 -Release: 1%{?dist} -Epoch: 2 +Release: 2%{?dist} +Epoch: 1 Group: Applications/Editors License: GPL Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 @@ -127,7 +127,10 @@ %{_datadir}/icons/*png %changelog -* Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1.fc4 +* Fri Jul 2 2005 Marc Maurer - 1:2.2.9-2.fc4 +- Bump release number + +* Fri Jul 2 2005 Marc Maurer - 1:2.2.9-1.fc4 - Update to 2.2.9 - Drop the mailmerge patch again Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2005 22:22:01 -0000 1.5 +++ sources 29 Jul 2005 11:33:26 -0000 1.6 @@ -1 +1 @@ -f6f58e6ea4720ca635ede7b7f13cf156 abiword-2.2.8.tar.bz2 +17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 11:56:32 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 29 Jul 2005 07:56:32 -0400 Subject: rpms/nexuiz/FC-4 nexuiz.spec,1.1,1.2 Message-ID: <200507291156.j6TBuWhZ026996@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26979 Modified Files: nexuiz.spec Log Message: added dist tag Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz.spec 9 Jul 2005 11:59:33 -0000 1.1 +++ nexuiz.spec 29 Jul 2005 11:56:29 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.1 -Release: 1 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ From fedora-extras-commits at redhat.com Fri Jul 29 13:07:36 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Fri, 29 Jul 2005 09:07:36 -0400 Subject: common tobuild,1.2150,1.2151 Message-ID: <200507291307.j6TD7aks029427@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29377/common Modified Files: tobuild Log Message: cleanup successfull build Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2150 retrieving revision 1.2151 diff -u -r1.2150 -r1.2151 --- tobuild 29 Jul 2005 10:24:51 -0000 1.2150 +++ tobuild 29 Jul 2005 13:07:34 -0000 1.2151 @@ -40,7 +40,6 @@ oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel -adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 13:26:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 09:26:33 -0400 Subject: devel/common tobuild,1.2151,1.2152 Message-ID: <200507291326.j6TDQXjw029500@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29483 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2151 retrieving revision 1.2152 diff -u -r1.2151 -r1.2152 --- tobuild 29 Jul 2005 13:07:34 -0000 1.2151 +++ tobuild 29 Jul 2005 13:26:31 -0000 1.2152 @@ -36,16 +36,13 @@ s4504kr rpms/inadyn/devel inadyn-1_95-1 devel bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 -mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel -mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel -mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel jnovy rpms/nedit/devel nedit-5_5-4 devel qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel @@ -53,7 +50,6 @@ ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel -mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 13:51:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 09:51:37 -0400 Subject: rpms/inkscape/FC-3 inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 inkscape.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200507291351.j6TDpbmT029617@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/FC-3 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.42-gettext-x86_64.patch Log Message: update -- sync with devel inkscape-0.42-gettext-x86_64.patch: --- NEW FILE inkscape-0.42-gettext-x86_64.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-07-29 12:34:14.000000000 +0200 @@ -21344,7 +21344,7 @@ int main () { -return (int) ngettext ("","", 1) +return (int)(long) ngettext ("","", 1) ; return 0; } @@ -21402,7 +21402,7 @@ int main () { -return (int) dgettext ("","") +return (int)(long) dgettext ("","") ; return 0; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Feb 2005 04:46:16 -0000 1.5 +++ .cvsignore 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -inkscape-0.41.tar.bz2 +inkscape-0.42.tar.bz2 +inkscape-0.42.tar.bz2.sig Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-3/inkscape.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- inkscape.spec 10 Feb 2005 04:14:11 -0000 1.5 +++ inkscape.spec 29 Jul 2005 13:51:35 -0000 1.6 @@ -1,12 +1,13 @@ Name: inkscape -Version: 0.41 -Release: 1 -Summary: A vector-based drawing program using SVG. +Version: 0.42 +Release: 2%{?dist} +Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2 +Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 +Patch0: inkscape-0.42-gettext-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -17,6 +18,7 @@ BuildRequires: gtkmm24-devel BuildRequires: libart_lgpl-devel >= 2.3.10 BuildRequires: libgnomeprintui22-devel >= 2.2.0 +BuildRequires: gnome-vfs2-devel BuildRequires: libpng-devel BuildRequires: libsigc++20-devel BuildRequires: libxml2-devel >= 2.4.24 @@ -43,11 +45,13 @@ It has a relatively modern display engine, giving you finely antialiased display, alpha transparencies, vector fonts and so on. Inkscape is written in -C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. +C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. %prep %setup -q +%patch0 -p1 -b .dgettext + %build %configure \ @@ -91,13 +95,44 @@ %doc AUTHORS COPYING ChangeLog NEWS README HACKING %doc %{_mandir}/man1/* %{_bindir}/* -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* -%{_libdir}/inkscape/ +%{_mandir}/fr/man1/* %changelog +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + +* Tue Jul 26 2005 Michael Schwendt - 0.42-1 +- update to 0.42 (also fixes #160326) +- BR gnome-vfs2-devel +- no files left in %%_libdir/inkscape +- include French manual page +- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off + +* Tue May 31 2005 Michael Schwendt - 0.41-7 +- append another 64-bit related patch (dgettext configure check failed) + +* Tue May 31 2005 Michael Schwendt - 0.41-6 +- remove explicit aclocal/autoconf calls in %%build as they create a + bad Makefile for FC4/i386, which causes build to fail (#156228), + and no comment explains where they were added/needed + +* Tue May 31 2005 Michael Schwendt - 0.41-5 +- bump and rebuild as 0.41-4 failed in build system setup + +* Wed May 25 2005 Jeremy Katz - 0.41-4 +- add patch for gcc4 problems (ignacio, #156228) +- fix build on 64bit boxes. sizeof(int) != sizeof(void*) + +* Sun May 22 2005 Jeremy Katz - 0.41-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Feb 09 2005 Phillip Compton - 0.41-1 - 0.41. - enable python. @@ -110,7 +145,7 @@ * Thu Nov 11 2004 Phillip Compton - 0.39-0.fdr.2 - post/postun for new mime system. -- Dropped redundant BR XFree86-devel. +- Dropped redundant BR XFree86-devel. * Sun Aug 29 2004 Phillip Compton - 0:0.39-0.fdr.1 - 0.39. @@ -128,9 +163,9 @@ - version upgrade with many improvements and bug fixes * Fri Mar 19 2004 P Linnell 0:0.37.0.fdr.7 -- repsin - sourceforge does not allow reloading files with same name +- repsin - sourceforge does not allow reloading files with same name * Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.6 -- fix typo in provides +- fix typo in provides * Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.5 - add %{release} to provides perl(SpSVG) = %{epoch}:%{version}:%{release} only * Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.4 @@ -146,10 +181,10 @@ - enable inkjar * Tue Feb 10 2004 P Linnell 0:0.37.0.fdr.1 - pgp'd tarball from inkscape.org -- clean out the cvs tweaks in spec file +- clean out the cvs tweaks in spec file - enable gnome-print - add the new tutorial files -- make sure .mo file gets packaged +- make sure .mo file gets packaged - add provides: perlSVG - submit to Fedora QA * Sat Feb 7 2004 P Linnell Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Feb 2005 04:46:16 -0000 1.5 +++ sources 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -9b4bbfaae688127dca4c3d816a42b21a inkscape-0.41.tar.bz2 +4af587b942647bf9e27861e2238844c8 inkscape-0.42.tar.bz2 +e0a299ff70044fd9a424961bd3ad8c13 inkscape-0.42.tar.bz2.sig From fedora-extras-commits at redhat.com Fri Jul 29 13:51:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 09:51:37 -0400 Subject: rpms/inkscape/FC-4 inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 inkscape.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200507291351.j6TDpbfB029627@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/FC-4 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.42-gettext-x86_64.patch Log Message: update -- sync with devel inkscape-0.42-gettext-x86_64.patch: --- NEW FILE inkscape-0.42-gettext-x86_64.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-07-29 12:34:14.000000000 +0200 @@ -21344,7 +21344,7 @@ int main () { -return (int) ngettext ("","", 1) +return (int)(long) ngettext ("","", 1) ; return 0; } @@ -21402,7 +21402,7 @@ int main () { -return (int) dgettext ("","") +return (int)(long) dgettext ("","") ; return 0; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Feb 2005 04:46:16 -0000 1.5 +++ .cvsignore 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -inkscape-0.41.tar.bz2 +inkscape-0.42.tar.bz2 +inkscape-0.42.tar.bz2.sig Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-4/inkscape.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- inkscape.spec 31 May 2005 12:56:25 -0000 1.12 +++ inkscape.spec 29 Jul 2005 13:51:35 -0000 1.13 @@ -1,14 +1,13 @@ Name: inkscape -Version: 0.41 -Release: 7 -Summary: A vector-based drawing program using SVG. +Version: 0.42 +Release: 2%{?dist} +Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2 -Patch0: inkscape-gcc4.patch -Patch1: inkscape-0.41-64bit.patch +Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 +Patch0: inkscape-0.42-gettext-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -19,6 +18,7 @@ BuildRequires: gtkmm24-devel BuildRequires: libart_lgpl-devel >= 2.3.10 BuildRequires: libgnomeprintui22-devel >= 2.2.0 +BuildRequires: gnome-vfs2-devel BuildRequires: libpng-devel BuildRequires: libsigc++20-devel BuildRequires: libxml2-devel >= 2.4.24 @@ -50,8 +50,7 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 -%patch1 -p1 -b .64bit +%patch0 -p1 -b .dgettext %build @@ -96,13 +95,23 @@ %doc AUTHORS COPYING ChangeLog NEWS README HACKING %doc %{_mandir}/man1/* %{_bindir}/* -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* -%{_libdir}/inkscape/ +%{_mandir}/fr/man1/* %changelog +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + +* Tue Jul 26 2005 Michael Schwendt - 0.42-1 +- update to 0.42 (also fixes #160326) +- BR gnome-vfs2-devel +- no files left in %%_libdir/inkscape +- include French manual page +- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off + * Tue May 31 2005 Michael Schwendt - 0.41-7 - append another 64-bit related patch (dgettext configure check failed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Feb 2005 04:46:16 -0000 1.5 +++ sources 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -9b4bbfaae688127dca4c3d816a42b21a inkscape-0.41.tar.bz2 +4af587b942647bf9e27861e2238844c8 inkscape-0.42.tar.bz2 +e0a299ff70044fd9a424961bd3ad8c13 inkscape-0.42.tar.bz2.sig From fedora-extras-commits at redhat.com Fri Jul 29 13:55:51 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 29 Jul 2005 09:55:51 -0400 Subject: rpms/scim/FC-3 scim.spec,1.8,1.9 Message-ID: <200507291355.j6TDtpqZ029717@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700 Modified Files: scim.spec Log Message: Import Jens patch Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim.spec 27 Jul 2005 22:21:10 -0000 1.8 +++ scim.spec 29 Jul 2005 13:55:49 -0000 1.9 @@ -1,6 +1,7 @@ Name: scim Version: 1.4.0 -Release: 2%{?dist} +# must be less than the release number of scim in Core +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -10,7 +11,7 @@ Source1: xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: %{_bindir}/update-gtk-immodules +PreReq: %{_bindir}/update-gtk-immodules BuildRequires: gtk2-devel, desktop-file-utils %description @@ -25,10 +26,16 @@ Requires: gtk2-devel %description devel -The scim-devel package includes the static libraries and header files -for the scim package. -Install scim-devel if you want to develop programs which will use -scim. +The scim-devel package includes the header files for the scim package. +Install scim-devel if you want to develop programs which will use scim. + + +%package doc +Summary: Smart Common Input Method platform documentation +Group: Development/Libraries + +%description doc +SCIM development documentation files generated from the sourcecode. %prep @@ -43,9 +50,10 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install + mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} -# Kill all .a and .la +# remove .la files find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel @@ -59,16 +67,9 @@ # remove capplet rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop -# install user manual -mkdir -p docs/dist/manual/zh_CN/figures/ -cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ -cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ - # install xinput config file. mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d -install -pm 755 %{SOURCE1} \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim - +install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim %find_lang %{name} @@ -80,39 +81,18 @@ %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW -do - %{_sbindir}/alternatives --install \ - %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc \ - %{_sysconfdir}/X11/xinit/xinput.d/scim 85 -done - %{_bindir}/update-gtk-immodules %{_target_platform} %postun /sbin/ldconfig -if [ "$1" = "0" ] -then - for llcc in ja_JP ko_KR zh_CN zh_TW - do - %{_sbindir}/alternatives --remove \ - xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-$llcc` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] - then - %{_sbindir}/alternatives --auto xinput-$llcc - fi - done -fi - %{_bindir}/update-gtk-immodules %{_target_platform} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog TODO -%doc docs/dist/manual/zh_CN %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d/scim @@ -126,16 +106,27 @@ %files devel %defattr(-,root,root,-) -%doc docs/html %doc docs/developers %{_includedir}/scim-1.0 %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc -#-------------------------------------------------- +%files doc +%defattr(-,root,root,-) +%doc docs/html + %changelog -* Thu Jul 28 2005 Jens Petersen -1.4.0-2 +* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 +- sync with Core + - remove xinput alternatives settings out to IME packages + - drop the old Chinese manual from docs for now + - update -devel description + - add doc subpackage for devel documentation + - don't set xinput.d script executable + - no need to set XMODIFIERS explicitly in xinput.d script + +* Thu Jul 28 2005 Ryo Dairiki - 1.4.0-2 - create scim-1.0 dirs to be accessible (Jens Petersen) * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 @@ -151,7 +142,10 @@ - don't set xinput.d script executable - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 +- Remove one of doubled capplets for setup. + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 - update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 From fedora-extras-commits at redhat.com Fri Jul 29 13:56:13 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 29 Jul 2005 09:56:13 -0400 Subject: rpms/scim/FC-4 scim.spec,1.9,1.10 Message-ID: <200507291356.j6TDuDDG029740@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29723 Modified Files: scim.spec Log Message: Import Jens patch Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim.spec 29 Jul 2005 09:56:33 -0000 1.9 +++ scim.spec 29 Jul 2005 13:56:11 -0000 1.10 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 2%{?dist} +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -117,7 +117,7 @@ %changelog -* Fri Jul 29 2005 Jens Petersen +* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 - sync with Core - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now From fedora-extras-commits at redhat.com Fri Jul 29 14:31:29 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 29 Jul 2005 10:31:29 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.9,1.10 Message-ID: <200507291431.j6TEVTIv030980@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30963 Modified Files: scim-anthy.spec Log Message: Add xinput-scim entry Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-anthy.spec 29 Jul 2005 11:07:14 -0000 1.9 +++ scim-anthy.spec 29 Jul 2005 14:31:26 -0000 1.10 @@ -9,6 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: scim-ja_JP Requires: anthy BuildRequires: scim-devel anthy-devel @@ -38,6 +39,23 @@ rm -rf $RPM_BUILD_ROOT +%post +%{_sbindir}/alternatives --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP /etc/X11/xinit/xinput.d/scim 90 + + +%postun +if [ "$1" = 0 ] +then + if ! rpm -q --whatprovides scim-ja_JP + then + %{_sbindir}/alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/scim + if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] + then + %{_sbindir}/alternatives --auto xinput-ja_JP + fi + fi +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO @@ -48,6 +66,7 @@ %changelog * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release +- add xinput-scim entry (Ryo Diairki) * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release From fedora-extras-commits at redhat.com Fri Jul 29 14:57:27 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 29 Jul 2005 10:57:27 -0400 Subject: common tobuild,1.2152,1.2153 Message-ID: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2152 retrieving revision 1.2153 diff -u -r1.2152 -r1.2153 --- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 +++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 @@ -65,3 +65,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 29 15:15:02 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 29 Jul 2005 11:15:02 -0400 Subject: common tobuild,1.2153,1.2154 Message-ID: <200507291515.j6TFF2w6032459@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32440 Modified Files: tobuild Log Message: Cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2153 retrieving revision 1.2154 diff -u -r1.2153 -r1.2154 --- tobuild 29 Jul 2005 14:57:25 -0000 1.2153 +++ tobuild 29 Jul 2005 15:15:00 -0000 1.2154 @@ -47,9 +47,6 @@ qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel -ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 -ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel -ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 15:20:26 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 29 Jul 2005 11:20:26 -0400 Subject: common tobuild,1.2154,1.2155 Message-ID: <200507291520.j6TFKQU0032502@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32485 Modified Files: tobuild Log Message: removed duplicate moomps entry. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2154 retrieving revision 1.2155 diff -u -r1.2154 -r1.2155 --- tobuild 29 Jul 2005 15:15:00 -0000 1.2154 +++ tobuild 29 Jul 2005 15:20:24 -0000 1.2155 @@ -62,4 +62,3 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From skvidal at phy.duke.edu Fri Jul 29 15:02:48 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 11:02:48 -0400 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> Message-ID: <1122649368.6197.5.camel@cutter> On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: > Author: jfontain > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 > > Modified Files: > tobuild > Log Message: > request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2152 > retrieving revision 1.2153 > diff -u -r1.2152 -r1.2153 > --- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 > +++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 > @@ -65,3 +65,4 @@ > jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 > qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 > jrb rpms/at-poke/devel at-poke-0_2_2-1 devel > +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 Please read your fedora-maintainers email. Unless you have a very good reason there shouldn't be any need to update this file anymore. please try the 'make plague' option for now so we can get the bugs worked out. Thanks, -sv From qspencer at ieee.org Fri Jul 29 15:23:35 2005 From: qspencer at ieee.org (Quentin Spencer) Date: Fri, 29 Jul 2005 10:23:35 -0500 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <1122649368.6197.5.camel@cutter> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> Message-ID: <42EA49F7.4030305@ieee.org> seth vidal wrote: >On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: > > >>Author: jfontain >> >>Update of /cvs/extras/common >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 >> >>Modified Files: >> tobuild >>Log Message: >>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 >> >> >>Index: tobuild >>=================================================================== >>RCS file: /cvs/extras/common/tobuild,v >>retrieving revision 1.2152 >>retrieving revision 1.2153 >>diff -u -r1.2152 -r1.2153 >>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 >>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 >>@@ -65,3 +65,4 @@ >> jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >> qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 >> jrb rpms/at-poke/devel at-poke-0_2_2-1 devel >>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >> >> > >Please read your fedora-maintainers email. Unless you have a very good >reason there shouldn't be any need to update this file anymore. > >please try the 'make plague' option for now so we can get the bugs >worked out. > > Some of us aren't subscribed to that list. If this is important to people on fedora-extras, can someone please forward the appropriate messages? -Quentin From skvidal at phy.duke.edu Fri Jul 29 15:28:32 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 11:28:32 -0400 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <42EA49F7.4030305@ieee.org> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> Message-ID: <1122650912.6197.9.camel@cutter> On Fri, 2005-07-29 at 10:23 -0500, Quentin Spencer wrote: > seth vidal wrote: > > >On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: > > > > > >>Author: jfontain > >> > >>Update of /cvs/extras/common > >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 > >> > >>Modified Files: > >> tobuild > >>Log Message: > >>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 > >> > >> > >>Index: tobuild > >>=================================================================== > >>RCS file: /cvs/extras/common/tobuild,v > >>retrieving revision 1.2152 > >>retrieving revision 1.2153 > >>diff -u -r1.2152 -r1.2153 > >>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 > >>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 > >>@@ -65,3 +65,4 @@ > >> jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 > >> qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 > >> jrb rpms/at-poke/devel at-poke-0_2_2-1 devel > >>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 > >> > >> > > > >Please read your fedora-maintainers email. Unless you have a very good > >reason there shouldn't be any need to update this file anymore. > > > >please try the 'make plague' option for now so we can get the bugs > >worked out. > > > > > > Some of us aren't subscribed to that list. If this is important to > people on fedora-extras, can someone please forward the appropriate > messages? > if you're a packager you should absolutely be on maintainers. -sv From qspencer at ieee.org Fri Jul 29 15:34:55 2005 From: qspencer at ieee.org (Quentin Spencer) Date: Fri, 29 Jul 2005 10:34:55 -0500 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <1122650912.6197.9.camel@cutter> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> <1122650912.6197.9.camel@cutter> Message-ID: <42EA4C9F.7040700@ieee.org> seth vidal wrote: >On Fri, 2005-07-29 at 10:23 -0500, Quentin Spencer wrote: > > >>seth vidal wrote: >> >> >> >>>On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: >>> >>> >>> >>> >>>>Author: jfontain >>>> >>>>Update of /cvs/extras/common >>>>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 >>>> >>>>Modified Files: >>>> tobuild >>>>Log Message: >>>>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 >>>> >>>> >>>>Index: tobuild >>>>=================================================================== >>>>RCS file: /cvs/extras/common/tobuild,v >>>>retrieving revision 1.2152 >>>>retrieving revision 1.2153 >>>>diff -u -r1.2152 -r1.2153 >>>>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 >>>>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 >>>>@@ -65,3 +65,4 @@ >>>>jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>>qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 >>>>jrb rpms/at-poke/devel at-poke-0_2_2-1 devel >>>>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>> >>>> >>>> >>>> >>>Please read your fedora-maintainers email. Unless you have a very good >>>reason there shouldn't be any need to update this file anymore. >>> >>>please try the 'make plague' option for now so we can get the bugs >>>worked out. >>> >>> >>> >>> >>Some of us aren't subscribed to that list. If this is important to >>people on fedora-extras, can someone please forward the appropriate >>messages? >> >> >> > >if you're a packager you should absolutely be on maintainers. > > OK, this keeps changing, and we need some official policies about what we're supposed to be subscribed to. Are there any? I'm happy to subscribe to yet another list that I didn't know existed if I'm supposed to, but I don't even see it on: http://fedora.redhat.com/participate/communicate/ At one time someone said we need to be subscribed to at least extras and extras-commits, so that's what I've been reading for all these months. What is different about the maintainers list that justifies the need for yet another mailing list? -Quentin From paul at city-fan.org Fri Jul 29 15:35:04 2005 From: paul at city-fan.org (Paul Howarth) Date: Fri, 29 Jul 2005 16:35:04 +0100 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <1122650912.6197.9.camel@cutter> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> <1122650912.6197.9.camel@cutter> Message-ID: <42EA4CA8.8010608@city-fan.org> seth vidal wrote: > On Fri, 2005-07-29 at 10:23 -0500, Quentin Spencer wrote: > >>seth vidal wrote: >> >> >>>On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: >>> >>> >>> >>>>Author: jfontain >>>> >>>>Update of /cvs/extras/common >>>>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 >>>> >>>>Modified Files: >>>> tobuild >>>>Log Message: >>>>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 >>>> >>>> >>>>Index: tobuild >>>>=================================================================== >>>>RCS file: /cvs/extras/common/tobuild,v >>>>retrieving revision 1.2152 >>>>retrieving revision 1.2153 >>>>diff -u -r1.2152 -r1.2153 >>>>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 >>>>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 >>>>@@ -65,3 +65,4 @@ >>>>jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>>qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 >>>>jrb rpms/at-poke/devel at-poke-0_2_2-1 devel >>>>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>> >>>> >>> >>>Please read your fedora-maintainers email. Unless you have a very good >>>reason there shouldn't be any need to update this file anymore. >>> >>>please try the 'make plague' option for now so we can get the bugs >>>worked out. >>> >>> >> >>Some of us aren't subscribed to that list. If this is important to >>people on fedora-extras, can someone please forward the appropriate >>messages? >> > > > if you're a packager you should absolutely be on maintainers. I'm on maintainers-readonly; I recall reading somewhere when I was signing up for cvs access etc. that all Extras package maintainers should be on that list and also fedora-extras-commits. I cannot for the life of me find where it said to do that now. Paul. From fedora-extras-commits at redhat.com Fri Jul 29 15:38:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 11:38:33 -0400 Subject: common tobuild,1.2155,1.2156 Message-ID: <200507291538.j6TFcX7p032561@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32544 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2155 retrieving revision 1.2156 diff -u -r1.2155 -r1.2156 --- tobuild 29 Jul 2005 15:20:24 -0000 1.2155 +++ tobuild 29 Jul 2005 15:38:31 -0000 1.2156 @@ -53,11 +53,8 @@ ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel -pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 -pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 -pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 From skvidal at phy.duke.edu Fri Jul 29 15:45:29 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 11:45:29 -0400 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <42EA4C9F.7040700@ieee.org> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> <1122650912.6197.9.camel@cutter> <42EA4C9F.7040700@ieee.org> Message-ID: <1122651929.6197.15.camel@cutter> > OK, this keeps changing, and we need some official policies about what > we're supposed to be subscribed to. Are there any? I'm happy to > subscribe to yet another list that I didn't know existed if I'm supposed > to, but I don't even see it on: > http://fedora.redhat.com/participate/communicate/ > > At one time someone said we need to be subscribed to at least extras and > extras-commits, so that's what I've been reading for all these months. > What is different about the maintainers list that justifies the need for > yet another mailing list? I thought all cvs committers were automatically added to -maintainers. But if it seems like you're not then add yourself, please. imo all extras maintainers should, at least, be on: - extras-commits - extras - maintainers -sv From fedora-extras-commits at redhat.com Fri Jul 29 16:00:48 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 29 Jul 2005 12:00:48 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.6, 1.7 freeciv.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200507291600.j6TG0muK032626@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32605 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 28 2005 Brian Pepple - 2.0.4-2 - Update to 2.0.4. - Use new stdsounds. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Jul 2005 16:56:29 -0000 1.6 +++ .cvsignore 29 Jul 2005 16:00:46 -0000 1.7 @@ -1,2 +1,2 @@ -freeciv-2.0.3.tar.bz2 -stdsounds2.tar.gz +freeciv-2.0.4.tar.bz2 +stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeciv.spec 15 Jul 2005 14:39:45 -0000 1.11 +++ freeciv.spec 29 Jul 2005 16:00:46 -0000 1.12 @@ -1,13 +1,13 @@ Name: freeciv -Version: 2.0.3 +Version: 2.0.4 Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games License: GPL URL: http://www.freeciv.org/index.php/Freeciv -Source0: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2 -Source1: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz +Source0: ftp://freeciv.org/pub/%{name}/stable/%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz Source2: %{name}-server.desktop Source3: %{name}.xpm Patch1: %{name}-desktop.patch @@ -62,8 +62,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual # Add the sound files. -(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; ) +tar xzf %{SOURCE1} +cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +# Add pixmap. %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm %find_lang %{name} @@ -87,6 +91,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 28 2005 Brian Pepple - 2.0.4-2 +- Update to 2.0.4. +- Use new stdsounds. + * Fri Jul 15 2005 Brian Pepple - 2.0.3-2 - Bump release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jul 2005 16:56:29 -0000 1.6 +++ sources 29 Jul 2005 16:00:46 -0000 1.7 @@ -1,2 +1,2 @@ -3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 -63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz +833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 16:04:20 2005 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 29 Jul 2005 12:04:20 -0400 Subject: rpms/epiphany-extensions/devel .cvsignore, 1.2, 1.3 epiphany-extensions.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507291604.j6TG4KtI001345@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1324 Modified Files: .cvsignore epiphany-extensions.spec sources Log Message: * Fri Jul 29 2005 Christopher Aillon - 1.7.3-1 - Update to 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jun 2005 07:10:11 -0000 1.2 +++ .cvsignore 29 Jul 2005 16:04:18 -0000 1.3 @@ -1 +1 @@ -epiphany-extensions-1.7.1.tar.bz2 +epiphany-extensions-1.7.3.tar.bz2 Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- epiphany-extensions.spec 27 Jun 2005 07:10:11 -0000 1.1 +++ epiphany-extensions.spec 29 Jul 2005 16:04:18 -0000 1.2 @@ -2,8 +2,8 @@ Summary: Extensions for Epiphany, the GNOME web browser. Name: epiphany-extensions -Version: 1.7.1 -Release: 2 +Version: 1.7.3 +Release: 1 License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/extensions @@ -39,6 +39,12 @@ %{_libdir}/epiphany %changelog +* Fri Jul 29 2005 Christopher Aillon - 1.7.3-1 +- Update to 1.7.3 + +* Mon Jul 11 2005 Christopher Aillon - 1.7.2-1 +- Update to 1.7.2 + * Mon Jun 27 2005 Christopher Aillon - 1.7.1-2 - Own %%{_libdir}/epiphany - Run find-lang.sh manually since the macro doesn't help us Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jun 2005 07:10:11 -0000 1.2 +++ sources 29 Jul 2005 16:04:18 -0000 1.3 @@ -1 +1 @@ -cd1bf1630ee453a08543f4e52060c75c epiphany-extensions-1.7.1.tar.bz2 +f9c7f260d1a777533b67b6f7ec475973 epiphany-extensions-1.7.3.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 16:15:26 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Fri, 29 Jul 2005 12:15:26 -0400 Subject: rpms/at-poke/devel at-poke.spec,1.1,1.2 Message-ID: <200507291615.j6TGFQfr001481@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464 Modified Files: at-poke.spec Log Message: * Fri Jul 29 2005 - 0.2.2-1 - update Requires and BuildRequires Index: at-poke.spec =================================================================== RCS file: /cvs/extras/rpms/at-poke/devel/at-poke.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-poke.spec 28 Jul 2005 20:55:03 -0000 1.1 +++ at-poke.spec 29 Jul 2005 16:15:24 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A tool for poking things Name: at-poke Version: 0.2.2 -Release: 1 +Release: 2 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ @@ -10,8 +10,11 @@ Patch1: at-poke-0.2.2-lvalue.patch Patch2: at-poke-0.2.2-weakref.patch Requires: libgail-gnome +Requires: at-spi BuildRequires: libgail-gnome-devel BuildRequires: gtk2-devel +BuildRequires: at-spi-devel +BuildRequires: libgnomeui-devel %description at-poke is a simple tool for introspecting applications using the @@ -43,6 +46,9 @@ %changelog +* Fri Jul 29 2005 - 0.2.2-1 +- update Requires and BuildRequires + * Tue Jul 26 2005 - poke-1 - Initial build. From fedora-extras-commits at redhat.com Fri Jul 29 16:16:56 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Fri, 29 Jul 2005 12:16:56 -0400 Subject: common tobuild,1.2156,1.2157 Message-ID: <200507291616.j6TGGuX2001543@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1526 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2156 retrieving revision 1.2157 diff -u -r1.2156 -r1.2157 --- tobuild 29 Jul 2005 15:38:31 -0000 1.2156 +++ tobuild 29 Jul 2005 16:16:54 -0000 1.2157 @@ -59,3 +59,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel +jrb rpms/at-poke/devel at-poke-0_2_2-2 devel From fedora-extras-commits at redhat.com Fri Jul 29 16:17:24 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 29 Jul 2005 12:17:24 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.6, 1.7 freeciv.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200507291617.j6TGHO6m001577@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1556 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 28 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. - Use new stdsounds. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Jul 2005 17:00:13 -0000 1.6 +++ .cvsignore 29 Jul 2005 16:17:22 -0000 1.7 @@ -1,2 +1,2 @@ -freeciv-2.0.3.tar.bz2 -stdsounds2.tar.gz +freeciv-2.0.4.tar.bz2 +stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeciv.spec 15 Jul 2005 14:42:18 -0000 1.11 +++ freeciv.spec 29 Jul 2005 16:17:22 -0000 1.12 @@ -1,13 +1,13 @@ Name: freeciv -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games License: GPL URL: http://www.freeciv.org/index.php/Freeciv -Source0: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2 -Source1: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz +Source0: ftp://freeciv.org/pub/%{name}/stable/%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz Source2: %{name}-server.desktop Source3: %{name}.xpm Patch1: %{name}-desktop.patch @@ -62,8 +62,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual # Add the sound files. -(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; ) +tar xzf %{SOURCE1} +cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +# Add pixmap. %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm %find_lang %{name} @@ -87,6 +91,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 28 2005 Brian Pepple - 2.0.4-1 +- Update to 2.0.4. +- Use new stdsounds. + * Thu Jul 14 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jul 2005 17:00:13 -0000 1.6 +++ sources 29 Jul 2005 16:17:22 -0000 1.7 @@ -1,2 +1,2 @@ -3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 -63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz +833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 16:17:48 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Fri, 29 Jul 2005 12:17:48 -0400 Subject: common tobuild,1.2157,1.2158 Message-ID: <200507291617.j6TGHmsd001639@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-2 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2157 retrieving revision 1.2158 diff -u -r1.2157 -r1.2158 --- tobuild 29 Jul 2005 16:16:54 -0000 1.2157 +++ tobuild 29 Jul 2005 16:17:46 -0000 1.2158 @@ -60,3 +60,4 @@ qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 devel +jrb rpms/at-poke/devel at-poke-0_2_2-2 development From fedora-extras-commits at redhat.com Fri Jul 29 16:28:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:28:07 -0400 Subject: rpms/clamav/devel clamav-0.86.2-timeout.patch,NONE,1.1 Message-ID: <200507291628.j6TGS7bj001693@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1675 Added Files: clamav-0.86.2-timeout.patch Log Message: this patch reverts the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration clamav-0.86.2-timeout.patch: --- NEW FILE clamav-0.86.2-timeout.patch --- --- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout +++ clamav-0.86.2/clamav-milter/clamav-milter.c @@ -373,7 +373,7 @@ static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; static volatile unsigned int n_children = 0; static unsigned int max_children = 0; -static int child_timeout = 300; /* number of seconds to wait for +static int child_timeout = 0; /* number of seconds to wait for * a child to die. Set to 0 to * wait forever */ From fedora-extras-commits at redhat.com Fri Jul 29 16:29:12 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:29:12 -0400 Subject: rpms/clamav/devel clamav.spec,1.26,1.27 Message-ID: <200507291629.j6TGTC8H001731@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1714 Modified Files: clamav.spec Log Message: - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- clamav.spec 28 Jul 2005 15:35:10 -0000 1.26 +++ clamav.spec 29 Jul 2005 16:29:09 -0000 1.27 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ 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) @@ -100,11 +101,9 @@ %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ %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; @@ -177,6 +177,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash From fedora-extras-commits at redhat.com Fri Jul 29 16:31:01 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 29 Jul 2005 12:31:01 -0400 Subject: common tobuild,1.2158,1.2159 Message-ID: <200507291631.j6TGV1sT001771@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Modified Files: tobuild Log Message: removed built packages Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2158 retrieving revision 1.2159 diff -u -r1.2158 -r1.2159 --- tobuild 29 Jul 2005 16:17:46 -0000 1.2158 +++ tobuild 29 Jul 2005 16:30:58 -0000 1.2159 @@ -15,7 +15,6 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel -bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel @@ -30,12 +29,9 @@ scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel -bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel -bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel -bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel From jspaleta at gmail.com Fri Jul 29 12:06:07 2005 From: jspaleta at gmail.com (Jeff Spaleta) Date: Fri, 29 Jul 2005 08:06:07 -0400 Subject: APPROVED: gxemul Message-ID: <604aa79105072905061b677da3@mail.gmail.com> gxemul: Instruction-level machine emulator GXemul is an experimental instruction-level machine emulator. It can be used to run binary code for (among others) MIPS-based machines, regardless of host platform. Several emulation modes are available. For some modes, processors and surrounding hardware components are emulated well enough to let unmodified operating systems (e.g. NetBSD) run as if they were running on a real machine. http://gavare.se/gxemul Maintainer: Tom 'spot' Callaway Reviewer: Jef Spaleta From skvidal at phy.duke.edu Fri Jul 29 16:38:09 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 12:38:09 -0400 Subject: common tobuild,1.2157,1.2158 In-Reply-To: <200507291617.j6TGHmsd001639@cvs-int.fedora.redhat.com> References: <200507291617.j6TGHmsd001639@cvs-int.fedora.redhat.com> Message-ID: <1122655089.6197.27.camel@cutter> On Fri, 2005-07-29 at 12:17 -0400, Jonathan Blandford wrote: > Author: jrb > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622 > > Modified Files: > tobuild > Log Message: > request build of rpms/at-poke/devel at-poke-0_2_2-2 for development > Hi Jonathan, Please do not request builds using make build. Install the plague-client as per these instructions[1] and try out 'make plague'. we need to get the plague-client mechanism tested a bit more so it can become 'make build' itself. thanks, -sv [1] http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup From fedora-extras-commits at redhat.com Fri Jul 29 16:37:47 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:37:47 -0400 Subject: rpms/clamav/FC-3 clamav.spec,1.16,1.17 Message-ID: <200507291638.j6TGcHkE001875@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843/FC-3 Modified Files: clamav.spec Log Message: synced with devel/ Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- clamav.spec 28 Jul 2005 15:37:20 -0000 1.16 +++ clamav.spec 29 Jul 2005 16:37:45 -0000 1.17 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ 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) @@ -100,11 +101,9 @@ %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ %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; @@ -177,6 +177,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash From fedora-extras-commits at redhat.com Fri Jul 29 16:37:47 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:37:47 -0400 Subject: rpms/clamav/FC-4 clamav.spec,1.25,1.26 Message-ID: <200507291638.j6TGcHc6001878@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843/FC-4 Modified Files: clamav.spec Log Message: synced with devel/ Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- clamav.spec 28 Jul 2005 15:37:21 -0000 1.25 +++ clamav.spec 29 Jul 2005 16:37:45 -0000 1.26 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ 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) @@ -100,11 +101,9 @@ %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ %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; @@ -177,6 +177,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash From fedora-extras-commits at redhat.com Fri Jul 29 16:39:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:39:07 -0400 Subject: rpms/clamav/FC-3 clamav-0.86.2-timeout.patch,NONE,1.1 Message-ID: <200507291639.j6TGd78j001916@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1890/FC-3 Added Files: clamav-0.86.2-timeout.patch Log Message: synced with devel/ clamav-0.86.2-timeout.patch: --- NEW FILE clamav-0.86.2-timeout.patch --- --- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout +++ clamav-0.86.2/clamav-milter/clamav-milter.c @@ -373,7 +373,7 @@ static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; static volatile unsigned int n_children = 0; static unsigned int max_children = 0; -static int child_timeout = 300; /* number of seconds to wait for +static int child_timeout = 0; /* number of seconds to wait for * a child to die. Set to 0 to * wait forever */ From fedora-extras-commits at redhat.com Fri Jul 29 16:39:08 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:39:08 -0400 Subject: rpms/clamav/FC-4 clamav-0.86.2-timeout.patch,NONE,1.1 Message-ID: <200507291639.j6TGd89K001923@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1890/FC-4 Added Files: clamav-0.86.2-timeout.patch Log Message: synced with devel/ clamav-0.86.2-timeout.patch: --- NEW FILE clamav-0.86.2-timeout.patch --- --- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout +++ clamav-0.86.2/clamav-milter/clamav-milter.c @@ -373,7 +373,7 @@ static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; static volatile unsigned int n_children = 0; static unsigned int max_children = 0; -static int child_timeout = 300; /* number of seconds to wait for +static int child_timeout = 0; /* number of seconds to wait for * a child to die. Set to 0 to * wait forever */ From fedora-extras-commits at redhat.com Fri Jul 29 16:40:52 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:40:52 -0400 Subject: common tobuild,1.2159,1.2160 Message-ID: <200507291640.j6TGeqjH002035@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2018 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-4 clamav-0_86_2-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2159 retrieving revision 1.2160 diff -u -r1.2159 -r1.2160 --- tobuild 29 Jul 2005 16:30:58 -0000 1.2159 +++ tobuild 29 Jul 2005 16:40:50 -0000 1.2160 @@ -57,3 +57,4 @@ jrb rpms/at-poke/devel at-poke-0_2_2-1 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 development +ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 16:41:32 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:41:32 -0400 Subject: common tobuild,1.2160,1.2161 Message-ID: <200507291641.j6TGfWOV002098@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2080 Modified Files: tobuild Log Message: request build of rpms/clamav/devel clamav-0_86_2-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2160 retrieving revision 1.2161 diff -u -r1.2160 -r1.2161 --- tobuild 29 Jul 2005 16:40:50 -0000 1.2160 +++ tobuild 29 Jul 2005 16:41:30 -0000 1.2161 @@ -58,3 +58,4 @@ jrb rpms/at-poke/devel at-poke-0_2_2-2 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 development ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 +ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel From skvidal at phy.duke.edu Fri Jul 29 16:48:21 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 12:48:21 -0400 Subject: common tobuild,1.2159,1.2160 In-Reply-To: <200507291640.j6TGeqjH002035@cvs-int.fedora.redhat.com> References: <200507291640.j6TGeqjH002035@cvs-int.fedora.redhat.com> Message-ID: <1122655701.6197.31.camel@cutter> On Fri, 2005-07-29 at 12:40 -0400, Enrico Scholz wrote: > Author: ensc > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2018 > > Modified Files: > tobuild > Log Message: > request build of rpms/clamav/FC-4 clamav-0_86_2-4_fc4 for fc4 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2159 > retrieving revision 1.2160 > diff -u -r1.2159 -r1.2160 > --- tobuild 29 Jul 2005 16:30:58 -0000 1.2159 > +++ tobuild 29 Jul 2005 16:40:50 -0000 1.2160 > @@ -57,3 +57,4 @@ > jrb rpms/at-poke/devel at-poke-0_2_2-1 devel > jrb rpms/at-poke/devel at-poke-0_2_2-2 devel > jrb rpms/at-poke/devel at-poke-0_2_2-2 development > +ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 > Enrico, Please download the plague-client package and try out the 'make plague' option from extras cvs. you can get the plague-client and instructions here: http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup thanks -sv From fedora-extras-commits at redhat.com Fri Jul 29 16:49:48 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 12:49:48 -0400 Subject: rpms/bluefish/devel bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE Message-ID: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2217 Modified Files: bluefish.spec sources .cvsignore Removed Files: bluefish.desktop Log Message: * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag - add libgnomeui support as per upstream package (#161234, #163804) - add project desktop entry - desktop entry munging not needed Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bluefish.spec 23 May 2005 00:21:12 -0000 1.11 +++ bluefish.spec 29 Jul 2005 16:49:46 -0000 1.12 @@ -1,13 +1,13 @@ Name: bluefish -Version: 1.0 -Release: 4 +Version: 1.0.2 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 @@ -15,6 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 +BuildRequires: libgnomeui >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -32,7 +33,6 @@ %build -sed -i "s/ICONDIR\/bluefish-icon.png/bluefish-icon.png/g;" data/bluefish.desktop.in %configure --disable-update-databases make %{?_smp_mflags} @@ -47,6 +47,10 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop +desktop-file-install --vendor fedora --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish-project.desktop %clean @@ -67,7 +71,8 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-bluefish.desktop +%{_datadir}/applications/fedora-bluefish-project.desktop %{_datadir}/application-registry/* %{_datadir}/bluefish %{_datadir}/mime/packages/bluefish.xml @@ -76,6 +81,13 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-1 +- update to 1.0.2 +- add dist tag +- add libgnomeui support as per upstream package (#161234, #163804) +- add project desktop entry +- desktop entry munging not needed + * Sun May 22 2005 Jeremy Katz - 1.0-4 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 00:56:52 -0000 1.4 +++ sources 29 Jul 2005 16:49:46 -0000 1.5 @@ -1 +1 @@ -3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 +281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 +++ .cvsignore 29 Jul 2005 16:49:46 -0000 1.5 @@ -1 +1 @@ -bluefish-1.0.tar.bz2 +bluefish-1.0.2.tar.bz2 --- bluefish.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 16:50:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:21 -0400 Subject: rpms/gxemul - New directory Message-ID: <200507291650.j6TGoL5x002345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/gxemul Log Message: Directory /cvs/extras/rpms/gxemul added to the repository From fedora-extras-commits at redhat.com Fri Jul 29 16:50:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:21 -0400 Subject: rpms/gxemul/devel - New directory Message-ID: <200507291650.j6TGoLGC002348@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/gxemul/devel Log Message: Directory /cvs/extras/rpms/gxemul/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 29 16:50:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:40 -0400 Subject: rpms/gxemul Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507291650.j6TGoeCv002404@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2370 Added Files: Makefile import.log Log Message: Setup of module gxemul --- NEW FILE Makefile --- # Top level Makefile for module gxemul all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 29 16:50:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:41 -0400 Subject: rpms/gxemul/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507291650.j6TGofbo002410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2370/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gxemul --- NEW 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 Jul 29 16:51:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:51:28 -0400 Subject: rpms/gxemul/devel gxemul.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507291651.j6TGphuZ002478@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2438/devel Modified Files: .cvsignore sources Added Files: gxemul.spec Log Message: auto-import gxemul-0.3.4-1 on branch devel from gxemul-0.3.4-1.src.rpm --- NEW FILE gxemul.spec --- Name: gxemul Version: 0.3.4 Release: 1%{?dist} License: BSD Group: Development/Tools Summary: Instruction-level machine emulator URL: http://gavare.se/gxemul Source0: http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description GXemul is an experimental instruction-level machine emulator. It can be used to run binary code for (among others) MIPS-based machines, regardless of host platform. Several emulation modes are available. For some modes, processors and surrounding hardware components are emulated well enough to let unmodified operating systems (e.g. NetBSD) run as if they were running on a real machine. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" ./configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m755 gxemul $RPM_BUILD_ROOT%{_bindir} install -m644 man/gxemul.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %doc LICENSE HISTORY RELEASE README doc/* %defattr(-,root,root,0755) %{_bindir}/gxemul %{_mandir}/man1/gxemul.* %changelog * Thu Jul 28 2005 Tom "spot" Callaway 0.3.4-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gxemul/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2005 16:50:39 -0000 1.1 +++ .cvsignore 29 Jul 2005 16:51:26 -0000 1.2 @@ -0,0 +1 @@ +gxemul-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gxemul/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2005 16:50:39 -0000 1.1 +++ sources 29 Jul 2005 16:51:26 -0000 1.2 @@ -0,0 +1 @@ +dbf7ef59d2bb8f1e3082d0fa5fb434af gxemul-0.3.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 16:51:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:51:28 -0400 Subject: rpms/gxemul import.log,1.1,1.2 Message-ID: <200507291651.j6TGpSlU002472@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2438 Modified Files: import.log Log Message: auto-import gxemul-0.3.4-1 on branch devel from gxemul-0.3.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gxemul/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Jul 2005 16:50:38 -0000 1.1 +++ import.log 29 Jul 2005 16:51:26 -0000 1.2 @@ -0,0 +1 @@ +gxemul-0_3_4-1:HEAD:gxemul-0.3.4-1.src.rpm:1122655942 From fedora-extras-commits at redhat.com Fri Jul 29 16:52:57 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 12:52:57 -0400 Subject: rpms/bluefish/FC-4 bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE Message-ID: <200507291652.j6TGqviO002697@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2674 Modified Files: bluefish.spec sources .cvsignore Removed Files: bluefish.desktop Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bluefish.spec 23 May 2005 00:21:12 -0000 1.11 +++ bluefish.spec 29 Jul 2005 16:52:55 -0000 1.12 @@ -1,13 +1,13 @@ Name: bluefish -Version: 1.0 -Release: 4 +Version: 1.0.2 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 @@ -15,6 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 +BuildRequires: libgnomeui >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -32,7 +33,6 @@ %build -sed -i "s/ICONDIR\/bluefish-icon.png/bluefish-icon.png/g;" data/bluefish.desktop.in %configure --disable-update-databases make %{?_smp_mflags} @@ -47,6 +47,10 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop +desktop-file-install --vendor fedora --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish-project.desktop %clean @@ -67,7 +71,8 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-bluefish.desktop +%{_datadir}/applications/fedora-bluefish-project.desktop %{_datadir}/application-registry/* %{_datadir}/bluefish %{_datadir}/mime/packages/bluefish.xml @@ -76,6 +81,13 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-1 +- update to 1.0.2 +- add dist tag +- add libgnomeui support as per upstream package (#161234, #163804) +- add project desktop entry +- desktop entry munging not needed + * Sun May 22 2005 Jeremy Katz - 1.0-4 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 00:56:52 -0000 1.4 +++ sources 29 Jul 2005 16:52:55 -0000 1.5 @@ -1 +1 @@ -3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 +281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 +++ .cvsignore 29 Jul 2005 16:52:55 -0000 1.5 @@ -1 +1 @@ -bluefish-1.0.tar.bz2 +bluefish-1.0.2.tar.bz2 --- bluefish.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 16:57:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:57:01 -0400 Subject: owners owners.list,1.36,1.37 Message-ID: <200507291657.j6TGv1qI002771@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2753 Modified Files: owners.list Log Message: gxemul Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- owners.list 28 Jul 2005 20:09:22 -0000 1.36 +++ owners.list 29 Jul 2005 16:56:58 -0000 1.37 @@ -270,6 +270,7 @@ Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gwget|GUI Download manager using wget|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|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|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| From fedora-extras-commits at redhat.com Fri Jul 29 16:59:35 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 12:59:35 -0400 Subject: rpms/bluefish/FC-3 bluefish.spec, 1.8, 1.9 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE Message-ID: <200507291659.j6TGxZmw002809@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2788 Modified Files: bluefish.spec sources .cvsignore Removed Files: bluefish.desktop Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bluefish.spec 20 Feb 2005 16:45:59 -0000 1.8 +++ bluefish.spec 29 Jul 2005 16:59:33 -0000 1.9 @@ -1,20 +1,22 @@ Name: bluefish -Version: 1.0 -Release: 2 -Summary: A GTK2 web development application for experienced users. +Version: 1.0.2 +Release: 1%{?dist} + +Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 -BuildRequires: desktop-file-utils -BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: gettext BuildRequires: gnome-vfs2-devel -BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: pcre-devel >= 3.9 +BuildRequires: gtk2-devel >= 2.0.6 +BuildRequires: libgnomeui >= 2.6 +BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info Requires(postun): desktop-file-utils @@ -31,7 +33,6 @@ %build -sed -i "s/ICONDIR\/bluefish-icon.png/bluefish-icon.png/g;" data/bluefish.desktop.in %configure --disable-update-databases make %{?_smp_mflags} @@ -46,6 +47,10 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop +desktop-file-install --vendor fedora --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish-project.desktop %clean @@ -66,7 +71,8 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-bluefish.desktop +%{_datadir}/applications/fedora-bluefish-project.desktop %{_datadir}/application-registry/* %{_datadir}/bluefish %{_datadir}/mime/packages/bluefish.xml @@ -75,6 +81,19 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-1 +- update to 1.0.2 +- add dist tag +- add libgnomeui support as per upstream package (#161234, #163804) +- add project desktop entry +- desktop entry munging not needed + +* Sun May 22 2005 Jeremy Katz - 1.0-4 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Feb 20 2005 Phillip Compton 1.0-2 - Fix for absolute path to icon in desktop entry. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 00:56:52 -0000 1.4 +++ sources 29 Jul 2005 16:59:33 -0000 1.5 @@ -1 +1 @@ -3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 +281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 +++ .cvsignore 29 Jul 2005 16:59:33 -0000 1.5 @@ -1 +1 @@ -bluefish-1.0.tar.bz2 +bluefish-1.0.2.tar.bz2 --- bluefish.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 17:09:15 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 13:09:15 -0400 Subject: common tobuild,1.2161,1.2162 Message-ID: <200507291709.j6TH9FbT004058@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-3 clamav-0_86_2-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2161 retrieving revision 1.2162 diff -u -r1.2161 -r1.2162 --- tobuild 29 Jul 2005 16:41:30 -0000 1.2161 +++ tobuild 29 Jul 2005 17:09:12 -0000 1.2162 @@ -59,3 +59,4 @@ jrb rpms/at-poke/devel at-poke-0_2_2-2 development ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel +ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 29 17:24:14 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 29 Jul 2005 13:24:14 -0400 Subject: common tobuild,1.2162,1.2163 Message-ID: <200507291724.j6THOEdX004108@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4091 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2162 retrieving revision 1.2163 diff -u -r1.2162 -r1.2163 --- tobuild 29 Jul 2005 17:09:12 -0000 1.2162 +++ tobuild 29 Jul 2005 17:24:12 -0000 1.2163 @@ -48,7 +48,6 @@ ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 -jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 17:25:25 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 29 Jul 2005 13:25:25 -0400 Subject: owners owners.list,1.37,1.38 Message-ID: <200507291725.j6THPPH1004136@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4119 Modified Files: owners.list Log Message: pygsl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- owners.list 29 Jul 2005 16:56:58 -0000 1.37 +++ owners.list 29 Jul 2005 17:25:23 -0000 1.38 @@ -682,6 +682,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|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|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| From fedora-extras-commits at redhat.com Fri Jul 29 17:53:20 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 13:53:20 -0400 Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.2, 1.3 perl-DBD-SQLite.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507291753.j6THrKSX004301@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4279 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.09. This new version can use an external SQLite library (>= 3.1.3). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 05:00:52 -0000 1.2 +++ .cvsignore 29 Jul 2005 17:53:17 -0000 1.3 @@ -1 +1 @@ -DBD-SQLite-1.08.tar.gz +DBD-SQLite-1.09.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBD-SQLite.spec 12 Jun 2005 15:37:05 -0000 1.3 +++ perl-DBD-SQLite.spec 29 Jul 2005 17:53:17 -0000 1.4 @@ -1,12 +1,12 @@ Name: perl-DBD-SQLite -Version: 1.08 -Release: 2%{?dist} +Version: 1.09 +Release: 1%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ -Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/DBD/DBD-SQLite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 @@ -21,6 +21,8 @@ a fast transaction capable RDBMS working for your perl project you simply have to install this module, and nothing else. +As of version 1.09 it can use the external SQLite library (>= 3.1.3). + %prep %setup -q -n DBD-SQLite-%{version} @@ -56,6 +58,10 @@ %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. +- This new version can use an external SQLite library (>= 3.1.3). + * Sun Jun 12 2005 Jose Pedro Oliveira - 1.08-2 - temporary maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 05:00:52 -0000 1.2 +++ sources 29 Jul 2005 17:53:17 -0000 1.3 @@ -1 +1 @@ -589a0497eaf4c855ad2a214950cba217 DBD-SQLite-1.08.tar.gz +02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:22:36 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 14:22:36 -0400 Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.4,1.5 Message-ID: <200507291822.j6TIMaP8005615@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5598 Modified Files: perl-DBD-SQLite.spec Log Message: Build requires sqlite-devel Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DBD-SQLite.spec 29 Jul 2005 17:53:17 -0000 1.4 +++ perl-DBD-SQLite.spec 29 Jul 2005 18:22:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -10,6 +10,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 +# if sqlite >= 3.1.3 then +# perl-DBD-SQLite uses the external library +# else +# perl-DBD-SQLite is self-contained (uses the sqlite local copy) +BuildRequires: sqlite-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -51,13 +56,17 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD/SQLite.pm %{_mandir}/man3/*.3* %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 +- Build requirement added: sqlite-devel. +- Doc file added: Changes. + * Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 - Update to 1.09. - This new version can use an external SQLite library (>= 3.1.3). From fedora-extras-commits at redhat.com Fri Jul 29 18:39:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 14:39:23 -0400 Subject: rpms/QuantLib/devel QuantLib.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200507291839.j6TIdNpn005877@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821/devel Modified Files: QuantLib.spec sources Log Message: new version Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- QuantLib.spec 1 Jul 2005 17:23:01 -0000 1.8 +++ QuantLib.spec 29 Jul 2005 18:39:21 -0000 1.9 @@ -1,8 +1,8 @@ %define docdir %{_datadir}/doc/QuantLib-%{version} Name: QuantLib -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 0.3.10-1 +- Bump for new release + * Sat Jun 25 2005 Colin Charles 0.3.9-2 - Fix download URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/QuantLib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2005 14:54:59 -0000 1.3 +++ sources 29 Jul 2005 18:39:21 -0000 1.4 @@ -1,2 +1,3 @@ e823bc1201127c6d12b685185b64f0a4 QuantLib-0.3.8.tar.gz f47d72e7d2aa8746dbcfbb6971d55643 QuantLib-0.3.9.tar.gz +836a714490219cc6806961b62c8c975b QuantLib-0.3.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:39:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 14:39:18 -0400 Subject: rpms/QuantLib/FC-3 QuantLib.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200507291839.j6TIdmU6005887@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821/FC-3 Modified Files: QuantLib.spec sources Log Message: new version Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-3/QuantLib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 +++ QuantLib.spec 29 Jul 2005 18:39:15 -0000 1.9 @@ -1,8 +1,8 @@ %define docdir %{_datadir}/doc/QuantLib-%{version} Name: QuantLib -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 0.3.10-1 +- Bump for new release + * Sat Jun 25 2005 Colin Charles 0.3.9-2 - Fix download URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2005 14:49:46 -0000 1.3 +++ sources 29 Jul 2005 18:39:15 -0000 1.4 @@ -1,2 +1,3 @@ e823bc1201127c6d12b685185b64f0a4 QuantLib-0.3.8.tar.gz f47d72e7d2aa8746dbcfbb6971d55643 QuantLib-0.3.9.tar.gz +836a714490219cc6806961b62c8c975b QuantLib-0.3.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:39:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 14:39:18 -0400 Subject: rpms/QuantLib/FC-4 .cvsignore, 1.3, 1.4 QuantLib.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507291839.j6TIdmti005892@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821/FC-4 Modified Files: .cvsignore QuantLib.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Jun 2005 14:54:59 -0000 1.3 +++ .cvsignore 29 Jul 2005 18:39:16 -0000 1.4 @@ -1,2 +1,3 @@ QuantLib-0.3.8.tar.gz QuantLib-0.3.9.tar.gz +QuantLib-0.3.10.tar.gz Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/QuantLib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 +++ QuantLib.spec 29 Jul 2005 18:39:16 -0000 1.9 @@ -1,8 +1,8 @@ %define docdir %{_datadir}/doc/QuantLib-%{version} Name: QuantLib -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 0.3.10-1 +- Bump for new release + * Sat Jun 25 2005 Colin Charles 0.3.9-2 - Fix download URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2005 14:54:59 -0000 1.3 +++ sources 29 Jul 2005 18:39:16 -0000 1.4 @@ -1,2 +1,3 @@ e823bc1201127c6d12b685185b64f0a4 QuantLib-0.3.8.tar.gz f47d72e7d2aa8746dbcfbb6971d55643 QuantLib-0.3.9.tar.gz +836a714490219cc6806961b62c8c975b QuantLib-0.3.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:48:38 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 14:48:38 -0400 Subject: rpms/perl-DBD-SQLite/FC-3 .cvsignore, 1.2, 1.3 perl-DBD-SQLite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507291849.j6TIn8Xq006093@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052/FC-3 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 05:00:52 -0000 1.2 +++ .cvsignore 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -DBD-SQLite-1.08.tar.gz +DBD-SQLite-1.09.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/perl-DBD-SQLite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite.spec 12 Jun 2005 05:00:52 -0000 1.2 +++ perl-DBD-SQLite.spec 29 Jul 2005 18:48:36 -0000 1.3 @@ -1,15 +1,20 @@ -Name: perl-DBD-SQLite -Version: 1.08 +Name: perl-DBD-SQLite +Version: 1.09 Release: 2%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ -Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/DBD/DBD-SQLite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 +# if sqlite >= 3.1.3 then +# perl-DBD-SQLite uses the external library +# else +# perl-DBD-SQLite is self-contained (uses the sqlite local copy) +BuildRequires: sqlite-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,6 +26,8 @@ a fast transaction capable RDBMS working for your perl project you simply have to install this module, and nothing else. +As of version 1.09 it can use the external SQLite library (>= 3.1.3). + %prep %setup -q -n DBD-SQLite-%{version} @@ -49,13 +56,21 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD/SQLite.pm %{_mandir}/man3/*.3* %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 +- Build requirement added: sqlite-devel. +- Doc file added: Changes. + +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. +- This new version can use an external SQLite library (>= 3.1.3). + * Sun Jun 12 2005 Jose Pedro Oliveira - 1.08-2 - temporary maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 05:00:52 -0000 1.2 +++ sources 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -589a0497eaf4c855ad2a214950cba217 DBD-SQLite-1.08.tar.gz +02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:48:38 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 14:48:38 -0400 Subject: rpms/perl-DBD-SQLite/FC-4 .cvsignore, 1.2, 1.3 perl-DBD-SQLite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507291849.j6TIn8fv006098@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052/FC-4 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 05:00:52 -0000 1.2 +++ .cvsignore 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -DBD-SQLite-1.08.tar.gz +DBD-SQLite-1.09.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/perl-DBD-SQLite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite.spec 12 Jun 2005 05:00:52 -0000 1.2 +++ perl-DBD-SQLite.spec 29 Jul 2005 18:48:36 -0000 1.3 @@ -1,15 +1,20 @@ -Name: perl-DBD-SQLite -Version: 1.08 +Name: perl-DBD-SQLite +Version: 1.09 Release: 2%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ -Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/DBD/DBD-SQLite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 +# if sqlite >= 3.1.3 then +# perl-DBD-SQLite uses the external library +# else +# perl-DBD-SQLite is self-contained (uses the sqlite local copy) +BuildRequires: sqlite-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,6 +26,8 @@ a fast transaction capable RDBMS working for your perl project you simply have to install this module, and nothing else. +As of version 1.09 it can use the external SQLite library (>= 3.1.3). + %prep %setup -q -n DBD-SQLite-%{version} @@ -49,13 +56,21 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD/SQLite.pm %{_mandir}/man3/*.3* %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 +- Build requirement added: sqlite-devel. +- Doc file added: Changes. + +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. +- This new version can use an external SQLite library (>= 3.1.3). + * Sun Jun 12 2005 Jose Pedro Oliveira - 1.08-2 - temporary maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 05:00:52 -0000 1.2 +++ sources 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -589a0497eaf4c855ad2a214950cba217 DBD-SQLite-1.08.tar.gz +02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 19:06:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:06:55 -0400 Subject: rpms/gambas/FC-4 gambas.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200507291907.j6TJ7emU007417@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348/FC-4 Modified Files: gambas.spec sources Log Message: New version: 1.0.9 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambas.spec 11 Jul 2005 20:33:00 -0000 1.5 +++ gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.7-gcc4.patch +Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 +- bump for 1.0.9 + * Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 - bump for another new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jul 2005 20:33:00 -0000 1.3 +++ sources 29 Jul 2005 19:06:53 -0000 1.4 @@ -1,2 +1,3 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 +888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 19:07:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:07:09 -0400 Subject: rpms/gambas/FC-3 .cvsignore, 1.2, 1.3 gambas.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507291907.j6TJ7dOk007411@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348/FC-3 Modified Files: .cvsignore gambas.spec sources Log Message: New version: 1.0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/.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 29 Jul 2005 19:06:53 -0000 1.3 @@ -1 +1,2 @@ gambas-1.0.6.tar.bz2 +gambas-1.0.9.tar.bz2 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambas.spec 11 Jul 2005 20:32:59 -0000 1.5 +++ gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.7-gcc4.patch +Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 +- bump for 1.0.9 + * Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 - bump for another new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jul 2005 20:32:59 -0000 1.3 +++ sources 29 Jul 2005 19:06:53 -0000 1.4 @@ -1,2 +1,3 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 +888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 19:06:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:06:56 -0400 Subject: rpms/gambas/devel gambas.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200507291907.j6TJ7eP9007418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348/devel Modified Files: gambas.spec sources Log Message: New version: 1.0.9 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambas.spec 11 Jul 2005 20:33:01 -0000 1.5 +++ gambas.spec 29 Jul 2005 19:06:54 -0000 1.6 @@ -1,6 +1,6 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.7-gcc4.patch +Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 +- bump for 1.0.9 + * Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 - bump for another new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jul 2005 20:33:01 -0000 1.3 +++ sources 29 Jul 2005 19:06:54 -0000 1.4 @@ -1,2 +1,3 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 +888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 19:16:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:16:16 -0400 Subject: rpms/gambas/FC-3 gambas-1.0.9-gcc4.patch,NONE,1.1 Message-ID: <200507291916.j6TJGGqb007666@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7639/FC-3 Added Files: gambas-1.0.9-gcc4.patch Log Message: Missing patch. gambas-1.0.9-gcc4.patch: --- NEW FILE gambas-1.0.9-gcc4.patch --- --- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500 @@ -57,7 +57,7 @@ { /* BM */ FILE *file = THIS_FILE; - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (!feof(file)) nmemb=fread(buffer,size,nmemb,file); @@ -70,7 +70,7 @@ int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (THIS_FILE) { @@ -111,12 +111,12 @@ { CCURL_stop(_object); ftp_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1); @@ -127,7 +127,7 @@ curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL); ftp_reset(THIS); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -177,7 +177,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -209,7 +209,7 @@ return; } - THIS_FILE=fopen(STRING(SourceFile),"r"); + THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r"); if (!THIS_FILE) { GB.Error("Unable to open file for reading"); @@ -234,12 +234,12 @@ char *tmp=NULL; GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21"))); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; strcpy(tmp,"ftp://127.0.0.1:21"); tmp=NULL; GB.Alloc((void**)&tmp,7); strcpy(tmp,"ftp://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC); --- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500 @@ -133,7 +133,7 @@ if (THIS_STATUS==6) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; GB.Ref(THIS); GB.Post(CCURL_raise_connect,(long)THIS); } @@ -335,14 +335,14 @@ GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80"))); strcpy(tmp,"http://127.0.0.1:80"); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0); tmp=NULL; GB.Alloc((void**)&tmp,8); strcpy(tmp,"http://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; END_METHOD @@ -378,12 +378,12 @@ { CCURL_stop(_object); http_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } @@ -410,7 +410,7 @@ THIS->ReturnString=NULL; } http_reset(_object); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -437,7 +437,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -500,7 +500,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); --- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500 @@ -170,20 +170,20 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } switch ( ErrCode ) { case CURLE_OK: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=0; + THIS_STATUS_NOCAST=NULL; GB.Ref(THIS); GB.Post(CCURL_raise_finished,(long)THIS); break; default: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=-1*(1000+ErrCode); + THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode)); GB.Ref(THIS); GB.Post(CCURL_raise_error,(long)THIS); break; @@ -200,16 +200,16 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } if (THIS_CURL) { curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); curl_easy_cleanup(THIS_CURL); - THIS_CURL=NULL; + THIS_CURL_NOCAST=NULL; } - THIS_STATUS=0; + THIS_STATUS_NOCAST=0; } void CCURL_init_post(void) @@ -362,7 +362,7 @@ GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char)); strcpy(tmp,GB.ToZeroString(PROP(GB_STRING))); Adv_correct_url(&tmp,THIS_PROTOCOL); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; END_PROPERTY @@ -380,9 +380,9 @@ BEGIN_METHOD_VOID(CCURL_new) THIS->stream.desc=NULL; - THIS_CURL=NULL; - THIS_URL=NULL; - THIS_FILE=NULL; + THIS_CURL_NOCAST=NULL; + THIS_URL_NOCAST=NULL; + THIS_FILE_NOCAST=NULL; GB.StoreVariant(NULL, (void *)&THIS->tag); Adv_user_NEW (&THIS->user); GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL); --- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct From fedora-extras-commits at redhat.com Fri Jul 29 19:16:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:16:17 -0400 Subject: rpms/gambas/FC-4 gambas-1.0.9-gcc4.patch,NONE,1.1 Message-ID: <200507291916.j6TJGHKU007673@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7639/FC-4 Added Files: gambas-1.0.9-gcc4.patch Log Message: Missing patch. gambas-1.0.9-gcc4.patch: --- NEW FILE gambas-1.0.9-gcc4.patch --- --- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500 @@ -57,7 +57,7 @@ { /* BM */ FILE *file = THIS_FILE; - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (!feof(file)) nmemb=fread(buffer,size,nmemb,file); @@ -70,7 +70,7 @@ int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (THIS_FILE) { @@ -111,12 +111,12 @@ { CCURL_stop(_object); ftp_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1); @@ -127,7 +127,7 @@ curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL); ftp_reset(THIS); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -177,7 +177,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -209,7 +209,7 @@ return; } - THIS_FILE=fopen(STRING(SourceFile),"r"); + THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r"); if (!THIS_FILE) { GB.Error("Unable to open file for reading"); @@ -234,12 +234,12 @@ char *tmp=NULL; GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21"))); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; strcpy(tmp,"ftp://127.0.0.1:21"); tmp=NULL; GB.Alloc((void**)&tmp,7); strcpy(tmp,"ftp://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC); --- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500 @@ -133,7 +133,7 @@ if (THIS_STATUS==6) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; GB.Ref(THIS); GB.Post(CCURL_raise_connect,(long)THIS); } @@ -335,14 +335,14 @@ GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80"))); strcpy(tmp,"http://127.0.0.1:80"); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0); tmp=NULL; GB.Alloc((void**)&tmp,8); strcpy(tmp,"http://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; END_METHOD @@ -378,12 +378,12 @@ { CCURL_stop(_object); http_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } @@ -410,7 +410,7 @@ THIS->ReturnString=NULL; } http_reset(_object); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -437,7 +437,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -500,7 +500,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); --- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500 @@ -170,20 +170,20 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } switch ( ErrCode ) { case CURLE_OK: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=0; + THIS_STATUS_NOCAST=NULL; GB.Ref(THIS); GB.Post(CCURL_raise_finished,(long)THIS); break; default: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=-1*(1000+ErrCode); + THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode)); GB.Ref(THIS); GB.Post(CCURL_raise_error,(long)THIS); break; @@ -200,16 +200,16 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } if (THIS_CURL) { curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); curl_easy_cleanup(THIS_CURL); - THIS_CURL=NULL; + THIS_CURL_NOCAST=NULL; } - THIS_STATUS=0; + THIS_STATUS_NOCAST=0; } void CCURL_init_post(void) @@ -362,7 +362,7 @@ GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char)); strcpy(tmp,GB.ToZeroString(PROP(GB_STRING))); Adv_correct_url(&tmp,THIS_PROTOCOL); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; END_PROPERTY @@ -380,9 +380,9 @@ BEGIN_METHOD_VOID(CCURL_new) THIS->stream.desc=NULL; - THIS_CURL=NULL; - THIS_URL=NULL; - THIS_FILE=NULL; + THIS_CURL_NOCAST=NULL; + THIS_URL_NOCAST=NULL; + THIS_FILE_NOCAST=NULL; GB.StoreVariant(NULL, (void *)&THIS->tag); Adv_user_NEW (&THIS->user); GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL); --- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct From fedora-extras-commits at redhat.com Fri Jul 29 19:16:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:16:22 -0400 Subject: rpms/gambas/devel gambas-1.0.9-gcc4.patch,NONE,1.1 Message-ID: <200507291916.j6TJGMg7007695@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7639/devel Added Files: gambas-1.0.9-gcc4.patch Log Message: Missing patch. gambas-1.0.9-gcc4.patch: --- NEW FILE gambas-1.0.9-gcc4.patch --- --- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500 @@ -57,7 +57,7 @@ { /* BM */ FILE *file = THIS_FILE; - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (!feof(file)) nmemb=fread(buffer,size,nmemb,file); @@ -70,7 +70,7 @@ int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (THIS_FILE) { @@ -111,12 +111,12 @@ { CCURL_stop(_object); ftp_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1); @@ -127,7 +127,7 @@ curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL); ftp_reset(THIS); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -177,7 +177,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -209,7 +209,7 @@ return; } - THIS_FILE=fopen(STRING(SourceFile),"r"); + THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r"); if (!THIS_FILE) { GB.Error("Unable to open file for reading"); @@ -234,12 +234,12 @@ char *tmp=NULL; GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21"))); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; strcpy(tmp,"ftp://127.0.0.1:21"); tmp=NULL; GB.Alloc((void**)&tmp,7); strcpy(tmp,"ftp://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC); --- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500 @@ -133,7 +133,7 @@ if (THIS_STATUS==6) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; GB.Ref(THIS); GB.Post(CCURL_raise_connect,(long)THIS); } @@ -335,14 +335,14 @@ GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80"))); strcpy(tmp,"http://127.0.0.1:80"); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0); tmp=NULL; GB.Alloc((void**)&tmp,8); strcpy(tmp,"http://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; END_METHOD @@ -378,12 +378,12 @@ { CCURL_stop(_object); http_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } @@ -410,7 +410,7 @@ THIS->ReturnString=NULL; } http_reset(_object); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -437,7 +437,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -500,7 +500,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); --- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500 @@ -170,20 +170,20 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } switch ( ErrCode ) { case CURLE_OK: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=0; + THIS_STATUS_NOCAST=NULL; GB.Ref(THIS); GB.Post(CCURL_raise_finished,(long)THIS); break; default: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=-1*(1000+ErrCode); + THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode)); GB.Ref(THIS); GB.Post(CCURL_raise_error,(long)THIS); break; @@ -200,16 +200,16 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } if (THIS_CURL) { curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); curl_easy_cleanup(THIS_CURL); - THIS_CURL=NULL; + THIS_CURL_NOCAST=NULL; } - THIS_STATUS=0; + THIS_STATUS_NOCAST=0; } void CCURL_init_post(void) @@ -362,7 +362,7 @@ GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char)); strcpy(tmp,GB.ToZeroString(PROP(GB_STRING))); Adv_correct_url(&tmp,THIS_PROTOCOL); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; END_PROPERTY @@ -380,9 +380,9 @@ BEGIN_METHOD_VOID(CCURL_new) THIS->stream.desc=NULL; - THIS_CURL=NULL; - THIS_URL=NULL; - THIS_FILE=NULL; + THIS_CURL_NOCAST=NULL; + THIS_URL_NOCAST=NULL; + THIS_FILE_NOCAST=NULL; GB.StoreVariant(NULL, (void *)&THIS->tag); Adv_user_NEW (&THIS->user); GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL); --- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct From fedora-extras-commits at redhat.com Fri Jul 29 19:17:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:17:30 -0400 Subject: rpms/gambas/devel gambas.spec,1.6,1.7 Message-ID: <200507291917.j6TJHUI7007748@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/devel Modified Files: gambas.spec Log Message: bump release for new tag Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambas.spec 29 Jul 2005 19:06:54 -0000 1.6 +++ gambas.spec 29 Jul 2005 19:17:28 -0000 1.7 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 +- put in correct patch + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 - bump for 1.0.9 From fedora-extras-commits at redhat.com Fri Jul 29 19:17:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:17:25 -0400 Subject: rpms/gambas/FC-3 gambas.spec,1.6,1.7 Message-ID: <200507291917.j6TJHt9P007751@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/FC-3 Modified Files: gambas.spec Log Message: bump release for new tag Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 +++ gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 +- put in correct patch + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 - bump for 1.0.9 From fedora-extras-commits at redhat.com Fri Jul 29 19:17:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:17:25 -0400 Subject: rpms/gambas/FC-4 gambas.spec,1.6,1.7 Message-ID: <200507291918.j6TJHtFT007754@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/FC-4 Modified Files: gambas.spec Log Message: bump release for new tag Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 +++ gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 +- put in correct patch + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 - bump for 1.0.9 From fedora-extras-commits at redhat.com Fri Jul 29 19:27:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 15:27:37 -0400 Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.5, 1.6 perl-Gtk2.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507291927.j6TJRbAh007957@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922/FC-4 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.083 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jun 2005 16:22:00 -0000 1.5 +++ .cvsignore 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -Gtk2-1.082.tar.gz +Gtk2-1.083.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Gtk2.spec 27 Jun 2005 16:22:00 -0000 1.9 +++ perl-Gtk2.spec 29 Jul 2005 19:27:35 -0000 1.10 @@ -1,12 +1,12 @@ Name: perl-Gtk2 -Version: 1.082 +Version: 1.083 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries License: LGPL URL: http://search.cpan.org/dist/Gtk2/ -Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.082.tar.gz +Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-%{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" @@ -60,6 +59,9 @@ %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.083-1 +- Update to 1.083. + * Mon Jun 27 2005 Jose Pedro Oliveira - 1.082-1 - Update to 1.082. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jun 2005 16:22:00 -0000 1.5 +++ sources 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -6a36c224d0a8f4792c206458c2845a8e Gtk2-1.082.tar.gz +4ccec16a8a87bbf0b058c92ac44d60ae Gtk2-1.083.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 19:27:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 15:27:37 -0400 Subject: rpms/perl-Gtk2/devel .cvsignore, 1.5, 1.6 perl-Gtk2.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507291927.j6TJRb84007965@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922/devel Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.083 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jun 2005 16:22:01 -0000 1.5 +++ .cvsignore 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -Gtk2-1.082.tar.gz +Gtk2-1.083.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Gtk2.spec 27 Jun 2005 16:22:01 -0000 1.9 +++ perl-Gtk2.spec 29 Jul 2005 19:27:35 -0000 1.10 @@ -1,12 +1,12 @@ Name: perl-Gtk2 -Version: 1.082 +Version: 1.083 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries License: LGPL URL: http://search.cpan.org/dist/Gtk2/ -Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.082.tar.gz +Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-%{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" @@ -60,6 +59,9 @@ %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.083-1 +- Update to 1.083. + * Mon Jun 27 2005 Jose Pedro Oliveira - 1.082-1 - Update to 1.082. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jun 2005 16:22:01 -0000 1.5 +++ sources 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -6a36c224d0a8f4792c206458c2845a8e Gtk2-1.082.tar.gz +4ccec16a8a87bbf0b058c92ac44d60ae Gtk2-1.083.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 19:36:26 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 29 Jul 2005 15:36:26 -0400 Subject: common Makefile.common,1.27,1.28 Message-ID: <200507291936.j6TJaQbY008099@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8053 Modified Files: Makefile.common Log Message: say what source file is being downloaded (#160142) Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.common 29 Jul 2005 03:41:29 -0000 1.27 +++ Makefile.common 29 Jul 2005 19:36:24 -0000 1.28 @@ -132,6 +132,7 @@ # Retrieve the sources we do not have in CVS $(SOURCEFILES): #FORCE @mkdir -p $(SOURCEDIR) + @echo "Downloading $@..." @if [ ! -e "$@" ] ; then $(CLIENT) $(REPOSITORY)/$(NAME)/$@/$(get_sources_md5)/$@ ; fi @if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi @if test "$$(md5sum $@ | awk '{print $$1}')" != "$(get_sources_md5)" ; then \ From fedora-extras-commits at redhat.com Fri Jul 29 19:42:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:42:02 -0400 Subject: rpms/blacs/devel blacs-shared.patch,NONE,1.1 blacs.spec,1.7,1.8 Message-ID: <200507291942.j6TJg27L008343@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/devel Modified Files: blacs.spec Added Files: blacs-shared.patch Log Message: actually add the patch. :P blacs-shared.patch: --- NEW FILE blacs-shared.patch --- --- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 +++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 @@ -88,12 +88,14 @@ make $(BLACSCINIT) $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) $(RANLIB) $(BLACSLIB) + ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) $(BLACSFINIT) : $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSFINIT) $(BLACSCINIT) : @@ -101,6 +103,7 @@ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSCINIT) # ------------------ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- blacs.spec 12 Jul 2005 19:46:29 -0000 1.7 +++ blacs.spec 29 Jul 2005 19:42:00 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 +- bump for new tag + * Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 - split static lib and .so into -devel package - fix Bmake files for shared library support From fedora-extras-commits at redhat.com Fri Jul 29 19:41:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:41:56 -0400 Subject: rpms/blacs/FC-3 blacs-shared.patch,NONE,1.1 blacs.spec,1.7,1.8 Message-ID: <200507291942.j6TJgQ8e008410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-3 Modified Files: blacs.spec Added Files: blacs-shared.patch Log Message: actually add the patch. :P blacs-shared.patch: --- NEW FILE blacs-shared.patch --- --- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 +++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 @@ -88,12 +88,14 @@ make $(BLACSCINIT) $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) $(RANLIB) $(BLACSLIB) + ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) $(BLACSFINIT) : $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSFINIT) $(BLACSCINIT) : @@ -101,6 +103,7 @@ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSCINIT) # ------------------ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- blacs.spec 12 Jul 2005 19:46:23 -0000 1.7 +++ blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 +- bump for new tag + * Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 - split static lib and .so into -devel package - fix Bmake files for shared library support From fedora-extras-commits at redhat.com Fri Jul 29 19:41:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:41:57 -0400 Subject: rpms/blacs/FC-4 blacs-shared.patch,NONE,1.1 blacs.spec,1.7,1.8 Message-ID: <200507291942.j6TJgRwN008413@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-4 Modified Files: blacs.spec Added Files: blacs-shared.patch Log Message: actually add the patch. :P blacs-shared.patch: --- NEW FILE blacs-shared.patch --- --- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 +++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 @@ -88,12 +88,14 @@ make $(BLACSCINIT) $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) $(RANLIB) $(BLACSLIB) + ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) $(BLACSFINIT) : $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSFINIT) $(BLACSCINIT) : @@ -101,6 +103,7 @@ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSCINIT) # ------------------ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- blacs.spec 12 Jul 2005 19:46:24 -0000 1.7 +++ blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 +- bump for new tag + * Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 - split static lib and .so into -devel package - fix Bmake files for shared library support From fedora-extras-commits at redhat.com Fri Jul 29 19:50:54 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 29 Jul 2005 15:50:54 -0400 Subject: rpms/hdf/devel hdf.spec,1.1,1.2 Message-ID: <200507291950.j6TJosto008744@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8727 Modified Files: hdf.spec Log Message: Exclude ppc/ppc64 Index: hdf.spec =================================================================== RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf.spec 25 Jul 2005 18:07:39 -0000 1.1 +++ hdf.spec 29 Jul 2005 19:50:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: hdf Version: 4.2r1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran +ExcludeArch: ppc ppc64 %description HDF is a general purpose library and file format for storing scientific data. @@ -70,6 +71,9 @@ %{_libdir}/%{name}/ %changelog +* Fri Jul 29 2005 Orion Poplawski 4.2r1-3 +- Exclude ppc/ppc64 - HDF does not recognize it + * Wed Jul 20 2005 Orion Poplawski 4.2r1-2 - Fix BuildRequires to have autoconf From rc040203 at freenet.de Fri Jul 29 20:06:52 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 29 Jul 2005 22:06:52 +0200 Subject: rpms/bluefish/devel bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE In-Reply-To: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> References: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> Message-ID: <1122667612.4941.164.camel@mccallum.corsepiu.local> On Fri, 2005-07-29 at 12:49 -0400, Paul Howarth wrote: > Author: pghmcfc > @@ -15,6 +15,7 @@ > BuildRequires: gettext > BuildRequires: gnome-vfs2-devel > BuildRequires: gtk2-devel >= 2.0.6 > +BuildRequires: libgnomeui >= 2.6 Why libgnomeui? Shouldn't that be libgnomeui-devel? Ralf From paul at city-fan.org Fri Jul 29 21:11:19 2005 From: paul at city-fan.org (Paul Howarth) Date: Fri, 29 Jul 2005 22:11:19 +0100 Subject: rpms/bluefish/devel bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE In-Reply-To: <1122667612.4941.164.camel@mccallum.corsepiu.local> References: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> <1122667612.4941.164.camel@mccallum.corsepiu.local> Message-ID: <1122671480.2851.108.camel@laurel.intra.city-fan.org> On Fri, 2005-07-29 at 22:06 +0200, Ralf Corsepius wrote: > On Fri, 2005-07-29 at 12:49 -0400, Paul Howarth wrote: > > Author: pghmcfc > > > @@ -15,6 +15,7 @@ > > BuildRequires: gettext > > BuildRequires: gnome-vfs2-devel > > BuildRequires: gtk2-devel >= 2.0.6 > > +BuildRequires: libgnomeui >= 2.6 > Why libgnomeui? Shouldn't that be libgnomeui-devel? Yes, it should. Good spot. I'd better let upstream know because the same mistake is in their spec file. Paul. -- Paul Howarth From fedora-extras-commits at redhat.com Fri Jul 29 21:13:46 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 17:13:46 -0400 Subject: rpms/bluefish/devel bluefish.spec,1.12,1.13 Message-ID: <200507292113.j6TLDlL0003594@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3577 Modified Files: bluefish.spec Log Message: wrong buildrequire Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bluefish.spec 29 Jul 2005 16:49:46 -0000 1.12 +++ bluefish.spec 29 Jul 2005 21:13:44 -0000 1.13 @@ -1,6 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK2 web development application for experienced users @@ -15,7 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libgnomeui >= 2.6 +BuildRequires: libgnomeui-devel >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -81,6 +81,9 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-2 +- buildrequire libgnomeui-devel, not libgnomeui + * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag From fedora-extras-commits at redhat.com Fri Jul 29 21:15:14 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 17:15:14 -0400 Subject: rpms/bluefish/FC-4 bluefish.spec,1.12,1.13 Message-ID: <200507292115.j6TLFEgm003677@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3660 Modified Files: bluefish.spec Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bluefish.spec 29 Jul 2005 16:52:55 -0000 1.12 +++ bluefish.spec 29 Jul 2005 21:15:12 -0000 1.13 @@ -1,6 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK2 web development application for experienced users @@ -15,7 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libgnomeui >= 2.6 +BuildRequires: libgnomeui-devel >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -81,6 +81,9 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-2 +- buildrequire libgnomeui-devel, not libgnomeui + * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag From fedora-extras-commits at redhat.com Fri Jul 29 21:16:08 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 17:16:08 -0400 Subject: rpms/bluefish/FC-3 bluefish.spec,1.9,1.10 Message-ID: <200507292116.j6TLG89v003784@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3738 Modified Files: bluefish.spec Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bluefish.spec 29 Jul 2005 16:59:33 -0000 1.9 +++ bluefish.spec 29 Jul 2005 21:16:06 -0000 1.10 @@ -1,6 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK2 web development application for experienced users @@ -15,7 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libgnomeui >= 2.6 +BuildRequires: libgnomeui-devel >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -81,6 +81,9 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-2 +- buildrequire libgnomeui-devel, not libgnomeui + * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag From fedora-extras-commits at redhat.com Fri Jul 29 22:08:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:08:25 -0400 Subject: rpms/blacs/devel Bmake.inc, 1.2, 1.3 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.8, 1.9 Message-ID: <200507292208.j6TM8P2D005194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/devel Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: Fix INTFACE for gfortran, ppc Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc 12 Jul 2005 19:46:29 -0000 1.2 +++ Bmake.inc 29 Jul 2005 22:08:23 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc.64bit 12 Jul 2005 19:46:29 -0000 1.2 +++ Bmake.inc.64bit 29 Jul 2005 22:08:23 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- blacs.spec 29 Jul 2005 19:42:00 -0000 1.8 +++ blacs.spec 29 Jul 2005 22:08:23 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,6 +54,11 @@ cp -f %{SOURCE2} . %endif +# I'm not sure why ppc is different here. :/ +%ifarch ppc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C" ./Bmake.inc +%endif + %build cd BLACS/ make mpi @@ -107,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 +- fix INTFACE for FC-4+ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 - bump for new tag From fedora-extras-commits at redhat.com Fri Jul 29 22:08:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:08:22 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.8,1.9 Message-ID: <200507292208.j6TM8qft005197@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/FC-3 Modified Files: blacs.spec Log Message: Fix INTFACE for gfortran, ppc Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 +++ blacs.spec 29 Jul 2005 22:08:20 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 +- fix INTFACE for FC-4+ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 - bump for new tag From fedora-extras-commits at redhat.com Fri Jul 29 22:08:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:08:23 -0400 Subject: rpms/blacs/FC-4 Bmake.inc, 1.2, 1.3 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.8, 1.9 Message-ID: <200507292209.j6TM8u4s005204@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/FC-4 Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: Fix INTFACE for gfortran, ppc Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc 12 Jul 2005 19:46:24 -0000 1.2 +++ Bmake.inc 29 Jul 2005 22:08:21 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc.64bit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc.64bit 12 Jul 2005 19:46:24 -0000 1.2 +++ Bmake.inc.64bit 29 Jul 2005 22:08:21 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 +++ blacs.spec 29 Jul 2005 22:08:21 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,6 +54,11 @@ cp -f %{SOURCE2} . %endif +# I'm not sure why ppc is different here. :/ +%ifarch ppc +sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C" ./Bmake.inc +%endif + %build cd BLACS/ make mpi @@ -107,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 +- fix INTFACE for FC-4+ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 - bump for new tag From fedora-extras-commits at redhat.com Fri Jul 29 22:13:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:13:36 -0400 Subject: rpms/blacs/devel blacs.spec,1.9,1.10 Message-ID: <200507292213.j6TMDa5I005365@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314/devel Modified Files: blacs.spec Log Message: I will learn to type correctly. I will learn to type correctly. :/ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blacs.spec 29 Jul 2005 22:08:23 -0000 1.9 +++ blacs.spec 29 Jul 2005 22:13:34 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C" ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +- Fix typo in fix. :/ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 - fix INTFACE for FC-4+ From fedora-extras-commits at redhat.com Fri Jul 29 22:13:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:13:31 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.9,1.10 Message-ID: <200507292214.j6TME1ng005371@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314/FC-4 Modified Files: blacs.spec Log Message: I will learn to type correctly. I will learn to type correctly. :/ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blacs.spec 29 Jul 2005 22:08:21 -0000 1.9 +++ blacs.spec 29 Jul 2005 22:13:29 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C" ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +- Fix typo in fix. :/ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 - fix INTFACE for FC-4+ From fedora-extras-commits at redhat.com Fri Jul 29 22:13:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:13:30 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.9,1.10 Message-ID: <200507292214.j6TME0hk005370@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314/FC-3 Modified Files: blacs.spec Log Message: I will learn to type correctly. I will learn to type correctly. :/ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blacs.spec 29 Jul 2005 22:08:20 -0000 1.9 +++ blacs.spec 29 Jul 2005 22:13:28 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -15,7 +15,7 @@ Source7: http://www.netlib.org/blacs/cblacsqref.ps Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit -BuildRequires: gcc-g77 +BuildRequires: gcc-gfortran # Lam before 7.1.1-5 is missing: # -shared library support # -fPIC compilation flag @@ -54,6 +54,11 @@ cp -f %{SOURCE2} . %endif +# I'm not sure why ppc is different here. :/ +%ifarch ppc +sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc +%endif + %build cd BLACS/ make mpi @@ -107,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +- Fix typo in fix. :/ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 - fix INTFACE for FC-4+ From fedora-extras-commits at redhat.com Fri Jul 29 22:17:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:17:08 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.10,1.11 Message-ID: <200507292217.j6TMH9VR005565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496/FC-3 Modified Files: blacs.spec Log Message: You ever hear the one about a monkey, a 67 Volkswagon Bug, and a pineapple upside down cake? Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blacs.spec 29 Jul 2005 22:13:28 -0000 1.10 +++ blacs.spec 29 Jul 2005 22:17:06 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:17:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:17:10 -0400 Subject: rpms/blacs/devel blacs.spec,1.10,1.11 Message-ID: <200507292217.j6TMHApb005580@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496/devel Modified Files: blacs.spec Log Message: You ever hear the one about a monkey, a 67 Volkswagon Bug, and a pineapple upside down cake? Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blacs.spec 29 Jul 2005 22:13:34 -0000 1.10 +++ blacs.spec 29 Jul 2005 22:17:08 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:17:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:17:09 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.10,1.11 Message-ID: <200507292217.j6TMH9YM005574@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496/FC-4 Modified Files: blacs.spec Log Message: You ever hear the one about a monkey, a 67 Volkswagon Bug, and a pineapple upside down cake? Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blacs.spec 29 Jul 2005 22:13:29 -0000 1.10 +++ blacs.spec 29 Jul 2005 22:17:07 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:23:44 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 29 Jul 2005 18:23:44 -0400 Subject: rpms/quilt/FC-4 .cvsignore, 1.3, 1.4 quilt.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507292223.j6TMNimC005800@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5740/FC-4 Modified Files: .cvsignore quilt.spec sources Log Message: Update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 17:11:45 -0000 1.3 +++ .cvsignore 29 Jul 2005 22:23:42 -0000 1.4 @@ -1 +1 @@ -quilt-0.40.tar.gz +quilt-0.42.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/quilt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- quilt.spec 7 Jun 2005 03:12:30 -0000 1.6 +++ quilt.spec 29 Jul 2005 22:23:42 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.40 -Release: 3%{?dist} +Version: 0.42 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc README README.MAIL quilt.pdf -%doc AUTHORS BUGS COPYING TODO +%doc AUTHORS COPYING TODO %{_bindir}/guards %{_bindir}/quilt %{_datadir}/quilt/ @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 29 2005 - jwboyer at jdub.homelinux.org 0.42-1 +- Update to latest upstream + * Mon Jun 6 2005 - jwboyer at jdub.homelinux.org 0.40-3 - Remove hardcoded dist tags - Bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 17:11:45 -0000 1.3 +++ sources 29 Jul 2005 22:23:42 -0000 1.4 @@ -1 +1 @@ -12305c1b114e9ca0a31980117b65a903 quilt-0.40.tar.gz +c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 22:23:45 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 29 Jul 2005 18:23:45 -0400 Subject: rpms/quilt/devel .cvsignore, 1.3, 1.4 quilt.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507292223.j6TMNjrl005808@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5740/devel Modified Files: .cvsignore quilt.spec sources Log Message: Update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 17:11:45 -0000 1.3 +++ .cvsignore 29 Jul 2005 22:23:43 -0000 1.4 @@ -1 +1 @@ -quilt-0.40.tar.gz +quilt-0.42.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- quilt.spec 7 Jun 2005 03:11:52 -0000 1.6 +++ quilt.spec 29 Jul 2005 22:23:43 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.40 -Release: 3%{?dist} +Version: 0.42 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc README README.MAIL quilt.pdf -%doc AUTHORS BUGS COPYING TODO +%doc AUTHORS COPYING TODO %{_bindir}/guards %{_bindir}/quilt %{_datadir}/quilt/ @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 29 2005 - jwboyer at jdub.homelinux.org 0.42-1 +- Update to latest upstream + * Mon Jun 6 2005 - jwboyer at jdub.homelinux.org 0.40-3 - Remove hardcoded dist tags - Bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 17:11:45 -0000 1.3 +++ sources 29 Jul 2005 22:23:43 -0000 1.4 @@ -1 +1 @@ -12305c1b114e9ca0a31980117b65a903 quilt-0.40.tar.gz +c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 22:23:43 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 29 Jul 2005 18:23:43 -0400 Subject: rpms/quilt/FC-3 .cvsignore, 1.3, 1.4 quilt.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507292224.j6TMODTH005813@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5740/FC-3 Modified Files: .cvsignore quilt.spec sources Log Message: Update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 17:16:37 -0000 1.3 +++ .cvsignore 29 Jul 2005 22:23:41 -0000 1.4 @@ -1 +1 @@ -quilt-0.40.tar.gz +quilt-0.42.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/quilt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- quilt.spec 7 Jun 2005 03:13:09 -0000 1.6 +++ quilt.spec 29 Jul 2005 22:23:41 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.40 -Release: 3%{?dist} +Version: 0.42 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc README README.MAIL quilt.pdf -%doc AUTHORS BUGS COPYING TODO +%doc AUTHORS COPYING TODO %{_bindir}/guards %{_bindir}/quilt %{_datadir}/quilt/ @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 29 2005 - jwboyer at jdub.homelinux.org 0.42-1 +- Update to latest upstream + * Mon Jun 6 2005 - jwboyer at jdub.homelinux.org 0.40-3 - Remove hardcoded dist tags - Bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 17:16:37 -0000 1.3 +++ sources 29 Jul 2005 22:23:41 -0000 1.4 @@ -1 +1 @@ -12305c1b114e9ca0a31980117b65a903 quilt-0.40.tar.gz +c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 22:27:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:27:24 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.11,1.12 Message-ID: <200507292227.j6TMRs2D005941@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894/FC-3 Modified Files: blacs.spec Log Message: ...and then the monkey says, well at least I'm not a Republican! Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blacs.spec 29 Jul 2005 22:17:06 -0000 1.11 +++ blacs.spec 29 Jul 2005 22:27:22 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc +sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:27:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:27:25 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.11,1.12 Message-ID: <200507292227.j6TMRtug005944@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894/FC-4 Modified Files: blacs.spec Log Message: ...and then the monkey says, well at least I'm not a Republican! Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blacs.spec 29 Jul 2005 22:17:07 -0000 1.11 +++ blacs.spec 29 Jul 2005 22:27:23 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc +sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:27:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:27:26 -0400 Subject: rpms/blacs/devel blacs.spec,1.11,1.12 Message-ID: <200507292227.j6TMRuFZ005947@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894/devel Modified Files: blacs.spec Log Message: ...and then the monkey says, well at least I'm not a Republican! Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blacs.spec 29 Jul 2005 22:17:08 -0000 1.11 +++ blacs.spec 29 Jul 2005 22:27:24 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc +sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From ivazquez at ivazquez.net Fri Jul 29 23:09:38 2005 From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams) Date: Fri, 29 Jul 2005 19:09:38 -0400 Subject: APPROVED: lzo2 Message-ID: <1122678578.302.7.camel@ignacio.lan> lzo2: Data compression library with very fast (de)compression LZO is a portable lossless data compression library written in ANSI C. It offers pretty fast compression and very fast decompression. Decompression requires no memory. In addition there are slower compression levels achieving a quite competitive compression ratio while still decompressing at this very high speed. Reviewer: Ignacio Vazquez-Abrams Maintainer: Alexander Dalloz -- Ignacio Vazquez-Abrams http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Fri Jul 29 23:26:41 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:26:41 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.10,1.11 Message-ID: <200507292326.j6TNQfIB007412@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7395 Modified Files: scim-anthy.spec Log Message: - prereq scim xinput.d script - count scim-ja_JP providers before removing xinput.d alternative Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-anthy.spec 29 Jul 2005 14:31:26 -0000 1.10 +++ scim-anthy.spec 29 Jul 2005 23:26:39 -0000 1.11 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -12,6 +12,8 @@ Provides: scim-ja_JP Requires: anthy BuildRequires: scim-devel anthy-devel +# for alternatives in install scripts +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim %description Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input. @@ -40,22 +42,18 @@ %post -%{_sbindir}/alternatives --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP /etc/X11/xinit/xinput.d/scim 90 +%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim 85 %postun -if [ "$1" = 0 ] -then - if ! rpm -q --whatprovides scim-ja_JP - then - %{_sbindir}/alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] - then - %{_sbindir}/alternatives --auto xinput-ja_JP - fi - fi +if [ "$1" = "0" -a `rpm -q --whatprovides scim-ja_JP 2>/dev/null | wc -l` = 1 ]; then + %{_sbindir}/alternatives --remove xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim + if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]; then + %{_sbindir}/alternatives --auto xinput-ja_JP + fi fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO @@ -64,9 +62,17 @@ %changelog +* Fri Jul 29 2005 Jens Petersen +- prereq scim xinput.d script +- count scim-ja_JP providers before removing xinput.d alternative + +* Fri Jul 29 2005 Ryo Dairiki +- add xinput.d alternatives setup in %%post and %%postun +- provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if + no other scim-ja_JP left + * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release -- add xinput-scim entry (Ryo Diairki) * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release From fedora-extras-commits at redhat.com Fri Jul 29 23:30:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:30:46 -0400 Subject: rpms/scim/FC-3 xinput-scim,1.2,1.3 Message-ID: <200507292330.j6TNUmpY007462@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7445 Modified Files: xinput-scim Log Message: really don't set XMODIFIERS in xinput.d script ;) Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/xinput-scim,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xinput-scim 20 Jun 2005 14:33:06 -0000 1.2 +++ xinput-scim 29 Jul 2005 23:30:44 -0000 1.3 @@ -1,4 +1,3 @@ -XMODIFIERS=@im=SCIM XIM=SCIM XIM_PROGRAM=scim XIM_ARGS="-d" From fedora-extras-commits at redhat.com Fri Jul 29 23:37:56 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:37:56 -0400 Subject: rpms/scim/FC-4 scim.spec,1.10,1.11 Message-ID: <200507292337.j6TNbvBm007515@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7498 Modified Files: scim.spec Log Message: - own the system xinput.d dir Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim.spec 29 Jul 2005 13:56:11 -0000 1.10 +++ scim.spec 29 Jul 2005 23:37:54 -0000 1.11 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 3%{?dist} +Release: 2.1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -95,7 +95,7 @@ %doc AUTHORS COPYING NEWS README ChangeLog TODO %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* -%{_sysconfdir}/X11/xinit/xinput.d/scim +%{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* %{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 @@ -117,7 +117,10 @@ %changelog -* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 +* Sat Jul 30 2005 Jens Petersen - 1.4.0-2.1 +- own the system xinput.d dir + +* Fri Jul 29 2005 Jens Petersen - sync with Core - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now From fedora-extras-commits at redhat.com Fri Jul 29 23:43:09 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:43:09 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.11,1.12 Message-ID: <200507292343.j6TNhANw007613@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7596 Modified Files: scim-anthy.spec Log Message: tag changelog Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-anthy.spec 29 Jul 2005 23:26:39 -0000 1.11 +++ scim-anthy.spec 29 Jul 2005 23:43:07 -0000 1.12 @@ -62,7 +62,7 @@ %changelog -* Fri Jul 29 2005 Jens Petersen +* Sat Jul 30 2005 Jens Petersen - 0.5.3-2 - prereq scim xinput.d script - count scim-ja_JP providers before removing xinput.d alternative From fedora-extras-commits at redhat.com Sat Jul 30 01:29:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:38 -0400 Subject: rpms/perl-Exporter-Lite - New directory Message-ID: <200507300129.j6U1TcpA010189@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10165/perl-Exporter-Lite Log Message: Directory /cvs/extras/rpms/perl-Exporter-Lite added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:29:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:39 -0400 Subject: rpms/perl-Exporter-Lite/devel - New directory Message-ID: <200507300129.j6U1Td4T010194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10165/perl-Exporter-Lite/devel Log Message: Directory /cvs/extras/rpms/perl-Exporter-Lite/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:29:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:54 -0400 Subject: rpms/perl-Exporter-Lite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300129.j6U1Ts7O010241@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10210 Added Files: Makefile import.log Log Message: Setup of module perl-Exporter-Lite --- NEW FILE Makefile --- # Top level Makefile for module perl-Exporter-Lite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 01:29:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:55 -0400 Subject: rpms/perl-Exporter-Lite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300129.j6U1Tt6N010246@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10210/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Exporter-Lite --- NEW 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 Jul 30 01:30:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:30:12 -0400 Subject: rpms/perl-Exporter-Lite import.log,1.1,1.2 Message-ID: <200507300130.j6U1Uhup010311@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10276 Modified Files: import.log Log Message: auto-import perl-Exporter-Lite-0.01-2 on branch devel from perl-Exporter-Lite-0.01-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Exporter-Lite/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 01:29:52 -0000 1.1 +++ import.log 30 Jul 2005 01:30:10 -0000 1.2 @@ -0,0 +1 @@ +perl-Exporter-Lite-0_01-2:HEAD:perl-Exporter-Lite-0.01-2.src.rpm:1122687067 From fedora-extras-commits at redhat.com Sat Jul 30 01:30:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:30:13 -0400 Subject: rpms/perl-Exporter-Lite/devel perl-Exporter-Lite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300130.j6U1UhRR010315@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10276/devel Modified Files: .cvsignore sources Added Files: perl-Exporter-Lite.spec Log Message: auto-import perl-Exporter-Lite-0.01-2 on branch devel from perl-Exporter-Lite-0.01-2.src.rpm --- NEW FILE perl-Exporter-Lite.spec --- Name: perl-Exporter-Lite Version: 0.01 Release: 2%{?dist} Summary: Lightweight exporting of variables Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Exporter-Lite/ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Exporter-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Exporter-Lite-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{perl_vendorlib}/Exporter %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 0.01-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.01-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exporter-Lite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 01:29:53 -0000 1.1 +++ .cvsignore 30 Jul 2005 01:30:11 -0000 1.2 @@ -0,0 +1 @@ +Exporter-Lite-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exporter-Lite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 01:29:53 -0000 1.1 +++ sources 30 Jul 2005 01:30:11 -0000 1.2 @@ -0,0 +1 @@ +e45c93513ecb22e183748592069bdaf8 Exporter-Lite-0.01.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 01:35:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:35:40 -0400 Subject: rpms/perl-SQL-Abstract/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300135.j6U1ZeUw010479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-SQL-Abstract --- NEW 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 Jul 30 01:35:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:35:39 -0400 Subject: rpms/perl-SQL-Abstract Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300135.j6U1ZdD8010474@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10447 Added Files: Makefile import.log Log Message: Setup of module perl-SQL-Abstract --- NEW FILE Makefile --- # Top level Makefile for module perl-SQL-Abstract all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 01:36:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:36:01 -0400 Subject: rpms/perl-SQL-Abstract import.log,1.1,1.2 Message-ID: <200507300136.j6U1a1g9010589@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10511 Modified Files: import.log Log Message: auto-import perl-SQL-Abstract-1.19-2 on branch devel from perl-SQL-Abstract-1.19-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 01:35:37 -0000 1.1 +++ import.log 30 Jul 2005 01:35:58 -0000 1.2 @@ -0,0 +1 @@ +perl-SQL-Abstract-1_19-2:HEAD:perl-SQL-Abstract-1.19-2.src.rpm:1122687415 From fedora-extras-commits at redhat.com Sat Jul 30 01:36:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:36:01 -0400 Subject: rpms/perl-SQL-Abstract/devel perl-SQL-Abstract.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300136.j6U1a1H2010596@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10511/devel Modified Files: .cvsignore sources Added Files: perl-SQL-Abstract.spec Log Message: auto-import perl-SQL-Abstract-1.19-2 on branch devel from perl-SQL-Abstract-1.19-2.src.rpm --- NEW FILE perl-SQL-Abstract.spec --- Name: perl-SQL-Abstract Version: 1.19 Release: 2%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/SQL-Abstract Source0: http://search.cpan.org/CPAN/authors/id/N/NW/NWIGER/SQL-Abstract-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n SQL-Abstract-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/SQL %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 1.19-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.19-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 01:35:38 -0000 1.1 +++ .cvsignore 30 Jul 2005 01:35:59 -0000 1.2 @@ -0,0 +1 @@ +SQL-Abstract-1.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 01:35:38 -0000 1.1 +++ sources 30 Jul 2005 01:35:59 -0000 1.2 @@ -0,0 +1 @@ +d0e937d2f7781ed56c4ba855ee4ab47a SQL-Abstract-1.19.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 01:38:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:04 -0400 Subject: rpms/perl-Test-MockModule - New directory Message-ID: <200507300138.j6U1c4sT010989@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965/perl-Test-MockModule Log Message: Directory /cvs/extras/rpms/perl-Test-MockModule added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:38:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:04 -0400 Subject: rpms/perl-Test-MockModule/devel - New directory Message-ID: <200507300138.j6U1c4kP010994@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965/perl-Test-MockModule/devel Log Message: Directory /cvs/extras/rpms/perl-Test-MockModule/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:38:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:20 -0400 Subject: rpms/perl-Test-MockModule Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300138.j6U1cKmR011041@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11010 Added Files: Makefile import.log Log Message: Setup of module perl-Test-MockModule --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-MockModule all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 01:38:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:21 -0400 Subject: rpms/perl-Test-MockModule/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300138.j6U1cLYc011046@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11010/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-MockModule --- NEW 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 Jul 30 01:38:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:43 -0400 Subject: rpms/perl-Test-MockModule import.log,1.1,1.2 Message-ID: <200507300139.j6U1dERQ011108@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074 Modified Files: import.log Log Message: auto-import perl-Test-MockModule-0.05-3 on branch devel from perl-Test-MockModule-0.05-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockModule/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 01:38:18 -0000 1.1 +++ import.log 30 Jul 2005 01:38:41 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-MockModule-0_05-3:HEAD:perl-Test-MockModule-0.05-3.src.rpm:1122687578 From fedora-extras-commits at redhat.com Sat Jul 30 01:38:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:44 -0400 Subject: rpms/perl-Test-MockModule/devel perl-Test-MockModule.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300139.j6U1dEu9011110@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/devel Modified Files: .cvsignore sources Added Files: perl-Test-MockModule.spec Log Message: auto-import perl-Test-MockModule-0.05-3 on branch devel from perl-Test-MockModule-0.05-3.src.rpm --- NEW FILE perl-Test-MockModule.spec --- Name: perl-Test-MockModule Version: 0.05 Release: 3%{?dist} Summary: Override subroutines in a module for unit testing Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockModule/ Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Test-MockModule-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Test %{_mandir}/man3/*.3* %changelog * Wed Jul 27 2005 Tom "spot" Callaway 0.05-3 - add missing BuildRequires * 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-Test-MockModule/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 01:38:19 -0000 1.1 +++ .cvsignore 30 Jul 2005 01:38:42 -0000 1.2 @@ -0,0 +1 @@ +Test-MockModule-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockModule/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 01:38:19 -0000 1.1 +++ sources 30 Jul 2005 01:38:42 -0000 1.2 @@ -0,0 +1 @@ +1b013aeeb221f83e7f325a2f98169296 Test-MockModule-0.05.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 01:45:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:45:20 -0400 Subject: owners owners.list,1.38,1.39 Message-ID: <200507300145.j6U1jKFn011362@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11341 Modified Files: owners.list Log Message: Add new entries for perl-Exporter-Lite, perl-SQL-Abstract, perl-Test-MockModule Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- owners.list 29 Jul 2005 17:25:23 -0000 1.38 +++ owners.list 30 Jul 2005 01:45:18 -0000 1.39 @@ -527,6 +527,7 @@ Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|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-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 @@ -588,6 +589,7 @@ 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-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-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -597,6 +599,7 @@ 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-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Memory-Cycle|Check for memory leaks and circular memory references|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Jul 30 02:31:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 22:31:38 -0400 Subject: rpms/blacs/devel blacs.spec,1.12,1.13 Message-ID: <200507300231.j6U2VcSr012945@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898/devel Modified Files: blacs.spec Log Message: ppc hack not needed. Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blacs.spec 29 Jul 2005 22:27:24 -0000 1.12 +++ blacs.spec 30 Jul 2005 02:31:36 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,11 +54,6 @@ cp -f %{SOURCE2} . %endif -# I'm not sure why ppc is different here. :/ -%ifarch ppc -sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc -%endif - %build cd BLACS/ make mpi @@ -112,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 +- remove ppc hack + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ From fedora-extras-commits at redhat.com Sat Jul 30 02:31:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 22:31:32 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.12,1.13 Message-ID: <200507300232.j6U2W2GG012948@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898/FC-3 Modified Files: blacs.spec Log Message: ppc hack not needed. Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blacs.spec 29 Jul 2005 22:27:22 -0000 1.12 +++ blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,11 +54,6 @@ cp -f %{SOURCE2} . %endif -# I'm not sure why ppc is different here. :/ -%ifarch ppc -sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc -%endif - %build cd BLACS/ make mpi @@ -112,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 +- remove ppc hack + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ From fedora-extras-commits at redhat.com Sat Jul 30 02:31:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 22:31:32 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.12,1.13 Message-ID: <200507300232.j6U2W2s2012951@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898/FC-4 Modified Files: blacs.spec Log Message: ppc hack not needed. Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blacs.spec 29 Jul 2005 22:27:23 -0000 1.12 +++ blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,11 +54,6 @@ cp -f %{SOURCE2} . %endif -# I'm not sure why ppc is different here. :/ -%ifarch ppc -sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc -%endif - %build cd BLACS/ make mpi @@ -112,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 +- remove ppc hack + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ From jpo at di.uminho.pt Sat Jul 30 02:45:26 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 30 Jul 2005 03:45:26 +0100 Subject: APPROVED: perl-Lingua-EN-Inflect Message-ID: <42EAE9C6.3050905@di.uminho.pt> Name : perl-Lingua-EN-Inflect Version : 1.89 Release : 3 Summary : Convert singular to plural, select "a" or "an" Maintainer: Tom "spot" Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Sat Jul 30 02:46:54 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 30 Jul 2005 03:46:54 +0100 Subject: APPROVED: perl-Lingua-EN-Inflect-Number Message-ID: <42EAEA1E.2050605@di.uminho.pt> Name : perl-Lingua-EN-Inflect-Number Version : 1.1 Release : 3 Summary : Force number of words to singular or plural Maintainer: Tom "spot" Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Sat Jul 30 03:08:06 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 30 Jul 2005 04:08:06 +0100 Subject: APPROVED: perl-CGI-Simple Message-ID: <42EAEF16.1090807@di.uminho.pt> Name : perl-CGI-Simple Version : 0.077 Release : 3 Summary : Simple totally OO CGI interface that is CGI.pm compliant Maintainer: Tom "spot" Callaway Reviewer: Jose Pedro Oliveira -- 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 Jul 30 03:09:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:03 -0400 Subject: rpms/perl-CGI-Simple - New directory Message-ID: <200507300309.j6U393UR014218@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14194/perl-CGI-Simple Log Message: Directory /cvs/extras/rpms/perl-CGI-Simple added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:09:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:04 -0400 Subject: rpms/perl-CGI-Simple/devel - New directory Message-ID: <200507300309.j6U394mc014223@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-serv14194/perl-CGI-Simple/devel Log Message: Directory /cvs/extras/rpms/perl-CGI-Simple/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:09:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:15 -0400 Subject: rpms/perl-CGI-Simple Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300309.j6U39F3n014273@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14239 Added Files: Makefile import.log Log Message: Setup of module perl-CGI-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-CGI-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Jul 30 03:09:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:15 -0400 Subject: rpms/perl-CGI-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300309.j6U39FSE014272@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-serv14239/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CGI-Simple --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 30 03:09:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:36 -0400 Subject: rpms/perl-CGI-Simple import.log,1.1,1.2 Message-ID: <200507300309.j6U39abg014334@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14303 Modified Files: import.log Log Message: auto-import perl-CGI-Simple-0.077-4 on branch devel from perl-CGI-Simple-0.077-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 03:09:12 -0000 1.1 +++ import.log 30 Jul 2005 03:09:34 -0000 1.2 @@ -0,0 +1 @@ +perl-CGI-Simple-0_077-4:HEAD:perl-CGI-Simple-0.077-4.src.rpm:1122693031 From fedora-extras-commits at redhat.com Sat Jul 30 03:09:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:36 -0400 Subject: rpms/perl-CGI-Simple/devel perl-CGI-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300309.j6U39aGD014341@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-serv14303/devel Modified Files: .cvsignore sources Added Files: perl-CGI-Simple.spec Log Message: auto-import perl-CGI-Simple-0.077-4 on branch devel from perl-CGI-Simple-0.077-4.src.rpm --- NEW FILE perl-CGI-Simple.spec --- Name: perl-CGI-Simple Version: 0.077 Release: 4%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Cgi-Simple/ Source0: http://search.cpan.org/CPAN/authors/id/J/JF/JFREEMAN/Cgi-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x * Wed Jul 27 2005 Tom "spot" Callaway 0.077-3 - add missing documentation - fix URL * Fri Jul 8 2005 Tom "spot" Callaway 0.077-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.077-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 03:09:13 -0000 1.1 +++ .cvsignore 30 Jul 2005 03:09:34 -0000 1.2 @@ -0,0 +1 @@ +Cgi-Simple-0.077.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 03:09:13 -0000 1.1 +++ sources 30 Jul 2005 03:09:34 -0000 1.2 @@ -0,0 +1 @@ +5b947fe84b30a2c8ed050550f73b39a9 Cgi-Simple-0.077.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 03:11:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:11:48 -0400 Subject: rpms/perl-Lingua-EN-Inflect - New directory Message-ID: <200507300311.j6U3Bm4r014442@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14418/perl-Lingua-EN-Inflect Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:11:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:11:49 -0400 Subject: rpms/perl-Lingua-EN-Inflect/devel - New directory Message-ID: <200507300311.j6U3Bnns014447@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14418/perl-Lingua-EN-Inflect/devel Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:12:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:00 -0400 Subject: rpms/perl-Lingua-EN-Inflect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300312.j6U3C0x7014494@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14463 Added Files: Makefile import.log Log Message: Setup of module perl-Lingua-EN-Inflect --- NEW FILE Makefile --- # Top level Makefile for module perl-Lingua-EN-Inflect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 03:12:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:01 -0400 Subject: rpms/perl-Lingua-EN-Inflect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300312.j6U3C1pk014499@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14463/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Lingua-EN-Inflect --- NEW 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 Jul 30 03:12:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:22 -0400 Subject: rpms/perl-Lingua-EN-Inflect import.log,1.1,1.2 Message-ID: <200507300312.j6U3CNDN014561@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527 Modified Files: import.log Log Message: auto-import perl-Lingua-EN-Inflect-1.89-3 on branch devel from perl-Lingua-EN-Inflect-1.89-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 03:11:58 -0000 1.1 +++ import.log 30 Jul 2005 03:12:20 -0000 1.2 @@ -0,0 +1 @@ +perl-Lingua-EN-Inflect-1_89-3:HEAD:perl-Lingua-EN-Inflect-1.89-3.src.rpm:1122693197 From fedora-extras-commits at redhat.com Sat Jul 30 03:12:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:23 -0400 Subject: rpms/perl-Lingua-EN-Inflect/devel perl-Lingua-EN-Inflect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300312.j6U3CNpp014563@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527/devel Modified Files: .cvsignore sources Added Files: perl-Lingua-EN-Inflect.spec Log Message: auto-import perl-Lingua-EN-Inflect-1.89-3 on branch devel from perl-Lingua-EN-Inflect-1.89-3.src.rpm --- NEW FILE perl-Lingua-EN-Inflect.spec --- Name: perl-Lingua-EN-Inflect Version: 1.89 Release: 3%{?dist} Summary: Convert singular to plural, select "a" or "an" Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Lingua-EN-Inflect/ Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Lingua-EN-Inflect-%{version} chmod -x Changes README lib/Lingua/EN/Inflect.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Lingua/ %{_mandir}/man3/*.3* %changelog * Fri Jul 29 2005 Tom "spot" Callaway 1.89-3 - chmod -x files that don't need to be executable (hooray upstream) - own Lingua directory correctly * Fri Jul 8 2005 Tom "spot" Callaway 1.89-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.89-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 03:11:59 -0000 1.1 +++ .cvsignore 30 Jul 2005 03:12:21 -0000 1.2 @@ -0,0 +1 @@ +Lingua-EN-Inflect-1.89.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 03:11:59 -0000 1.1 +++ sources 30 Jul 2005 03:12:21 -0000 1.2 @@ -0,0 +1 @@ +ca864087a32754a8185d30fa677121ea Lingua-EN-Inflect-1.89.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 03:13:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:34 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number - New directory Message-ID: <200507300313.j6U3DYuN015004@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14981/perl-Lingua-EN-Inflect-Number Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:13:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:34 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number/devel - New directory Message-ID: <200507300313.j6U3DYJX015009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14981/perl-Lingua-EN-Inflect-Number/devel Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:13:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:49 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200507300313.j6U3DnCs015060@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15029 Added Files: Makefile import.log Log Message: Setup of module perl-Lingua-EN-Inflect-Number --- NEW FILE Makefile --- # Top level Makefile for module perl-Lingua-EN-Inflect-Number all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 03:13:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:50 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300313.j6U3Dolj015065@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15029/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Lingua-EN-Inflect-Number --- NEW 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 Jul 30 03:14:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:14:15 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number import.log,1.1,1.2 Message-ID: <200507300314.j6U3EjiU015137@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15096 Modified Files: import.log Log Message: auto-import perl-Lingua-EN-Inflect-Number-1.1-3 on branch devel from perl-Lingua-EN-Inflect-Number-1.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 03:13:47 -0000 1.1 +++ import.log 30 Jul 2005 03:14:13 -0000 1.2 @@ -0,0 +1 @@ +perl-Lingua-EN-Inflect-Number-1_1-3:HEAD:perl-Lingua-EN-Inflect-Number-1.1-3.src.rpm:1122693307 From fedora-extras-commits at redhat.com Sat Jul 30 03:14:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:14:15 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number/devel perl-Lingua-EN-Inflect-Number.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300314.j6U3El9L015141@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15096/devel Modified Files: .cvsignore sources Added Files: perl-Lingua-EN-Inflect-Number.spec Log Message: auto-import perl-Lingua-EN-Inflect-Number-1.1-3 on branch devel from perl-Lingua-EN-Inflect-Number-1.1-3.src.rpm --- NEW FILE perl-Lingua-EN-Inflect-Number.spec --- Name: perl-Lingua-EN-Inflect-Number Version: 1.1 Release: 3%{?dist} Summary: Force number of words to singular or plural Group: Development/Libraries License: Distributable #License: GPL or Artistic URL: http://search.cpan.org/dist/Lingua-EN-Inflect-Number/ Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Lingua::EN::Inflect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Lingua-EN-Inflect-Number-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Lingua/EN/Inflect %{_mandir}/man3/*.3* %changelog * Fri Jul 29 2005 Tom "spot" Callaway 1.1-3 - remove superfluous Requires: perl(Lingua::EN::Inflect) - set License to Distributable until we know better * Fri Jul 8 2005 Tom "spot" Callaway 1.1-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.1-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 03:13:48 -0000 1.1 +++ .cvsignore 30 Jul 2005 03:14:13 -0000 1.2 @@ -0,0 +1 @@ +Lingua-EN-Inflect-Number-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 03:13:48 -0000 1.1 +++ sources 30 Jul 2005 03:14:13 -0000 1.2 @@ -0,0 +1 @@ +bcee940ef603da93e7da11d8eecad409 Lingua-EN-Inflect-Number-1.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 03:17:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:17:44 -0400 Subject: owners owners.list,1.39,1.40 Message-ID: <200507300317.j6U3HiFB015339@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322 Modified Files: owners.list Log Message: perl-CGI-Simple, perl-Lingua-EN-Inflect, perl-Lingua-EN-Inflect-Number Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- owners.list 30 Jul 2005 01:45:18 -0000 1.39 +++ owners.list 30 Jul 2005 03:17:42 -0000 1.40 @@ -511,6 +511,7 @@ Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-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-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-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org| 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 @@ -562,6 +563,8 @@ Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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-Mail-Alias|For bugs related to the perl-Mail-Alias component|anvil at livna.org|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-MailTools|MailTools 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 Sat Jul 30 04:14:24 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 30 Jul 2005 00:14:24 -0400 Subject: common tobuild,1.2163,1.2164 Message-ID: <200507300414.j6U4EOp2016851@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16834 Modified Files: tobuild Log Message: request build of rpms/proj/FC-4 proj-4_4_9-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2163 retrieving revision 1.2164 diff -u -r1.2163 -r1.2164 --- tobuild 29 Jul 2005 17:24:12 -0000 1.2163 +++ tobuild 30 Jul 2005 04:14:22 -0000 1.2164 @@ -59,3 +59,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 +smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 30 04:30:48 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 30 Jul 2005 00:30:48 -0400 Subject: common tobuild,1.2164,1.2165 Message-ID: <200507300430.j6U4UmHk016962@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16948 Modified Files: tobuild Log Message: Remove proj for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2164 retrieving revision 1.2165 diff -u -r1.2164 -r1.2165 --- tobuild 30 Jul 2005 04:14:22 -0000 1.2164 +++ tobuild 30 Jul 2005 04:30:46 -0000 1.2165 @@ -15,7 +15,6 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel -smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 30 06:12:24 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 02:12:24 -0400 Subject: rpms/scim/FC-4 scim.spec,1.11,1.12 Message-ID: <200507300612.j6U6COEA019353@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19336 Modified Files: scim.spec Log Message: disable ld verion script Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim.spec 29 Jul 2005 23:37:54 -0000 1.11 +++ scim.spec 30 Jul 2005 06:12:22 -0000 1.12 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 2.1%{?dist} +Release: 2.2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -43,7 +43,8 @@ %build -%configure --disable-static --disable-ld-version-script +%configure --disable-static +# --disable-ld-version-script make %{?_smp_mflags} @@ -117,6 +118,9 @@ %changelog +* Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.2 +- disable ld-version-script, which used to enabled due to broken configure file + * Sat Jul 30 2005 Jens Petersen - 1.4.0-2.1 - own the system xinput.d dir From fedora-extras-commits at redhat.com Sat Jul 30 06:13:08 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 02:13:08 -0400 Subject: rpms/scim/FC-3 scim.spec,1.9,1.10 Message-ID: <200507300613.j6U6D8JZ019376@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19359 Modified Files: scim.spec Log Message: disable ld version script Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim.spec 29 Jul 2005 13:55:49 -0000 1.9 +++ scim.spec 30 Jul 2005 06:13:06 -0000 1.10 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 3%{?dist} +Release: 2.2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -43,7 +43,8 @@ %build -%configure --disable-static --disable-ld-version-script +%configure --disable-static +# --disable-ld-version-script make %{?_smp_mflags} @@ -95,7 +96,7 @@ %doc AUTHORS COPYING NEWS README ChangeLog TODO %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* -%{_sysconfdir}/X11/xinit/xinput.d/scim +%{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* %{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 @@ -117,7 +118,13 @@ %changelog -* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 +* Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.2 +- disable ld-version-script, which used to enabled due to broken configure file + +* Sat Jul 30 2005 Jens Petersen - 1.4.0-2.1 +- own the system xinput.d dir + +* Fri Jul 29 2005 Jens Petersen - sync with Core - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now From fedora-extras-commits at redhat.com Sat Jul 30 06:50:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 02:50:13 -0400 Subject: rpms/glunarclock/FC-4 glunarclock-0.32.4-bug149711.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.7, 1.8 sources, 1.4, 1.5 glunarclock-0.32.2-i18n_macro.patch, 1.1, NONE glunarclock-configure.in.patch, 1.1, NONE Message-ID: <200507300650.j6U6oDgD019502@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19478 Modified Files: .cvsignore glunarclock.spec sources Added Files: glunarclock-0.32.4-bug149711.patch Removed Files: glunarclock-0.32.2-i18n_macro.patch glunarclock-configure.in.patch Log Message: sync with devel update/fix glunarclock-0.32.4-bug149711.patch: --- NEW FILE glunarclock-0.32.4-bug149711.patch --- diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c --- glunarclock-0.32.4-orig/src/glunarclock.c 2005-04-06 12:51:29.000000000 +0200 +++ glunarclock-0.32.4/src/glunarclock.c 2005-07-25 00:39:56.000000000 +0200 @@ -154,14 +154,14 @@ gtk_toggle_button_get_active (toggle), NULL); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_dialog (GtkWidget *widget, MoonApplet *moon) { diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c --- glunarclock-0.32.4-orig/src/moondata.c 2005-01-04 18:28:43.000000000 +0100 +++ glunarclock-0.32.4/src/moondata.c 2005-07-25 00:39:55.000000000 +0200 @@ -219,14 +219,14 @@ mod_time(&moondata.LAT); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_data_dialog (GtkWidget *widget, MoonApplet *moon) { @@ -280,10 +280,10 @@ /* gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */ /* format_time(buf, size, moondata.NewMoon*24.0); */ - g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon); + g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon); gtk_label_set_text(GTK_LABEL(mw.flm), buf); - g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon)); + g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon)); gtk_label_set_text(GTK_LABEL(mw.nwm), buf); /* g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2005 16:42:01 -0000 1.4 +++ .cvsignore 30 Jul 2005 06:50:11 -0000 1.5 @@ -1,2 +1,2 @@ glunarclock-0.32.2-autoreconf.patch.bz2 -glunarclock-0.32.2.tar.gz +glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/glunarclock.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- glunarclock.spec 15 Apr 2005 00:38:26 -0000 1.7 +++ glunarclock.spec 30 Jul 2005 06:50:11 -0000 1.8 @@ -1,14 +1,12 @@ Name: glunarclock -Version: 0.32.2 -Release: 4 +Version: 0.32.4 +Release: 1%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz -Patch0: glunarclock-configure.in.patch -Patch1: glunarclock-0.32.2-autoreconf.patch.bz2 +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch2: glunarclock-0.32.2-i18n_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,12 +31,6 @@ %prep %setup -q -%ifarch x86_64 -# patch0 is normally only needed if you want to recreate patch1 -%patch0 -# was created after autoreconf -f -i and removing autom4te.cache/ -%patch1 -p1 -%endif %patch2 -p1 -b .i18n_macro %build @@ -95,6 +87,12 @@ %changelog +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-1 +- Update to 0.32.4. +- Fix compiler warnings bug #149711. +- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether + they are still needed. + * Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 - Add patch2 to fix build for FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 16:42:01 -0000 1.4 +++ sources 30 Jul 2005 06:50:11 -0000 1.5 @@ -1,2 +1,2 @@ 3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 -3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz +63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz --- glunarclock-0.32.2-i18n_macro.patch DELETED --- --- glunarclock-configure.in.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 30 06:51:21 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 02:51:21 -0400 Subject: rpms/glunarclock/devel glunarclock.spec,1.8,1.9 Message-ID: <200507300651.j6U6pLFo019563@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546 Modified Files: glunarclock.spec Log Message: Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- glunarclock.spec 24 Jul 2005 23:14:59 -0000 1.8 +++ glunarclock.spec 30 Jul 2005 06:51:18 -0000 1.9 @@ -7,8 +7,6 @@ License: GPL URL: http://glunarclock.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Patch0: glunarclock-configure.in.patch -#Patch1: glunarclock-0.32.2-autoreconf.patch.bz2 Patch2: glunarclock-0.32.2-i18n_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,12 +31,6 @@ %prep %setup -q -#%ifarch x86_64 -# patch0 is normally only needed if you want to recreate patch1 -#%patch0 -# was created after autoreconf -f -i and removing autom4te.cache/ -#%patch1 -p1 -#%endif %patch2 -p1 -b .i18n_macro %build From fedora-extras-commits at redhat.com Sat Jul 30 07:02:09 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 03:02:09 -0400 Subject: common tobuild,1.2165,1.2166 Message-ID: <200507300702.j6U72Wh0020765@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20748 Modified Files: tobuild Log Message: request build of rpms/scim/FC-4 scim-1_4_0-2_2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2165 retrieving revision 1.2166 diff -u -r1.2165 -r1.2166 --- tobuild 30 Jul 2005 04:30:46 -0000 1.2165 +++ tobuild 30 Jul 2005 07:02:04 -0000 1.2166 @@ -59,3 +59,4 @@ ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 +ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 30 07:04:58 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 03:04:58 -0400 Subject: common tobuild,1.2166,1.2167 Message-ID: <200507300705.j6U75ScD020799@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20782 Modified Files: tobuild Log Message: request build of rpms/scim/FC-3 scim-1_4_0-2_2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2166 retrieving revision 1.2167 diff -u -r1.2166 -r1.2167 --- tobuild 30 Jul 2005 07:02:04 -0000 1.2166 +++ tobuild 30 Jul 2005 07:04:56 -0000 1.2167 @@ -60,3 +60,4 @@ ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 +ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 30 07:18:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 03:18:30 -0400 Subject: rpms/glunarclock/FC-4 glunarclock-0.32.2-i18n_macro.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 glunarclock.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200507300718.j6U7IU0Q020878@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20852 Modified Files: .cvsignore glunarclock.spec sources Added Files: glunarclock-0.32.2-i18n_macro.patch Log Message: put back a needed patch glunarclock-0.32.2-i18n_macro.patch: Index: glunarclock-0.32.2-i18n_macro.patch =================================================================== RCS file: glunarclock-0.32.2-i18n_macro.patch diff -N glunarclock-0.32.2-i18n_macro.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ glunarclock-0.32.2-i18n_macro.patch 30 Jul 2005 07:18:28 -0000 1.3 @@ -0,0 +1,11 @@ +diff -Nur glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c glunarclock-0.32.2/screen-exec/egg-screen-help.c +--- glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c 2003-03-10 13:02:08.000000000 +0100 ++++ glunarclock-0.32.2/screen-exec/egg-screen-help.c 2005-04-15 02:29:09.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Jul 2005 06:50:11 -0000 1.5 +++ .cvsignore 30 Jul 2005 07:18:28 -0000 1.6 @@ -1,2 +1 @@ -glunarclock-0.32.2-autoreconf.patch.bz2 glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/glunarclock.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- glunarclock.spec 30 Jul 2005 06:50:11 -0000 1.8 +++ glunarclock.spec 30 Jul 2005 07:18:28 -0000 1.9 @@ -1,13 +1,14 @@ Name: glunarclock Version: 0.32.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch2: glunarclock-0.32.2-i18n_macro.patch +Patch0: glunarclock-0.32.2-i18n_macro.patch +Patch1: glunarclock-0.32.4-bug149711.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -31,7 +32,9 @@ %prep %setup -q -%patch2 -p1 -b .i18n_macro +%patch0 -p1 -b .i18n_macro +%patch1 -p1 -b .bug149711 + %build %configure @@ -87,11 +90,10 @@ %changelog -* Mon Jul 25 2005 Michael Schwendt - 0.32.4-1 +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 - Update to 0.32.4. - Fix compiler warnings bug #149711. -- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether - they are still needed. +- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2). * Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 - Add patch2 to fix build for FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Jul 2005 06:50:11 -0000 1.5 +++ sources 30 Jul 2005 07:18:28 -0000 1.6 @@ -1,2 +1 @@ -3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 07:19:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 03:19:38 -0400 Subject: rpms/glunarclock/devel .cvsignore, 1.5, 1.6 glunarclock.spec, 1.9, 1.10 sources, 1.5, 1.6 glunarclock-configure.in.patch, 1.1, NONE Message-ID: <200507300719.j6U7JcPC020953@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20932 Modified Files: .cvsignore glunarclock.spec sources Removed Files: glunarclock-configure.in.patch Log Message: put back a needed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Jul 2005 23:14:59 -0000 1.5 +++ .cvsignore 30 Jul 2005 07:19:36 -0000 1.6 @@ -1,2 +1 @@ -glunarclock-0.32.2-autoreconf.patch.bz2 glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glunarclock.spec 30 Jul 2005 06:51:18 -0000 1.9 +++ glunarclock.spec 30 Jul 2005 07:19:36 -0000 1.10 @@ -1,13 +1,14 @@ Name: glunarclock Version: 0.32.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch2: glunarclock-0.32.2-i18n_macro.patch +Patch0: glunarclock-0.32.2-i18n_macro.patch +Patch1: glunarclock-0.32.4-bug149711.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -31,7 +32,9 @@ %prep %setup -q -%patch2 -p1 -b .i18n_macro +%patch0 -p1 -b .i18n_macro +%patch1 -p1 -b .bug149711 + %build %configure @@ -87,11 +90,10 @@ %changelog -* Mon Jul 25 2005 Michael Schwendt - 0.32.4-1 +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 - Update to 0.32.4. - Fix compiler warnings bug #149711. -- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether - they are still needed. +- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2). * Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 - Add patch2 to fix build for FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Jul 2005 23:14:59 -0000 1.5 +++ sources 30 Jul 2005 07:19:36 -0000 1.6 @@ -1,2 +1 @@ -3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz --- glunarclock-configure.in.patch DELETED --- From jwboyer at jdub.homelinux.org Sat Jul 30 13:04:37 2005 From: jwboyer at jdub.homelinux.org (Josh Boyer) Date: Sat, 30 Jul 2005 08:04:37 -0500 Subject: common tobuild,1.2163,1.2164 In-Reply-To: <200507300414.j6U4EOp2016851@cvs-int.fedora.redhat.com> References: <200507300414.j6U4EOp2016851@cvs-int.fedora.redhat.com> Message-ID: <1122728677.4755.9.camel@yoda.jdub.homelinux.org> On Sat, 2005-07-30 at 00:14 -0400, Shawn McCann wrote: > Author: smccann > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16834 > > Modified Files: > tobuild > Log Message: > request build of rpms/proj/FC-4 proj-4_4_9-1_fc4 for fc4 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2163 > retrieving revision 1.2164 > diff -u -r1.2163 -r1.2164 > --- tobuild 29 Jul 2005 17:24:12 -0000 1.2163 > +++ tobuild 30 Jul 2005 04:14:22 -0000 1.2164 > @@ -59,3 +59,4 @@ > ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 > ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel > ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 > +smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 The tobuild file no longer works. Please use 'make plague' after reading: http://www.fedoraproject.org/wiki/Extras/BuildSystemClientSetup josh From fedora-extras-commits at redhat.com Sat Jul 30 13:49:47 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 09:49:47 -0400 Subject: rpms/scim/FC-4 .cvsignore,1.3,1.4 Message-ID: <200507301349.j6UDnlft028781@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28764 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 May 2005 01:35:21 -0000 1.3 +++ .cvsignore 30 Jul 2005 13:49:44 -0000 1.4 @@ -1 +1,2 @@ scim-1.2.3.tar.gz +update-scim-locale From fedora-extras-commits at redhat.com Sat Jul 30 13:51:17 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 09:51:17 -0400 Subject: rpms/scim/FC-4 .cvsignore,1.4,1.5 Message-ID: <200507301351.j6UDpLxf028816@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28799 Modified Files: .cvsignore Log Message: Add update-scim-locale script Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jul 2005 13:49:44 -0000 1.4 +++ .cvsignore 30 Jul 2005 13:51:15 -0000 1.5 @@ -1,2 +1 @@ scim-1.2.3.tar.gz -update-scim-locale From fedora-extras-commits at redhat.com Sat Jul 30 14:29:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:29:02 -0400 Subject: rpms/scim/FC-4 update-xinput-scim,NONE,1.1 scim.spec,1.12,1.13 Message-ID: <200507301429.j6UET2xh030111@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30093 Modified Files: scim.spec Added Files: update-xinput-scim Log Message: Import update-xinput-scim --- NEW FILE update-xinput-scim --- #!/usr/bin/python # please someone put good comments on this script. import os, sys, re alternatives_bin = "/usr/sbin/alternatives" locale_bin = "locale" readlink_bin = "readlink" rpm_bin = "rpm" sysconf_dir = "/etc" alternatives_dir = sysconf_dir + "/alternatives" xinput_dir = sysconf_dir + "/X11/xinit/xinput.d" xinput_scim = xinput_dir + "/scim" default_priority = 85 # FIXME I'm not sure if this is correct valid_locale_pattern = re.compile("^[a-z][a-z]_[A-Z][A-Z]$") script_name = "update-scim-locale" authorization_rejected_message = script_name + ": you must be root to run this script" invalid_locale_message = script_name + ": invalid locale" too_few_arguments_message = script_name + ": too few arguments" unknwon_command_message = script_name + ": unknown command" # FIXME authorization_rejected_returncode = 1 invalid_locale_returncode = 2 too_few_arguments_returncode = 3 unknwon_command_returncode = 4 locales = [] def check_authorization(): uid = os.getuid() if uid != 0: print authorization_rejected_message sys.exit(authorization_rejected_returncode) def load_locales(): (fi, fo) = os.popen2(locale_bin + " --all") for locale in fo: locale = locale.strip() if valid_locale_pattern.match(locale) and not locale in locales: locales.append(locale) fi.close() fo.close() def check_locale(locale): if len(locales) == 0: load_locales() if not locale in locales: print invalid_locale_message + " :" + locale sys.exit(invalid_locale_returncode) def install_alternative(locale, priority): check_locale(locale) if priority == -1: priority = default_priority xinput_locale = "xinput-" + locale os.system(alternatives_bin + " --install %s/%s %s " %(xinput_dir, locale, xinput_locale) + xinput_scim + " %s" %priority) def remove_alternative(locale): check_locale(locale) scim_locale = "scim-" + locale xinput_locale = "xinput-" + locale (fi, fo) = os.popen2(rpm_bin + " -q --whatprovides " + scim_locale + " 2>/dev/null | wc -l") input_method_count = int(fo.readline()) fi.close() fo.close() if input_method_count <= 1: # there is no more input method for this locale os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim) # check the current input method (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) current_xinput = fo.readline() fi.close() fo.close() if current_xinput == xinput_scim: # change the input method, as scim won't support this locale anymore. os.system(alternatives_bin + " --auto " + xinput_locale) # FIXME def main(): args = sys.argv if len(args) == 1: print too_few_arguments_message sys.exit(too_few_arguments_returncode) if args[1] == "install": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] if len(args) >= 4: priority = args[3] else: priority = -1 install_alternative(locale, priority) elif args[1] == "remove": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] remove_alternative(locale) else: print unknown_command_message + ": " + args[1] sys.exit(unknwon_command_returncode) # main check_authorization() main() Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim.spec 30 Jul 2005 06:12:22 -0000 1.12 +++ scim.spec 30 Jul 2005 14:28:59 -0000 1.13 @@ -9,6 +9,7 @@ URL: http://www.scim-im.org/ Source0: http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz Source1: xinput-scim +Source2: update-xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: %{_bindir}/update-gtk-immodules @@ -72,6 +73,9 @@ mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim +# install update-xinput-scim script. +install -pm 644 ${SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim + %find_lang %{name} @@ -118,6 +122,9 @@ %changelog +* Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.3 +- add update-xinput-scim + * Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.2 - disable ld-version-script, which used to enabled due to broken configure file From fedora-extras-commits at redhat.com Sat Jul 30 14:29:43 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:29:43 -0400 Subject: rpms/scim/FC-4 scim.spec,1.13,1.14 Message-ID: <200507301429.j6UEThJI030135@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30118 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scim.spec 30 Jul 2005 14:28:59 -0000 1.13 +++ scim.spec 30 Jul 2005 14:29:41 -0000 1.14 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 2.2%{?dist} +Release: 2.3%{?dist} Summary: Smart Common Input Method platform License: LGPL From fedora-extras-commits at redhat.com Sat Jul 30 14:47:52 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:47:52 -0400 Subject: rpms/scim/FC-4 scim.spec,1.14,1.15 Message-ID: <200507301447.j6UElqlN030189@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim.spec 30 Jul 2005 14:29:41 -0000 1.14 +++ scim.spec 30 Jul 2005 14:47:50 -0000 1.15 @@ -74,7 +74,7 @@ install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim # install update-xinput-scim script. -install -pm 644 ${SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim +install -pm 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim %find_lang %{name} From fedora-extras-commits at redhat.com Sat Jul 30 14:56:37 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:56:37 -0400 Subject: rpms/scim/FC-4 scim.spec,1.15,1.16 Message-ID: <200507301456.j6UEub3D030230@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30210 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim.spec 30 Jul 2005 14:47:50 -0000 1.15 +++ scim.spec 30 Jul 2005 14:56:35 -0000 1.16 @@ -74,7 +74,7 @@ install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim # install update-xinput-scim script. -install -pm 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim +install -pm 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim %find_lang %{name} From fedora-extras-commits at redhat.com Sat Jul 30 14:58:10 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:58:10 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.12,1.13 Message-ID: <200507301458.j6UEwAW5030262@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245 Modified Files: scim-anthy.spec Log Message: Modify to use update-xinput-scim script Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-anthy.spec 29 Jul 2005 23:43:07 -0000 1.12 +++ scim-anthy.spec 30 Jul 2005 14:58:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -42,15 +42,12 @@ %post -%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim 85 +%{_libdir}/scim-1.0/update-xinput-scim install ja_JP %postun -if [ "$1" = "0" -a `rpm -q --whatprovides scim-ja_JP 2>/dev/null | wc -l` = 1 ]; then - %{_sbindir}/alternatives --remove xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]; then - %{_sbindir}/alternatives --auto xinput-ja_JP - fi +if [ "$1" = "0"]; then + %{_libdir}/scim-1.0/update-xinput-scim remove ja_JP fi @@ -62,6 +59,9 @@ %changelog +* Sat Jul 30 2005 Ryo Dairiki - 0.5.3-3 +- modify to use update-xinput-scim script + * Sat Jul 30 2005 Jens Petersen - 0.5.3-2 - prereq scim xinput.d script - count scim-ja_JP providers before removing xinput.d alternative From fedora-extras-commits at redhat.com Sat Jul 30 14:59:51 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:59:51 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.13,1.14 Message-ID: <200507301459.j6UExpAJ030296@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30277 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scim-anthy.spec 30 Jul 2005 14:58:08 -0000 1.13 +++ scim-anthy.spec 30 Jul 2005 14:59:49 -0000 1.14 @@ -13,7 +13,7 @@ Requires: anthy BuildRequires: scim-devel anthy-devel # for alternatives in install scripts -PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input. From fedora-extras-commits at redhat.com Sat Jul 30 15:05:33 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 30 Jul 2005 11:05:33 -0400 Subject: extras-buildsys/server UserInterface.py,1.36,1.37 Message-ID: <200507301506.j6UF64ub031438@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31421 Modified Files: UserInterface.py Log Message: make sure resolve_target looks at the master targets, too, not just the aliases Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- UserInterface.py 29 Jul 2005 07:13:53 -0000 1.36 +++ UserInterface.py 30 Jul 2005 15:05:19 -0000 1.37 @@ -83,7 +83,11 @@ for master_target in client_target_map.keys(): if not target_dict.has_key(master_target): # make sure we build it continue # if not, move along + + if target_dict.has_key(resolved_target): # it's one of the masters + return resolved_target + # do the aliases for alias in client_target_map[master_target]: if resolved_target.lower() == alias.lower(): return master_target From fedora-extras-commits at redhat.com Sat Jul 30 15:08:31 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 11:08:31 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.14,1.15 Message-ID: <200507301508.j6UF8V7g031479@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31450 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim-anthy.spec 30 Jul 2005 14:59:49 -0000 1.14 +++ scim-anthy.spec 30 Jul 2005 15:08:29 -0000 1.15 @@ -46,7 +46,7 @@ %postun -if [ "$1" = "0"]; then +if [ "$1" = "0" ]; then %{_libdir}/scim-1.0/update-xinput-scim remove ja_JP fi From fedora-extras-commits at redhat.com Sat Jul 30 16:26:35 2005 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sat, 30 Jul 2005 12:26:35 -0400 Subject: rpms/fontforge/devel .cvsignore, 1.6, 1.7 fontforge.spec, 1.10, 1.11 sources, 1.6, 1.7 fontforge-20040618-docview.patch, 1.1, NONE Message-ID: <200507301626.j6UGQZO4000357@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv336 Modified Files: .cvsignore fontforge.spec sources Removed Files: fontforge-20040618-docview.patch Log Message: * Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc5 - Update to 20050729 - Remove .docview patch, looking for HTMLview is upstream so no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 May 2005 19:31:10 -0000 1.6 +++ .cvsignore 30 Jul 2005 16:26:33 -0000 1.7 @@ -4,3 +4,5 @@ fontforge_htdocs-20050310.tgz fontforge_full-20050502.tgz fontforge_htdocs-20050503.tgz +fontforge_full-20050729.tgz +fontforge_htdocs-20050729.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fontforge.spec 10 May 2005 19:31:10 -0000 1.10 +++ fontforge.spec 30 Jul 2005 16:26:33 -0000 1.11 @@ -1,15 +1,14 @@ Name: fontforge Version: 0.0 -Release: 2.20050502.fc4 +Release: 2.20050729.fc5 Summary: Outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20050729.tgz Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050503.tgz -Patch1: fontforge-20040618-docview.patch +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050729.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -31,8 +30,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050502 -%patch1 -p2 -b .docview +%setup -q -n %{name}-20050729 mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -102,6 +100,10 @@ %changelog +* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc5 +- Update to 20050729 +- Remove .docview patch, looking for HTMLview is upstream so no longer needed + * Tue May 10 2005 Owen Taylor - 0.0-2.20050502.fc4 - Update to 20050502 - Fix the build to look for the docs where we install them Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 May 2005 19:31:10 -0000 1.6 +++ sources 30 Jul 2005 16:26:33 -0000 1.7 @@ -1,2 +1,2 @@ -6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz -1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz +81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz +3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz --- fontforge-20040618-docview.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 30 16:39:31 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 30 Jul 2005 12:39:31 -0400 Subject: rpms/loudmouth/FC-4 loudmouth.spec,1.4,1.5 Message-ID: <200507301639.j6UGdVSK000460@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv443 Modified Files: loudmouth.spec Log Message: * Sat Jul 30 2005 Brian Pepple - 0.90 - Fix description. Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-4/loudmouth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- loudmouth.spec 13 May 2005 14:40:55 -0000 1.4 +++ loudmouth.spec 30 Jul 2005 16:39:29 -0000 1.5 @@ -2,7 +2,7 @@ Name: loudmouth Version: 0.90 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -24,7 +24,6 @@ Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. -7%{?dist} %package devel Summary: Development files for Loudmouth @@ -85,6 +84,9 @@ %changelog +* Sat Jul 30 2005 Brian Pepple - 0.90 +- Fix description. + * Fri May 13 2005 Brian Pepple - 0.90-2 - Add dist tag. From fedora-extras-commits at redhat.com Sat Jul 30 16:40:03 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 30 Jul 2005 12:40:03 -0400 Subject: rpms/loudmouth/devel loudmouth.spec,1.4,1.5 Message-ID: <200507301640.j6UGe3Ew000488@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471 Modified Files: loudmouth.spec Log Message: * Sat Jul 30 2005 Brian Pepple - 0.90-4 - Fix description. Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- loudmouth.spec 13 May 2005 14:40:55 -0000 1.4 +++ loudmouth.spec 30 Jul 2005 16:40:01 -0000 1.5 @@ -2,7 +2,7 @@ Name: loudmouth Version: 0.90 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -24,7 +24,6 @@ Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. -7%{?dist} %package devel Summary: Development files for Loudmouth @@ -85,6 +84,9 @@ %changelog +* Sat Jul 30 2005 Brian Pepple - 0.90-4 +- Fix description. + * Fri May 13 2005 Brian Pepple - 0.90-2 - Add dist tag. From fedora-extras-commits at redhat.com Sat Jul 30 16:44:57 2005 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sat, 30 Jul 2005 12:44:57 -0400 Subject: rpms/fontforge/FC-4 fontforge.spec,1.10,1.11 sources,1.6,1.7 Message-ID: <200507301644.j6UGiveM000530@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/fontforge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv511 Modified Files: fontforge.spec sources Log Message: * Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc4 - Update to 20050729 - Remove .docview patch, looking for HTMLview is upstream so no longer needed Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/fontforge.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fontforge.spec 10 May 2005 19:31:10 -0000 1.10 +++ fontforge.spec 30 Jul 2005 16:44:54 -0000 1.11 @@ -6,10 +6,9 @@ Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20050729.tgz Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050503.tgz -Patch1: fontforge-20040618-docview.patch +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050729.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -31,8 +30,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050502 -%patch1 -p2 -b .docview +%setup -q -n %{name}-20050729 mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -102,6 +100,10 @@ %changelog +* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc4 +- Update to 20050729 +- Remove .docview patch, looking for HTMLview is upstream so no longer needed + * Tue May 10 2005 Owen Taylor - 0.0-2.20050502.fc4 - Update to 20050502 - Fix the build to look for the docs where we install them Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 May 2005 19:31:10 -0000 1.6 +++ sources 30 Jul 2005 16:44:54 -0000 1.7 @@ -1,2 +1,2 @@ -6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz -1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz +81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz +3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz From fedora-extras-commits at redhat.com Sat Jul 30 16:45:42 2005 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sat, 30 Jul 2005 12:45:42 -0400 Subject: rpms/fontforge/FC-4 fontforge.spec,1.11,1.12 Message-ID: <200507301645.j6UGjgGf000587@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/fontforge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv570 Modified Files: fontforge.spec Log Message: Fix version Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/fontforge.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fontforge.spec 30 Jul 2005 16:44:54 -0000 1.11 +++ fontforge.spec 30 Jul 2005 16:45:40 -0000 1.12 @@ -1,6 +1,6 @@ Name: fontforge Version: 0.0 -Release: 2.20050502.fc4 +Release: 2.20050729.fc4 Summary: Outline and bitmap font editor Group: Applications/Publishing From fedora-extras-commits at redhat.com Sat Jul 30 17:21:05 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:05 -0400 Subject: rpms/krecipes - New directory Message-ID: <200507301721.j6UHL5uI001907@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1887/krecipes Log Message: Directory /cvs/extras/rpms/krecipes added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 17:21:05 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:05 -0400 Subject: rpms/krecipes/devel - New directory Message-ID: <200507301721.j6UHL5t9001912@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1887/krecipes/devel Log Message: Directory /cvs/extras/rpms/krecipes/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 17:21:17 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:17 -0400 Subject: rpms/krecipes Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507301721.j6UHLHeW001959@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1932 Added Files: Makefile import.log Log Message: Setup of module krecipes --- NEW FILE Makefile --- # Top level Makefile for module krecipes all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 17:21:18 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:18 -0400 Subject: rpms/krecipes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507301721.j6UHLISN001964@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1932/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module krecipes --- NEW 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 Jul 30 17:23:14 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:23:14 -0400 Subject: rpms/krecipes import.log,1.1,1.2 Message-ID: <200507301723.j6UHNiqL002043@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2003 Modified Files: import.log Log Message: auto-import krecipes-0.8.1-1.fc4 on branch devel from krecipes-0.8.1-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/krecipes/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 17:21:15 -0000 1.1 +++ import.log 30 Jul 2005 17:23:12 -0000 1.2 @@ -0,0 +1 @@ +krecipes-0_8_1-1_fc4:HEAD:krecipes-0.8.1-1.fc4.src.rpm:1122744149 From fedora-extras-commits at redhat.com Sat Jul 30 17:23:14 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:23:14 -0400 Subject: rpms/krecipes/devel krecipes-gcc4.patch, NONE, 1.1 krecipes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507301723.j6UHNEA0002036@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2003/devel Modified Files: .cvsignore sources Added Files: krecipes-gcc4.patch krecipes.spec Log Message: auto-import krecipes-0.8.1-1.fc4 on branch devel from krecipes-0.8.1-1.fc4.src.rpm krecipes-gcc4.patch: --- NEW FILE krecipes-gcc4.patch --- --- kmymoney2-0.7.4/configure 2005-07-18 10:49:10.000000000 -0500 +++ kmymoney2-0.7.4.temp/configure 2005-07-24 11:49:09.000000000 -0500 @@ -4230,93 +4230,6 @@ - echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 -echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6 - - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef __GNUC__ -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 -choke me -#endif -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - kde_bad_compiler=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -kde_bad_compiler=yes - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 -echo "${ECHO_T}$kde_bad_compiler" >&6 - -if test "$kde_bad_compiler" = "yes"; then - { { echo "$as_me:$LINENO: error: - -This particular compiler version is blacklisted because it -is known to miscompile KDE. Please use a newer version, or -if that is not yet available, choose an older version. - -Please do not report a bug or bother us reporting this -configure error. We know about it, and we introduced -it by intention to avoid untraceable bugs or crashes in KDE. - -" >&5 -echo "$as_me: error: - -This particular compiler version is blacklisted because it -is known to miscompile KDE. Please use a newer version, or -if that is not yet available, choose an older version. - -Please do not report a bug or bother us reporting this -configure error. We know about it, and we introduced -it by intention to avoid untraceable bugs or crashes in KDE. - -" >&2;} - { (exit 1); exit 1; }; } -fi - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then if test "$kde_use_debug_code" != "no"; then --- NEW FILE krecipes.spec --- Name: krecipes Version: 0.8.1 Release: 1%{?dist} Summary: Krecipes: Your Way to Cook with Tux! Group: Applications/Productivity License: GPL URL: http://krecipes.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/krecipes/krecipes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel > 3.1, sqlite-devel Requires: kdebase >= 3.1, qt-MySQL, qt-PostgreSQL, sqlite patch0: krecipes-gcc4.patch %description Krecipes is a program that lets you to manage your recipes, create shopping lists, choose a recipe based on available ingredients and plan your menu/diet in advance. Supports MySQL, Postgres and sqlite backends. %prep %setup -q %patch0 -p1 -b .gcc4 %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor=fedora \ --add-category=X-Fedora \ --add-category=Application \ --add-category=Utility \ --add-category=KDE \ --add-category=Qt \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do lang=$(basename $lang_dir) echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc %{_bindir}/krecipes %{_datadir}/applications/fedora-krecipes.desktop %{_datadir}/apps/krecipes %{_datadir}/icons/hicolor/*/apps/* %changelog * Sun Jul 24 2005 - 0.8.1-1%{?dist} - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 17:21:16 -0000 1.1 +++ .cvsignore 30 Jul 2005 17:23:12 -0000 1.2 @@ -0,0 +1 @@ +krecipes-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 17:21:16 -0000 1.1 +++ sources 30 Jul 2005 17:23:12 -0000 1.2 @@ -0,0 +1 @@ +f9049384bad2139f049b9b4eadd7239a krecipes-0.8.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 18:18:40 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 30 Jul 2005 14:18:40 -0400 Subject: rpms/moomps/FC-3 moomps.spec,1.6,1.7 Message-ID: <200507301818.j6UIIeiE003528@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3509 Modified Files: moomps.spec Log Message: increased release as I suspect sources weren't tagged right Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/moomps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- moomps.spec 1 Jul 2005 23:36:32 -0000 1.6 +++ moomps.spec 30 Jul 2005 18:18:38 -0000 1.7 @@ -1,6 +1,6 @@ Name: moomps Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Powerful modular monitoring service Group: Applications/System @@ -79,6 +79,9 @@ %changelog +* Sat Jul 30 2005 Jean-Luc Fontaine 0:5.2-2 +- increased release as I suspect sources weren't tagged right + * Sun Jun 26 2005 Jean-Luc Fontaine 0:5.2-1 - 5.2 source release From fedora-extras-commits at redhat.com Sat Jul 30 18:49:55 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 30 Jul 2005 14:49:55 -0400 Subject: rpms/moomps/FC-4 moomps.spec,1.5,1.6 Message-ID: <200507301849.j6UIntrU003667@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3650 Modified Files: moomps.spec Log Message: increased release number to match FC-3 release Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moomps.spec 1 Jul 2005 23:24:54 -0000 1.5 +++ moomps.spec 30 Jul 2005 18:49:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: moomps Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -78,6 +78,9 @@ %changelog +* Sat Jul 30 2005 Jean-Luc Fontaine 5.2-2 +- increased release number to match FC-3 release + * Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 - 5.2 source release From fedora-extras-commits at redhat.com Sat Jul 30 18:50:40 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 30 Jul 2005 14:50:40 -0400 Subject: rpms/moomps/devel .cvsignore,1.3,1.4 moomps.spec,1.5,1.6 Message-ID: <200507301850.j6UIoegD003731@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3712 Modified Files: .cvsignore moomps.spec Log Message: increased release number to match FC-3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 May 2005 19:39:10 -0000 1.3 +++ .cvsignore 30 Jul 2005 18:50:37 -0000 1.4 @@ -1 +1 @@ -moomps-5.1.tar.bz2 +moomps-5.2.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moomps.spec 2 Jul 2005 10:45:36 -0000 1.5 +++ moomps.spec 30 Jul 2005 18:50:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: moomps Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -78,6 +78,9 @@ %changelog +* Sat Jul 30 2005 Jean-Luc Fontaine 5.2-2 +- increased release number to match FC-3 release + * Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 - 5.2 source release From fedora-extras-commits at redhat.com Sat Jul 30 19:18:58 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 15:18:58 -0400 Subject: rpms/glunarclock/FC-3 glunarclock-0.32.2-i18n_macro.patch, NONE, 1.1 glunarclock-0.32.4-bug149711.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.4, 1.5 sources, 1.4, 1.5 glunarclock-configure.in.patch, 1.1, NONE Message-ID: <200507301918.j6UJIw33005043@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5017 Modified Files: .cvsignore glunarclock.spec sources Added Files: glunarclock-0.32.2-i18n_macro.patch glunarclock-0.32.4-bug149711.patch Removed Files: glunarclock-configure.in.patch Log Message: update for FC3 - sync with devel glunarclock-0.32.2-i18n_macro.patch: --- NEW FILE glunarclock-0.32.2-i18n_macro.patch --- diff -Nur glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c glunarclock-0.32.2/screen-exec/egg-screen-help.c --- glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c 2003-03-10 13:02:08.000000000 +0100 +++ glunarclock-0.32.2/screen-exec/egg-screen-help.c 2005-04-15 02:29:09.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include glunarclock-0.32.4-bug149711.patch: --- NEW FILE glunarclock-0.32.4-bug149711.patch --- diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c --- glunarclock-0.32.4-orig/src/glunarclock.c 2005-04-06 12:51:29.000000000 +0200 +++ glunarclock-0.32.4/src/glunarclock.c 2005-07-25 00:39:56.000000000 +0200 @@ -154,14 +154,14 @@ gtk_toggle_button_get_active (toggle), NULL); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_dialog (GtkWidget *widget, MoonApplet *moon) { diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c --- glunarclock-0.32.4-orig/src/moondata.c 2005-01-04 18:28:43.000000000 +0100 +++ glunarclock-0.32.4/src/moondata.c 2005-07-25 00:39:55.000000000 +0200 @@ -219,14 +219,14 @@ mod_time(&moondata.LAT); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_data_dialog (GtkWidget *widget, MoonApplet *moon) { @@ -280,10 +280,10 @@ /* gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */ /* format_time(buf, size, moondata.NewMoon*24.0); */ - g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon); + g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon); gtk_label_set_text(GTK_LABEL(mw.flm), buf); - g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon)); + g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon)); gtk_label_set_text(GTK_LABEL(mw.nwm), buf); /* g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2005 16:42:01 -0000 1.4 +++ .cvsignore 30 Jul 2005 19:18:56 -0000 1.5 @@ -1,2 +1 @@ -glunarclock-0.32.2-autoreconf.patch.bz2 -glunarclock-0.32.2.tar.gz +glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-3/glunarclock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- glunarclock.spec 13 Feb 2005 16:42:01 -0000 1.4 +++ glunarclock.spec 30 Jul 2005 19:18:56 -0000 1.5 @@ -1,15 +1,14 @@ Name: glunarclock -Version: 0.32.2 -Release: 2 -Epoch: 0 +Version: 0.32.4 +Release: 2%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz -Patch0: glunarclock-configure.in.patch -Patch1: glunarclock-0.32.2-autoreconf.patch.bz2 +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: glunarclock-0.32.2-i18n_macro.patch +Patch1: glunarclock-0.32.4-bug149711.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -33,12 +32,9 @@ %prep %setup -q -%ifarch x86_64 -# patch0 is normally only needed if you want to recreate patch1 -%patch0 -# was created after autoreconf -f -i and removing autom4te.cache/ -%patch1 -p1 -%endif +%patch0 -p1 -b .i18n_macro +%patch1 -p1 -b .bug149711 + %build %configure @@ -81,7 +77,7 @@ %files -f glunarclock-0.32.lang %defattr (-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README +%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README %{_sysconfdir}/gconf/schemas/* %{_libexecdir}/* %{_datadir}/glunarclock @@ -94,8 +90,19 @@ %changelog +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 +- Update to 0.32.4. +- Fix compiler warnings bug #149711. +- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2). + +* Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 +- Add patch2 to fix build for FC4. + +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Feb 13 2005 Thorsten Leemhuis - 0.32.2-2 -- Add autoreconf and configure.in patch to fix x86_64; +- Add autoreconf and configure.in patch to fix x86_64; * Sun Jan 16 2005 Marius L. J??hndal - 0:0.32.2-1 - Updated to 0.32.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 16:42:01 -0000 1.4 +++ sources 30 Jul 2005 19:18:56 -0000 1.5 @@ -1,2 +1 @@ -3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 -3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz +63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz --- glunarclock-configure.in.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 30 20:51:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 16:51:38 -0400 Subject: rpms/apg/FC-4 apg-2.3.0b-gen_rand_pass.patch, NONE, 1.1 apg.spec, 1.9, 1.10 Message-ID: <200507302051.j6UKpc7Z006435@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/apg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6415 Modified Files: apg.spec Added Files: apg-2.3.0b-gen_rand_pass.patch Log Message: * Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 - Fix -y segfault (#164698). - Make with CFLAGS and FLAGS to build with RPM optflags to repair debuginfo package. apg-2.3.0b-gen_rand_pass.patch: --- NEW FILE apg-2.3.0b-gen_rand_pass.patch --- diff -Nur apg-2.3.0b-orig/apg.c apg-2.3.0b/apg.c --- apg-2.3.0b-orig/apg.c 2003-08-07 17:40:39.000000000 +0200 +++ apg-2.3.0b/apg.c 2005-07-30 22:48:22.000000000 +0200 @@ -709,7 +709,7 @@ */ char * crypt_passstring (const char *p) { - char salt[10]; + char salt[11]; gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB); return (crypt(p, salt)); } Index: apg.spec =================================================================== RCS file: /cvs/extras/rpms/apg/FC-4/apg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apg.spec 24 Apr 2005 11:28:40 -0000 1.9 +++ apg.spec 30 Jul 2005 20:51:36 -0000 1.10 @@ -2,14 +2,14 @@ Name: apg Version: 2.3.0b -Release: 1.fc4 - +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.adel.nursat.kz/%{name}/ Source0: http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz Source1: apg.xinetd +Patch0: apg-2.3.0b-gen_rand_pass.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,13 +20,14 @@ %prep %setup -q +%patch0 -p1 -b .gen_rand_pass %build # Build server -make %{?_smp_mflags} cliserv +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv # Build standalone files -make %{?_smp_mflags} standalone +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -59,6 +60,11 @@ %{_sysconfdir}/xinetd.d/apgd %changelog +* Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 +- Fix -y segfault (#164698). +- Make with CFLAGS and FLAGS to build with RPM optflags to + repair debuginfo package. + * Fri Apr 22 2005 Oliver Falk - 2.3.0b-1_FC4 - Add FC4 to the release tag, so it's newer than the FC3 package From fedora-extras-commits at redhat.com Sat Jul 30 20:58:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 16:58:04 -0400 Subject: rpms/apg/devel apg-2.3.0b-gen_rand_pass.patch, NONE, 1.1 apg.spec, 1.9, 1.10 Message-ID: <200507302058.j6UKw43r006511@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/apg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6491 Modified Files: apg.spec Added Files: apg-2.3.0b-gen_rand_pass.patch Log Message: sync with FC-4 apg-2.3.0b-gen_rand_pass.patch: --- NEW FILE apg-2.3.0b-gen_rand_pass.patch --- diff -Nur apg-2.3.0b-orig/apg.c apg-2.3.0b/apg.c --- apg-2.3.0b-orig/apg.c 2003-08-07 17:40:39.000000000 +0200 +++ apg-2.3.0b/apg.c 2005-07-30 22:48:22.000000000 +0200 @@ -709,7 +709,7 @@ */ char * crypt_passstring (const char *p) { - char salt[10]; + char salt[11]; gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB); return (crypt(p, salt)); } Index: apg.spec =================================================================== RCS file: /cvs/extras/rpms/apg/devel/apg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apg.spec 24 Apr 2005 11:28:40 -0000 1.9 +++ apg.spec 30 Jul 2005 20:58:02 -0000 1.10 @@ -2,14 +2,14 @@ Name: apg Version: 2.3.0b -Release: 1.fc4 - +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.adel.nursat.kz/%{name}/ Source0: http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz Source1: apg.xinetd +Patch0: apg-2.3.0b-gen_rand_pass.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,13 +20,14 @@ %prep %setup -q +%patch0 -p1 -b .gen_rand_pass %build # Build server -make %{?_smp_mflags} cliserv +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv # Build standalone files -make %{?_smp_mflags} standalone +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -59,6 +60,11 @@ %{_sysconfdir}/xinetd.d/apgd %changelog +* Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 +- Fix -y segfault (#164698). +- Make with CFLAGS and FLAGS to build with RPM optflags to + repair debuginfo package. + * Fri Apr 22 2005 Oliver Falk - 2.3.0b-1_FC4 - Add FC4 to the release tag, so it's newer than the FC3 package From fedora-extras-commits at redhat.com Sat Jul 30 23:21:41 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 30 Jul 2005 19:21:41 -0400 Subject: rpms/openvpn/devel openvpn.spec,1.4,1.5 Message-ID: <200507302321.j6UNLfRO010436@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/openvpn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419 Modified Files: openvpn.spec Log Message: Create/own pid dir. Index: openvpn.spec =================================================================== RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openvpn.spec 30 Jun 2005 17:38:21 -0000 1.4 +++ openvpn.spec 30 Jul 2005 23:21:39 -0000 1.5 @@ -86,6 +86,8 @@ cp plugin/$plugin/README plugin/$plugin.txt done +mkdir -m 755 -p $RPM_BUILD_ROOT%{_var}/run/%{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -119,6 +121,7 @@ %{_datadir}/%{name}/ %{_libdir}/%{name}/ %{_initrddir}/%{name} +%{_var}/run/%{name}/ %config %dir %{_sysconfdir}/%{name}/ %changelog @@ -129,6 +132,7 @@ - Add "processname" header to init script - The init script isn't a config file - Tag contrib, sample-config-files, sample-keys, and sample-scripts as doc +- Create/own pid dir * Sat Jun 25 2005 Steven Pritchard 2.0-1 - Update to 2.0 final From fedora-extras-commits at redhat.com Sun Jul 31 00:30:04 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 20:30:04 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.3,1.4 Message-ID: <200507310030.j6V0U47u011741@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11724 Modified Files: scim-pinyin.spec Log Message: modify to use update-xinput-scim script Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-pinyin.spec 27 Jul 2005 08:12:41 -0000 1.3 +++ scim-pinyin.spec 31 Jul 2005 00:30:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 4%{?dist} +Release: 4.1%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: scim-pinyin-0.5.0-setup-ambiguity-cast.patch +Provides: scim-zh_CN, scim-zh_TW BuildRequires: scim-devel, gtk2-devel +# for alternatives in install scripts +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description @@ -42,10 +45,18 @@ %post /sbin/ldconfig +%{_libdir}/scim-1.0/update-xinput-scim install zh_CN +%{_libdir}/scim-1.0/update-xinput-scim install zh_TW + %postun /sbin/ldconfig +if [ "$1" = "0" ]; then + %{_libdir}/scim-1.0/update-xinput-scim remove zh_CN + %{_libdir}/scim-1.0/update-xinput-scim remove zh_TW +fi + %files -f %{name}.lang %defattr(-,root,root,-) @@ -57,6 +68,9 @@ %changelog +* Sun Jul 31 2005 Ryo Dairiki -0.5.0-4.1 +- Modify to use update-xinput-scim script + * Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 - Rebuild for scim-1.4.0 From fedora-extras-commits at redhat.com Sun Jul 31 01:18:19 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 30 Jul 2005 21:18:19 -0400 Subject: rpms/perl-Tk/devel perl-Tk.spec,1.3,1.4 Message-ID: <200507310118.j6V1IJQc013001@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/perl-Tk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953/devel Modified Files: perl-Tk.spec Log Message: - fix #164716 Index: perl-Tk.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tk/devel/perl-Tk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tk.spec 21 Jun 2005 05:28:20 -0000 1.3 +++ perl-Tk.spec 31 Jul 2005 01:18:17 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.027 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -22,6 +22,7 @@ Requires: perl(:MODULE_COMPAT_%{perlver}) Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::TextReindex) +Provides: perl(Tk) = %{version} %description This a re-port of a perl interface to Tk8.4. @@ -83,6 +84,10 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Sun Jul 31 2005 Andreas Bierfert +804.026-7 +- fix #164716 + * Mon Jun 20 2005 Andreas Bierfert 804.027-6 - some small cleanups From fedora-extras-commits at redhat.com Sun Jul 31 01:18:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 30 Jul 2005 21:18:14 -0400 Subject: rpms/perl-Tk/FC-3 perl-Tk.spec,1.3,1.4 Message-ID: <200507310118.j6V1Ii2l013004@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/perl-Tk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953/FC-3 Modified Files: perl-Tk.spec Log Message: - fix #164716 Index: perl-Tk.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tk/FC-3/perl-Tk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tk.spec 21 Jun 2005 05:26:13 -0000 1.3 +++ perl-Tk.spec 31 Jul 2005 01:18:11 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.027 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -22,6 +22,7 @@ Requires: perl(:MODULE_COMPAT_%{perlver}) Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::TextReindex) +Provides: perl(Tk) = %{version} %description This a re-port of a perl interface to Tk8.4. @@ -83,6 +84,10 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Sun Jul 31 2005 Andreas Bierfert +804.026-7 +- fix #164716 + * Mon Jun 20 2005 Andreas Bierfert 804.027-6 - some small cleanups From fedora-extras-commits at redhat.com Sun Jul 31 01:18:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 30 Jul 2005 21:18:14 -0400 Subject: rpms/perl-Tk/FC-4 perl-Tk.spec,1.3,1.4 Message-ID: <200507310118.j6V1IiNV013007@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/perl-Tk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953/FC-4 Modified Files: perl-Tk.spec Log Message: - fix #164716 Index: perl-Tk.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tk/FC-4/perl-Tk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tk.spec 21 Jun 2005 05:27:19 -0000 1.3 +++ perl-Tk.spec 31 Jul 2005 01:18:12 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.027 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -22,6 +22,7 @@ Requires: perl(:MODULE_COMPAT_%{perlver}) Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::TextReindex) +Provides: perl(Tk) = %{version} %description This a re-port of a perl interface to Tk8.4. @@ -83,6 +84,10 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Sun Jul 31 2005 Andreas Bierfert +804.026-7 +- fix #164716 + * Mon Jun 20 2005 Andreas Bierfert 804.027-6 - some small cleanups From fedora-extras-commits at redhat.com Sun Jul 31 01:41:01 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 21:41:01 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.15,1.16 Message-ID: <200507310141.j6V1f1Tp013211@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13189 Modified Files: scim-anthy.spec Log Message: remove "if" in postun to check whether it is "replaceing" the package Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim-anthy.spec 30 Jul 2005 15:08:29 -0000 1.15 +++ scim-anthy.spec 31 Jul 2005 01:40:59 -0000 1.16 @@ -46,9 +46,7 @@ %postun -if [ "$1" = "0" ]; then - %{_libdir}/scim-1.0/update-xinput-scim remove ja_JP -fi +%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP %files -f %{name}.lang @@ -67,7 +65,8 @@ - count scim-ja_JP providers before removing xinput.d alternative * Fri Jul 29 2005 Ryo Dairiki -- add xinput.d alternatives setup in %%post and %%postun +- add xinput.d alternatives setup in %%post and %%po +stun - provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if no other scim-ja_JP left From fedora-extras-commits at redhat.com Sun Jul 31 01:43:00 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 21:43:00 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.4,1.5 Message-ID: <200507310143.j6V1h0Ua013236@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13219 Modified Files: scim-pinyin.spec Log Message: Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-pinyin.spec 31 Jul 2005 00:30:02 -0000 1.4 +++ scim-pinyin.spec 31 Jul 2005 01:42:58 -0000 1.5 @@ -52,10 +52,8 @@ %postun /sbin/ldconfig -if [ "$1" = "0" ]; then - %{_libdir}/scim-1.0/update-xinput-scim remove zh_CN - %{_libdir}/scim-1.0/update-xinput-scim remove zh_TW -fi +%{_libdir}/scim-1.0/update-xinput-scim remove zh_CN +%{_libdir}/scim-1.0/update-xinput-scim remove zh_TW %files -f %{name}.lang From fedora-extras-commits at redhat.com Sun Jul 31 01:47:01 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 21:47:01 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.3,1.4 Message-ID: <200507310147.j6V1l1iq013266@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249 Modified Files: scim-tables.spec Log Message: modify to use update-xinput-scim script Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tables.spec 27 Jul 2005 08:09:38 -0000 1.3 +++ scim-tables.spec 31 Jul 2005 01:46:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -10,6 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: scim-devel, gtk2-devel +# for alternatives in install scripts +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim + %description This package contains the Generic Table IMEngine for SCIM. @@ -18,6 +21,7 @@ Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-zh_CN, scim-zh_TW %description zh This package includes table IM data files for Chinese. @@ -26,6 +30,7 @@ Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-ja_JP %description ja This package includes table IM data files for Japanese. @@ -34,6 +39,7 @@ Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-ko_KR %description ko This package includes table IM data files for Korean. @@ -76,9 +82,30 @@ /sbin/ldconfig +%post ja +%{_libdir}/scim-1.0/update-xinput-scim install ja_JP + +%post zh +%{_libdir}/scim-1.0/update-xinput-scim install zh_CN +%{_libdir}/scim-1.0/update-xinput-scim install zh_TW + +%post ko +%{_libdir}/scim-1.0/update-xinput-scim install ko_KR + + %postun /sbin/ldconfig +%postun ja +%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP + +%postun zh +%{_libdir}/scim-1.0/update-xinput-scim remove zh_CN +%{_libdir}/scim-1.0/update-xinput-scim remove zh_TW + +%postun ko +%{_libdir}/scim-1.0/update-xinput-scim remove ko_KR + %files -f %{name}.lang %defattr(-, root, root, -) @@ -158,6 +185,9 @@ %changelog +* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 +- Modify to use update-xinput-scim script + * Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 - Rebuild for scim-1.4.0 From fedora-extras-commits at redhat.com Sun Jul 31 04:23:23 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 31 Jul 2005 00:23:23 -0400 Subject: rpms/scim/FC-4 update-xinput-scim,1.1,1.2 Message-ID: <200507310423.j6V4NNU1016856@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16839 Modified Files: update-xinput-scim Log Message: fix some bug of update-xinput-scim script Index: update-xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/update-xinput-scim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- update-xinput-scim 30 Jul 2005 14:28:59 -0000 1.1 +++ update-xinput-scim 31 Jul 2005 04:23:21 -0000 1.2 @@ -17,19 +17,20 @@ default_priority = 85 # FIXME I'm not sure if this is correct -valid_locale_pattern = re.compile("^[a-z][a-z]_[A-Z][A-Z]$") +valid_locale_pattern = re.compile("^([a-z][a-z])_[A-Z][A-Z]$") +xinput_locale_pattern = re.compile("^xinput-[a-z][a-z]$|^xinput-[a-z][a-z]_[A-Z][A-Z]$") script_name = "update-scim-locale" authorization_rejected_message = script_name + ": you must be root to run this script" invalid_locale_message = script_name + ": invalid locale" too_few_arguments_message = script_name + ": too few arguments" -unknwon_command_message = script_name + ": unknown command" +unknown_command_message = script_name + ": unknown command" # FIXME authorization_rejected_returncode = 1 invalid_locale_returncode = 2 too_few_arguments_returncode = 3 -unknwon_command_returncode = 4 +unknown_command_returncode = 4 locales = [] @@ -44,9 +45,15 @@ (fi, fo) = os.popen2(locale_bin + " --all") for locale in fo: locale = locale.strip() - if valid_locale_pattern.match(locale) and not locale in locales: - locales.append(locale) - + matches = valid_locale_pattern.match(locale) + if matches: + lang_group = matches.group(1) + if lang_group in locales: + if not locale in locales: + locales.append(locale) + else: + locales.append(lang_group) + locales.append(locale) fi.close() fo.close() @@ -59,7 +66,7 @@ sys.exit(invalid_locale_returncode) -def install_alternative(locale, priority): +def install(locale, priority): check_locale(locale) if priority == -1: priority = default_priority @@ -67,7 +74,7 @@ os.system(alternatives_bin + " --install %s/%s %s " %(xinput_dir, locale, xinput_locale) + xinput_scim + " %s" %priority) -def remove_alternative(locale): +def remove(locale): check_locale(locale) scim_locale = "scim-" + locale xinput_locale = "xinput-" + locale @@ -80,14 +87,30 @@ os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim) # check the current input method (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) - current_xinput = fo.readline() + current_xinput = fo.readline().strip() fi.close() fo.close() if current_xinput == xinput_scim: - # change the input method, as scim won't support this locale anymore. + # change the input method, as scim won't support this locale anymore os.system(alternatives_bin + " --auto " + xinput_locale) +def list(): + xinput_locales = [] + alternatives = os.listdir(alternatives_dir) + for alternative in alternatives: + if xinput_locale_pattern.match(alternative): + xinput_locales.append(alternative) + for xinput_locale in xinput_locales: + (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) + current_xinput = fo.readline().strip() + fi.close() + fo.close() + if current_xinput == xinput_scim: + locale = xinput_locale[7:] + print(locale) + + # FIXME def main(): args = sys.argv @@ -103,16 +126,18 @@ priority = args[3] else: priority = -1 - install_alternative(locale, priority) + install(locale, priority) elif args[1] == "remove": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] - remove_alternative(locale) + remove(locale) + elif args[1] == "list": + list() else: print unknown_command_message + ": " + args[1] - sys.exit(unknwon_command_returncode) + sys.exit(unknown_command_returncode) # main From fedora-extras-commits at redhat.com Sun Jul 31 05:45:38 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 31 Jul 2005 01:45:38 -0400 Subject: rpms/scim/FC-4 update-xinput-scim,1.2,1.3 Message-ID: <200507310545.j6V5jc40018181@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18163 Modified Files: update-xinput-scim Log Message: few more fixes on the script, and add the instruction Index: update-xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/update-xinput-scim,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- update-xinput-scim 31 Jul 2005 04:23:21 -0000 1.2 +++ update-xinput-scim 31 Jul 2005 05:45:36 -0000 1.3 @@ -19,11 +19,30 @@ # FIXME I'm not sure if this is correct valid_locale_pattern = re.compile("^([a-z][a-z])_[A-Z][A-Z]$") xinput_locale_pattern = re.compile("^xinput-[a-z][a-z]$|^xinput-[a-z][a-z]_[A-Z][A-Z]$") +xinput_current_link_pattern = re.compile("link\s+currently\s+points\s+to\s+(%s/\w+)" %xinput_dir) +xinput_link_pattern = re.compile("(%s/\w+)\s+-\s+priority\s\d+" %xinput_dir) -script_name = "update-scim-locale" +script_name = "update-xinput-scim" +white_space = " " +usage_message = "Usage: \n\n" + \ + " %s install LANG [PRIORITY]\n" %script_name + \ + " %s to install xinput file for LANG with the PRIORITY.\n\n" %white_space + \ + " %s remove LANG\n" %script_name + \ + " %s to remove xinput file for LANG\n" %white_space + \ + " %s only if there is no other IMEngine for LANG in SCIM.\n" %white_space + \ + " %s This will switch IM from SCIM\n" %white_space + \ + " %s if there is no more SCIM IMEngine for this LANG.\n\n" %white_space + \ + " %s list\n" %script_name + \ + " %s to list LANG which currently uses SCIM.\n\n" %white_space + \ + " %s dump\n" %script_name + \ + " %s to dump all locales with xinput entries for SCIM.\n\n" %white_space + \ + " %s help\n" %script_name + \ + " %s to show this instruction.\n" %white_space +read_help_message = "Try \'%s help\' for more information." %script_name authorization_rejected_message = script_name + ": you must be root to run this script" -invalid_locale_message = script_name + ": invalid locale" -too_few_arguments_message = script_name + ": too few arguments" +invalid_locale_message = script_name + ": invalid locale" + "\n" + read_help_message +too_few_arguments_message = script_name + ": too few arguments" + "\n" + read_help_message +too_much_arguments_message = script_name + ": too much arguments" + "\n" + read_help_message unknown_command_message = script_name + ": unknown command" # FIXME @@ -34,6 +53,7 @@ locales = [] + def check_authorization(): uid = os.getuid() if uid != 0: @@ -66,6 +86,30 @@ sys.exit(invalid_locale_returncode) +def readlink(xinput_locale): + current_link = None + (fi, fo) = os.popen2("LANG=C;" + alternatives_bin + " --display " + xinput_locale) + for line in fo: + current_links = xinput_current_link_pattern.findall(line) + if len(current_links) > 0: + current_link = current_links[0] + break + fi.close() + fo.close() + return current_link + + +def dumplinks(xinput_locale): + links = [] + (fi, fo) = os.popen2("LANG=C;" + alternatives_bin + " --display " + xinput_locale) + for line in fo: + links_in_line = xinput_link_pattern.findall(line) + links += links_in_line + fi.close() + fo.close() + return links + + def install(locale, priority): check_locale(locale) if priority == -1: @@ -86,10 +130,7 @@ # there is no more input method for this locale os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim) # check the current input method - (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) - current_xinput = fo.readline().strip() - fi.close() - fo.close() + current_xinput = readlink(xinput_locale) if current_xinput == xinput_scim: # change the input method, as scim won't support this locale anymore os.system(alternatives_bin + " --auto " + xinput_locale) @@ -102,41 +143,67 @@ if xinput_locale_pattern.match(alternative): xinput_locales.append(alternative) for xinput_locale in xinput_locales: - (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) - current_xinput = fo.readline().strip() - fi.close() - fo.close() + current_xinput = readlink(xinput_locale) if current_xinput == xinput_scim: locale = xinput_locale[7:] print(locale) +def dump(): + xinput_locales = [] + alternatives = os.listdir(alternatives_dir) + for alternative in alternatives: + if xinput_locale_pattern.match(alternative): + xinput_locales.append(alternative) + for xinput_locale in xinput_locales: + links_for_locale = dumplinks(xinput_locale) + for link in links_for_locale: + if link == xinput_scim: + locale = xinput_locale[7:] + print(locale) + + # FIXME def main(): args = sys.argv if len(args) == 1: print too_few_arguments_message sys.exit(too_few_arguments_returncode) - if args[1] == "install": + command = args[1] + if command.startswith("--"): + command = command[2:] + if command == "install": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] - if len(args) >= 4: + if len(args) == 4: priority = args[3] + elif len(args) > 4: + print too_much_arguments_message + sys.exit(too_much_arguments_returncode) else: priority = -1 install(locale, priority) - elif args[1] == "remove": + elif command == "remove": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) + elif len(args) > 3: + print too_much_arguments_message + sys.exit(too_much_arguments_returncode) locale = args[2] remove(locale) - elif args[1] == "list": + elif command == "list": list() + elif command == "dump": + dump() + elif command == "help": + print usage_message + sys.exit(0) else: print unknown_command_message + ": " + args[1] + print read_help_message sys.exit(unknown_command_returncode) From fedora-extras-commits at redhat.com Sun Jul 31 05:50:44 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 31 Jul 2005 01:50:44 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.4,1.5 Message-ID: <200507310550.j6V5oiN1018211@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18191 Modified Files: scim-tables.spec Log Message: some fixes around the update-xinput-scim script Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tables.spec 31 Jul 2005 01:46:59 -0000 1.4 +++ scim-tables.spec 31 Jul 2005 05:50:42 -0000 1.5 @@ -48,6 +48,7 @@ Summary: SCIM tables for some additional languages Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-am_ET, scim-ar, scim-vi_VN, scim-ru_RU %description additional This package includes table IM data files for additional languages, @@ -92,6 +93,12 @@ %post ko %{_libdir}/scim-1.0/update-xinput-scim install ko_KR +%post additional +%{_libdir}/scim-1.0/update-xinput-scim install am_ET +%{_libdir}/scim-1.0/update-xinput-scim install ar +%{_libdir}/scim-1.0/update-xinput-scim install vi_VN +%{_libdir}/scim-1.0/update-xinput-scim install ru_RU + %postun /sbin/ldconfig @@ -106,6 +113,12 @@ %postun ko %{_libdir}/scim-1.0/update-xinput-scim remove ko_KR +%postun additional +%{_libdir}/scim-1.0/update-xinput-scim remove am_ET +%{_libdir}/scim-1.0/update-xinput-scim remove ar +%{_libdir}/scim-1.0/update-xinput-scim remove vi_VN +%{_libdir}/scim-1.0/update-xinput-scim remove ru_RU + %files -f %{name}.lang %defattr(-, root, root, -) From fedora-extras-commits at redhat.com Sun Jul 31 06:53:52 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 31 Jul 2005 02:53:52 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.16,1.17 Message-ID: <200507310653.j6V6rqNf019540@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19521 Modified Files: scim-anthy.spec Log Message: fixup changelog Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scim-anthy.spec 31 Jul 2005 01:40:59 -0000 1.16 +++ scim-anthy.spec 31 Jul 2005 06:53:50 -0000 1.17 @@ -65,10 +65,9 @@ - count scim-ja_JP providers before removing xinput.d alternative * Fri Jul 29 2005 Ryo Dairiki -- add xinput.d alternatives setup in %%post and %%po -stun +- add xinput.d alternatives setup in %%post and %%postun - provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if - no other scim-ja_JP left + no scim-ja_JP left * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release From fedora-extras-commits at redhat.com Sun Jul 31 10:15:12 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 31 Jul 2005 06:15:12 -0400 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sylpheed-claws.spec, 1.17, 1.18 Message-ID: <200507311015.j6VAFC84028432@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-serv28409 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - upgrade to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Jul 2005 07:41:46 -0000 1.7 +++ .cvsignore 31 Jul 2005 10:15:10 -0000 1.8 @@ -1 +1 @@ -sylpheed-claws-1.9.12.tar.bz2 +sylpheed-claws-1.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jul 2005 07:41:46 -0000 1.8 +++ sources 31 Jul 2005 10:15:10 -0000 1.9 @@ -1 +1 @@ -c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 +afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed-claws.spec 7 Jul 2005 10:20:35 -0000 1.17 +++ sylpheed-claws.spec 31 Jul 2005 10:15:10 -0000 1.18 @@ -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.12 -Release: 2%{?dist} +Version: 1.9.13 +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.12.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -20,10 +20,11 @@ BuildRequires: pilot-link-devel BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel -BuildRequires: gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8 +BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel +BuildRequires: libetpan-devel Requires: spamassassin Requires: dillo @@ -57,14 +58,11 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --with-gpgme-prefix=%{_libdir}/gpgme03 \ --program-suffix="-claws" %{__make} %{?_smp_mflags} - %{__make} check - %install %{__rm} -rf ${RPM_BUILD_ROOT} %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir} @@ -83,11 +81,9 @@ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png - %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -113,8 +109,15 @@ %dir %{_includedir}/sylpheed-claws/ %{_includedir}/sylpheed-claws/* %{_libdir}/pkgconfig/sylpheed-claws.pc +%{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Sun Jul 31 2005 Andreas Bierfert +1.9.13-1 +- upgrade +- switch s/gpgme03/gpgme/ +- need libetpan + * Thu Jul 07 2005 Andreas Bierfert 1.9.12-2 - add some doc From fedora-extras-commits at redhat.com Sun Jul 31 10:16:30 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 31 Jul 2005 06:16:30 -0400 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sylpheed-claws.spec, 1.17, 1.18 Message-ID: <200507311016.j6VAGUkC028469@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28444 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - upgrade to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Jul 2005 07:42:42 -0000 1.7 +++ .cvsignore 31 Jul 2005 10:16:28 -0000 1.8 @@ -1 +1 @@ -sylpheed-claws-1.9.12.tar.bz2 +sylpheed-claws-1.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jul 2005 07:42:42 -0000 1.8 +++ sources 31 Jul 2005 10:16:28 -0000 1.9 @@ -1 +1 @@ -c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 +afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed-claws.spec 7 Jul 2005 10:22:37 -0000 1.17 +++ sylpheed-claws.spec 31 Jul 2005 10:16:28 -0000 1.18 @@ -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.12 -Release: 2%{?dist} +Version: 1.9.13 +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.12.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -20,10 +20,11 @@ BuildRequires: pilot-link-devel BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel -BuildRequires: gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8 +BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel +BuildRequires: libetpan-devel Requires: spamassassin Requires: dillo @@ -57,14 +58,11 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --with-gpgme-prefix=%{_libdir}/gpgme03 \ --program-suffix="-claws" %{__make} %{?_smp_mflags} - %{__make} check - %install %{__rm} -rf ${RPM_BUILD_ROOT} %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir} @@ -83,11 +81,9 @@ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png - %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -113,8 +109,15 @@ %dir %{_includedir}/sylpheed-claws/ %{_includedir}/sylpheed-claws/* %{_libdir}/pkgconfig/sylpheed-claws.pc +%{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Sun Jul 31 2005 Andreas Bierfert +1.9.13-1 +- upgrade +- switch s/gpgme03/gpgme/ +- need libetpan + * Thu Jul 07 2005 Andreas Bierfert 1.9.12-2 - add some doc From fedora-extras-commits at redhat.com Sun Jul 31 11:17:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 31 Jul 2005 07:17:34 -0400 Subject: common tobuild,1.2167,1.2168 Message-ID: <200507311117.j6VBHYtZ029804@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29787 Modified Files: tobuild Log Message: Clean up some successful builds. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2167 retrieving revision 1.2168 diff -u -r1.2167 -r1.2168 --- tobuild 30 Jul 2005 07:04:56 -0000 1.2167 +++ tobuild 31 Jul 2005 11:17:32 -0000 1.2168 @@ -20,13 +20,6 @@ thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel -scop rpms/lft/devel lft-2_31-3 devel -scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel -scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel -scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel -scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel -scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 12:38:21 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:38:21 -0400 Subject: rpms/unison/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 unison.spec, 1.11, 1.12 Message-ID: <200507311238.j6VCcLPR031119@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31098 Modified Files: .cvsignore sources unison.spec Log Message: new version 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Feb 2005 00:16:24 -0000 1.2 +++ .cvsignore 31 Jul 2005 12:38:19 -0000 1.3 @@ -1 +1 @@ -unison-2.10.2.tar.gz +unison-2.12.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2005 00:16:24 -0000 1.2 +++ sources 31 Jul 2005 12:38:19 -0000 1.3 @@ -1 +1 @@ -a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz +c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/unison.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- unison.spec 27 May 2005 14:28:00 -0000 1.11 +++ unison.spec 31 Jul 2005 12:38:19 -0000 1.12 @@ -1,15 +1,14 @@ Name: unison -Version: 2.10.2 -Release: 7 +Version: 2.12.0 +Release: 0%{?dist} Summary: File-synchronization tool Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz Source1: unison.png -Patch0: unison-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex BuildRequires: desktop-file-utils @@ -25,11 +24,9 @@ %prep %setup -q -%patch0 -p1 %build -make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2 -#(cd doc; make) +make NATIVE=true UISTYLE=gtk2 %install rm -rf $RPM_BUILD_ROOT @@ -71,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 +- New Version 2.12.0 + * Fri May 27 2005 Toshio Kuratomi - 2.10.2-7 - Bump and rebuild with new ocaml and new lablgtk From fedora-extras-commits at redhat.com Sun Jul 31 12:39:28 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:39:28 -0400 Subject: rpms/unison/FC-4 unison-fix.patch,1.1,NONE Message-ID: <200507311239.j6VCdSft031174@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159 Removed Files: unison-fix.patch Log Message: removed fix --- unison-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 31 12:39:59 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:39:59 -0400 Subject: rpms/unison/FC-4 unison.spec,1.12,1.13 Message-ID: <200507311239.j6VCdxCd031230@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31213 Modified Files: unison.spec Log Message: Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/unison.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- unison.spec 31 Jul 2005 12:38:19 -0000 1.12 +++ unison.spec 31 Jul 2005 12:39:57 -0000 1.13 @@ -1,6 +1,6 @@ Name: unison Version: 2.12.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: File-synchronization tool From fedora-extras-commits at redhat.com Sun Jul 31 12:40:54 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:40:54 -0400 Subject: common tobuild,1.2168,1.2169 Message-ID: <200507311240.j6VCesge031292@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31275 Modified Files: tobuild Log Message: request build of rpms/unison/FC-4 unison-2_12_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2168 retrieving revision 1.2169 diff -u -r1.2168 -r1.2169 --- tobuild 31 Jul 2005 11:17:32 -0000 1.2168 +++ tobuild 31 Jul 2005 12:40:52 -0000 1.2169 @@ -54,3 +54,4 @@ smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 +gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 31 12:42:20 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:42:20 -0400 Subject: rpms/unison/devel sources, 1.2, 1.3 unison.spec, 1.11, 1.12 unison-fix.patch, 1.1, NONE Message-ID: <200507311242.j6VCgKWW031322@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31303 Modified Files: sources unison.spec Removed Files: unison-fix.patch Log Message: new version 2.12.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2005 00:16:24 -0000 1.2 +++ sources 31 Jul 2005 12:42:18 -0000 1.3 @@ -1 +1 @@ -a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz +c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/devel/unison.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- unison.spec 27 May 2005 14:28:00 -0000 1.11 +++ unison.spec 31 Jul 2005 12:42:18 -0000 1.12 @@ -1,15 +1,14 @@ Name: unison -Version: 2.10.2 -Release: 7 +Version: 2.12.0 +Release: 1%{?dist} Summary: File-synchronization tool Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz Source1: unison.png -Patch0: unison-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex BuildRequires: desktop-file-utils @@ -25,11 +24,9 @@ %prep %setup -q -%patch0 -p1 %build -make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2 -#(cd doc; make) +make NATIVE=true UISTYLE=gtk2 %install rm -rf $RPM_BUILD_ROOT @@ -71,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 +- New Version 2.12.0 + * Fri May 27 2005 Toshio Kuratomi - 2.10.2-7 - Bump and rebuild with new ocaml and new lablgtk --- unison-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 31 12:42:51 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:42:51 -0400 Subject: common tobuild,1.2169,1.2170 Message-ID: <200507311242.j6VCgpfQ031384@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31367 Modified Files: tobuild Log Message: request build of rpms/unison/devel unison-2_12_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2169 retrieving revision 1.2170 diff -u -r1.2169 -r1.2170 --- tobuild 31 Jul 2005 12:40:52 -0000 1.2169 +++ tobuild 31 Jul 2005 12:42:48 -0000 1.2170 @@ -55,3 +55,4 @@ ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 +gemi rpms/unison/devel unison-2_12_0-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 13:51:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 31 Jul 2005 09:51:42 -0400 Subject: rpms/blacs/devel blacs.spec,1.13,1.14 Message-ID: <200507311352.j6VDqCv2000324@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/devel Modified Files: blacs.spec Log Message: fix FC-3 spec file Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blacs.spec 30 Jul 2005 02:31:36 -0000 1.13 +++ blacs.spec 31 Jul 2005 13:51:40 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Sun Jul 31 2005 Tom "spot" Callaway 1.1-17 +- fix g77 for FC-3 spec + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 - remove ppc hack From fedora-extras-commits at redhat.com Sun Jul 31 13:51:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 31 Jul 2005 09:51:41 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.13,1.14 Message-ID: <200507311352.j6VDqBNM000320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-3 Modified Files: blacs.spec Log Message: fix FC-3 spec file Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 +++ blacs.spec 31 Jul 2005 13:51:39 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -15,7 +15,7 @@ Source7: http://www.netlib.org/blacs/cblacsqref.ps Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit -BuildRequires: gcc-gfortran +BuildRequires: gcc-g77 # Lam before 7.1.1-5 is missing: # -shared library support # -fPIC compilation flag @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Sun Jul 31 2005 Tom "spot" Callaway 1.1-17 +- fix g77 for FC-3 spec + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 - remove ppc hack From fedora-extras-commits at redhat.com Sun Jul 31 13:51:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 31 Jul 2005 09:51:41 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.13,1.14 Message-ID: <200507311352.j6VDqCRu000323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-4 Modified Files: blacs.spec Log Message: fix FC-3 spec file Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 +++ blacs.spec 31 Jul 2005 13:51:39 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Sun Jul 31 2005 Tom "spot" Callaway 1.1-17 +- fix g77 for FC-3 spec + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 - remove ppc hack From fedora-extras-commits at redhat.com Sun Jul 31 14:25:49 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:25:49 -0400 Subject: rpms/dejavu-fonts import.log,1.2,1.3 Message-ID: <200507311426.j6VEQJio001687@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1651 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1 on branch devel from dejavu-fonts-1.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 23 Jun 2005 19:10:11 -0000 1.2 +++ import.log 31 Jul 2005 14:25:47 -0000 1.3 @@ -1 +1,2 @@ dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802 +dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 From fedora-extras-commits at redhat.com Sun Jul 31 14:25:49 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:25:49 -0400 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.2, 1.3 dejavu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507311426.j6VEQKWe001692@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1651/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-1.12-1 on branch devel from dejavu-fonts-1.12-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jun 2005 19:10:12 -0000 1.2 +++ .cvsignore 31 Jul 2005 14:25:47 -0000 1.3 @@ -1 +1 @@ -dejavu-ttf-1.11.tar.gz +dejavu-ttf-1.12.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejavu-fonts.spec 23 Jun 2005 19:10:12 -0000 1.1 +++ dejavu-fonts.spec 31 Jul 2005 14:25:47 -0000 1.2 @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/dejavu Name: dejavu-fonts -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: DejaVu Fonts Group: User Interface/X @@ -62,6 +62,9 @@ %changelog +* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 +- 1.12 + * Thu Jun 23 2005 Nicolas Mailhot 1.11-1 - 1.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jun 2005 19:10:12 -0000 1.2 +++ sources 31 Jul 2005 14:25:47 -0000 1.3 @@ -1 +1 @@ -7dc69c0afc8fd28b74720413d17e78f4 dejavu-ttf-1.11.tar.gz +93117ca13aa3a81d6579013029ef975d dejavu-ttf-1.12.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:28:13 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:28:13 -0400 Subject: rpms/dejavu-fonts import.log,1.3,1.4 Message-ID: <200507311428.j6VESh0m001808@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1772 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-4 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 31 Jul 2005 14:25:47 -0000 1.3 +++ import.log 31 Jul 2005 14:28:11 -0000 1.4 @@ -1,2 +1,3 @@ dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802 dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 +dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 From fedora-extras-commits at redhat.com Sun Jul 31 14:28:13 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:28:13 -0400 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.2, 1.3 dejavu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507311428.j6VESib1001813@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1772/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-4 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jun 2005 19:10:12 -0000 1.2 +++ .cvsignore 31 Jul 2005 14:28:11 -0000 1.3 @@ -1 +1 @@ -dejavu-ttf-1.11.tar.gz +dejavu-ttf-1.12.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejavu-fonts.spec 23 Jun 2005 19:10:12 -0000 1.1 +++ dejavu-fonts.spec 31 Jul 2005 14:28:11 -0000 1.2 @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/dejavu Name: dejavu-fonts -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: DejaVu Fonts Group: User Interface/X @@ -62,6 +62,9 @@ %changelog +* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 +- 1.12 + * Thu Jun 23 2005 Nicolas Mailhot 1.11-1 - 1.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jun 2005 19:10:12 -0000 1.2 +++ sources 31 Jul 2005 14:28:11 -0000 1.3 @@ -1 +1 @@ -7dc69c0afc8fd28b74720413d17e78f4 dejavu-ttf-1.11.tar.gz +93117ca13aa3a81d6579013029ef975d dejavu-ttf-1.12.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:33:25 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:33:25 -0400 Subject: rpms/dejavu-fonts import.log,1.4,1.5 Message-ID: <200507311433.j6VEXtIa001940@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1901 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-3 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 31 Jul 2005 14:28:11 -0000 1.4 +++ import.log 31 Jul 2005 14:33:23 -0000 1.5 @@ -1,3 +1,4 @@ dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802 dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 +dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 From fedora-extras-commits at redhat.com Sun Jul 31 14:33:26 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:33:26 -0400 Subject: rpms/dejavu-fonts/FC-3 .cvsignore, 1.2, 1.3 dejavu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507311434.j6VEXuu1001945@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1901/FC-3 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-3 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jun 2005 19:10:12 -0000 1.2 +++ .cvsignore 31 Jul 2005 14:33:24 -0000 1.3 @@ -1 +1 @@ -dejavu-ttf-1.11.tar.gz +dejavu-ttf-1.12.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejavu-fonts.spec 23 Jun 2005 19:10:12 -0000 1.1 +++ dejavu-fonts.spec 31 Jul 2005 14:33:24 -0000 1.2 @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/dejavu Name: dejavu-fonts -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: DejaVu Fonts Group: User Interface/X @@ -62,6 +62,9 @@ %changelog +* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 +- 1.12 + * Thu Jun 23 2005 Nicolas Mailhot 1.11-1 - 1.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jun 2005 19:10:12 -0000 1.2 +++ sources 31 Jul 2005 14:33:24 -0000 1.3 @@ -1 +1 @@ -7dc69c0afc8fd28b74720413d17e78f4 dejavu-ttf-1.11.tar.gz +93117ca13aa3a81d6579013029ef975d dejavu-ttf-1.12.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:48:47 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:48:47 -0400 Subject: rpms/dejavu-fonts import.log,1.5,1.6 Message-ID: <200507311448.j6VEmlPG002090@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2073 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1.fc4 on branch FC-4 from dejavu-fonts-1.12-1.fc4.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 31 Jul 2005 14:33:23 -0000 1.5 +++ import.log 31 Jul 2005 14:48:45 -0000 1.6 @@ -2,3 +2,4 @@ dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 +dejavu-fonts-1_12-1_fc4:FC-4:dejavu-fonts-1.12-1.fc4.src.rpm:1122821314 From fedora-extras-commits at redhat.com Sun Jul 31 14:50:12 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:50:12 -0400 Subject: rpms/dejavu-fonts import.log,1.6,1.7 Message-ID: <200507311450.j6VEoCkU002167@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2150 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1.fc3 on branch FC-3 from dejavu-fonts-1.12-1.fc3.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 31 Jul 2005 14:48:45 -0000 1.6 +++ import.log 31 Jul 2005 14:50:10 -0000 1.7 @@ -3,3 +3,4 @@ dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 dejavu-fonts-1_12-1_fc4:FC-4:dejavu-fonts-1.12-1.fc4.src.rpm:1122821314 +dejavu-fonts-1_12-1_fc3:FC-3:dejavu-fonts-1.12-1.fc3.src.rpm:1122821399 From fedora-extras-commits at redhat.com Sun Jul 31 14:50:52 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 31 Jul 2005 10:50:52 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.8, 1.9 liferea.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200507311450.j6VEoqNv002234@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2213 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Jul 31 2005 Brian Pepple - 0.9.5-1 - Update to 0.9.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jul 2005 21:58:57 -0000 1.8 +++ .cvsignore 31 Jul 2005 14:50:50 -0000 1.9 @@ -1 +1 @@ -liferea-0.9.4.tar.gz +liferea-0.9.5.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- liferea.spec 22 Jul 2005 21:58:57 -0000 1.13 +++ liferea.spec 31 Jul 2005 14:50:50 -0000 1.14 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -39,7 +39,7 @@ %build -%configure --disable-schemas-install \ +%configure --disable-schemas-install \ %if %{with_dbus} --enable-dbus=yes %else @@ -92,6 +92,9 @@ %changelog +* Sun Jul 31 2005 Brian Pepple - 0.9.5-1 +- Update to 0.9.5. + * Fri Jul 22 2005 Brian Pepple - 0.9.4-1 - Update to 0.9.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 21:58:57 -0000 1.9 +++ sources 31 Jul 2005 14:50:50 -0000 1.10 @@ -1 +1 @@ -91994fb89c107230ef3b15708aa31209 liferea-0.9.4.tar.gz +562c84cd394fd2faf7944990613117ca liferea-0.9.5.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:55:43 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 31 Jul 2005 10:55:43 -0400 Subject: rpms/liferea/devel .cvsignore, 1.8, 1.9 liferea.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200507311455.j6VEthbj002304@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Jul 31 2005 Brian Pepple - 0.9.5-2 - Update to 0.9.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jul 2005 21:57:07 -0000 1.8 +++ .cvsignore 31 Jul 2005 14:55:41 -0000 1.9 @@ -1 +1 @@ -liferea-0.9.4.tar.gz +liferea-0.9.5.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- liferea.spec 22 Jul 2005 21:57:07 -0000 1.13 +++ liferea.spec 31 Jul 2005 14:55:41 -0000 1.14 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.4 +Version: 0.9.5 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Sun Jul 31 2005 Brian Pepple - 0.9.5-2 +- Update to 0.9.5. + * Fri Jul 22 2005 Brian Pepple - 0.9.4-2 - Update to 0.9.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 21:57:07 -0000 1.9 +++ sources 31 Jul 2005 14:55:41 -0000 1.10 @@ -1 +1 @@ -91994fb89c107230ef3b15708aa31209 liferea-0.9.4.tar.gz +562c84cd394fd2faf7944990613117ca liferea-0.9.5.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 15:17:39 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:17:39 -0400 Subject: rpms/dejavu-fonts import.log,1.7,1.8 Message-ID: <200507311517.j6VFHdMo003581@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3564 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1.fc5 on branch devel from dejavu-fonts-1.12-1.fc5.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 31 Jul 2005 14:50:10 -0000 1.7 +++ import.log 31 Jul 2005 15:17:36 -0000 1.8 @@ -4,3 +4,4 @@ dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 dejavu-fonts-1_12-1_fc4:FC-4:dejavu-fonts-1.12-1.fc4.src.rpm:1122821314 dejavu-fonts-1_12-1_fc3:FC-3:dejavu-fonts-1.12-1.fc3.src.rpm:1122821399 +dejavu-fonts-1_12-1_fc5:HEAD:dejavu-fonts-1.12-1.fc5.src.rpm:1122823030 From fedora-extras-commits at redhat.com Sun Jul 31 15:22:43 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 31 Jul 2005 11:22:43 -0400 Subject: rpms/icu/devel icu-dot.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 icu.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200507311522.j6VFMhrX003705@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3681 Modified Files: .cvsignore icu.spec sources Added Files: icu-dot.patch Log Message: * Sun Jul 31 2005 Ville Skytt?? - 3.4-0.2.d02 - 3.4-d02. - Don't ship static libraries. icu-dot.patch: --- NEW FILE icu-dot.patch --- --- source/Doxyfile.in~ 2005-06-25 02:13:02.000000000 +0300 +++ source/Doxyfile.in 2005-07-31 17:01:55.000000000 +0300 @@ -201,7 +201,7 @@ #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO +HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = YES UML_LOOK = NO Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icu/devel/.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 31 Jul 2005 15:22:41 -0000 1.4 @@ -1,2 +1 @@ -icu-3.2.tgz -icu-3.2-patch.tgz +icu4c-3.4-d02.tgz Index: icu.spec =================================================================== RCS file: /cvs/extras/rpms/icu/devel/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 31 Jul 2005 15:22:41 -0000 1.4 @@ -1,18 +1,19 @@ %define gcc32 1 Name: icu -Version: 3.2 -Release: 3 +Version: 3.4 +Release: 0.2.d02 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 +Source0: http://download.sourceforge.net/icu/icu4c-%{version}-d02.tgz +Patch0: %{name}-dot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen graphviz +BuildRequires: doxygen +BuildRequires: graphviz %if %{gcc32} BuildRequires: compat-gcc-32-c++ %endif @@ -53,10 +54,8 @@ %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} +%patch0 %build @@ -65,7 +64,7 @@ %{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)} export CC=gcc32 CXX=g++32 %endif -%configure --enable-static --with-data-packaging=library --disable-samples +%configure --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 @@ -119,7 +118,6 @@ %{_mandir}/man1/%{name}-config.1* %{_includedir}/layout %{_includedir}/unicode -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/%{name} %dir %{_datadir}/%{name} @@ -134,6 +132,10 @@ %changelog +* 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/devel/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 31 Jul 2005 15:22:41 -0000 1.4 @@ -1,2 +1 @@ -55a85d2365338ece483d275119fd990c icu-3.2.tgz -304f6cb1659967c7fbdeebca4f9c0e39 icu-3.2-patch.tgz +009f76a89c008cb9b7d4b1aa77db3a90 icu4c-3.4-d02.tgz From fedora-extras-commits at redhat.com Sun Jul 31 15:23:45 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:23:45 -0400 Subject: common tobuild,1.2170,1.2171 Message-ID: <200507311523.j6VFNj08003743@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2170 retrieving revision 1.2171 diff -u -r1.2170 -r1.2171 --- tobuild 31 Jul 2005 12:42:48 -0000 1.2170 +++ tobuild 31 Jul 2005 15:23:43 -0000 1.2171 @@ -56,3 +56,4 @@ ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 gemi rpms/unison/devel unison-2_12_0-1_fc5 devel +nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 15:37:52 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:37:52 -0400 Subject: common tobuild,1.2171,1.2172 Message-ID: <200507311537.j6VFbq0u003783@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3766 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2171 retrieving revision 1.2172 diff -u -r1.2171 -r1.2172 --- tobuild 31 Jul 2005 15:23:43 -0000 1.2171 +++ tobuild 31 Jul 2005 15:37:50 -0000 1.2172 @@ -57,3 +57,4 @@ gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 gemi rpms/unison/devel unison-2_12_0-1_fc5 devel nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel +nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 31 15:41:42 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:41:42 -0400 Subject: common tobuild,1.2172,1.2173 Message-ID: <200507311541.j6VFfgn4003818@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3801 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2172 retrieving revision 1.2173 diff -u -r1.2172 -r1.2173 --- tobuild 31 Jul 2005 15:37:50 -0000 1.2172 +++ tobuild 31 Jul 2005 15:41:40 -0000 1.2173 @@ -58,3 +58,4 @@ gemi rpms/unison/devel unison-2_12_0-1_fc5 devel nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 +nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 31 15:49:49 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:49:49 -0400 Subject: common tobuild,1.2173,1.2174 Message-ID: <200507311549.j6VFnn7e003861@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3844 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2173 retrieving revision 1.2174 diff -u -r1.2173 -r1.2174 --- tobuild 31 Jul 2005 15:41:40 -0000 1.2173 +++ tobuild 31 Jul 2005 15:49:47 -0000 1.2174 @@ -59,3 +59,4 @@ nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 +nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 15:58:14 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sun, 31 Jul 2005 11:58:14 -0400 Subject: fedora-security/audit fc4,1.33,1.34 Message-ID: <200507311558.j6VFwE1K003887@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3870 Modified Files: fc4 Log Message: Lots of fc4 updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fc4 28 Jul 2005 09:30:21 -0000 1.33 +++ fc4 31 Jul 2005 15:58:12 -0000 1.34 @@ -3,10 +3,18 @@ ** are items that need attention +****-**** ** backport (NetworkManager) [since FEDORA-2005-680] 2005-2395 ** firefox -2005-2370 backport (kdenetwork) [since FEDORA-2005-624] -2005-2369 backport (kdenetwork) [since FEDORA-2005-624] +2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 +2005-2369 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-2368 VULNERABLE (vim) +2005-2367 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2366 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2365 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2364 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2363 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2362 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2361 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2335 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] @@ -49,7 +57,7 @@ 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] -2005-1852 backport (kdenetwork) [since FEDORA-2005-624] +2005-1852 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-1849 backport (zlib, fixed 1.2.3) [since FEDORA-2005-626] 2005-1831 ignore (sudo) unsubstantiated report 2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5) From fedora-extras-commits at redhat.com Sun Jul 31 17:08:31 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 31 Jul 2005 13:08:31 -0400 Subject: rpms/freedroidrpg/devel freedroidrpg-lvalue.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 freedroidrpg.desktop, 1.2, 1.3 freedroidrpg.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200507311708.j6VH8VUL006395@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6369 Modified Files: .cvsignore freedroidrpg.desktop freedroidrpg.spec sources Added Files: freedroidrpg-lvalue.patch Log Message: * Sun Jul 31 2005 Ville Skytt?? - 0.9.13-0.2.rc2 - 0.9.13rc2. - Apply upstream lvalue cast fix. - Update desktop entry categories. freedroidrpg-lvalue.patch: --- NEW FILE freedroidrpg-lvalue.patch --- --- freedroid/FreeDroid/src/map.c 2005/07/11 08:11:35 1.326 +++ freedroid/FreeDroid/src/map.c 2005/07/18 18:18:18 1.327 @@ -2408,7 +2408,7 @@ /* read MapData */ for (i = 0; i < loadlevel->ylen; i++) - if ( ( (char*)loadlevel -> map[i] = strtok ( NULL, "\n") ) == NULL) + if ( ( loadlevel -> map[i] = (void *)strtok ( NULL, "\n") ) == NULL) return NULL; /* Get Waypoints */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:23:35 -0000 1.3 +++ .cvsignore 31 Jul 2005 17:08:29 -0000 1.4 @@ -1 +1 @@ -freedroidrpg-0.9.12.tar.bz2 +freedroidrpg-0.9.13-rc2.tar.bz2 Index: freedroidrpg.desktop =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freedroidrpg.desktop 8 Nov 2004 04:23:35 -0000 1.2 +++ freedroidrpg.desktop 31 Jul 2005 17:08:29 -0000 1.3 @@ -6,4 +6,4 @@ Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;Game;ArcadeGame; +Categories=Game;ArcadeGame;RolePlaying; Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- freedroidrpg.spec 10 Jun 2005 06:30:53 -0000 1.9 +++ freedroidrpg.spec 31 Jul 2005 17:08:29 -0000 1.10 @@ -1,13 +1,14 @@ Name: freedroidrpg -Version: 0.9.12 -Release: 5 +Version: 0.9.13 +Release: 0.2.rc2 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}.tar.bz2 +Source0: http://download.sf.net/freedroid/%{name}-%{version}-rc2.tar.bz2 Source1: %{name}.desktop +Patch0: %{name}-lvalue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel @@ -27,7 +28,8 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}-rc2 +%patch0 -p2 %build @@ -46,10 +48,11 @@ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -convert graphics/paraicon.bmp \ +convert -resize 48x48 graphics/droids/001.png \ $RPM_BUILD_ROOT%{_datadir}/pixmaps/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 find $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg -type f | xargs chmod -x @@ -68,6 +71,11 @@ %changelog +* Sun Jul 31 2005 Ville Skytt?? - 0.9.13-0.2.rc2 +- 0.9.13rc2. +- Apply upstream lvalue cast fix. +- Update desktop entry categories. + * Thu Jun 9 2005 Ville Skytt?? - 0.9.12-5 - Rebuild for FC4+ with compat-gcc-32 due to crashy gcc4 experience (#152498). - Build with dependency tracking disabled. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:23:35 -0000 1.3 +++ sources 31 Jul 2005 17:08:29 -0000 1.4 @@ -1 +1 @@ -5b8b8e74e641c73645a7597ca8515707 freedroidrpg-0.9.12.tar.bz2 +eda34581d784cbd1db59ebc46208880e freedroidrpg-0.9.13-rc2.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 31 18:42:49 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 31 Jul 2005 14:42:49 -0400 Subject: rpms/inadyn/FC-4 inadyn.spec,1.11,1.12 sources,1.2,1.3 Message-ID: <200507311842.j6VIgnEd007929@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/inadyn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7910 Modified Files: inadyn.spec sources Log Message: Description: New upstream release. Index: inadyn.spec =================================================================== RCS file: /cvs/extras/rpms/inadyn/FC-4/inadyn.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- inadyn.spec 8 Jul 2005 18:23:04 -0000 1.11 +++ inadyn.spec 31 Jul 2005 18:42:47 -0000 1.12 @@ -1,6 +1,7 @@ Name: inadyn -Version: 1.90 -Release: 11%{?dist} + +Version: 1.95 +Release: 1%{dist} Summary: Dynamic DNS Client @@ -31,18 +32,19 @@ %setup -q -c %build -make -f makefile.linux CFLAGS="$RPM_OPT_FLAGS" +cd inadyn +make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sbindir} -install -m 0755 bin/inadyn $RPM_BUILD_ROOT%{_sbindir} +install -m 0755 inadyn/bin/linux/inadyn $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 0644 man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 0644 man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install -p -m 0644 inadyn/man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -p -m 0644 inadyn/man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} install -p -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} @@ -74,13 +76,16 @@ %files %defattr(-,root,root,-) -%doc readme.html +%doc inadyn/readme.html %{_sbindir}/inadyn %{_mandir}/man*/* %attr(0755,root,root) %{_initrddir}/inadyn %config %{_sysconfdir}/inadyn.conf %changelog +* Wed Jul 20 2005 Jochen Schmitt 1.95-1 +- New upstream release + * Tue May 3 2005 Jochen Schmitt 1.90-11 - Move note from README.Fedora to %%description Index: sources =================================================================== RCS file: /cvs/extras/rpms/inadyn/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2005 19:42:23 -0000 1.2 +++ sources 31 Jul 2005 18:42:47 -0000 1.3 @@ -1 +1 @@ -65552d4a34f825aa7f214775bdeac1cc inadyn.v1.90.zip +3d4c912ba9678284d330de043b7d05cb inadyn.v1.95.zip From fedora-extras-commits at redhat.com Sun Jul 31 18:43:29 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 31 Jul 2005 14:43:29 -0400 Subject: common tobuild,1.2174,1.2175 Message-ID: <200507311843.j6VIhT8B007996@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7979 Modified Files: tobuild Log Message: request build of rpms/inadyn/FC-4 inadyn-1_95-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2174 retrieving revision 1.2175 diff -u -r1.2174 -r1.2175 --- tobuild 31 Jul 2005 15:49:47 -0000 1.2174 +++ tobuild 31 Jul 2005 18:43:27 -0000 1.2175 @@ -60,3 +60,4 @@ nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel +s4504kr rpms/inadyn/FC-4 inadyn-1_95-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 31 18:45:14 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 31 Jul 2005 14:45:14 -0400 Subject: common tobuild,1.2175,1.2176 Message-ID: <200507311845.j6VIjEBH008056@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039 Modified Files: tobuild Log Message: request build of rpms/kyum/devel kyum-0_7_5-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2175 retrieving revision 1.2176 diff -u -r1.2175 -r1.2176 --- tobuild 31 Jul 2005 18:43:27 -0000 1.2175 +++ tobuild 31 Jul 2005 18:45:12 -0000 1.2176 @@ -61,3 +61,4 @@ nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel s4504kr rpms/inadyn/FC-4 inadyn-1_95-1_fc4 fc4 +s4504kr rpms/kyum/devel kyum-0_7_5-1 devel From fedora-extras-commits at redhat.com Fri Jul 1 02:09:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:00 -0400 Subject: rpms/dd_rescue - New directory Message-ID: <200507010209.j612908b030174@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30150/dd_rescue Log Message: Directory /cvs/extras/rpms/dd_rescue added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 02:09:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:00 -0400 Subject: rpms/dd_rescue/devel - New directory Message-ID: <200507010209.j61290Wb030179@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30150/dd_rescue/devel Log Message: Directory /cvs/extras/rpms/dd_rescue/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 02:09:34 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:34 -0400 Subject: rpms/dd_rescue Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507010209.j6129Y4E030222@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195 Added Files: Makefile import.log Log Message: Setup of module dd_rescue --- NEW FILE Makefile --- # Top level Makefile for module dd_rescue all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 02:09:34 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:09:34 -0400 Subject: rpms/dd_rescue/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507010209.j6129YxN030227@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dd_rescue --- NEW 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 Jul 1 02:10:24 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:10:24 -0400 Subject: rpms/dd_rescue/devel dd_rescue.1, NONE, 1.1 dd_rescue.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507010210.j612AOmO030296@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30265/devel Modified Files: .cvsignore sources Added Files: dd_rescue.1 dd_rescue.spec Log Message: auto-import dd_rescue-1.11-1 on branch devel from dd_rescue-1.11-1.src.rpm inital import --- NEW FILE dd_rescue.1 --- .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH DDRESCUE 1 "April 16, 2003" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME dd_rescue \- copies data from one file (or block device) to another .SH SYNOPSIS .B dd_rescue .RI [ options ] " infile outfile" .SH DESCRIPTION This manual page documents briefly the .B dd_rescue command. This manual page was written for the Debian distribution because the original program does not have a manual page. .PP .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invode bold face and italics, .\" respectively. \fBdd_rescue\fP is a program that copies data from one file or block device to another, it is a tool to help you to save data from crashed partition. It tries to read and if it fails it will go on with the next sectors, where tools like dd will fail. If the copying process is interrupted by the user it is possible to continue at any position later. It can copy backwards. .SH OPTIONS .TP .B \-s ipos start position in input file (default=0) .TP .B \-S opos start position in output file (def=ipos) .TP .B \-b softbs block size for copy operation (def=16384) .TP .B \-B hardbs fallback block size in case of errs (def=512) .TP .B \-e maxerr exit after maxerr errors (def=0=infinite) .TP .B \-m maxxfer maximum amount of data to be transfered (def=0=inf) .TP .B \-l logfile name of a file to log errors and summary to (def="") .TP .B \-r reverse direction copy (def=forward) .TP .B \-t truncate output file (def=no) .TP .B \-w abort on Write errors (def=no) .TP .B \-a spArse file writing (def=no) .TP .B \-A Always write blocks, zeroed if err (def=no) .TP .B \-i interactive: ask before overwriting data (def=no) .TP .B \-f force: skip some sanity checks (def=no) .TP .B \-q quiet operation .TP .B \-v verbose operation .TP .B \-V display version and exit .TP .B \-h Show summary of options .br .SH AUTHOR This manual page was written by Ayman Negm , for the Debian project (but may be used by others). --- NEW FILE dd_rescue.spec --- Summary: Fault tolerant "dd" utility for rescuing data from bad media Name: dd_rescue Version: 1.11 Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{version}.tar.gz Source1: dd_rescue.1 URL: http://www.garloff.de/kurt/linux/ddrescue/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description ddrescue is a utility similar to the system utility "dd" which copies data from a file or block device to another. ddrescue does however not abort on errors in the input file. This makes it suitable for rescuing data from media with errors, e.g. a disk with bad sectors. %prep %setup -q -n dd_rescue %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cp README.dd_rescue README %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} %{__install} -p -m 755 dd_rescue %{buildroot}%{_bindir}/dd_rescue %{__install} -p -D -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man1/dd_rescue.1 %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/dd_rescue %{_mandir}/man1/dd_rescue.1* %changelog * Fri Jul 01 2005 Andreas Thienemann 1.11-1 - Updated to 1.11 - Adapted specfile to extras conventions. - Renamed package to dd_rescue to reflect upstream, name. - Added manpage * Sun Sep 5 2004 Marius L. J??hndal 0:1.10-0.fdr.1 - Updated to 1.10. * Sat Dec 13 2003 Marius L. J??hndal 0:1.03-0.fdr.1 - Updated to 1.03. - Minor editing of description. * Mon Sep 29 2003 Marius L. J??hndal 0:1.02-0.fdr.1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dd_rescue/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 02:09:32 -0000 1.1 +++ .cvsignore 1 Jul 2005 02:10:18 -0000 1.2 @@ -0,0 +1 @@ +dd_rescue-1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dd_rescue/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 02:09:32 -0000 1.1 +++ sources 1 Jul 2005 02:10:18 -0000 1.2 @@ -0,0 +1 @@ +1fdd3716d5e8e33de66552efb176fe61 dd_rescue-1.11.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 02:10:23 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Jun 2005 22:10:23 -0400 Subject: rpms/dd_rescue import.log,1.1,1.2 Message-ID: <200507010210.j612AtRk030304@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/dd_rescue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30265 Modified Files: import.log Log Message: auto-import dd_rescue-1.11-1 on branch devel from dd_rescue-1.11-1.src.rpm inital import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dd_rescue/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 02:09:32 -0000 1.1 +++ import.log 1 Jul 2005 02:10:18 -0000 1.2 @@ -0,0 +1 @@ +dd_rescue-1_11-1:HEAD:dd_rescue-1.11-1.src.rpm:1120183814 From fedora-extras-commits at redhat.com Fri Jul 1 05:26:49 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 01:26:49 -0400 Subject: rpms/darcs/devel darcs.spec,1.1,1.2 Message-ID: <200507010526.j615Qn5t001425@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1405 Modified Files: darcs.spec Log Message: - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and tetex-latex, tetex-dvips, latex2html for doc generation Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- darcs.spec 13 Jun 2005 13:50:01 -0000 1.1 +++ darcs.spec 1 Jul 2005 05:26:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -9,7 +9,12 @@ Source0: http://www.darcs.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc +BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel +# for documentation +BuildRequires: tetex-latex, tetex-dvips, latex2html +# for make check +BuildRequires: which + %description Darcs is a revision control system, along the lines of CVS @@ -80,6 +85,11 @@ %changelog +* Fri Jul 1 2005 Jens Petersen - 1.0.3-2 +- fix buildrequires + - add sendmail, curl-devel, ncurses-devel, zlib-devel, and + tetex-latex, tetex-dvips, latex2html for doc generation + * Tue May 31 2005 Jens Petersen - 1.0.3-1 - initial import into Fedora Extras - 1.0.3 release From fedora-extras-commits at redhat.com Fri Jul 1 05:27:42 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 01:27:42 -0400 Subject: common tobuild,1.1644,1.1645 Message-ID: <200507010527.j615Rgbr001491@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1474 Modified Files: tobuild Log Message: request build of rpms/darcs/devel darcs-1_0_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1644 retrieving revision 1.1645 diff -u -r1.1644 -r1.1645 --- tobuild 30 Jun 2005 21:54:12 -0000 1.1644 +++ tobuild 1 Jul 2005 05:27:39 -0000 1.1645 @@ -36,3 +36,4 @@ zkota rpms/pybliographer/devel pybliographer-1_2_6_2-4 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5 devel +petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 05:36:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 01:36:46 -0400 Subject: common tobuild,1.1645,1.1646 Message-ID: <200507010536.j615akqP001584@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1567 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1645 retrieving revision 1.1646 diff -u -r1.1645 -r1.1646 --- tobuild 1 Jul 2005 05:27:39 -0000 1.1645 +++ tobuild 1 Jul 2005 05:36:43 -0000 1.1646 @@ -37,3 +37,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5 devel petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 06:07:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 02:07:33 -0400 Subject: common tobuild,1.1646,1.1647 Message-ID: <200507010607.j6167XHn002777@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760 Modified Files: tobuild Log Message: request build of rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1646 retrieving revision 1.1647 diff -u -r1.1646 -r1.1647 --- tobuild 1 Jul 2005 05:36:43 -0000 1.1646 +++ tobuild 1 Jul 2005 06:07:31 -0000 1.1647 @@ -38,3 +38,4 @@ petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 +pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 06:08:15 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 02:08:15 -0400 Subject: common tobuild,1.1647,1.1648 Message-ID: <200507010608.j6168FP3002841@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2824 Modified Files: tobuild Log Message: request build of rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1647 retrieving revision 1.1648 diff -u -r1.1647 -r1.1648 --- tobuild 1 Jul 2005 06:07:31 -0000 1.1647 +++ tobuild 1 Jul 2005 06:08:12 -0000 1.1648 @@ -39,3 +39,4 @@ petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 +pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 06:57:02 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 02:57:02 -0400 Subject: rpms/anthy/FC-4 .cvsignore, 1.4, 1.5 anthy.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507010657.j616v2Xf003028@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007 Modified Files: .cvsignore anthy.spec sources Log Message: * Fri Jul 1 2005 Akira TAGOH - 6700-1.fc4 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Mar 2005 14:17:31 -0000 1.4 +++ .cvsignore 1 Jul 2005 06:57:00 -0000 1.5 @@ -4,3 +4,4 @@ anthy-6024.tar.gz anthy-6131.tar.gz anthy-6300d.tar.gz +anthy-6700.tar.gz Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- anthy.spec 1 Apr 2005 14:11:56 -0000 1.7 +++ anthy.spec 1 Jul 2005 06:57:00 -0000 1.8 @@ -1,8 +1,8 @@ -%define version 6300d +%define version 6700 Name: anthy Version: %{version} -Release: 3 +Release: 1.%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ @@ -110,6 +110,9 @@ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jul 1 2005 Akira TAGOH - 6700-1.fc4 +- New upstream release. + * Fri Apr 1 2005 Michael Schwendt - 6300d-3 - include anthy datadir in main package, and anthy site directory in -el and -el-xemacs packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Mar 2005 14:17:31 -0000 1.4 +++ sources 1 Jul 2005 06:57:00 -0000 1.5 @@ -1 +1 @@ -7bbb58cb2c759ca065dad40b194ff118 anthy-6300d.tar.gz +14c604f26d7626838058b257c835e293 anthy-6700.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 06:57:47 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 02:57:47 -0400 Subject: rpms/anthy/FC-4 anthy.spec,1.8,1.9 Message-ID: <200507010657.j616vlBh003053@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3036 Modified Files: anthy.spec Log Message: Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- anthy.spec 1 Jul 2005 06:57:00 -0000 1.8 +++ anthy.spec 1 Jul 2005 06:57:45 -0000 1.9 @@ -2,7 +2,7 @@ Name: anthy Version: %{version} -Release: 1.%{?dist} +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ From fedora-extras-commits at redhat.com Fri Jul 1 06:58:59 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 02:58:59 -0400 Subject: common tobuild,1.1648,1.1649 Message-ID: <200507010658.j616wxFv003121@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3104 Modified Files: tobuild Log Message: request build of rpms/anthy/FC-4 anthy-6700-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1648 retrieving revision 1.1649 diff -u -r1.1648 -r1.1649 --- tobuild 1 Jul 2005 06:08:12 -0000 1.1648 +++ tobuild 1 Jul 2005 06:58:57 -0000 1.1649 @@ -40,3 +40,4 @@ petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 +tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 07:07:06 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:07:06 -0400 Subject: rpms/anthy/FC-3 .cvsignore, 1.3, 1.4 anthy.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507010707.j61776Gi004222@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4201 Modified Files: .cvsignore anthy.spec sources Log Message: * Fri Jul 1 2005 Akira TAGOH - 6700-1.fc3 - New upstream release. - include anthy datadir in main package, and anthy site directory in -el and -el-xemacs packages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Feb 2005 14:31:30 -0000 1.3 +++ .cvsignore 1 Jul 2005 07:07:04 -0000 1.4 @@ -3,3 +3,4 @@ *.rpm anthy-6024.tar.gz anthy-6131.tar.gz +anthy-6700.tar.gz Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-3/anthy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- anthy.spec 24 Feb 2005 14:31:31 -0000 1.2 +++ anthy.spec 1 Jul 2005 07:07:04 -0000 1.3 @@ -1,8 +1,8 @@ -%define version 6131 +%define version 6700 Name: anthy Version: %{version} -Release: 1 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ @@ -12,7 +12,7 @@ Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el -Summary: A Japanese character set input library +Summary: Japanese character set input library %description Anthy provides the library to input Japanese on the applications, such as X applications and emacs. and the user dictionaries and the users information @@ -85,7 +85,7 @@ %doc AUTHORS COPYING ChangeLog DIARY NEWS README doc %{_bindir}/* %{_sysconfdir}/* -%{_datadir}/anthy/* +%{_datadir}/anthy/ %files libs %defattr (-, root, root) @@ -101,15 +101,20 @@ %files el %defattr (-, root, root) -%{_datadir}/emacs/site-lisp/anthy/* +%{_datadir}/emacs/site-lisp/anthy/ %{_datadir}/emacs/site-lisp/site-start.d/anthy-init.el %files el-xemacs %defattr (-, root, root) -%{_datadir}/xemacs/xemacs-packages/lisp/anthy/* +%{_datadir}/xemacs/xemacs-packages/lisp/anthy/ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jul 1 2005 Akira TAGOH - 6700-1.fc3 +- New upstream release. +- include anthy datadir in main package, and anthy site directory + in -el and -el-xemacs packages + * Thu Feb 24 2005 Akira TAGOH - 6131-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/anthy/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 24 Feb 2005 14:31:31 -0000 1.3 +++ sources 1 Jul 2005 07:07:04 -0000 1.4 @@ -1 +1 @@ -ee094243b33fc75f144da56f5ebb580e anthy-6131.tar.gz +14c604f26d7626838058b257c835e293 anthy-6700.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 07:07:56 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:07:56 -0400 Subject: common tobuild,1.1649,1.1650 Message-ID: <200507010707.j6177u58004315@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4298 Modified Files: tobuild Log Message: request build of rpms/anthy/FC-3 anthy-6700-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1649 retrieving revision 1.1650 diff -u -r1.1649 -r1.1650 --- tobuild 1 Jul 2005 06:58:57 -0000 1.1649 +++ tobuild 1 Jul 2005 07:07:54 -0000 1.1650 @@ -41,3 +41,4 @@ pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 +tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 07:09:42 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:09:42 -0400 Subject: rpms/anthy/devel anthy.spec,1.8,1.9 Message-ID: <200507010709.j6179g1u004363@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346 Modified Files: anthy.spec Log Message: * Fri Jul 1 2005 Akira TAGOH - 6700-2.fc5 - added %%{?dist} to Release. Index: anthy.spec =================================================================== RCS file: /cvs/extras/rpms/anthy/devel/anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- anthy.spec 29 Jun 2005 13:46:03 -0000 1.8 +++ anthy.spec 1 Jul 2005 07:09:40 -0000 1.9 @@ -2,7 +2,7 @@ Name: anthy Version: %{version} -Release: 1 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://sourceforge.jp/projects/anthy/ @@ -110,6 +110,9 @@ %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el %changelog +* Fri Jul 1 2005 Akira TAGOH - 6700-2.fc5 +- added %%{?dist} to Release. + * Wed Jun 29 2005 Akira TAGOH - 6700-1 - New upstream release. From fedora-extras-commits at redhat.com Fri Jul 1 07:10:41 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 1 Jul 2005 03:10:41 -0400 Subject: common tobuild,1.1650,1.1651 Message-ID: <200507010710.j617Afcb004436@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4417 Modified Files: tobuild Log Message: request build of rpms/anthy/devel anthy-6700-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1650 retrieving revision 1.1651 diff -u -r1.1650 -r1.1651 --- tobuild 1 Jul 2005 07:07:54 -0000 1.1650 +++ tobuild 1 Jul 2005 07:10:39 -0000 1.1651 @@ -42,3 +42,4 @@ pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 +tagoh rpms/anthy/devel anthy-6700-2_fc5 devel From rc040203 at freenet.de Fri Jul 1 08:07:03 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 01 Jul 2005 10:07:03 +0200 Subject: APPROVED: lout Message-ID: <1120205223.3741.105.camel@mccallum.corsepiu.local> Description: Lout is a document formatting system designed and implemented by Jeffrey Kingston at the Basser Department of Computer Science, University of Sydney, Australia. The system reads a high-level description of a document similar in style to LaTeX and produces a PostScript file which can be printed on most laser printers and graphic display devices. Plain text output is also available, PDF output is limited but working (e.g. no graphics). Reviewer: Ralf Cors?pius Maintainer: Tom "Spot" Callaway From fedora-extras-commits at redhat.com Fri Jul 1 10:44:40 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:44:40 -0400 Subject: rpms/rblcheck/devel rblcheck-1.5-res_query.patch, NONE, 1.1 rblcheck.spec, 1.1, 1.2 Message-ID: <200507011044.j61AieqP008766@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8746 Modified Files: rblcheck.spec Added Files: rblcheck-1.5-res_query.patch Log Message: * Add compile fix patch for x86_64 rblcheck-1.5-res_query.patch: --- NEW FILE rblcheck-1.5-res_query.patch --- --- rblcheck-1.5/configure 2005-07-01 10:50:36.000000000 +0100 +++ rblcheck-1.5/configure 2005-07-01 10:57:05.000000000 +0100 @@ -1529,13 +1529,12 @@ cat > conftest.$ac_ext < to get macro definition for res_query */ +#include int main() { -res_query() +res_query("",0,0,"",0) ; return 0; } EOF if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/devel/rblcheck.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rblcheck.spec 29 Jun 2005 08:33:44 -0000 1.1 +++ rblcheck.spec 1 Jul 2005 10:44:37 -0000 1.2 @@ -29,6 +29,9 @@ # http://sourceforge.net/mailarchive/forum.php?thread_id=1371771&forum_id=4256 Patch2: rblcheck-names.patch +# Compile fix for x86_64 systems +Patch3: rblcheck-1.5-res_query.patch + BuildRequires: docbook-utils %description @@ -42,6 +45,7 @@ %patch0 -p1 -b .texttweak %patch1 -p0 -b .txt %patch2 -p0 -b .names +%patch3 -p1 -b .res_query %build %configure @@ -65,6 +69,9 @@ %config(noreplace) %{_sysconfdir}/rblcheckrc %changelog +* Fri Jul 01 2005 Oliver Falk - 1.5-10 +- Add compile fix patch for x86_64 + * Wed Jun 29 2005 Oliver Falk - 1.5-9 - Applied patch from Matthias (readability changes in specfile) From fedora-extras-commits at redhat.com Fri Jul 1 10:45:31 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:45:31 -0400 Subject: rpms/rblcheck/devel rblcheck.spec,1.2,1.3 Message-ID: <200507011045.j61AjVAE008826@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8809 Modified Files: rblcheck.spec Log Message: * Update the release Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/devel/rblcheck.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rblcheck.spec 1 Jul 2005 10:44:37 -0000 1.2 +++ rblcheck.spec 1 Jul 2005 10:45:29 -0000 1.3 @@ -4,7 +4,7 @@ Summary: Command-line interface to RBL-style listings Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz Source1: rblcheckrc From fedora-extras-commits at redhat.com Fri Jul 1 10:45:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:45:54 -0400 Subject: common tobuild,1.1651,1.1652 Message-ID: <200507011045.j61AjsLA008888@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8871 Modified Files: tobuild Log Message: request build of rpms/rblcheck/devel rblcheck-1_5-10_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1651 retrieving revision 1.1652 diff -u -r1.1651 -r1.1652 --- tobuild 1 Jul 2005 07:10:39 -0000 1.1651 +++ tobuild 1 Jul 2005 10:45:52 -0000 1.1652 @@ -43,3 +43,4 @@ tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel +oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 10:46:33 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:46:33 -0400 Subject: rpms/rblcheck/FC-3 rblcheck-1.5-res_query.patch, NONE, 1.1 rblcheck.spec, 1.1, 1.2 Message-ID: <200507011046.j61AkXsp008929@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8909 Modified Files: rblcheck.spec Added Files: rblcheck-1.5-res_query.patch Log Message: * Add compile fix patch for x86_64 rblcheck-1.5-res_query.patch: --- NEW FILE rblcheck-1.5-res_query.patch --- --- rblcheck-1.5/configure 2005-07-01 10:50:36.000000000 +0100 +++ rblcheck-1.5/configure 2005-07-01 10:57:05.000000000 +0100 @@ -1529,13 +1529,12 @@ cat > conftest.$ac_ext < to get macro definition for res_query */ +#include int main() { -res_query() +res_query("",0,0,"",0) ; return 0; } EOF if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/FC-3/rblcheck.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rblcheck.spec 29 Jun 2005 08:33:44 -0000 1.1 +++ rblcheck.spec 1 Jul 2005 10:46:30 -0000 1.2 @@ -4,7 +4,7 @@ Summary: Command-line interface to RBL-style listings Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz Source1: rblcheckrc @@ -29,6 +29,9 @@ # http://sourceforge.net/mailarchive/forum.php?thread_id=1371771&forum_id=4256 Patch2: rblcheck-names.patch +# Compile fix for x86_64 systems +Patch3: rblcheck-1.5-res_query.patch + BuildRequires: docbook-utils %description @@ -42,6 +45,7 @@ %patch0 -p1 -b .texttweak %patch1 -p0 -b .txt %patch2 -p0 -b .names +%patch3 -p1 -b .res_query %build %configure @@ -65,6 +69,9 @@ %config(noreplace) %{_sysconfdir}/rblcheckrc %changelog +* Fri Jul 01 2005 Oliver Falk - 1.5-10 +- Add compile fix patch for x86_64 + * Wed Jun 29 2005 Oliver Falk - 1.5-9 - Applied patch from Matthias (readability changes in specfile) From fedora-extras-commits at redhat.com Fri Jul 1 10:46:50 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:46:50 -0400 Subject: common tobuild,1.1652,1.1653 Message-ID: <200507011046.j61AkoqQ008991@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8974 Modified Files: tobuild Log Message: request build of rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1652 retrieving revision 1.1653 diff -u -r1.1652 -r1.1653 --- tobuild 1 Jul 2005 10:45:52 -0000 1.1652 +++ tobuild 1 Jul 2005 10:46:48 -0000 1.1653 @@ -44,3 +44,4 @@ tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel +oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 10:47:23 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:47:23 -0400 Subject: rpms/rblcheck/FC-4 rblcheck-1.5-res_query.patch, NONE, 1.1 rblcheck.spec, 1.1, 1.2 Message-ID: <200507011047.j61AlNsF009027@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/rblcheck/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9007 Modified Files: rblcheck.spec Added Files: rblcheck-1.5-res_query.patch Log Message: * Add compile fix patch for x86_64 rblcheck-1.5-res_query.patch: --- NEW FILE rblcheck-1.5-res_query.patch --- --- rblcheck-1.5/configure 2005-07-01 10:50:36.000000000 +0100 +++ rblcheck-1.5/configure 2005-07-01 10:57:05.000000000 +0100 @@ -1529,13 +1529,12 @@ cat > conftest.$ac_ext < to get macro definition for res_query */ +#include int main() { -res_query() +res_query("",0,0,"",0) ; return 0; } EOF if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: rblcheck.spec =================================================================== RCS file: /cvs/extras/rpms/rblcheck/FC-4/rblcheck.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rblcheck.spec 29 Jun 2005 08:33:44 -0000 1.1 +++ rblcheck.spec 1 Jul 2005 10:47:21 -0000 1.2 @@ -4,7 +4,7 @@ Summary: Command-line interface to RBL-style listings Version: 1.5 -Release: 9%{?dist} +Release: 10%{?dist} Source0: http://dl.sf.net/rblcheck/rblcheck-%{version}.tar.gz Source1: rblcheckrc @@ -29,6 +29,9 @@ # http://sourceforge.net/mailarchive/forum.php?thread_id=1371771&forum_id=4256 Patch2: rblcheck-names.patch +# Compile fix for x86_64 systems +Patch3: rblcheck-1.5-res_query.patch + BuildRequires: docbook-utils %description @@ -42,6 +45,7 @@ %patch0 -p1 -b .texttweak %patch1 -p0 -b .txt %patch2 -p0 -b .names +%patch3 -p1 -b .res_query %build %configure @@ -65,6 +69,9 @@ %config(noreplace) %{_sysconfdir}/rblcheckrc %changelog +* Fri Jul 01 2005 Oliver Falk - 1.5-10 +- Add compile fix patch for x86_64 + * Wed Jun 29 2005 Oliver Falk - 1.5-9 - Applied patch from Matthias (readability changes in specfile) From fedora-extras-commits at redhat.com Fri Jul 1 10:47:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 06:47:44 -0400 Subject: common tobuild,1.1653,1.1654 Message-ID: <200507011047.j61Aliuq009089@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9072 Modified Files: tobuild Log Message: request build of rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1653 retrieving revision 1.1654 diff -u -r1.1653 -r1.1654 --- tobuild 1 Jul 2005 10:46:48 -0000 1.1653 +++ tobuild 1 Jul 2005 10:47:42 -0000 1.1654 @@ -45,3 +45,4 @@ tagoh rpms/anthy/devel anthy-6700-2_fc5 devel oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 +oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 11:00:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:00:43 -0400 Subject: rpms/fish - New directory Message-ID: <200507011100.j61B0hd3009441@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417/fish Log Message: Directory /cvs/extras/rpms/fish added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 11:00:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:00:43 -0400 Subject: rpms/fish/devel - New directory Message-ID: <200507011100.j61B0hSQ009446@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9417/fish/devel Log Message: Directory /cvs/extras/rpms/fish/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 11:01:02 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:01:02 -0400 Subject: rpms/fish Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011101.j61B12N3010354@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9462 Added Files: Makefile import.log Log Message: Setup of module fish --- NEW FILE Makefile --- # Top level Makefile for module fish all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 11:01:01 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:01:01 -0400 Subject: rpms/fish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011101.j61B11bP010392@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9462/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fish --- NEW 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 Jul 1 11:02:49 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:02:49 -0400 Subject: rpms/fish import.log,1.1,1.2 Message-ID: <200507011103.j61B3orI010592@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558 Modified Files: import.log Log Message: auto-import fish-1.11.1-9 on branch devel from fish-1.11.1-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fish/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 11:00:59 -0000 1.1 +++ import.log 1 Jul 2005 11:02:47 -0000 1.2 @@ -0,0 +1 @@ +fish-1_11_1-9:HEAD:fish-1.11.1-9.src.rpm:1120215740 From fedora-extras-commits at redhat.com Fri Jul 1 11:03:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:03:20 -0400 Subject: rpms/fish/devel fish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011104.j61B3ooC010594@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10558/devel Modified Files: .cvsignore sources Added Files: fish.spec Log Message: auto-import fish-1.11.1-9 on branch devel from fish-1.11.1-9.src.rpm --- NEW FILE fish.spec --- Summary: A friendly interactive shell Name: fish Version: 1.11.1 Release: 9 License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are focused on user friendlieness and discoverability. The language syntax is simple but incompatible with other shell languages. %prep %setup -q %build %configure docdir=%_datadir/doc/%{name}-%{version} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" %clean rm -rf $RPM_BUILD_ROOT %post if ! grep %_bindir/fish %_sysconfdir/shells >/dev/null; then echo %_bindir/fish >>%_sysconfdir/shells fi %postun if [ "$1" = 0 ]; then grep -v %_bindir/fish %_sysconfdir/shells >%_sysconfdir/fish.tmp mv %_sysconfdir/fish.tmp %_sysconfdir/shells fi %files %defattr(-,root,root,-) %doc %_datadir/doc/%{name}-%{version} %_mandir/man1/fish.1* %_mandir/man1/xsel.1x* %_mandir/man1/mimedb.1* %_mandir/man1/set_color.1* %_mandir/man1/tokenize.1* %_mandir/man1/count.1* %attr(0755,root,root) %_bindir/fish %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color %attr(0755,root,root) %_bindir/tokenize %attr(0755,root,root) %_bindir/mimedb %attr(0755,root,root) %_bindir/count %config %_sysconfdir/fish %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish %changelog * Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way * Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog * Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null * Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' - Fix typo in post install scriptlet test - Set CFLAGS from spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 11:01:00 -0000 1.1 +++ .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 @@ -0,0 +1 @@ +fish-1.11.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 11:01:00 -0000 1.1 +++ sources 1 Jul 2005 11:03:18 -0000 1.2 @@ -0,0 +1 @@ +b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 11:08:36 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:08:36 -0400 Subject: rpms/fish/devel fish.spec,1.1,1.2 Message-ID: <200507011108.j61B8aEI010707@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10684 Modified Files: fish.spec Log Message: - Added dist macro to the release - Small spec beautifying Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fish.spec 1 Jul 2005 11:03:18 -0000 1.1 +++ fish.spec 1 Jul 2005 11:08:34 -0000 1.2 @@ -1,13 +1,17 @@ -Summary: A friendly interactive shell -Name: fish -Version: 1.11.1 -Release: 9 -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +Summary: A friendly interactive shell +Name: fish + +Version: 1.11.1 +Release: 9%{?dist} + +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ + +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -61,16 +65,20 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 +* 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 -* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' From fedora-extras-commits at redhat.com Fri Jul 1 11:09:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:09:54 -0400 Subject: common tobuild,1.1654,1.1655 Message-ID: <200507011109.j61B9sZj010777@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10760 Modified Files: tobuild Log Message: request build of rpms/fish/devel fish-1_11_1-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1654 retrieving revision 1.1655 diff -u -r1.1654 -r1.1655 --- tobuild 1 Jul 2005 10:47:42 -0000 1.1654 +++ tobuild 1 Jul 2005 11:09:50 -0000 1.1655 @@ -46,3 +46,4 @@ oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 +oliver rpms/fish/devel fish-1_11_1-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:10:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:10:45 -0400 Subject: common tobuild,1.1655,1.1656 Message-ID: <200507011110.j61BAjTX010800@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10783 Modified Files: tobuild Log Message: * Oops, don't want to build this release Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1655 retrieving revision 1.1656 diff -u -r1.1655 -r1.1656 --- tobuild 1 Jul 2005 11:09:50 -0000 1.1655 +++ tobuild 1 Jul 2005 11:10:42 -0000 1.1656 @@ -46,4 +46,3 @@ oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 -oliver rpms/fish/devel fish-1_11_1-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:11:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:11:13 -0400 Subject: rpms/fish/devel fish.spec,1.2,1.3 Message-ID: <200507011111.j61BBDfs010828@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10811 Modified Files: fish.spec Log Message: * Update release (forgot to do that) Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fish.spec 1 Jul 2005 11:08:34 -0000 1.2 +++ fish.spec 1 Jul 2005 11:11:11 -0000 1.3 @@ -2,7 +2,7 @@ Name: fish Version: 1.11.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: System Environment/Shells From fedora-extras-commits at redhat.com Fri Jul 1 11:11:31 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 1 Jul 2005 07:11:31 -0400 Subject: common tobuild,1.1656,1.1657 Message-ID: <200507011111.j61BBVpK010890@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10873 Modified Files: tobuild Log Message: request build of rpms/fish/devel fish-1_11_1-10_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1656 retrieving revision 1.1657 diff -u -r1.1656 -r1.1657 --- tobuild 1 Jul 2005 11:10:42 -0000 1.1656 +++ tobuild 1 Jul 2005 11:11:29 -0000 1.1657 @@ -46,3 +46,4 @@ oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 +oliver rpms/fish/devel fish-1_11_1-10_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:15:39 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 07:15:39 -0400 Subject: rpms/perl-MailTools/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 perl-MailTools.spec, 1.9, 1.10 Message-ID: <200507011115.j61BFdUN010983@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10957 Modified Files: sources .cvsignore perl-MailTools.spec Log Message: * Fri Jul 1 2005 Paul Howarth - 1.67-1 - update to 1.67 (#161830) - assume perl_vendorlib is set - license is same as perl (GPL or Artistic) according to README - don't include module name in summary - use macros consistently Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2005 11:50:32 -0000 1.4 +++ sources 1 Jul 2005 11:15:37 -0000 1.5 @@ -1 +1 @@ -fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz +7871c38e42792c5e0920b3817e1523fd MailTools-1.67.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 +++ .cvsignore 1 Jul 2005 11:15:37 -0000 1.5 @@ -1 +1 @@ -MailTools-1.66.tar.gz +MailTools-1.67.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-MailTools.spec 6 Apr 2005 22:13:07 -0000 1.9 +++ perl-MailTools.spec 1 Jul 2005 11:15:37 -0000 1.10 @@ -1,19 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - -Summary: MailTools module for Perl +Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.66 -Release: 2 +Version: 1.67 +Release: 1 -License: Artistic +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MailTools is a set of Perl modules related to mail applications. @@ -25,26 +23,26 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +%{__rm} -rf "$RPM_BUILD_ROOT" +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';' +%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';' %check || : -make test +%{__make} test %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf "$RPM_BUILD_ROOT" %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog README* examples/ %{perl_vendorlib}/auto/Mail/ %{perl_vendorlib}/Mail/ @@ -52,6 +50,13 @@ %changelog +* Fri Jul 1 2005 Paul Howarth - 1.67-1 +- update to 1.67 (#161830) +- assume perl_vendorlib is set +- license is same as perl (GPL or Artistic) according to README +- don't include module name in summary +- use macros consistently + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Jul 1 11:16:49 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 07:16:49 -0400 Subject: rpms/perl-MailTools/devel perl-MailTools.spec,1.10,1.11 Message-ID: <200507011116.j61BGoXB011006@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10989 Modified Files: perl-MailTools.spec Log Message: add dist tag Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-MailTools.spec 1 Jul 2005 11:15:37 -0000 1.10 +++ perl-MailTools.spec 1 Jul 2005 11:16:47 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Various mail-related perl modules Name: perl-MailTools Version: 1.67 -Release: 1 +Release: 1%{?dist} License: GPL or Artistic Group: Development/Libraries @@ -56,6 +56,7 @@ - license is same as perl (GPL or Artistic) according to README - don't include module name in summary - use macros consistently +- add dist tag * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Jul 1 11:33:54 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 1 Jul 2005 07:33:54 -0400 Subject: common tobuild,1.1657,1.1658 Message-ID: <200507011133.j61BXsIC011270@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1657 retrieving revision 1.1658 diff -u -r1.1657 -r1.1658 --- tobuild 1 Jul 2005 11:11:29 -0000 1.1657 +++ tobuild 1 Jul 2005 11:33:52 -0000 1.1658 @@ -1,45 +1,3 @@ -mschwendt rpms/gai-temp/FC-3 gai-temp-0_1_1-2_fc3 fc3 -mschwendt rpms/libkipi/devel libkipi-0_1_1-1_2_fc5 devel -petersen rpms/darcs/FC-4 darcs-1_0_3-1_fc4 fc4 -awjb rpms/fluxconf/devel fluxconf-0_9_8-1_fc5 devel -caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel -tagoh rpms/uim/devel uim-0_4_6-5 devel -tagoh rpms/anthy/devel anthy-6700-1 devel -shahms rpms/bazaar/devel bazaar-1_4_2-1_fc5 devel -shahms rpms/bazaar/FC-4 bazaar-1_4_2-1_fc4 fc4 -Tian rpms/gcfilms/devel gcfilms-5_2-1 devel -shahms rpms/bazaar/FC-3 bazaar-1_4_2-1_fc3 fc3 -steve rpms/cone/devel cone-0_64-5_fc5 devel -sheltren rpms/cfengine/FC-4 cfengine-2_1_15-2_fc4 fc4 -sheltren rpms/cfengine/devel cfengine-2_1_15-2_fc5 devel -sheltren rpms/cfengine/FC-3 cfengine-2_1_15-2_fc3 fc3 -scop rpms/xemacs/devel xemacs-21_4_17-4 devel -ausil rpms/konversation/devel konversation-0_18-3_fc5 devel -oliver rpms/rblcheck/FC-3 rblcheck-1_5-9_fc3 fc3 -oliver rpms/rblcheck/FC-4 rblcheck-1_5-9_fc4 fc4 -thomasvs rpms/directfb/FC-4 directfb-0_9_22-2_fc4 fc4 -ivazquez rpms/gnome-theme-clearlooks/FC-3 gnome-theme-clearlooks-0_6_2-1 fc3 -tagoh rpms/kinput2/FC-4 kinput2-v3_1-24_fc4 fc4 -tagoh rpms/kinput2/devel kinput2-v3_1-25_fc5 devel -petersen rpms/scim-anthy/devel scim-anthy-0_5_0-1_fc5 devel -kaboom devel/fping fping-2_4b2-5_fc5 devel -ausil rpms/konversation/FC-4 konversation-0_18-3_fc4 fc4 -mschwendt rpms/id3lib/devel id3lib-3_8_3-11_fc5 devel -jpo rpms/splint/FC-4 splint-3_1_1-9_fc4 fc4 -jpo rpms/splint/devel splint-3_1_1-9_fc5 devel -spot rpms/libotr/FC-3 libotr-2_0_2-7_fc3 fc3 -spot rpms/libotr/FC-4 libotr-2_0_2-7_fc4 fc4 -davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-1 devel -kaboom devel/rinetd rinetd-0_62-4_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-3_fc4 FC4 -zkota rpms/python-bibtex/devel python-bibtex-1_2_1-3 devel -zkota rpms/pybliographer/devel pybliographer-1_2_6_2-4 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5 devel - -petersen rpms/darcs/devel darcs-1_0_3-2_fc5 devel -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_0-1_fc4 fc4 -pghmcfc rpms/rbldnsd/FC-4 rbldnsd-0_995-4_fc4 fc4 -pghmcfc rpms/rbldnsd/FC-3 rbldnsd-0_995-4_fc3 fc3 tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 11:51:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:28 -0400 Subject: extras-buildsys ChangeLog,1.41,1.42 plague.spec,1.6,1.7 Message-ID: <200507011151.j61BpwDr011398@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305 Modified Files: ChangeLog plague.spec Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ChangeLog 29 Jun 2005 20:27:11 -0000 1.41 +++ ChangeLog 1 Jul 2005 11:51:26 -0000 1.42 @@ -1,3 +1,18 @@ +2005-07-01 Dan Williams + + * We now use lighttpd as the fileserver in both the server and the builder. It's + a lot more robust than the python implementation, but the python implementation + code still exists and can be used. + + * The server key and certificate must now be in the same file. You can 'cat' them + together with 'cat key.pem cert.pem > key_and_cert.pem' + + * Initialize m2crypto threading in buildservery.py and builder.py + + * Change some config options for the builder that said 'client' to 'builder' + + * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py + 2005-06-29 Dan Williams * Add the ability to search jobs on current job status from plague-client Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- plague.spec 29 Jun 2005 21:32:33 -0000 1.6 +++ plague.spec 1 Jul 2005 11:51:26 -0000 1.7 @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-sqlite, m2crypto, createrepo Requires: %{name}-common = %{version}-%{release} +Requires: lighttpd %description The Plague build system is a client/server distributed build system for @@ -42,6 +43,7 @@ Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: m2crypto +Requires: lighttpd %description client Client program for enqueueing package builds and interrogating the build system. From fedora-extras-commits at redhat.com Fri Jul 1 11:51:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:29 -0400 Subject: extras-buildsys/builder CONFIG.py,1.2,1.3 builder.py,1.3,1.4 Message-ID: <200507011151.j61BpxRF011402@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CONFIG.py 28 Jun 2005 02:03:12 -0000 1.2 +++ CONFIG.py 1 Jul 2005 11:51:27 -0000 1.3 @@ -1,4 +1,4 @@ -# Configuration file for archwelder.py +# Configuration file for plague builder config_opts = {} config_opts['debug'] = True @@ -7,7 +7,7 @@ # Distro and Repo: # -# The build client constructs the buildroot name that it +# The builder constructs the buildroot name that it # passes to mock from a few things. The format is: # # --- @@ -26,12 +26,11 @@ # SSL Certs and keys # MUST be full path to cert -config_opts['client_cert'] = BUILDER_DIR + "/certs/client_cert.pem" -config_opts['client_key'] = BUILDER_DIR + "/certs/client_key.pem" +config_opts['builder_key_and_cert'] = BUILDER_DIR + "/certs/builder_key_and_cert.pem" config_opts['ca_cert'] = BUILDER_DIR + "/certs/ca_cert.pem" # Where to keep SRPMs to build and the finished products # and logs. # WARNING: this directory is world-readable via HTTP! -config_opts['client_work_dir'] = "/tmp/build_client_work" +config_opts['builder_work_dir'] = "/tmp/builder_work" Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- builder.py 29 Jun 2005 05:22:54 -0000 1.3 +++ builder.py 1 Jul 2005 11:51:27 -0000 1.4 @@ -15,8 +15,6 @@ # copyright 2005 Duke University # written by Seth Vidal -# TODO: xml-rpc communication using 2-way ssl-cert-verified xmlrpc connection - import SimpleXMLRPCServer import xmlrpclib @@ -32,19 +30,21 @@ import fcntl import urllib import errno -from plague import SimpleHTTPSServer from plague import FileDownloader from plague import SimpleSSLXMLRPCServer +from plague import lighttpdManager +from plague import SimpleHTTPSServer +from M2Crypto import threading as m2thread # Load in the config execfile("/etc/plague/builder/CONFIG.py") +use_lighttpd = True g_our_hostname = None certs = {} -certs['cert'] = config_opts['client_cert'] -certs['key'] = config_opts['client_key'] +certs['key_and_cert'] = config_opts['builder_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] @@ -52,10 +52,10 @@ def get_url_for_file(file_path): """ Return a URL pointing to a particular file in our work dir """ - # Ensure the file we're turning into a URL lives in our client work dir - if not file_path.startswith(config_opts["client_work_dir"]): + # Ensure the file we're turning into a URL lives in our builder work dir + if not file_path.startswith(config_opts["builder_work_dir"]): return None - file_part = file_path[len(config_opts["client_work_dir"]) + 1:] + file_part = file_path[len(config_opts["builder_work_dir"]) + 1:] port = "%s" % config_opts['fileserver_port'] full_url = "https://" + g_our_hostname + ":" + port + "/" + file_part return urllib.quote(full_url) @@ -77,15 +77,15 @@ self._log_fd = None self._mock_config = None - self._result_dir = os.path.join(config_opts['client_work_dir'], self._uniqid, "result") + self._result_dir = os.path.join(config_opts['builder_work_dir'], self._uniqid, "result") if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) - self._state_dir = os.path.join(config_opts['client_work_dir'], self._uniqid, "mock-state") + self._state_dir = os.path.join(config_opts['builder_work_dir'], self._uniqid, "mock-state") if not os.path.exists(self._state_dir): os.makedirs(self._state_dir) - logfile = os.path.join(self._result_dir, "buildclient.log") + logfile = os.path.join(self._result_dir, "builder.log") self._log_fd = open(logfile, "w+") self.log("""Starting job: @@ -101,7 +101,7 @@ self._srpm_path = None self.log("Failed in __init__, couldn't extract SRPM filename.\n") else: - self._srpm_path = os.path.join(config_opts['client_work_dir'], self._uniqid, "source", srpm_filename) + self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename) def die(self, sig=15): if self._pobj and self._pobj.pid: # Can't kill the package download from build server @@ -433,7 +433,7 @@ } def getBuildClient(uniqid, target, buildarch, srpm_url, localarches): - """hand it an arch it hands you back the build client instance you need""" + """hand it an arch it hands you back the builder instance you need""" if not builder_dict.has_key(buildarch): # raise an exception here bitching about no place to build for that arch @@ -554,6 +554,8 @@ print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + m2thread.init() + xmlrpc_port = config_opts['xmlrpc_port'] xmlserver = SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer(certs, (g_our_hostname, xmlrpc_port)) bcs = XMLRPCBuildClientServer(localarches) @@ -561,9 +563,13 @@ # Start up the HTTP server thread which the build server # pulls completed RPMs from - work_dir = config_opts['client_work_dir'] - fs_port = config_opts['fileserver_port'] - http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, fs_port), work_dir) + work_dir = config_opts['builder_work_dir'] + port = config_opts['fileserver_port'] + if use_lighttpd: + http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid() + http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, config_opts['builder_key_and_cert']) + else: + http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, port), work_dir) http_server.start() last_time = time.time() @@ -587,4 +593,7 @@ bcs.process() last_time = time.time() + http_server.stop() + time.sleep(2) + m2thread.cleanup() os._exit(0) From fedora-extras-commits at redhat.com Fri Jul 1 11:51:30 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:30 -0400 Subject: extras-buildsys/client client.py,1.4,1.5 Message-ID: <200507011152.j61Bq0pS011405@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/client Modified Files: client.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- client.py 29 Jun 2005 20:27:12 -0000 1.4 +++ client.py 1 Jul 2005 11:51:27 -0000 1.5 @@ -28,7 +28,6 @@ config = ConfigParser.ConfigParser() config.add_section('Certs') config.set('Certs', 'user-cert', '~/.fedora.cert') -config.set('Certs', 'user-key', '') config.set('Certs', 'user-ca-cert', '~/.fedora-upload-ca.cert') config.set('Certs', 'server-ca-cert', '~/.fedora-server-ca.cert') @@ -187,12 +186,7 @@ raise ServerException("Error: '%s' is not an SSL server, but the use_ssl config option set to True. See %s" % (addr, config_file_path)) else: certs = {} - certs['cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) - client_key = config.get('Certs', 'user-key') - # If client-key is empty, key assumed to be in user-cert - certs['key'] = None - if len(client_key) > 0: - certs['key'] = os.path.expanduser(client_key) + certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert')) certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert')) server = SSLXMLRPCServerProxy.SSLXMLRPCServerProxy(certs, config.get('Server', 'address')) From fedora-extras-commits at redhat.com Fri Jul 1 11:51:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:35 -0400 Subject: extras-buildsys/server BuildJob.py, 1.14, 1.15 CONFIG.py, 1.13, 1.14 buildserver.py, 1.11, 1.12 client_manager.py, 1.26, 1.27 Message-ID: <200507011152.j61Bq6fd011414@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/server Modified Files: BuildJob.py CONFIG.py buildserver.py client_manager.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py Index: BuildJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildJob.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- BuildJob.py 29 Jun 2005 21:32:33 -0000 1.14 +++ BuildJob.py 1 Jul 2005 11:51:33 -0000 1.15 @@ -410,7 +410,7 @@ # Only some stages need to sleep because we stay in # them for a while. if do_sleep: - time.sleep(3) + time.sleep(5) def _start_unspawned_builds(self): for arch in self.buildarches: Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- CONFIG.py 27 Jun 2005 02:33:27 -0000 1.13 +++ CONFIG.py 1 Jul 2005 11:51:33 -0000 1.14 @@ -23,8 +23,7 @@ # SSL Cert and key bits # MUST be full path to cert -config_opts['server_cert'] = SERVER_BASE_DIR + "/certs/server_cert.pem" -config_opts['server_key'] = SERVER_BASE_DIR + "/certs/server_key.pem" +config_opts['server_key_and_cert'] = SERVER_BASE_DIR + "/certs/server_key_and_cert.pem" # CA cert that signs build client certificates config_opts['ca_cert'] = SERVER_BASE_DIR + "/certs/ca_cert.pem" Index: buildserver.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/buildserver.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- buildserver.py 28 Jun 2005 01:41:33 -0000 1.11 +++ buildserver.py 1 Jul 2005 11:51:33 -0000 1.12 @@ -18,9 +18,11 @@ import sys import os -from plague import SimpleHTTPSServer from plague import SimpleSSLXMLRPCServer +from plague import lighttpdManager +from plague import SimpleHTTPSServer import SimpleXMLRPCServer +from M2Crypto import threading as m2thread sys.path.append('/usr/share/plague/server') @@ -34,6 +36,8 @@ # Load in the config execfile("/etc/plague/server/CONFIG.py") +use_lighttpd = True + class AuthenticatedSSLXMLRPCServer(SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer): """ @@ -86,6 +90,8 @@ hostname = sys.argv[1] + m2thread.init() + bcm = BuildClientManager() # Create the BuildMaster thread @@ -93,15 +99,8 @@ bm.start() # SSL certificate and key filenames - srpm_server_certs = {} - srpm_server_certs['cert'] = config_opts['server_cert'] - srpm_server_certs['key'] = config_opts['server_key'] - srpm_server_certs['ca_cert'] = config_opts['ca_cert'] - srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] - ui_certs = {} - ui_certs['cert'] = config_opts['server_cert'] - ui_certs['key'] = config_opts['server_key'] + ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] ui_certs['ca_cert'] = config_opts['ca_cert'] ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] @@ -117,7 +116,15 @@ # SRPM fileserver http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") - srpm_server = SimpleHTTPSServer.SimpleHTTPSServer(srpm_server_certs, (hostname, 8886), http_dir) + if use_lighttpd: + http_cnf_file = "/var/tmp/plague-server.conf" + srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, 8886, http_dir, config_opts['server_key_and_cert']) + else: + srpm_server_certs = {} + srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] + srpm_server_certs['ca_cert'] = config_opts['ca_cert'] + srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] + srpm_server = SimpleHTTPSServer.SimpleHTTPSServer(srpm_server_certs, (hostname, 8886), http_dir) srpm_server.start() print "Build Server accepting requests on %s:8887.\n" % hostname @@ -127,9 +134,11 @@ # Make sure the BuildMaster thread shuts down print "Shutting down..." bm.stop() + srpm_server.stop() del bm print "Done." + m2thread.cleanup() os._exit(0) Index: client_manager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/client_manager.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- client_manager.py 29 Jun 2005 21:37:12 -0000 1.26 +++ client_manager.py 1 Jul 2005 11:51:33 -0000 1.27 @@ -34,8 +34,7 @@ # SSL certificate and key filenames certs = {} -certs['cert'] = config_opts['server_cert'] -certs['key'] = config_opts['server_key'] +certs['key_and_cert'] = config_opts['server_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] From fedora-extras-commits at redhat.com Fri Jul 1 11:51:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 1 Jul 2005 07:51:35 -0400 Subject: extras-buildsys/common lighttpdManager.py, NONE, 1.1 FileDownloader.py, 1.8, 1.9 Makefile, 1.2, 1.3 SSLCommon.py, 1.6, 1.7 SimpleHTTPSServer.py, 1.5, 1.6 Message-ID: <200507011151.j61BpZjl011388@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/common Modified Files: FileDownloader.py Makefile SSLCommon.py SimpleHTTPSServer.py Added Files: lighttpdManager.py Log Message: 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's a lot more robust than the python implementation, but the python implementation code still exists and can be used. * The server key and certificate must now be in the same file. You can 'cat' them together with 'cat key.pem cert.pem > key_and_cert.pem' * Initialize m2crypto threading in buildservery.py and builder.py * Change some config options for the builder that said 'client' to 'builder' * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py --- NEW FILE lighttpdManager.py --- #!/usr/bin/python -t # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. # import os import shutil import fcntl import threading import time import popen2 class lighttpdManager(threading.Thread): def __init__(self, conffile, hostname, port, basedir, key_and_cert): self._stop = False self._pobj = None self._conffile = conffile self._port = port self._hostname = hostname self._basedir = basedir self._key_and_cert = key_and_cert threading.Thread.__init__(self) if not self._setup(): os._exit(1) self._start_server() def _setup(self): if not os.path.exists(self._basedir): os.makedirs(self._basedir) if not os.access(self._key_and_cert, os.R_OK): print "%s does not exist or is not readable." % self._key_and_cert return False if not os.path.exists(os.path.dirname(self._conffile)): os.makedirs(os.path.dirname(self._conffile)) cnf = ''' server.chroot = "%s" server.document-root = "/" mimetype.assign = ( ".rpm" => "application/x-rpm", ".log" => "text/plain" ) server.port = %d server.bind = "%s" server.username = "lighttpd" server.groupname = "lighttpd" server.dir-listing = "disable" ssl.engine = "enable" ssl.pemfile = "%s" ''' % (self._basedir, self._port, self._hostname, self._key_and_cert) f = open(self._conffile, "w") f.write(cnf) f.close() return True def _start_server(self): cmd = "/usr/sbin/lighttpd -f %s -D" % self._conffile self._pobj = popen2.Popen4(cmd=cmd, bufsize=1024) fcntl.fcntl(self._pobj.fromchild.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) def run(self): while not self._stop: if self._pobj: st = self._pobj.poll() # Restart it if it fails if st >= 0: print "HTTP server failed, trying to restart..." print "----------------------------------------" for line in self._pobj.fromchild.readlines(): print line print "----------------------------------------\n" del self._pobj if not self._setup(): os._exit(1) self._start_server() time.sleep(5) if self._pobj: os.kill(self._pobj.pid, 15) os.remove(self._conffile) def stop(self): self._stop = True Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- FileDownloader.py 21 Jun 2005 17:54:58 -0000 1.8 +++ FileDownloader.py 1 Jul 2005 11:51:33 -0000 1.9 @@ -102,9 +102,83 @@ except socket.error, e: if CommonErrors.canIgnoreSocketError(e): pass + except IOError, e: + if CommonErrors.canIgnoreSocketError(e): + pass if result: self._callback('done', self._cb_data) else: self._callback('failed', self._cb_data) + + +########################################################### +# Testing stuff +########################################################### + +import sys, time +from M2Crypto import threading as m2thread + +class dlwr: + def __init__(self, x, t): + self.num = x + self.tracker = t + self.dl = None + + def set_dl(self, dl): + self.dl = dl + + +class dl_tracker: + def __init__(self): + self.lst = [] + + def add(self, dlwr): + self.lst.append(dlwr) + + def remove(self, dlwr): + self.lst.remove(dlwr) + + def num(self): + return len(self.lst) + + +def dl_callback(status, dlwr): + print "Finished with %d (%s)" % (dlwr.num, status) + dlwr.tracker.remove(dlwr) + + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python FileDownloader.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + print "Starting..." + dlt = dl_tracker() + + m2thread.init() + x = 0 + while x < 100: + wr = dlwr(x, dlt) + dstdir = os.path.join("/tmp", "client_dir", "%s" % x) + if not os.path.exists(dstdir): + os.makedirs(dstdir) + time.sleep(0.25) + dl = FileDownloader(dl_callback, wr, "https://localhost:8886/testfile.dat", dstdir, ['.dat'], certs) + dlt.add(wr) + dl.start() + x = x + 1 + + while dlt.num() > 0: + try: + time.sleep(1) + except KeyboardInterrupt: + print "Quitting..." + m2thread.cleanup() + os._exit(0) Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 28 Jun 2005 01:41:28 -0000 1.2 +++ Makefile 1 Jul 2005 11:51:33 -0000 1.3 @@ -15,6 +15,7 @@ SimpleSSLXMLRPCServer.py \ SSLCommon.py \ SSLXMLRPCServerProxy.py \ + lighttpdManager.py \ __init__.py clean: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SSLCommon.py 27 Jun 2005 02:40:54 -0000 1.6 +++ SSLCommon.py 1 Jul 2005 11:51:33 -0000 1.7 @@ -29,17 +29,16 @@ """ Helper method for m2crypto's SSL libraries. """ - cert = certs['cert'] - key = certs['key'] + key_and_cert = certs['key_and_cert'] ca_cert = certs['ca_cert'] peer_ca_cert = certs['peer_ca_cert'] - for f in cert, key, ca_cert, peer_ca_cert: + for f in key_and_cert, ca_cert, peer_ca_cert: if f and not os.access(f, os.R_OK): print "%s does not exist or is not readable." % f os._exit(1) ctx = SSL.Context('sslv3') # SSLv3 only - ctx.load_cert(cert, key) + ctx.load_cert(key_and_cert) ctx.load_client_ca(ca_cert) ctx.load_verify_info(peer_ca_cert) ctx.set_allow_unknown_ca(False) @@ -58,6 +57,7 @@ # because it hung or tracebacked timeout = SSL.timeout(10) self.socket.set_socket_read_timeout(timeout) + self.socket.set_socket_write_timeout(timeout) def handle_request(self): request = None @@ -66,6 +66,7 @@ request, client_address = self.get_request() timeout = SSL.timeout(10) request.set_socket_read_timeout(timeout) + request.set_socket_write_timeout(timeout) if self.verify_request(request, client_address): self.process_request(request, client_address) except SSL.SSLError, e: Index: SimpleHTTPSServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SimpleHTTPSServer.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SimpleHTTPSServer.py 27 Jun 2005 02:40:54 -0000 1.5 +++ SimpleHTTPSServer.py 1 Jul 2005 11:51:33 -0000 1.6 @@ -19,7 +19,6 @@ import SimpleHTTPServer import SocketServer import threading -import os import urllib import posixpath import os, sys @@ -29,6 +28,7 @@ import SSLCommon import socket import time +from M2Crypto import threading as m2thread class HttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): @@ -90,6 +90,7 @@ # because it hung or tracebacked timeout = SSL.timeout(10) self.socket.set_socket_read_timeout(timeout) + self.socket.set_socket_write_timeout(timeout) def finish(self): if self.request: @@ -116,8 +117,55 @@ def __init__(self, certs, addr, http_dir): self._server = ThreadingHTTPSServer(certs, addr, http_dir) + self._stop = False threading.Thread.__init__(self) def run(self): - self._server.serve_forever() + while not self._stop: + self._server.handle_request() + def stop(self): + self._stop = True + + +########################################################### +# Testing stuff +########################################################### + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python SimpleHTTPSServer.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + print "Starting..." + + srcdir = os.path.join("/tmp", "server_dir") + if not os.path.exists(srcdir): + os.makedirs(srcdir) + + print "Creating random test data..." + f = open(os.path.join(srcdir, "testfile.dat"), "w") + x = 1 + while x < 10000: + f.write(os.urandom(50)) + x = x + 1 + f.close() + + m2thread.init() + + print "Starting the server." + server = SimpleHTTPSServer(certs, ('localhost', 8886), srcdir) + server.start() + + while True: + try: + time.sleep(1) + except KeyboardInterrupt: + print "Quitting..." + m2thread.cleanup() + os._exit(0) From fedora-extras-commits at redhat.com Fri Jul 1 12:00:42 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:00:42 -0400 Subject: common tobuild,1.1658,1.1659 Message-ID: <200507011200.j61C0gX0011542@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11525 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1658 retrieving revision 1.1659 diff -u -r1.1658 -r1.1659 --- tobuild 1 Jul 2005 11:33:52 -0000 1.1658 +++ tobuild 1 Jul 2005 12:00:40 -0000 1.1659 @@ -5,3 +5,4 @@ oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 oliver rpms/fish/devel fish-1_11_1-10_fc5 devel +petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 12:03:37 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:03:37 -0400 Subject: rpms/darcs/FC-4 darcs.spec,1.1,1.2 Message-ID: <200507011204.j61C473N012637@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12618 Modified Files: darcs.spec Log Message: - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and tetex-latex, tetex-dvips, latex2html for doc generation Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- darcs.spec 13 Jun 2005 13:50:01 -0000 1.1 +++ darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -9,7 +9,12 @@ Source0: http://www.darcs.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc +BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel +# for documentation +BuildRequires: tetex-latex, tetex-dvips, latex2html +# for make check +BuildRequires: which + %description Darcs is a revision control system, along the lines of CVS @@ -80,6 +85,11 @@ %changelog +* Fri Jul 1 2005 Jens Petersen - 1.0.3-2 +- fix buildrequires + - add sendmail, curl-devel, ncurses-devel, zlib-devel, and + tetex-latex, tetex-dvips, latex2html for doc generation + * Tue May 31 2005 Jens Petersen - 1.0.3-1 - initial import into Fedora Extras - 1.0.3 release From oliver at linux-kernel.at Fri Jul 1 12:05:01 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 01 Jul 2005 14:05:01 +0200 Subject: APPROVED: fish In-Reply-To: <42C51D09.9090000@linux-kernel.at> References: <42C51D09.9090000@linux-kernel.at> Message-ID: <42C5316D.8090203@linux-kernel.at> On 07/01/2005 12:38 PM, Oliver Falk wrote: > Name: fish > Summary: A friendly interactive shell > > Description: > fish is a shell geared towards interactive use. It's features are > focused on user friendlieness and discoverability. The language syntax > is simple but incompatible with other shell languages. > > Maintainer: Axel Liljencrantz > Reviewer: Oliver Falk > From fedora-extras-commits at redhat.com Fri Jul 1 12:06:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 08:06:45 -0400 Subject: common tobuild,1.1659,1.1660 Message-ID: <200507011206.j61C6jMQ012709@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12687 Modified Files: tobuild Log Message: restore table header Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1659 retrieving revision 1.1660 diff -u -r1.1659 -r1.1660 --- tobuild 1 Jul 2005 12:00:40 -0000 1.1659 +++ tobuild 1 Jul 2005 12:06:28 -0000 1.1660 @@ -1,3 +1,6 @@ +# this is the build control file. the format is +# user repo tag target status +# tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 tagoh rpms/anthy/devel anthy-6700-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 12:18:07 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:18:07 -0400 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 Message-ID: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12804 Modified Files: darcs.spec Log Message: microbump release - to workround running make tag before committing Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 +++ darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: David's advanced revision control system Group: Development/Tools From fedora-extras-commits at redhat.com Fri Jul 1 12:19:45 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:19:45 -0400 Subject: rpms/darcs/FC-3 darcs.spec,1.1,1.2 Message-ID: <200507011219.j61CJjPN012890@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12866 Modified Files: darcs.spec Log Message: - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and tetex-latex, tetex-dvips, latex2html for doc generation Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-3/darcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- darcs.spec 13 Jun 2005 13:50:01 -0000 1.1 +++ darcs.spec 1 Jul 2005 12:19:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -9,7 +9,12 @@ Source0: http://www.darcs.net/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc +BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel +# for documentation +BuildRequires: tetex-latex, tetex-dvips, latex2html +# for make check +BuildRequires: which + %description Darcs is a revision control system, along the lines of CVS @@ -80,6 +85,11 @@ %changelog +* Fri Jul 1 2005 Jens Petersen - 1.0.3-2 +- fix buildrequires + - add sendmail, curl-devel, ncurses-devel, zlib-devel, and + tetex-latex, tetex-dvips, latex2html for doc generation + * Tue May 31 2005 Jens Petersen - 1.0.3-1 - initial import into Fedora Extras - 1.0.3 release From fedora-extras-commits at redhat.com Fri Jul 1 12:20:12 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:20:12 -0400 Subject: common tobuild,1.1660,1.1661 Message-ID: <200507011220.j61CKCBG012953@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12935 Modified Files: tobuild Log Message: request build of rpms/darcs/FC-3 darcs-1_0_3-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1660 retrieving revision 1.1661 diff -u -r1.1660 -r1.1661 --- tobuild 1 Jul 2005 12:06:28 -0000 1.1660 +++ tobuild 1 Jul 2005 12:20:10 -0000 1.1661 @@ -9,3 +9,4 @@ oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 oliver rpms/fish/devel fish-1_11_1-10_fc5 devel petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 +petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 12:25:11 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 1 Jul 2005 08:25:11 -0400 Subject: common tobuild,1.1661,1.1662 Message-ID: <200507011225.j61CPBaV013026@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13009 Modified Files: tobuild Log Message: request build of rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1661 retrieving revision 1.1662 diff -u -r1.1661 -r1.1662 --- tobuild 1 Jul 2005 12:20:10 -0000 1.1661 +++ tobuild 1 Jul 2005 12:25:09 -0000 1.1662 @@ -10,3 +10,4 @@ oliver rpms/fish/devel fish-1_11_1-10_fc5 devel petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 +petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 From rc040203 at freenet.de Fri Jul 1 12:27:07 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 01 Jul 2005 14:27:07 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Message-ID: <1120220827.3741.189.camel@mccallum.corsepiu.local> On Fri, 2005-07-01 at 08:18 -0400, Jens Petersen wrote: > Author: petersen > diff -u -r1.2 -r1.3 > --- darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 > +++ darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 > @@ -1,6 +1,6 @@ > Name: darcs > Version: 1.0.3 > -Release: 2%{?dist} > +Release: 2%{?dist}.1 Would you mind to explain this weird choice of Release-tag? Ralf From fedora-extras-commits at redhat.com Fri Jul 1 12:33:27 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 08:33:27 -0400 Subject: common tobuild,1.1662,1.1663 Message-ID: <200507011233.j61CXRrF013106@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13089 Modified Files: tobuild Log Message: request build of rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1662 retrieving revision 1.1663 diff -u -r1.1662 -r1.1663 --- tobuild 1 Jul 2005 12:25:09 -0000 1.1662 +++ tobuild 1 Jul 2005 12:33:25 -0000 1.1663 @@ -11,3 +11,4 @@ petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 +spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 12:33:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 08:33:49 -0400 Subject: common tobuild,1.1663,1.1664 Message-ID: <200507011233.j61CXnd2013168@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13151 Modified Files: tobuild Log Message: request build of rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1663 retrieving revision 1.1664 diff -u -r1.1663 -r1.1664 --- tobuild 1 Jul 2005 12:33:25 -0000 1.1663 +++ tobuild 1 Jul 2005 12:33:47 -0000 1.1664 @@ -12,3 +12,4 @@ petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 +spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 From petersen at redhat.com Fri Jul 1 12:40:01 2005 From: petersen at redhat.com (Jens Petersen) Date: Fri, 01 Jul 2005 21:40:01 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <1120220827.3741.189.camel@mccallum.corsepiu.local> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <1120220827.3741.189.camel@mccallum.corsepiu.local> Message-ID: <42C539A1.7070301@redhat.com> Ralf Corsepius wrote: > On Fri, 2005-07-01 at 08:18 -0400, Jens Petersen wrote: > >>diff -u -r1.2 -r1.3 >>--- darcs.spec 1 Jul 2005 12:03:35 -0000 1.2 >>+++ darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 >>@@ -1,6 +1,6 @@ >> Name: darcs >> Version: 1.0.3 >>-Release: 2%{?dist} >>+Release: 2%{?dist}.1 > > Would you mind to explain this weird choice of Release-tag? I accidently ran "make tag" before committing head, which left it in a state where I could no longer "make tag" after actually committing. :( So I bumped the release... It seems like an extras-cvs bug to me? Jens From fedora-extras-commits at redhat.com Fri Jul 1 12:41:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 1 Jul 2005 08:41:28 -0400 Subject: rpms/most/devel .cvsignore, 1.2, 1.3 most.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200507011241.j61CfSGN013235@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13214 Modified Files: .cvsignore most.spec sources Log Message: updated to 4.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:52:46 -0000 1.2 +++ .cvsignore 1 Jul 2005 12:41:26 -0000 1.3 @@ -1 +1 @@ -most-4.9.5.tar.gz +most-4.10.1.tar.bz2 Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- most.spec 30 Mar 2005 14:32:43 -0000 1.6 +++ most.spec 1 Jul 2005 12:41:26 -0000 1.7 @@ -1,13 +1,13 @@ -Summary: more, less, most -Name: most -Version: 4.9.5 -Release: 4 -License: GPL -URL: ftp://space.mit.edu/pub/davis/most/ -Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: slang-devel +Summary: more, less, most +Name: most +Version: 4.10.1 +Release: 1 +License: GPL +URL: ftp://space.mit.edu/pub/davis/most/ +Group: Applications/Text +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: slang-devel %description most is a paging program that displays, one windowful at a time, the @@ -43,6 +43,9 @@ %changelog +* Fri Jul 01 2005 Adrian Reber - 4.10.1-1 +- updated to 4.10.1 + * Wed Mar 30 2005 Adrian Reber - 4.9.5-4 - fix build on ppc/ppc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:52:46 -0000 1.2 +++ sources 1 Jul 2005 12:41:26 -0000 1.3 @@ -1 +1 @@ -5c0922952485b0a5822ef994603dcc2f most-4.9.5.tar.gz +9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 12:48:41 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 1 Jul 2005 08:48:41 -0400 Subject: common tobuild,1.1664,1.1665 Message-ID: <200507011248.j61CmfqG013400@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13383 Modified Files: tobuild Log Message: request build of rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1664 retrieving revision 1.1665 diff -u -r1.1664 -r1.1665 --- tobuild 1 Jul 2005 12:33:47 -0000 1.1664 +++ tobuild 1 Jul 2005 12:48:38 -0000 1.1665 @@ -13,3 +13,4 @@ petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 +abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 12:49:34 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Fri, 1 Jul 2005 08:49:34 -0400 Subject: common tobuild,1.1665,1.1666 Message-ID: <200507011249.j61CnYtl013443@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13426 Modified Files: tobuild Log Message: request build of rpms/libvisual/devel libvisual-0_2_0-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1665 retrieving revision 1.1666 diff -u -r1.1665 -r1.1666 --- tobuild 1 Jul 2005 12:48:38 -0000 1.1665 +++ tobuild 1 Jul 2005 12:49:32 -0000 1.1666 @@ -14,3 +14,4 @@ spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 +abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 12:53:18 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 1 Jul 2005 08:53:18 -0400 Subject: common tobuild,1.1666,1.1667 Message-ID: <200507011253.j61CrIAC013483@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13466 Modified Files: tobuild Log Message: request build of rpms/most/devel most-4_10_1-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1666 retrieving revision 1.1667 diff -u -r1.1666 -r1.1667 --- tobuild 1 Jul 2005 12:49:32 -0000 1.1666 +++ tobuild 1 Jul 2005 12:53:16 -0000 1.1667 @@ -15,3 +15,4 @@ spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel +adrian rpms/most/devel most-4_10_1-1 devel From fedora-extras-commits at redhat.com Fri Jul 1 13:03:06 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 09:03:06 -0400 Subject: common tobuild,1.1667,1.1668 Message-ID: <200507011303.j61D3bgr014592@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14575 Modified Files: tobuild Log Message: request build of rpms/rinetd/FC-4 rinetd-0_62-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1667 retrieving revision 1.1668 diff -u -r1.1667 -r1.1668 --- tobuild 1 Jul 2005 12:53:16 -0000 1.1667 +++ tobuild 1 Jul 2005 13:02:41 -0000 1.1668 @@ -16,3 +16,4 @@ abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel adrian rpms/most/devel most-4_10_1-1 devel +kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 From kaboom at oobleck.net Fri Jul 1 13:26:50 2005 From: kaboom at oobleck.net (Chris Ricker) Date: Fri, 1 Jul 2005 09:26:50 -0400 (EDT) Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Message-ID: On Fri, 1 Jul 2005, Jens Petersen wrote: > microbump release - to workround running make tag before committing Everyone's favorite CVS mistake ;-) > -Release: 2%{?dist} > +Release: 2%{?dist}.1 It'd be preferable to increment the release, rather than monkeying around with new numbers after the dist stuff darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a hypothetical FC 4.1 release darcs-1.0.3-3.fc4 is unambiguous later, chris From oliver at linux-kernel.at Fri Jul 1 13:41:00 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 01 Jul 2005 15:41:00 +0200 Subject: APPROVED: perl-Want Message-ID: <42C547EC.9020601@linux-kernel.at> Name: perl-Want Summary: Perl module implementing a generalisation of wantarray This module generalises the mechanism of the wantarray function, allowing a function to determine in some detail how its return value is going to be immediately used. Maintainer: Ralf Corsepius Reviewer: Oliver Falk From fedora-extras-commits at redhat.com Fri Jul 1 13:40:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:42 -0400 Subject: rpms/lout - New directory Message-ID: <200507011340.j61DegBG015125@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15104/lout Log Message: Directory /cvs/extras/rpms/lout added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 13:40:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:42 -0400 Subject: rpms/lout/devel - New directory Message-ID: <200507011340.j61Degsq015130@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15104/lout/devel Log Message: Directory /cvs/extras/rpms/lout/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 13:40:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:58 -0400 Subject: rpms/lout Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011340.j61DewmK015189@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15158 Added Files: Makefile import.log Log Message: Setup of module lout --- NEW FILE Makefile --- # Top level Makefile for module lout all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 13:40:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:40:58 -0400 Subject: rpms/lout/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011340.j61DewT5015194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15158/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lout --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From tcallawa at redhat.com Fri Jul 1 13:43:36 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 01 Jul 2005 08:43:36 -0500 Subject: APPROVED: lout Message-ID: <1120225416.8990.156.camel@localhost.localdomain> Name: lout Summary: A document formatting system Description: Lout is a document formatting system designed and implemented by Jeffrey Kingston at the Basser Department of Computer Science, University of Sydney, Australia. The system reads a high-level description of a document similar in style to LaTeX and produces a PostScript file which can be printed on most laser printers and graphic display devices. Plain text output is also available, PDF output is limited but working (e.g. no graphics). Lout is inherently multilingual. Adding new languages is easy. Reviewer: Ralf Corsepius Maintainer: Tom 'spot' Callaway ~spot -- Tom "spot" Callaway: Red Hat Sales Engineer || GPG Fingerprint: 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 Jul 1 13:42:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:42:22 -0400 Subject: rpms/lout/devel lout-3.30-Fedora-makefile-new.patch, NONE, 1.1 lout.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011342.j61DgMor015310@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275/devel Modified Files: .cvsignore sources Added Files: lout-3.30-Fedora-makefile-new.patch lout.spec Log Message: auto-import lout-3.30-4 on branch devel from lout-3.30-4.src.rpm lout-3.30-Fedora-makefile-new.patch: --- NEW FILE lout-3.30-Fedora-makefile-new.patch --- --- lout-3.30/makefile.BAD 2005-06-30 07:55:49.000000000 -0500 +++ lout-3.30/makefile 2005-06-30 08:14:29.000000000 -0500 @@ -280,15 +280,15 @@ COLLATE = 1 -PDF_COMPRESSION = 0 -ZLIB = -ZLIBPATH = +PDF_COMPRESSION = 1 +ZLIB = -lz +ZLIBPATH = CC = gcc RCOPY = cp -r -COPTS = -ansi -pedantic -Wall -O3 +COPTS = $(RPM_OPT_FLAGS) CFLAGS = -DOS_UNIX=$(OSUNIX) \ -DOS_DOS=$(OSDOS) \ @@ -336,91 +336,91 @@ install: lout prg2lout @echo "" @echo "(a) Installing lout and prg2lout binaries into BINDIR $(BINDIR)" - cp lout $(BINDIR)/lout - chmod 755 $(BINDIR)/lout - cp prg2lout $(BINDIR)/prg2lout - chmod 755 $(BINDIR)/prg2lout + cp lout $(DESTDIR)$(BINDIR)/lout + chmod 755 $(DESTDIR)$(BINDIR)/lout + cp prg2lout $(DESTDIR)$(BINDIR)/prg2lout + chmod 755 $(DESTDIR)$(BINDIR)/prg2lout @echo "" @echo "(b) Installing library files into LIBDIR $(LIBDIR)" - mkdir $(LIBDIR) - chmod 755 $(LIBDIR) + mkdir $(DESTDIR)$(LIBDIR) + chmod 755 $(DESTDIR)$(LIBDIR) @echo "" - mkdir $(LIBDIR)/$(LIBINCL) - chmod 755 $(LIBDIR)/$(LIBINCL) - cp include/* $(LIBDIR)/$(LIBINCL) - chmod 644 $(LIBDIR)/$(LIBINCL)/* - @echo "" - mkdir $(LIBDIR)/$(LIBDATA) - chmod 755 $(LIBDIR)/$(LIBDATA) - cp data/* $(LIBDIR)/$(LIBDATA) - chmod 644 $(LIBDIR)/$(LIBDATA)/* - @echo "" - mkdir $(LIBDIR)/$(LIBHYPH) - chmod 755 $(LIBDIR)/$(LIBHYPH) - cp hyph/* $(LIBDIR)/$(LIBHYPH) - chmod 644 $(LIBDIR)/$(LIBHYPH)/* - @echo "" - mkdir $(LIBDIR)/$(LIBFONT) - chmod 755 $(LIBDIR)/$(LIBFONT) - cp font/* $(LIBDIR)/$(LIBFONT) - chmod 644 $(LIBDIR)/$(LIBFONT)/* - @echo "" - mkdir $(LIBDIR)/$(LIBMAPS) - chmod 755 $(LIBDIR)/$(LIBMAPS) - cp maps/* $(LIBDIR)/$(LIBMAPS) - chmod 644 $(LIBDIR)/$(LIBMAPS)/* + mkdir $(DESTDIR)$(LIBDIR)/$(LIBINCL) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBINCL) + cp include/* $(DESTDIR)$(LIBDIR)/$(LIBINCL) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBINCL)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBDATA) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBDATA) + cp data/* $(DESTDIR)$(LIBDIR)/$(LIBDATA) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBDATA)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBHYPH) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBHYPH) + cp hyph/* $(DESTDIR)$(LIBDIR)/$(LIBHYPH) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBFONT) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBFONT) + cp font/* $(DESTDIR)$(LIBDIR)/$(LIBFONT) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBFONT)/* + @echo "" + mkdir $(DESTDIR)$(LIBDIR)/$(LIBMAPS) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBMAPS) + cp maps/* $(DESTDIR)$(LIBDIR)/$(LIBMAPS) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBMAPS)/* @echo "" - mkdir $(LIBDIR)/$(LIBLOCA) - chmod 755 $(LIBDIR)/$(LIBLOCA) + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA) @echo "" @echo "(c) Initializing run (should be silent, no errors expected)" - $(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init + $(DESTDIR)$(BINDIR)/lout -x -s $(DESTDIR)$(LIBDIR)/$(LIBINCL)/init -I $(DESTDIR)$(LIBDIR)/$(LIBINCL) -H $(DESTDIR)$(LIBDIR)/$(LIBHYPH) -D $(DESTDIR)$(LIBDIR)/$(LIBDATA) @echo "" @echo "(d) Changing mode of files just created by initializing run" - chmod 644 $(LIBDIR)/$(LIBDATA)/* - chmod 644 $(LIBDIR)/$(LIBHYPH)/* + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBDATA)/* + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBHYPH)/* installman: @echo "" @echo "Installing manual entries into MANDIR $(MANDIR)" sed -e "s@@$(BINDIR)@" -e "s@@$(LIBDIR)@" \ -e "s@@$(DOCDIR)@" -e "s@@$(MANDIR)@" \ - man/lout.1 > $(MANDIR)/lout.1 - chmod 644 $(MANDIR)/lout.1 - cp man/prg2lout.1 $(MANDIR)/prg2lout.1 - chmod 644 $(MANDIR)/prg2lout.1 + man/lout.1 > $(DESTDIR)$(MANDIR)/lout.1 + chmod 644 $(DESTDIR)$(MANDIR)/lout.1 + cp man/prg2lout.1 $(DESTDIR)$(MANDIR)/prg2lout.1 + chmod 644 $(DESTDIR)$(MANDIR)/prg2lout.1 installdoc: @echo "" @echo "Creating DOCDIR $(DOCDIR) and copying documentation into it" - $(RCOPY) doc $(DOCDIR) - chmod 755 $(DOCDIR) - chmod 755 $(DOCDIR)/* - chmod 644 $(DOCDIR)/*/* + $(RCOPY) doc $(DESTDIR)$(DOCDIR) + chmod 755 $(DESTDIR)$(DOCDIR) + chmod 755 $(DESTDIR)$(DOCDIR)/* + chmod 644 $(DESTDIR)$(DOCDIR)/*/* installfr: @echo "" @echo "Putting French error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)" - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR) - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES - cp locale/msgs.fr $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) - gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ - $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) - chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/* + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR) + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES + cp locale/msgs.fr $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) + gencat $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/errors.$(LOC_FR) \ + $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/msgs.$(LOC_FR) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_FR)/LC_MESSAGES/* installde: @echo "" @echo "Putting German error messages into $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)" - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE) - mkdir $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES - chmod 755 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES - cp locale/msgs.de $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) - gencat $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ - $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) - chmod 644 $(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/* + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE) + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE) + mkdir $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES + chmod 755 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES + cp locale/msgs.de $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) + gencat $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/errors.$(LOC_DE) \ + $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/msgs.$(LOC_DE) + chmod 644 $(DESTDIR)$(LIBDIR)/$(LIBLOCA)/$(LOC_DE)/LC_MESSAGES/* uninstall: -rm -f $(BINDIR)/lout $(BINDIR)/prg2lout --- NEW FILE lout.spec --- Name: lout Summary: A document formatting system Version: 3.30 Release: 4%{?dist} License: GPL Group: Applications/Publishing URL: http://lout.sourceforge.net/ Source0: http://dl.sourceforge.net/lout/%{name}-%{version}.tar.gz Source1: http://snark.ptc.spbu.ru/~uwe/lout/user.ps.gz Patch0: lout-3.30-Fedora-makefile-new.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel %description Lout is a document formatting system designed and implemented by Jeffrey Kingston at the Basser Department of Computer Science, University of Sydney, Australia. The system reads a high-level description of a document similar in style to LaTeX and produces a PostScript file which can be printed on most laser printers and graphic display devices. Plain text output is also available, PDF output is limited but working (e.g. no graphics). Lout is inherently multilingual. Adding new languages is easy. %prep %setup -q %patch0 -p1 %build make BINDIR=%{_bindir} LIBDIR=%{_datadir}/%{name} DOCDIR=%{_datadir}/%{name}/doc \ MANDIR=%{_mandir}/man1 prg2lout lout %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir} mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 make DESTDIR=$RPM_BUILD_ROOT \ BINDIR=%{_bindir} \ LIBDIR=%{_datadir}/%{name} \ DOCDIR=%{_datadir}/%{name}/doc \ MANDIR=%{_mandir}/man1 \ install installman installdoc cp %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc gunzip $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc/user.ps.gz # looks like a vim dump, just taking up space rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc/user/.pie_intr.swp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, 0755) %doc gnu.gpl README READMEPDF %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_mandir}/man1/*.1* %changelog * Fri Jul 1 2005 Tom "spot" Callaway 3.30-4 - delete hidden trash file * Thu Jun 30 2005 Tom "spot" Callaway 3.30-3 - cleanups, macro consistency * Thu Jun 30 2005 Tom "spot" Callaway 3.30-2 - remove hardcoded directory definitions - link with shared zlib, not static * Thu Jun 30 2005 Tom "spot" Callaway 3.30-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lout/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 13:40:56 -0000 1.1 +++ .cvsignore 1 Jul 2005 13:42:20 -0000 1.2 @@ -0,0 +1,2 @@ +lout-3.30.tar.gz +user.ps.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lout/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 13:40:56 -0000 1.1 +++ sources 1 Jul 2005 13:42:20 -0000 1.2 @@ -0,0 +1,2 @@ +770930dec05f136a29ff078e66e59881 lout-3.30.tar.gz +7786e5363c5716a22fc5bd7666a24826 user.ps.gz From fedora-extras-commits at redhat.com Fri Jul 1 13:42:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:42:22 -0400 Subject: rpms/lout import.log,1.1,1.2 Message-ID: <200507011342.j61DgqTU015331@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15275 Modified Files: import.log Log Message: auto-import lout-3.30-4 on branch devel from lout-3.30-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lout/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 13:40:56 -0000 1.1 +++ import.log 1 Jul 2005 13:42:20 -0000 1.2 @@ -0,0 +1 @@ +lout-3_30-4:HEAD:lout-3.30-4.src.rpm:1120225402 From fedora-extras-commits at redhat.com Fri Jul 1 13:46:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:46:00 -0400 Subject: common tobuild,1.1668,1.1669 Message-ID: <200507011346.j61Dk07q015736@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15717 Modified Files: tobuild Log Message: request build of rpms/lout/FC-3 lout-3_30-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1668 retrieving revision 1.1669 diff -u -r1.1668 -r1.1669 --- tobuild 1 Jul 2005 13:02:41 -0000 1.1668 +++ tobuild 1 Jul 2005 13:45:58 -0000 1.1669 @@ -17,3 +17,4 @@ abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel adrian rpms/most/devel most-4_10_1-1 devel kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 +spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 13:46:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:46:20 -0400 Subject: common tobuild,1.1669,1.1670 Message-ID: <200507011346.j61DkKok015807@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15789 Modified Files: tobuild Log Message: request build of rpms/lout/FC-4 lout-3_30-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1669 retrieving revision 1.1670 diff -u -r1.1669 -r1.1670 --- tobuild 1 Jul 2005 13:45:58 -0000 1.1669 +++ tobuild 1 Jul 2005 13:46:18 -0000 1.1670 @@ -18,3 +18,4 @@ adrian rpms/most/devel most-4_10_1-1 devel kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 +spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 13:48:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 09:48:11 -0400 Subject: rpms/id3lib/FC-3 .cvsignore, 1.2, 1.3 id3lib.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200507011348.j61DmCgG015897@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15874 Modified Files: .cvsignore id3lib.spec sources Log Message: * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:34:28 -0000 1.2 +++ .cvsignore 1 Jul 2005 13:48:09 -0000 1.3 @@ -1 +1,2 @@ id3lib-3.8.3.tar.gz +id3lib-3.8.3-libtool-autofoo.patch.bz2 Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/id3lib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- id3lib.spec 10 Dec 2004 22:03:03 -0000 1.5 +++ id3lib.spec 1 Jul 2005 13:48:09 -0000 1.6 @@ -1,23 +1,22 @@ -Summary: An Open-Source library for manipulating ID3v1 and ID3v2 tags. -Name: id3lib -Version: 3.8.3 -Release: 9 -Epoch: 0 -License: LGPL -Group: System Environment/Libraries -URL: http://id3lib.sourceforge.net/ -Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz +Summary: Library for manipulating ID3v1 and ID3v2 tags +Name: id3lib +Version: 3.8.3 +Release: 11%{?dist} +License: LGPL +Group: System Environment/Libraries +URL: http://id3lib.sourceforge.net/ +Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen %package devel -Summary: Development tools for the id3lib. +Summary: Development tools for the id3lib library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: zlib-devel -#--------------------------------------------------------------------- %description This package provides a software library for manipulating ID3v1 and @@ -31,40 +30,36 @@ %description devel This package provides files needed to develop with the id3lib. -#--------------------------------------------------------------------- %prep %setup -q %patch0 -p0 +%patch1 -p1 -b .libtool-autofoo -#--------------------------------------------------------------------- %build %configure make %{?_smp_mflags} -#--------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT %makeinstall make docs -#--------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT -#--------------------------------------------------------------------- %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %files %defattr(-,root,root,-) -%exclude %{_libdir}/libid3.la %doc AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO -%doc doc +%doc doc/ %{_libdir}/libid3-3.8.so.* %{_bindir}/id3convert %{_bindir}/id3cp @@ -76,10 +71,16 @@ %{_includedir}/id3.h %{_includedir}/id3/ %{_libdir}/libid3.a +%exclude %{_libdir}/libid3.la %{_libdir}/libid3.so -#--------------------------------------------------------------------- %changelog +* Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 +- Make libtool link against libstdc++ (bug #162127). + +* Thu Apr 7 2005 Michael Schwendt - 3.8.3-10 +- rebuilt + * Wed Oct 29 2003 Ville Skytta - 0:3.8.3-0.fdr.9 - Rebuild. @@ -105,5 +106,5 @@ * Thu Apr 3 2003 Dams 0:3.8.3-0.fdr.2 - Added missing epoch requirement -* Wed Apr 2 2003 Dams +* Wed Apr 2 2003 Dams - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:34:28 -0000 1.2 +++ sources 1 Jul 2005 13:48:09 -0000 1.3 @@ -1 +1,2 @@ 19f27ddd2dda4b2d26a559a4f0f402a7 id3lib-3.8.3.tar.gz +ce106e4386e4fbc0d49aea9fbd14eb4b id3lib-3.8.3-libtool-autofoo.patch.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 13:50:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 09:50:51 -0400 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 Message-ID: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16031/devel Modified Files: gambas.spec Log Message: ExcludeArch lines added for x86_64 and ppc Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gambas.spec 13 Jun 2005 16:43:05 -0000 1.1 +++ gambas.spec 1 Jul 2005 13:50:49 -0000 1.2 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -10,6 +10,10 @@ BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +# Code is not 64 bit clean. +ExcludeArch: x86_64 +# Code is not endian clean. +ExcludeArch: ppc Patch0: gambas-1.0.6-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,5 +125,8 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 +- added ExcludeArch for x86_64 and ppc + * Mon May 23 2005 Tom "spot" Callaway 1.0.6-1 - initial package for Fedora Extras (based on package by Dries Verachtert) From fedora-extras-commits at redhat.com Fri Jul 1 13:56:21 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 09:56:21 -0400 Subject: common tobuild,1.1670,1.1671 Message-ID: <200507011356.j61DuL68016089@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1670 retrieving revision 1.1671 diff -u -r1.1670 -r1.1671 --- tobuild 1 Jul 2005 13:46:18 -0000 1.1670 +++ tobuild 1 Jul 2005 13:56:19 -0000 1.1671 @@ -19,3 +19,4 @@ kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 +mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 14:30:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:02 -0400 Subject: rpms/perl-Want - New directory Message-ID: <200507011430.j61EU2Zl017343@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17319/perl-Want Log Message: Directory /cvs/extras/rpms/perl-Want added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:30:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:03 -0400 Subject: rpms/perl-Want/devel - New directory Message-ID: <200507011430.j61EU3IE017348@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17319/perl-Want/devel Log Message: Directory /cvs/extras/rpms/perl-Want/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:30:38 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:38 -0400 Subject: rpms/perl-Want Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011430.j61EUcpT017396@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17365 Added Files: Makefile import.log Log Message: Setup of module perl-Want --- NEW FILE Makefile --- # Top level Makefile for module perl-Want all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 14:30:40 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:30:40 -0400 Subject: rpms/perl-Want/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011430.j61EUeir017401@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17365/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Want --- NEW 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 Jul 1 14:31:32 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:31:32 -0400 Subject: rpms/perl-Want import.log,1.1,1.2 Message-ID: <200507011432.j61EW3tP017463@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17429 Modified Files: import.log Log Message: auto-import perl-Want-0.08-2 on branch devel from perl-Want-0.08-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Want/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 14:30:36 -0000 1.1 +++ import.log 1 Jul 2005 14:31:30 -0000 1.2 @@ -0,0 +1 @@ +perl-Want-0_08-2:HEAD:perl-Want-0.08-2.src.rpm:1120228276 From fedora-extras-commits at redhat.com Fri Jul 1 14:31:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 10:31:33 -0400 Subject: rpms/perl-Want/devel perl-Want.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011432.j61EW32w017467@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17429/devel Modified Files: .cvsignore sources Added Files: perl-Want.spec Log Message: auto-import perl-Want-0.08-2 on branch devel from perl-Want-0.08-2.src.rpm --- NEW FILE perl-Want.spec --- Name: perl-Want Version: 0.08 Release: 2%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Want/ Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module generalises the mechanism of the wantarray function, allowing a function to determine in some detail how its return value is going to be immediately used. %prep %setup -q -n Want-%{version} %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install \ PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} find $RPM_BUILD_ROOT -type f -a \( -name .packlist \ -o -name perllocal.pod \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %clean rm -rf $RPM_BUILD_ROOT %check || : make test %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/Want* %{perl_vendorarch}/auto/Want* %{_mandir}/man3/* %changelog * Fri Jul 01 2005 Ralf Corsepius - 0.08-2 - Pass OPTIMIZE during generation of Makefile. - Use perl instead of %%__perl. * Fri Jul 01 2005 Ralf Corsepius - 0.08-1 - FE submission. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 14:30:37 -0000 1.1 +++ .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 @@ -0,0 +1 @@ +Want-0.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 14:30:37 -0000 1.1 +++ sources 1 Jul 2005 14:31:31 -0000 1.2 @@ -0,0 +1 @@ +72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz From nphilipp at redhat.com Fri Jul 1 14:41:20 2005 From: nphilipp at redhat.com (Nils Philippsen) Date: Fri, 01 Jul 2005 16:41:20 +0200 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 In-Reply-To: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> References: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> Message-ID: <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> On Fri, 2005-07-01 at 09:50 -0400, Tom Callaway wrote: > BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel > +# Code is not 64 bit clean. > +ExcludeArch: x86_64 > +# Code is not endian clean. > +ExcludeArch: ppc I don't think we build many packages for ppc64, but wouldn't it be good to "ExcludeArch: ppc64" for both of these reasons despite that? Nils -- Nils Philippsen / Red Hat / nphilipp at redhat.com "They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety." -- B. Franklin, 1759 PGP fingerprint: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011 From fedora-extras-commits at redhat.com Fri Jul 1 14:55:15 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:15 -0400 Subject: rpms/perl-Time-modules - New directory Message-ID: <200507011455.j61EtFTK017587@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17563/perl-Time-modules Log Message: Directory /cvs/extras/rpms/perl-Time-modules added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:55:15 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:15 -0400 Subject: rpms/perl-Time-modules/devel - New directory Message-ID: <200507011455.j61EtFdX017592@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17563/perl-Time-modules/devel Log Message: Directory /cvs/extras/rpms/perl-Time-modules/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 14:55:23 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:23 -0400 Subject: rpms/perl-Time-modules Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011455.j61EtND4017635@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17608 Added Files: Makefile import.log Log Message: Setup of module perl-Time-modules --- NEW FILE Makefile --- # Top level Makefile for module perl-Time-modules all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 14:55:23 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:23 -0400 Subject: rpms/perl-Time-modules/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011455.j61EtNJM017640@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17608/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Time-modules --- NEW 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 Jul 1 14:55:41 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:41 -0400 Subject: rpms/perl-Time-modules import.log,1.1,1.2 Message-ID: <200507011455.j61EtfHi017703@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17672 Modified Files: import.log Log Message: auto-import perl-Time-modules-0.2003.1126-2 on branch devel from perl-Time-modules-0.2003.1126-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Time-modules/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 14:55:21 -0000 1.1 +++ import.log 1 Jul 2005 14:55:39 -0000 1.2 @@ -0,0 +1 @@ +perl-Time-modules-0_2003_1126-2:HEAD:perl-Time-modules-0.2003.1126-2.src.rpm:1120229542 From fedora-extras-commits at redhat.com Fri Jul 1 14:55:42 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 10:55:42 -0400 Subject: rpms/perl-Time-modules/devel perl-Time-modules.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011455.j61Etg7g017710@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/perl-Time-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17672/devel Modified Files: .cvsignore sources Added Files: perl-Time-modules.spec Log Message: auto-import perl-Time-modules-0.2003.1126-2 on branch devel from perl-Time-modules-0.2003.1126-2.src.rpm --- NEW FILE perl-Time-modules.spec --- Name: perl-Time-modules Version: 0.2003.1126 Release: 2 Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable URL: http://search.cpan.org/dist/Time-modules/ Source0: http://www.cpan.org/authors/id/M/MU/MUIR/modules/Time-modules-2003.1126.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Time-modules provides several Perl modules, including Time::CTime, Time::DaysInMonth, Time::JulianDay, Time::ParseDate, and Time::Timezone. These modules can be useful for parsing and manipulating dates and times. %prep %setup -q -n Time-modules-2003.1126 %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 * Fri Jul 01 2005 Chris Ricker 0.2003.1126-2 - license change, include README, simplify build (Ville Skytt??) * Fri May 27 2005 Chris Ricker 0.2003.1126-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Time-modules/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 14:55:21 -0000 1.1 +++ .cvsignore 1 Jul 2005 14:55:40 -0000 1.2 @@ -0,0 +1 @@ +Time-modules-2003.1126.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Time-modules/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 14:55:21 -0000 1.1 +++ sources 1 Jul 2005 14:55:40 -0000 1.2 @@ -0,0 +1 @@ +b3bda3a2935c2d7d099c8001f583c4cb Time-modules-2003.1126.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:00:45 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:45 -0400 Subject: rpms/diction - New directory Message-ID: <200507011500.j61F0jEY017824@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804/diction Log Message: Directory /cvs/extras/rpms/diction added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 15:00:45 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:45 -0400 Subject: rpms/diction/devel - New directory Message-ID: <200507011500.j61F0jY4017829@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17804/diction/devel Log Message: Directory /cvs/extras/rpms/diction/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 15:00:57 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:57 -0400 Subject: rpms/diction Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011500.j61F0vLd017876@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17849 Added Files: Makefile import.log Log Message: Setup of module diction --- NEW FILE Makefile --- # Top level Makefile for module diction all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 15:00:57 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:00:57 -0400 Subject: rpms/diction/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011500.j61F0vGS017881@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17849/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module diction --- NEW 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 Jul 1 15:02:18 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:02:18 -0400 Subject: rpms/diction/devel diction.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011502.j61F2mvH018979@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18944/devel Modified Files: .cvsignore sources Added Files: diction.spec Log Message: auto-import diction-1.08-1 on branch devel from diction-1.08-1.src.rpm --- NEW FILE diction.spec --- Name: diction Version: 1.08 Release: 1%{?dist} Summary: Identifies diction and style errors Group: Applications/Text License: GPL URL: http://www.gnu.org/software/diction/diction.html Source0: http://www.moria.de/~michael/diction/diction-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext %description Diction and style are two old standard UNIX commands. Diction identifies wordy and commonly misused phrases. Style analyses surface characteristics of a document, including sentence length and other readability measures. These programs cannot help you structure a document well, but they can help to avoid poor wording and compare the readability (not the understandability!) of your documents with others. Both commands support English and German documents. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README NEWS %{_bindir}/* %{_datadir}/diction %{_mandir}/man*/* %changelog * Thu Jun 30 2005 Konstantin Ryabitsev - 1.08-1 - Version 1.08 - Do not list locale files namely in addition to findlang - Add NEWS to doc - Disttagging - Remove epoch * Fri Jul 23 2004 Michel Salim - 0:1.06-0.fdr.2 - Added version info to changelog entries - Use find_lang * Tue Jul 20 2004 Michel Salim - 0:1.06-0.fdr.1 - Update to new version * Sat Jul 17 2004 Michel Salim - 0:1.05-0.fdr.1 - Initial Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/diction/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 15:00:55 -0000 1.1 +++ .cvsignore 1 Jul 2005 15:02:16 -0000 1.2 @@ -0,0 +1 @@ +diction-1.08.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/diction/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 15:00:55 -0000 1.1 +++ sources 1 Jul 2005 15:02:16 -0000 1.2 @@ -0,0 +1 @@ +18bf7dbd4776772a8208a8cc7eed5f9b diction-1.08.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:01:49 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 11:01:49 -0400 Subject: rpms/diction import.log,1.1,1.2 Message-ID: <200507011502.j61F2nch018982@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/diction In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18944 Modified Files: import.log Log Message: auto-import diction-1.08-1 on branch devel from diction-1.08-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/diction/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 15:00:54 -0000 1.1 +++ import.log 1 Jul 2005 15:01:47 -0000 1.2 @@ -0,0 +1 @@ +diction-1_08-1:HEAD:diction-1.08-1.src.rpm:1120230085 From oliver at linux-kernel.at Fri Jul 1 15:04:44 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 01 Jul 2005 17:04:44 +0200 Subject: ebtables (WAS: Re: Reviews still needed) In-Reply-To: <1120226047.8990.162.camel@localhost.localdomain> References: <1120226047.8990.162.camel@localhost.localdomain> Message-ID: <42C55B8C.2020101@linux-kernel.at> On 07/01/2005 03:54 PM, Tom 'spot' Callaway wrote: > ebtables: > https://www.redhat.com/archives/fedora-extras-list/2005-June/msg00704.html TODO * Don't include the INSTALL file in %doc section, as it is not of interesst for end-users and it contains wrong paths (eg /usr/local stuff). OK * Builds fine on FCdev i386 (don't know about x86_64) * Installs fine * Uninstalls fine * Starting via initscript works * License OK * Source matches upstream * install cleans out the build root * clean exists * No BuildRequires needed * No need for subpackages * Use of macros is consistant Call it an approval, if you kick out the INSTALL file. :-) Best, Oliver From fedora-extras-commits at redhat.com Fri Jul 1 15:20:28 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 11:20:28 -0400 Subject: rpms/perl-Want/devel perl-Want.spec,1.1,1.2 Message-ID: <200507011520.j61FKSpl019090@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19073 Modified Files: perl-Want.spec Log Message: Cosmetics. Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/perl-Want.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Want.spec 1 Jul 2005 14:31:31 -0000 1.1 +++ perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-Want Version: 0.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Want/ Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -36,7 +36,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%check || : +%check make test %files @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Fri Jul 01 2005 Ralf Corsepius - 0.08-3 +- Remove ||: in %%check. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-2 - Pass OPTIMIZE during generation of Makefile. - Use perl instead of %%__perl. From fedora-extras-commits at redhat.com Fri Jul 1 15:21:19 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 11:21:19 -0400 Subject: common tobuild,1.1671,1.1672 Message-ID: <200507011521.j61FLJIE019152@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19135 Modified Files: tobuild Log Message: request build of rpms/perl-Want/devel perl-Want-0_08-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1671 retrieving revision 1.1672 diff -u -r1.1671 -r1.1672 --- tobuild 1 Jul 2005 13:56:19 -0000 1.1671 +++ tobuild 1 Jul 2005 15:21:17 -0000 1.1672 @@ -20,3 +20,4 @@ spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 +corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 15:26:42 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:26:42 -0400 Subject: rpms/gramps/devel .cvsignore, 1.7, 1.8 gramps.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200507011526.j61FQgLo019191@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19170 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Jun 2005 13:10:05 -0000 1.7 +++ .cvsignore 1 Jul 2005 15:26:39 -0000 1.8 @@ -1 +1 @@ -gramps-2.0.3.tar.gz +gramps-2.0.4.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gramps.spec 25 Jun 2005 13:10:05 -0000 1.7 +++ gramps.spec 1 Jul 2005 15:26:39 -0000 1.8 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jun 29 2005 Brian Pepple - 2.0.4-1 +- Update to 2.0.4. + * Sat Jun 18 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Jun 2005 13:10:05 -0000 1.7 +++ sources 1 Jul 2005 15:26:39 -0000 1.8 @@ -1 +1 @@ -c103968d314245b994ce004bfc6db8f0 gramps-2.0.3.tar.gz +7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:27:11 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:27:11 -0400 Subject: common tobuild,1.1672,1.1673 Message-ID: <200507011527.j61FRBWi019248@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19231 Modified Files: tobuild Log Message: request build of rpms/gramps/devel gramps-2_0_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1672 retrieving revision 1.1673 diff -u -r1.1672 -r1.1673 --- tobuild 1 Jul 2005 15:21:17 -0000 1.1672 +++ tobuild 1 Jul 2005 15:27:09 -0000 1.1673 @@ -21,3 +21,4 @@ spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel +bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 15:29:21 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:29:21 -0400 Subject: rpms/gramps/FC-4 .cvsignore, 1.7, 1.8 gramps.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200507011529.j61FTLYR019286@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19265 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 25 Jun 2005 21:14:15 -0000 1.7 +++ .cvsignore 1 Jul 2005 15:29:19 -0000 1.8 @@ -1 +1 @@ -gramps-2.0.3.tar.gz +gramps-2.0.4.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gramps.spec 25 Jun 2005 21:14:15 -0000 1.7 +++ gramps.spec 1 Jul 2005 15:29:19 -0000 1.8 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jun 29 2005 Brian Pepple - 2.0.4-1 +- Update to 2.0.4. + * Sat Jun 18 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 25 Jun 2005 21:14:15 -0000 1.7 +++ sources 1 Jul 2005 15:29:19 -0000 1.8 @@ -1 +1 @@ -c103968d314245b994ce004bfc6db8f0 gramps-2.0.3.tar.gz +7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 15:29:38 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 1 Jul 2005 11:29:38 -0400 Subject: common tobuild,1.1673,1.1674 Message-ID: <200507011529.j61FTcn1019343@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19326 Modified Files: tobuild Log Message: request build of rpms/gramps/FC-4 gramps-2_0_4-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1673 retrieving revision 1.1674 diff -u -r1.1673 -r1.1674 --- tobuild 1 Jul 2005 15:27:09 -0000 1.1673 +++ tobuild 1 Jul 2005 15:29:36 -0000 1.1674 @@ -22,3 +22,4 @@ mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel +bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 15:41:43 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 11:41:43 -0400 Subject: devel/perl-Time-modules perl-Time-modules.spec,1.1,1.2 Message-ID: <200507011541.j61Ffhr4019395@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19378 Modified Files: perl-Time-modules.spec Log Message: Add dist tag Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/extras/devel/perl-Time-modules/perl-Time-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Time-modules.spec 1 Jul 2005 14:55:40 -0000 1.1 +++ perl-Time-modules.spec 1 Jul 2005 15:41:41 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Time-modules Version: 0.2003.1126 -Release: 2 +Release: 2%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable @@ -45,6 +45,7 @@ %changelog * Fri Jul 01 2005 Chris Ricker 0.2003.1126-2 - license change, include README, simplify build (Ville Skytt??) +- Add dist tag * Fri May 27 2005 Chris Ricker 0.2003.1126-1 - Initial package From ville.skytta at iki.fi Fri Jul 1 15:43:20 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Fri, 01 Jul 2005 18:43:20 +0300 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 In-Reply-To: <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> References: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> Message-ID: <1120232600.2815.366.camel@localhost.localdomain> On Fri, 2005-07-01 at 16:41 +0200, Nils Philippsen wrote: > On Fri, 2005-07-01 at 09:50 -0400, Tom Callaway wrote: > > BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel > > +# Code is not 64 bit clean. > > +ExcludeArch: x86_64 > > +# Code is not endian clean. > > +ExcludeArch: ppc > > I don't think we build many packages for ppc64, but wouldn't it be good > to "ExcludeArch: ppc64" for both of these reasons despite that? Or even change the whole shebang to "ExclusiveArch: %{ix86}"? From fedora-extras-commits at redhat.com Fri Jul 1 15:54:37 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:54:37 -0400 Subject: rpms/exim/devel .cvsignore, 1.4, 1.5 exim.spec, 1.4, 1.5 sources, 1.4, 1.5 exim-4.24-no_libc5.patch, 1.1, NONE exim-csa.patch, 1.1, NONE Message-ID: <200507011554.j61Fsb0Z019498@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19476 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.24-no_libc5.patch exim-csa.patch Log Message: import 4.52 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 11:17:05 -0000 1.4 +++ .cvsignore 1 Jul 2005 15:54:35 -0000 1.5 @@ -1,2 +1,3 @@ exim-4.51.tar.bz2 sa-exim-4.2.tar.gz +exim-4.52.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim.spec 16 Jun 2005 11:27:34 -0000 1.4 +++ exim.spec 1 Jul 2005 15:54:35 -0000 1.5 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.51 -Release: 3 +Version: 4.52 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -20,12 +20,10 @@ Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz Patch4: exim-rhl.patch Patch6: exim-4.50-config.patch -Patch7: exim-4.24-no_libc5.patch Patch8: exim-4.24-libdir.patch Patch12: exim-4.33-cyrus.patch Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch -Patch15: http://www.cus.cam.ac.uk/~fanf2/hermes/doc/antiforgery/exim-csa.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel @@ -73,12 +71,10 @@ %patch4 -p1 -b .rhl %patch6 -p1 -b .config -%patch7 -p1 -b .no_libc5 %patch8 -p1 -b .libdir %patch12 -p1 -b .cyrus %patch13 -p1 -b .pam %patch14 -p1 -b .spamd -%patch15 -p0 -b .csa %build %ifnarch s390 s390x @@ -287,6 +283,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Fri Jul 1 2005 David Woodhouse 4.52-1 +- Update to Exim 4.52 + * Thu Jun 16 2005 David Woodhouse 4.51-3 - Rebuild for -devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 11:17:05 -0000 1.4 +++ sources 1 Jul 2005 15:54:35 -0000 1.5 @@ -1,2 +1,3 @@ 36c0c005e012d13beb7edfd8d124c049 exim-4.51.tar.bz2 ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz +89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 --- exim-4.24-no_libc5.patch DELETED --- --- exim-csa.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 1 15:56:30 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:56:30 -0400 Subject: rpms/exim/FC-4 .cvsignore, 1.4, 1.5 exim.spec, 1.4, 1.5 sources, 1.4, 1.5 exim-4.24-no_libc5.patch, 1.1, NONE exim-csa.patch, 1.1, NONE Message-ID: <200507011556.j61FuUMq019577@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19556 Modified Files: .cvsignore exim.spec sources Removed Files: exim-4.24-no_libc5.patch exim-csa.patch Log Message: import 4.52 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Jun 2005 11:16:22 -0000 1.4 +++ .cvsignore 1 Jul 2005 15:56:28 -0000 1.5 @@ -1,2 +1,2 @@ -exim-4.51.tar.bz2 sa-exim-4.2.tar.gz +exim-4.52.tar.bz2 Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim.spec 16 Jun 2005 11:28:31 -0000 1.4 +++ exim.spec 1 Jul 2005 15:56:28 -0000 1.5 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.51 -Release: 2 +Version: 4.52 +Release: 1%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -20,12 +20,10 @@ Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz Patch4: exim-rhl.patch Patch6: exim-4.50-config.patch -Patch7: exim-4.24-no_libc5.patch Patch8: exim-4.24-libdir.patch Patch12: exim-4.33-cyrus.patch Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch -Patch15: http://www.cus.cam.ac.uk/~fanf2/hermes/doc/antiforgery/exim-csa.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel @@ -73,12 +71,10 @@ %patch4 -p1 -b .rhl %patch6 -p1 -b .config -%patch7 -p1 -b .no_libc5 %patch8 -p1 -b .libdir %patch12 -p1 -b .cyrus %patch13 -p1 -b .pam %patch14 -p1 -b .spamd -%patch15 -p0 -b .csa %build %ifnarch s390 s390x @@ -287,6 +283,12 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Fri Jul 1 2005 David Woodhouse 4.52-1 +- Update to Exim 4.52 + +* Thu Jun 16 2005 David Woodhouse 4.51-3 +- Rebuild for -devel + * Thu Jun 16 2005 David Woodhouse 4.51-2 - Update CSA patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Jun 2005 11:16:22 -0000 1.4 +++ sources 1 Jul 2005 15:56:28 -0000 1.5 @@ -1,2 +1,2 @@ -36c0c005e012d13beb7edfd8d124c049 exim-4.51.tar.bz2 ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz +89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 --- exim-4.24-no_libc5.patch DELETED --- --- exim-csa.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 1 15:56:55 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:56:55 -0400 Subject: rpms/exim/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200507011556.j61FutK9019605@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19586 Modified Files: .cvsignore sources Log Message: remove 4.51 from sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jul 2005 15:54:35 -0000 1.5 +++ .cvsignore 1 Jul 2005 15:56:53 -0000 1.6 @@ -1,3 +1,2 @@ -exim-4.51.tar.bz2 sa-exim-4.2.tar.gz exim-4.52.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jul 2005 15:54:35 -0000 1.5 +++ sources 1 Jul 2005 15:56:53 -0000 1.6 @@ -1,3 +1,2 @@ -36c0c005e012d13beb7edfd8d124c049 exim-4.51.tar.bz2 ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz 89601650f3b854d469451f30b369622b exim-4.52.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 15:57:14 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:57:14 -0400 Subject: common tobuild,1.1674,1.1675 Message-ID: <200507011557.j61FvEbH019662@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19645 Modified Files: tobuild Log Message: request build of rpms/exim/devel exim-4_52-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1674 retrieving revision 1.1675 diff -u -r1.1674 -r1.1675 --- tobuild 1 Jul 2005 15:29:36 -0000 1.1674 +++ tobuild 1 Jul 2005 15:57:12 -0000 1.1675 @@ -23,3 +23,4 @@ corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 +dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 15:57:38 2005 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 1 Jul 2005 11:57:38 -0400 Subject: common tobuild,1.1675,1.1676 Message-ID: <200507011557.j61Fvcxs019719@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19702 Modified Files: tobuild Log Message: request build of rpms/exim/FC-4 exim-4_52-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1675 retrieving revision 1.1676 diff -u -r1.1675 -r1.1676 --- tobuild 1 Jul 2005 15:57:12 -0000 1.1675 +++ tobuild 1 Jul 2005 15:57:36 -0000 1.1676 @@ -24,3 +24,4 @@ bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel +dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 16:00:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:00:49 -0400 Subject: rpms/ebtables - New directory Message-ID: <200507011600.j61G0nWI019793@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19773/ebtables Log Message: Directory /cvs/extras/rpms/ebtables added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 16:00:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:00:49 -0400 Subject: rpms/ebtables/devel - New directory Message-ID: <200507011600.j61G0nqI019798@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19773/ebtables/devel Log Message: Directory /cvs/extras/rpms/ebtables/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 16:01:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:01:03 -0400 Subject: rpms/ebtables Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011601.j61G13dv020871@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20676 Added Files: Makefile import.log Log Message: Setup of module ebtables --- NEW FILE Makefile --- # Top level Makefile for module ebtables all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 16:01:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:01:03 -0400 Subject: rpms/ebtables/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011601.j61G13Bi020874@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20676/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ebtables --- NEW 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 Jul 1 16:03:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:03:00 -0400 Subject: rpms/ebtables import.log,1.1,1.2 Message-ID: <200507011603.j61G3rwp020990@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945 Modified Files: import.log Log Message: auto-import ebtables-2.0.6-4 on branch devel from ebtables-2.0.6-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ebtables/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 16:01:01 -0000 1.1 +++ import.log 1 Jul 2005 16:02:58 -0000 1.2 @@ -0,0 +1 @@ +ebtables-2_0_6-4:HEAD:ebtables-2.0.6-4.src.rpm:1120233817 From fedora-extras-commits at redhat.com Fri Jul 1 16:03:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:03:26 -0400 Subject: rpms/ebtables/devel ebtables-2.0.6-gcc34.patch, NONE, 1.1 ebtables-2.0.6-gcc4.patch, NONE, 1.1 ebtables.spec, NONE, 1.1 ebtables.sysv, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011603.j61G3Qqp020983@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945/devel Modified Files: .cvsignore sources Added Files: ebtables-2.0.6-gcc34.patch ebtables-2.0.6-gcc4.patch ebtables.spec ebtables.sysv Log Message: auto-import ebtables-2.0.6-4 on branch devel from ebtables-2.0.6-4.src.rpm ebtables-2.0.6-gcc34.patch: --- NEW FILE ebtables-2.0.6-gcc34.patch --- --- ebtables-v2.0.6/ebtables.c.old Thu Sep 9 22:39:49 2004 +++ ebtables-v2.0.6/ebtables.c Thu Sep 9 22:40:18 2004 @@ -1170,7 +1170,7 @@ static int check_rule_exists(int rule_nr if (!t->compare(t->t, u_e->t)) continue; return i; -letscontinue: +letscontinue:; } return -1; } ebtables-2.0.6-gcc4.patch: --- NEW FILE ebtables-2.0.6-gcc4.patch --- --- ebtables-v2.0.6/extensions/ebt_ip.c.BAD 2005-05-31 11:45:44.000000000 -0500 +++ ebtables-v2.0.6/extensions/ebt_ip.c 2005-05-31 11:48:53.000000000 -0500 @@ -244,6 +244,7 @@ struct ebt_ip_info *ipinfo = (struct ebt_ip_info *)(*match)->data; char *end; long int i; + unsigned char j; switch (c) { case IP_SOURCE: @@ -313,7 +314,7 @@ ipinfo->invflags |= EBT_IP_PROTO; if (optind > argc) print_error("Missing IP protocol argument"); - (unsigned char) i = strtoul(argv[optind - 1], &end, 10); + j = strtoul(argv[optind - 1], &end, 10); if (*end != '\0') { struct protoent *pe; @@ -324,7 +325,7 @@ argv[optind - 1]); ipinfo->protocol = pe->p_proto; } else { - ipinfo->protocol = (unsigned char) i; + ipinfo->protocol = j; } ipinfo->bitmask |= EBT_IP_PROTO; break; --- ebtables-v2.0.6/extensions/ebt_vlan.c.BAD 2005-05-31 11:44:12.000000000 -0500 +++ ebtables-v2.0.6/extensions/ebt_vlan.c 2005-05-31 11:54:06.000000000 -0500 @@ -135,14 +135,16 @@ (struct ebt_vlan_info *) (*match)->data; char *end; struct ebt_vlan_info local; + unsigned short id, encap; + unsigned char prio; switch (c) { case VLAN_ID: check_option(flags, OPT_VLAN_ID); CHECK_INV_FLAG(EBT_VLAN_ID); CHECK_IF_MISSING_VALUE; - (unsigned short) local.id = - strtoul(argv[optind - 1], &end, 10); + id = strtoul(argv[optind - 1], &end, 10); + local.id = (uint16_t) id; CHECK_RANGE(local.id > 4094 || *end != '\0'); vlaninfo->id = local.id; SET_BITMASK(EBT_VLAN_ID); @@ -152,8 +154,8 @@ check_option(flags, OPT_VLAN_PRIO); CHECK_INV_FLAG(EBT_VLAN_PRIO); CHECK_IF_MISSING_VALUE; - (unsigned char) local.prio = - strtoul(argv[optind - 1], &end, 10); + prio = strtoul(argv[optind - 1], &end, 10); + local.prio = (uint8_t) prio; CHECK_RANGE(local.prio >= 8 || *end != '\0'); vlaninfo->prio = local.prio; SET_BITMASK(EBT_VLAN_PRIO); @@ -163,8 +165,8 @@ check_option(flags, OPT_VLAN_ENCAP); CHECK_INV_FLAG(EBT_VLAN_ENCAP); CHECK_IF_MISSING_VALUE; - (unsigned short) local.encap = - strtoul(argv[optind - 1], &end, 16); + encap = strtoul(argv[optind - 1], &end, 16); + local.encap = (uint16_t) encap; if (*end != '\0') { ethent = getethertypebyname(argv[optind - 1]); if (ethent == NULL) --- ebtables-v2.0.6/extensions/ebt_limit.c.BAD 2005-05-31 11:55:53.000000000 -0500 +++ ebtables-v2.0.6/extensions/ebt_limit.c 2005-05-31 11:56:16.000000000 -0500 @@ -203,15 +203,15 @@ static struct ebt_u_match limit_match = { - .name EBT_LIMIT_MATCH, - .size sizeof(struct ebt_limit_info), - .help print_help, - .init init, - .parse parse, - .final_check final_check, - .print print, - .compare compare, - .extra_ops opts, + .name = EBT_LIMIT_MATCH, + .size = sizeof(struct ebt_limit_info), + .help = print_help, + .init = init, + .parse = parse, + .final_check = final_check, + .print = print, + .compare = compare, + .extra_ops = opts, }; static void _init(void) __attribute((constructor)); --- NEW FILE ebtables.spec --- Name: ebtables Version: 2.0.6 Release: 4%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base URL: http://ebtables.sourceforge.net/ Source0: http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz Source1: ebtables.sysv Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Ethernet bridge tables is a firewalling tool to transparantly filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. %prep %setup -n ebtables-v%{version} %patch0 -p1 %patch1 -p1 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add ebtables %preun if [ $1 -eq 0 ]; then /sbin/service ebtables stop &>/dev/null || : /sbin/chkconfig --del ebtables fi %postun /sbin/service ebtables condrestart &>/dev/null || : %files %defattr(-, root, root, 0755) %doc ChangeLog COPYING THANKS %doc %{_mandir}/man8/ebtables.8* %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables %changelog * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras - add gcc4 fix - move init file into SOURCE1 * Thu Dec 02 2004 Dag Wieers - 2.0.6-2 - Added patch for gcc 3.4. (Nigel Smith) * Tue Apr 27 2004 Dag Wieers - 2.0.6-2 - Cosmetic changes. * Tue Apr 27 2004 Dag Wieers - 2.0.6-1 - Initial package. (using DAR) --- NEW FILE ebtables.sysv --- #!/bin/bash # # init script for the Ethernet Bridge filter tables # # Original written by Dag Wieers . # Modified by Tom "spot" Callaway # # chkconfig: - 15 85 # description: Ethernet Bridge filtering tables # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat # config: /etc/sysconfig/ebtables.route source /etc/init.d/functions source /etc/sysconfig/network # Check that networking is up. [ ${NETWORKING} = "no" ] && exit 0 [ -x /sbin/ebtables ] || exit 1 RETVAL=0 RETVAL_FILTER=0 RETVAL_NAT=0 RETVAL_BROUTE=0 prog="ebtables" desc="Ethernet bridge filtering" initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " if [ -r /etc/sysconfig/ebtables.$TYPE ]; then /sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE --atomic-commit > /dev/null || RETVAL=1 else echo -n "not configured" fi if [ $RETVAL -eq 0 ]; then success "$TYPE startup" else failure "$TYPE startup" fi return $RETVAL } start() { echo "Starting $desc ($prog): " # Initialize filter tables TYPE=filter initialize RETVAL_FILTER=$RETVAL RETVAL=0 # Initialize NAT tables echo TYPE=nat initialize RETVAL_NAT=$RETVAL RETVAL=0 # Initialize broute tables echo TYPE=broute initialize RETVAL_BROUTE=$RETVAL RETVAL=0 RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then rm -f /var/lock/subsys/$prog fi echo return $RETVAL } stop() { echo -n $"Stopping $desc ($prog): " /sbin/ebtables -t filter --init-table || RETVAL=1 /sbin/ebtables -t nat --init-table || RETVAL=1 /sbin/ebtables -t broute --init-table || RETVAL=1 for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do /sbin/rmmod $mod || RETVAL=1 done if [ $RETVAL -eq 0 ]; then success "$prog shutdown" rm -f /var/lock/subsys/$prog else failure "$prog shutdown" fi echo return $RETVAL } restart() { stop start } save() { echo -n $"Saving $desc ($prog): " /sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1 /sbin/ebtables -t nat --atomic-file /etc/sysconfig/ebtables.nat --atomic-save || RETVAL=1 /sbin/ebtables -t broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1 if [ $RETVAL -eq 0 ]; then success "$prog saved" else failure "$prog saved" fi echo } case "$1" in start) start ;; stop) stop ;; restart|reload) restart ;; condrestart) [ -e /var/lock/subsys/$prog ] && restart RETVAL=$? ;; save) save ;; status) status $prog RETVAL=$? ;; *) echo $"Usage $0 {start|stop|restart|condrestart|save|status}" RETVAL=1 esac exit $RETVAL Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 16:01:02 -0000 1.1 +++ .cvsignore 1 Jul 2005 16:03:23 -0000 1.2 @@ -0,0 +1 @@ +ebtables-v2.0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 16:01:02 -0000 1.1 +++ sources 1 Jul 2005 16:03:23 -0000 1.2 @@ -0,0 +1 @@ +c4559af2366c764c6c42a3fdd40d60d3 ebtables-v2.0.6.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 16:04:47 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 12:04:47 -0400 Subject: devel/perl-Time-modules perl-Time-modules.spec,1.2,1.3 Message-ID: <200507011605.j61G5H3x021046@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20995 Modified Files: perl-Time-modules.spec Log Message: Fixed version Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/extras/devel/perl-Time-modules/perl-Time-modules.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Time-modules.spec 1 Jul 2005 15:41:41 -0000 1.2 +++ perl-Time-modules.spec 1 Jul 2005 16:04:44 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Time-modules -Version: 0.2003.1126 -Release: 2%{?dist} +Version: 2003.1126 +Release: 1%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable @@ -43,6 +43,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 01 2005 Chris Ricker 2003.1126-1 +- Version is 2003.1126, not 0.2003.1126 (Ville Skytt??) + * Fri Jul 01 2005 Chris Ricker 0.2003.1126-2 - license change, include README, simplify build (Ville Skytt??) - Add dist tag From rc040203 at freenet.de Fri Jul 1 16:05:55 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 01 Jul 2005 18:05:55 +0200 Subject: APPROVED: perl-Time-modules Message-ID: <1120233955.3741.252.camel@mccallum.corsepiu.local> Time-modules provides several Perl modules, including Time::CTime, Time::DaysInMonth, Time::JulianDay, Time::ParseDate, and Time::Timezone. These modules can be useful for parsing and manipulating dates and times. Maintainer: Chris Ricker Reviewer: Ralf Cors?pius From tcallawa at redhat.com Fri Jul 1 16:12:53 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 01 Jul 2005 11:12:53 -0500 Subject: APPROVED: ebtables Message-ID: <1120234373.8990.176.camel@localhost.localdomain> Name: ebtables Summary: Ethernet Bridge frame table administration tool Description: Ethernet bridge tables is a firewalling tool to transparantly filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. Reviewer: Oliver Falk Maintainer: Tom 'spot' Callaway ~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 dwmw2 at infradead.org Fri Jul 1 16:14:43 2005 From: dwmw2 at infradead.org (David Woodhouse) Date: Fri, 01 Jul 2005 17:14:43 +0100 Subject: rpms/gambas/devel gambas.spec,1.1,1.2 In-Reply-To: <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> References: <200507011350.j61DopBG016056@cvs-int.fedora.redhat.com> <1120228881.13095.25.camel@gibraltar.stuttgart.redhat.com> Message-ID: <1120234483.8058.116.camel@baythorne.infradead.org> On Fri, 2005-07-01 at 16:41 +0200, Nils Philippsen wrote: > On Fri, 2005-07-01 at 09:50 -0400, Tom Callaway wrote: > > BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel > > +# Code is not 64 bit clean. > > +ExcludeArch: x86_64 > > +# Code is not endian clean. > > +ExcludeArch: ppc > > I don't think we build many packages for ppc64, but wouldn't it be good > to "ExcludeArch: ppc64" for both of these reasons despite that? Or perhaps just veto the package on code quality grounds? We don't want Extras to be a dumping ground for dross -- if the problems are so bad that it _can't_ be made endian and wordsize-clean, then perhaps we shouldn't be shipping it. And if it _can_ be fixed, we should fix it. -- dwmw2 From fedora-extras-commits at redhat.com Fri Jul 1 16:15:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 1 Jul 2005 12:15:18 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.1,1.2 Message-ID: <200507011615.j61GFI1B021172@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21136 Modified Files: python-matplotlib.spec Log Message: * Fri Jul 01 2005 Orion Poplawski 0.82-3 - Use %{python_sitearch} Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-matplotlib.spec 30 Jun 2005 21:40:07 -0000 1.1 +++ python-matplotlib.spec 1 Jul 2005 16:15:16 -0000 1.2 @@ -1,6 +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.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -38,10 +40,13 @@ %doc license/LICENSE_PAINT license/LICENSE_PIL license/PYTZ_LICENSE.txt %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS %doc NUMARRAY_ISSUES PKG-INFO TODO -%dir %{_libdir}/python2.4/site-packages/matplotlib +%dir %{python_sitearch}/matplotlib %dir %{_datadir}/matplotlib %changelog +* Fri Jul 01 2005 Orion Poplawski 0.82-3 +- Use %{python_sitearch} + * Thu Jun 30 2005 Orion Poplawski 0.82-2 - Rename to python-matplotlib - Remove unneeded Requires: python From fedora-extras-commits at redhat.com Fri Jul 1 16:23:52 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 1 Jul 2005 12:23:52 -0400 Subject: common tobuild,1.1676,1.1677 Message-ID: <200507011623.j61GNqZX021413@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21396 Modified Files: tobuild Log Message: request build of rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1676 retrieving revision 1.1677 diff -u -r1.1676 -r1.1677 --- tobuild 1 Jul 2005 15:57:36 -0000 1.1676 +++ tobuild 1 Jul 2005 16:23:50 -0000 1.1677 @@ -25,3 +25,4 @@ bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 +orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 16:26:04 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 12:26:04 -0400 Subject: devel/perl-Time-modules perl-Time-modules.spec,1.3,1.4 Message-ID: <200507011626.j61GQ4Xh021440@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/perl-Time-modules In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21423 Modified Files: perl-Time-modules.spec Log Message: Remove perl version requirement Index: perl-Time-modules.spec =================================================================== RCS file: /cvs/extras/devel/perl-Time-modules/perl-Time-modules.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Time-modules.spec 1 Jul 2005 16:04:44 -0000 1.3 +++ perl-Time-modules.spec 1 Jul 2005 16:26:01 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Time-modules Version: 2003.1126 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl modules for parsing dates and times Group: Development/Libraries License: Distributable @@ -8,7 +8,7 @@ Source0: http://www.cpan.org/authors/id/M/MU/MUIR/modules/Time-modules-2003.1126.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -43,6 +43,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jul 01 2005 Chris Ricker 2003.1126-2 +- Remove overly high perl version BuildRequires (Ralf Corsepius) + * Fri Jul 01 2005 Chris Ricker 2003.1126-1 - Version is 2003.1126, not 0.2003.1126 (Ville Skytt??) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:12 -0400 Subject: rpms/ebtables/FC-3 ebtables.spec,1.1,1.2 ebtables.sysv,1.1,1.2 Message-ID: <200507011627.j61GRCGP021525@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475/FC-3 Modified Files: ebtables.spec ebtables.sysv Log Message: Resolve blockers that Chris Ricker pointed out. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.spec 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.spec 1 Jul 2005 16:27:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,12 +10,17 @@ Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +PreReq: /sbin/chkconfig +PreReq: /sbin/service %description -Ethernet bridge tables is a firewalling tool to transparantly filter network +Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. +This tool is the userspace control for the bridge and ebtables kernel +components (built by default in Fedora Core kernels). + The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. @@ -47,7 +52,9 @@ fi %postun -/sbin/service ebtables condrestart &>/dev/null || : +if [ $1 -ge 1 ] + /sbin/service ebtables condrestart &> /dev/null || : +fi %files %defattr(-, root, root, 0755) @@ -56,10 +63,20 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables +%ghost %{_sysconfdir}/ebtables.filter +%ghost %{_sysconfdir}/ebtables.nat +%ghost %{_sysconfdir}/ebtables.broute %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 +- fix sysv file + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file +- add some text to description, correct typos +- fix %postun +- add PreReqs +- add %ghost config files * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras Index: ebtables.sysv =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.sysv 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.sysv 1 Jul 2005 16:27:10 -0000 1.2 @@ -10,7 +10,7 @@ # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat -# config: /etc/sysconfig/ebtables.route +# config: /etc/sysconfig/ebtables.broute source /etc/init.d/functions source /etc/sysconfig/network @@ -27,6 +27,8 @@ prog="ebtables" desc="Ethernet bridge filtering" +lockfile=/var/lock/subsys/$prog + initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " @@ -68,7 +70,7 @@ RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$prog + touch $lockfile fi echo @@ -87,7 +89,7 @@ if [ $RETVAL -eq 0 ]; then success "$prog shutdown" - rm -f /var/lock/subsys/$prog + rm -f $lockfile else failure "$prog shutdown" fi @@ -126,7 +128,7 @@ restart ;; condrestart) - [ -e /var/lock/subsys/$prog ] && restart + [ -e $lockfile ] && restart RETVAL=$? ;; save) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:13 -0400 Subject: rpms/ebtables/devel ebtables.spec,1.1,1.2 ebtables.sysv,1.1,1.2 Message-ID: <200507011627.j61GRDxR021539@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475/devel Modified Files: ebtables.spec ebtables.sysv Log Message: Resolve blockers that Chris Ricker pointed out. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.spec 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,12 +10,17 @@ Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +PreReq: /sbin/chkconfig +PreReq: /sbin/service %description -Ethernet bridge tables is a firewalling tool to transparantly filter network +Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. +This tool is the userspace control for the bridge and ebtables kernel +components (built by default in Fedora Core kernels). + The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. @@ -47,7 +52,9 @@ fi %postun -/sbin/service ebtables condrestart &>/dev/null || : +if [ $1 -ge 1 ] + /sbin/service ebtables condrestart &> /dev/null || : +fi %files %defattr(-, root, root, 0755) @@ -56,10 +63,20 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables +%ghost %{_sysconfdir}/ebtables.filter +%ghost %{_sysconfdir}/ebtables.nat +%ghost %{_sysconfdir}/ebtables.broute %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 +- fix sysv file + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file +- add some text to description, correct typos +- fix %postun +- add PreReqs +- add %ghost config files * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras Index: ebtables.sysv =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.sysv 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.sysv 1 Jul 2005 16:27:11 -0000 1.2 @@ -10,7 +10,7 @@ # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat -# config: /etc/sysconfig/ebtables.route +# config: /etc/sysconfig/ebtables.broute source /etc/init.d/functions source /etc/sysconfig/network @@ -27,6 +27,8 @@ prog="ebtables" desc="Ethernet bridge filtering" +lockfile=/var/lock/subsys/$prog + initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " @@ -68,7 +70,7 @@ RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$prog + touch $lockfile fi echo @@ -87,7 +89,7 @@ if [ $RETVAL -eq 0 ]; then success "$prog shutdown" - rm -f /var/lock/subsys/$prog + rm -f $lockfile else failure "$prog shutdown" fi @@ -126,7 +128,7 @@ restart ;; condrestart) - [ -e /var/lock/subsys/$prog ] && restart + [ -e $lockfile ] && restart RETVAL=$? ;; save) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:13 -0400 Subject: rpms/ebtables/FC-4 ebtables.spec,1.1,1.2 ebtables.sysv,1.1,1.2 Message-ID: <200507011627.j61GRDc7021532@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21475/FC-4 Modified Files: ebtables.spec ebtables.sysv Log Message: Resolve blockers that Chris Ricker pointed out. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.spec 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -10,12 +10,17 @@ Patch0: ebtables-2.0.6-gcc34.patch Patch1: ebtables-2.0.6-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +PreReq: /sbin/chkconfig +PreReq: /sbin/service %description -Ethernet bridge tables is a firewalling tool to transparantly filter network +Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link layer filtering and some basic filtering on higher network layers. +This tool is the userspace control for the bridge and ebtables kernel +components (built by default in Fedora Core kernels). + The ebtables tool can be used together with the other Linux filtering tools, like iptables. There are no known incompatibility issues. @@ -47,7 +52,9 @@ fi %postun -/sbin/service ebtables condrestart &>/dev/null || : +if [ $1 -ge 1 ] + /sbin/service ebtables condrestart &> /dev/null || : +fi %files %defattr(-, root, root, 0755) @@ -56,10 +63,20 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_initrddir}/ebtables /sbin/ebtables +%ghost %{_sysconfdir}/ebtables.filter +%ghost %{_sysconfdir}/ebtables.nat +%ghost %{_sysconfdir}/ebtables.broute %changelog +* Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 +- fix sysv file + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-4 - remove INSTALL file +- add some text to description, correct typos +- fix %postun +- add PreReqs +- add %ghost config files * Tue May 31 2005 Tom "spot" Callaway 2.0.6-3 - reworked for Fedora Extras Index: ebtables.sysv =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.sysv,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ebtables.sysv 1 Jul 2005 16:03:23 -0000 1.1 +++ ebtables.sysv 1 Jul 2005 16:27:11 -0000 1.2 @@ -10,7 +10,7 @@ # # config: /etc/sysconfig/ebtables.filter # config: /etc/sysconfig/ebtables.nat -# config: /etc/sysconfig/ebtables.route +# config: /etc/sysconfig/ebtables.broute source /etc/init.d/functions source /etc/sysconfig/network @@ -27,6 +27,8 @@ prog="ebtables" desc="Ethernet bridge filtering" +lockfile=/var/lock/subsys/$prog + initialize() { # Initialize $TYPE tables echo -n $" $TYPE tables: " @@ -68,7 +70,7 @@ RETVAL=`expr $RETVAL_BROUTE + $RETVAL_NAT + $RETVAL_FILTER` if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$prog + touch $lockfile fi echo @@ -87,7 +89,7 @@ if [ $RETVAL -eq 0 ]; then success "$prog shutdown" - rm -f /var/lock/subsys/$prog + rm -f $lockfile else failure "$prog shutdown" fi @@ -126,7 +128,7 @@ restart ;; condrestart) - [ -e /var/lock/subsys/$prog ] && restart + [ -e $lockfile ] && restart RETVAL=$? ;; save) From fedora-extras-commits at redhat.com Fri Jul 1 16:27:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:33 -0400 Subject: common tobuild,1.1677,1.1678 Message-ID: <200507011627.j61GRXs5021606@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21589 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1677 retrieving revision 1.1678 diff -u -r1.1677 -r1.1678 --- tobuild 1 Jul 2005 16:23:50 -0000 1.1677 +++ tobuild 1 Jul 2005 16:27:31 -0000 1.1678 @@ -26,3 +26,4 @@ dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel +spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 16:27:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 12:27:52 -0400 Subject: common tobuild,1.1678,1.1679 Message-ID: <200507011627.j61GRqcm021673@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1678 retrieving revision 1.1679 diff -u -r1.1678 -r1.1679 --- tobuild 1 Jul 2005 16:27:31 -0000 1.1678 +++ tobuild 1 Jul 2005 16:27:50 -0000 1.1679 @@ -27,3 +27,4 @@ dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 +spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 16:28:32 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Fri, 1 Jul 2005 12:28:32 -0400 Subject: devel/common tobuild,1.1679,1.1680 Message-ID: <200507011628.j61GSWSe021737@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21720 Modified Files: tobuild Log Message: request build of devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1679 retrieving revision 1.1680 diff -u -r1.1679 -r1.1680 --- tobuild 1 Jul 2005 16:27:50 -0000 1.1679 +++ tobuild 1 Jul 2005 16:28:29 -0000 1.1680 @@ -28,3 +28,4 @@ orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 +kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 17:05:35 2005 From: fedora-extras-commits at redhat.com (Christian Jodar (Tian)) Date: Fri, 1 Jul 2005 13:05:35 -0400 Subject: rpms/gcfilms/devel gcfilms.spec,1.2,1.3 Message-ID: <200507011706.j61H68vZ023438@cvs-int.fedora.redhat.com> Author: Tian Update of /cvs/extras/rpms/gcfilms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23411 Modified Files: gcfilms.spec Log Message: Added dist tag Index: gcfilms.spec =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcfilms.spec 29 Jun 2005 16:58:41 -0000 1.2 +++ gcfilms.spec 1 Jul 2005 17:05:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: gcfilms Version: 5.2 -Release: 1 +Release: 1%{?dist} Summary: Movies collection management Group: Applications/Databases From fedora-extras-commits at redhat.com Fri Jul 1 17:10:12 2005 From: fedora-extras-commits at redhat.com (Christian Jodar (Tian)) Date: Fri, 1 Jul 2005 13:10:12 -0400 Subject: common tobuild,1.1680,1.1681 Message-ID: <200507011710.j61HACg3023547@cvs-int.fedora.redhat.com> Author: Tian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23530 Modified Files: tobuild Log Message: request build of rpms/gcfilms/devel gcfilms-5_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1680 retrieving revision 1.1681 diff -u -r1.1680 -r1.1681 --- tobuild 1 Jul 2005 16:28:29 -0000 1.1680 +++ tobuild 1 Jul 2005 17:10:10 -0000 1.1681 @@ -29,3 +29,4 @@ spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel +Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 17:23:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 13:23:03 -0400 Subject: rpms/QuantLib/devel QuantLib.spec,1.7,1.8 Message-ID: <200507011723.j61HN3PK023686@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639/devel Modified Files: QuantLib.spec Log Message: Fix URL to resolve BZ 161674 Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- QuantLib.spec 3 Jun 2005 14:49:51 -0000 1.7 +++ QuantLib.spec 1 Jul 2005 17:23:01 -0000 1.8 @@ -2,12 +2,12 @@ Name: QuantLib Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries URL: http://www.quantlib.org -Source0: http://prdownloads.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz +Source0: http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz Patch0: QuantLib-0.3.8-installdatahookfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel, tetex, tetex-latex, tetex-dvips, emacs @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Sat Jun 25 2005 Colin Charles 0.3.9-2 +- Fix download URL + * Fri Jun 3 2005 Tom "spot" Callaway 0.3.9-1 - cleanup spec - add emacs,xemacs BuildRequires From fedora-extras-commits at redhat.com Fri Jul 1 17:22:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 13:22:57 -0400 Subject: rpms/QuantLib/FC-3 QuantLib.spec,1.7,1.8 Message-ID: <200507011723.j61HNRxA023689@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639/FC-3 Modified Files: QuantLib.spec Log Message: Fix URL to resolve BZ 161674 Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-3/QuantLib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- QuantLib.spec 3 Jun 2005 14:49:46 -0000 1.7 +++ QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 @@ -2,12 +2,12 @@ Name: QuantLib Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries URL: http://www.quantlib.org -Source0: http://prdownloads.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz +Source0: http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz Patch0: QuantLib-0.3.8-installdatahookfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel, tetex, tetex-latex, tetex-dvips, emacs @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Sat Jun 25 2005 Colin Charles 0.3.9-2 +- Fix download URL + * Fri Jun 3 2005 Tom "spot" Callaway 0.3.9-1 - cleanup spec - add emacs,xemacs BuildRequires From fedora-extras-commits at redhat.com Fri Jul 1 17:22:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 1 Jul 2005 13:22:58 -0400 Subject: rpms/QuantLib/FC-4 QuantLib.spec,1.7,1.8 Message-ID: <200507011723.j61HNSPe023692@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23639/FC-4 Modified Files: QuantLib.spec Log Message: Fix URL to resolve BZ 161674 Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/QuantLib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- QuantLib.spec 3 Jun 2005 14:49:46 -0000 1.7 +++ QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 @@ -2,12 +2,12 @@ Name: QuantLib Version: 0.3.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries URL: http://www.quantlib.org -Source0: http://prdownloads.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz +Source0: http://download.sourceforge.net/quantlib/QuantLib-%{version}.tar.gz Patch0: QuantLib-0.3.8-installdatahookfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel, tetex, tetex-latex, tetex-dvips, emacs @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Sat Jun 25 2005 Colin Charles 0.3.9-2 +- Fix download URL + * Fri Jun 3 2005 Tom "spot" Callaway 0.3.9-1 - cleanup spec - add emacs,xemacs BuildRequires From tcallawa at redhat.com Fri Jul 1 18:04:33 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 01 Jul 2005 13:04:33 -0500 Subject: APPROVAL: diction Message-ID: <1120241073.8990.202.camel@localhost.localdomain> Name: diction Summary: Identifies diction and style errors Description: Diction and style are two old standard UNIX commands. Diction identifies wordy and commonly misused phrases. Style analyses surface characteristics of a document, including sentence length and other readability measures. These programs cannot help you structure a document well, but they can help to avoid poor wording and compare the readability (not the understandability!) of your documents with others. Both commands support English and German documents. Reviewer: Tom 'spot' Callaway Maintainer: Konstantin Ryabitsev ~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 Jul 1 18:21:03 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 14:21:03 -0400 Subject: common tobuild,1.1681,1.1682 Message-ID: <200507011821.j61IL3xr025246@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25229 Modified Files: tobuild Log Message: request build of rpms/diction/FC-4 diction-1_08-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1681 retrieving revision 1.1682 diff -u -r1.1681 -r1.1682 --- tobuild 1 Jul 2005 17:10:10 -0000 1.1681 +++ tobuild 1 Jul 2005 18:21:01 -0000 1.1682 @@ -30,3 +30,4 @@ spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel +icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 18:21:25 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Fri, 1 Jul 2005 14:21:25 -0400 Subject: common tobuild,1.1682,1.1683 Message-ID: <200507011821.j61ILQkC025313@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25294 Modified Files: tobuild Log Message: request build of rpms/diction/devel diction-1_08-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1682 retrieving revision 1.1683 diff -u -r1.1682 -r1.1683 --- tobuild 1 Jul 2005 18:21:01 -0000 1.1682 +++ tobuild 1 Jul 2005 18:21:23 -0000 1.1683 @@ -31,3 +31,4 @@ kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 +icon rpms/diction/devel diction-1_08-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 18:41:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 14:41:13 -0400 Subject: common tobuild,1.1683,1.1684 Message-ID: <200507011841.j61IfDLu025437@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25418 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1683 retrieving revision 1.1684 diff -u -r1.1683 -r1.1684 --- tobuild 1 Jul 2005 18:21:23 -0000 1.1683 +++ tobuild 1 Jul 2005 18:41:11 -0000 1.1684 @@ -32,3 +32,4 @@ Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 icon rpms/diction/devel diction-1_08-1_fc5 devel +mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 18:45:36 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 1 Jul 2005 14:45:36 -0400 Subject: rpms/exo/devel exo.spec,1.8,1.9 Message-ID: <200507011845.j61IjaIg025505@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/rpms/exo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25488 Modified Files: exo.spec Log Message: Bump release for a new build Index: exo.spec =================================================================== RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- exo.spec 20 Jun 2005 20:28:34 -0000 1.8 +++ exo.spec 1 Jul 2005 18:45:33 -0000 1.9 @@ -3,7 +3,7 @@ Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.0 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPL URL: http://libexo.os-cillation.com/ Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2 @@ -71,6 +71,9 @@ %{python_sitearch}/pyexo.* %changelog +* Fri Jul 1 2005 Kevin Fenzi - 0.3.0-9.fc5 +- Bump release for a new build + * Mon Jun 20 2005 Kevin Fenzi - 0.3.0-8.fc5 - Add patch to make x86_64 package build From fedora-extras-commits at redhat.com Fri Jul 1 18:45:52 2005 From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin)) Date: Fri, 1 Jul 2005 14:45:52 -0400 Subject: common tobuild,1.1684,1.1685 Message-ID: <200507011845.j61Ijq59025568@cvs-int.fedora.redhat.com> Author: kevin Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25550 Modified Files: tobuild Log Message: request build of rpms/exo/devel exo-0_3_0-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1684 retrieving revision 1.1685 diff -u -r1.1684 -r1.1685 --- tobuild 1 Jul 2005 18:41:11 -0000 1.1684 +++ tobuild 1 Jul 2005 18:45:50 -0000 1.1685 @@ -33,3 +33,4 @@ icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 icon rpms/diction/devel diction-1_08-1_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 +kevin rpms/exo/devel exo-0_3_0-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 18:46:45 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 14:46:45 -0400 Subject: common tobuild,1.1685,1.1686 Message-ID: <200507011846.j61IkjBB025597@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25580 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1685 retrieving revision 1.1686 diff -u -r1.1685 -r1.1686 --- tobuild 1 Jul 2005 18:45:50 -0000 1.1685 +++ tobuild 1 Jul 2005 18:46:43 -0000 1.1686 @@ -1,25 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -tagoh rpms/anthy/FC-4 anthy-6700-1_fc4 fc4 -tagoh rpms/anthy/FC-3 anthy-6700-1_fc3 fc3 -tagoh rpms/anthy/devel anthy-6700-2_fc5 devel -oliver rpms/rblcheck/devel rblcheck-1_5-10_fc5 devel -oliver rpms/rblcheck/FC-3 rblcheck-1_5-10_fc3 fc3 -oliver rpms/rblcheck/FC-4 rblcheck-1_5-10_fc4 fc4 -oliver rpms/fish/devel fish-1_11_1-10_fc5 devel -petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 -petersen rpms/darcs/FC-3 darcs-1_0_3-2_fc3 fc3 -petersen rpms/darcs/FC-4 darcs-1_0_3-2_fc4_1 fc4 -spot rpms/gaim-otr/FC-3 gaim-otr-2_0_2-2_fc3 fc3 -spot rpms/gaim-otr/FC-4 gaim-otr-2_0_2-2_fc4 fc4 -abompard rpms/libvisual/FC-4 libvisual-0_2_0-6_fc4 fc4 -abompard rpms/libvisual/devel libvisual-0_2_0-6_fc5 devel -adrian rpms/most/devel most-4_10_1-1 devel -kaboom rpms/rinetd/FC-4 rinetd-0_62-4_fc4 fc4 -spot rpms/lout/FC-3 lout-3_30-4_fc3 fc3 -spot rpms/lout/FC-4 lout-3_30-4_fc4 fc4 -mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-11_fc3 fc3 corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 19:47:18 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 15:47:18 -0400 Subject: rpms/moodss import.log,1.7,1.8 Message-ID: <200507011947.j61JlIJp026901@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26870 Modified Files: import.log Log Message: auto-import moodss-20.2-1 on branch FC-4 from moodss-20.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/moodss/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 26 May 2005 19:36:38 -0000 1.7 +++ import.log 1 Jul 2005 19:47:16 -0000 1.8 @@ -4,3 +4,4 @@ moodss-20_0-1:HEAD:moodss-20.0-1.src.rpm:1115576777 moodss-20_0-1:FC-3:moodss-20.0-1.src.rpm:1115577017 moodss-20_1-1:HEAD:moodss-20.1-1.src.rpm:1117136187 +moodss-20_2-1:FC-4:moodss-20.2-1.src.rpm:1120247225 From fedora-extras-commits at redhat.com Fri Jul 1 19:47:19 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 15:47:19 -0400 Subject: rpms/moodss/FC-4 .cvsignore, 1.4, 1.5 moodss.spec, 1.15, 1.16 sources, 1.4, 1.5 Message-ID: <200507011947.j61JlJ30026909@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26870/FC-4 Modified Files: .cvsignore moodss.spec sources Log Message: auto-import moodss-20.2-1 on branch FC-4 from moodss-20.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 May 2005 19:36:38 -0000 1.4 +++ .cvsignore 1 Jul 2005 19:47:17 -0000 1.5 @@ -1 +1 @@ -moodss-20.1.tar.bz2 +moodss-20.2.tar.bz2 Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- moodss.spec 31 May 2005 19:31:42 -0000 1.15 +++ moodss.spec 1 Jul 2005 19:47:17 -0000 1.16 @@ -1,10 +1,10 @@ Name: moodss -Version: 20.1 -Release: 4%{?dist} +Version: 20.2 +Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-20.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: tcl-devel >= 8.4.8 @@ -58,8 +58,8 @@ %changelog -* Tue May 31 2005 Jean-Luc Fontaine 20.1-4 -- increased release for FC-4 +* Sun Jun 26 2005 Jean-Luc Fontaine 20.2-1 +- 20.2 source release * Sun May 22 2005 Jean-Luc Fontaine 20.1-3 - 20.1 source release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 May 2005 19:36:38 -0000 1.4 +++ sources 1 Jul 2005 19:47:17 -0000 1.5 @@ -1 +1 @@ -b55e2aff0ff05e55a6b1f4dff6e58fa9 moodss-20.1.tar.bz2 +151a823de023ddb1961d046d8adfaa0b moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 19:48:35 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 15:48:35 -0400 Subject: common tobuild,1.1686,1.1687 Message-ID: <200507011948.j61JmZ85027005@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26988 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-4 moodss-20_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1686 retrieving revision 1.1687 diff -u -r1.1686 -r1.1687 --- tobuild 1 Jul 2005 18:46:43 -0000 1.1686 +++ tobuild 1 Jul 2005 19:48:33 -0000 1.1687 @@ -15,3 +15,4 @@ icon rpms/diction/devel diction-1_08-1_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 kevin rpms/exo/devel exo-0_3_0-9_fc5 devel +jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 19:52:30 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:30 -0400 Subject: rpms/mercurial - New directory Message-ID: <200507011952.j61JqU5Z027095@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27071/mercurial Log Message: Directory /cvs/extras/rpms/mercurial added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 19:52:30 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:30 -0400 Subject: rpms/mercurial/devel - New directory Message-ID: <200507011952.j61JqUbk027100@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27071/mercurial/devel Log Message: Directory /cvs/extras/rpms/mercurial/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 19:52:51 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:51 -0400 Subject: rpms/mercurial Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507011952.j61Jqph8027143@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27116 Added Files: Makefile import.log Log Message: Setup of module mercurial --- NEW FILE Makefile --- # Top level Makefile for module mercurial all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 19:52:51 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:52:51 -0400 Subject: rpms/mercurial/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507011952.j61JqpJj027148@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27116/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mercurial --- NEW 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 Jul 1 19:53:17 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:53:17 -0400 Subject: rpms/mercurial import.log,1.1,1.2 Message-ID: <200507011953.j61JrlF5027214@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27180 Modified Files: import.log Log Message: auto-import mercurial-0.6-1 on branch devel from mercurial-0.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mercurial/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 19:52:49 -0000 1.1 +++ import.log 1 Jul 2005 19:53:15 -0000 1.2 @@ -0,0 +1 @@ +mercurial-0_6-1:HEAD:mercurial-0.6-1.src.rpm:1120247533 From fedora-extras-commits at redhat.com Fri Jul 1 19:53:18 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:53:18 -0400 Subject: rpms/mercurial/devel mercurial.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507011953.j61JrmZP027218@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27180/devel Modified Files: .cvsignore sources Added Files: mercurial.spec Log Message: auto-import mercurial-0.6-1 on branch devel from mercurial-0.6-1.src.rpm --- NEW FILE mercurial.spec --- Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 0.6 Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://www.selenic.com/mercurial/ Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: python-devel %description Mercurial is a fast, lightweight source control management system designed for efficient handling of very large distributed projects. %prep %setup -q %build python ./setup.py build %install rm -rf $RPM_BUILD_ROOT python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.files %defattr(-,root,root,-) %doc doc/FAQ.txt README doc/hg.1.txt %changelog * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 19:52:49 -0000 1.1 +++ .cvsignore 1 Jul 2005 19:53:16 -0000 1.2 @@ -0,0 +1 @@ +mercurial-0.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 19:52:49 -0000 1.1 +++ sources 1 Jul 2005 19:53:16 -0000 1.2 @@ -0,0 +1 @@ +25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz From katzj at redhat.com Fri Jul 1 19:53:15 2005 From: katzj at redhat.com (Jeremy Katz) Date: Fri, 01 Jul 2005 15:53:15 -0400 Subject: APPROVED: mercurial Message-ID: <1120247595.25441.24.camel@bree.local.net> Name: mercurial Mercurial is a fast, lightweight source control management system designed for efficient handling of very large distributed projects. Reviewer: Jason Tibbits III Maintainer: Jeremy Katz Jeremy From fedora-extras-commits at redhat.com Fri Jul 1 19:55:37 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:55:37 -0400 Subject: common tobuild,1.1687,1.1688 Message-ID: <200507011955.j61JtbbQ027522@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27499 Modified Files: tobuild Log Message: request build of rpms/mercurial/devel mercurial-0_6-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1687 retrieving revision 1.1688 diff -u -r1.1687 -r1.1688 --- tobuild 1 Jul 2005 19:48:33 -0000 1.1687 +++ tobuild 1 Jul 2005 19:55:35 -0000 1.1688 @@ -16,3 +16,4 @@ mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 kevin rpms/exo/devel exo-0_3_0-9_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 +katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 19:56:25 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:56:25 -0400 Subject: common tobuild,1.1688,1.1689 Message-ID: <200507011956.j61JuPVN027592@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27575 Modified Files: tobuild Log Message: request build of rpms/mercurial/FC-4 mercurial-0_6-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1688 retrieving revision 1.1689 diff -u -r1.1688 -r1.1689 --- tobuild 1 Jul 2005 19:55:35 -0000 1.1688 +++ tobuild 1 Jul 2005 19:56:23 -0000 1.1689 @@ -17,3 +17,4 @@ kevin rpms/exo/devel exo-0_3_0-9_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel +katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 19:57:06 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 1 Jul 2005 15:57:06 -0400 Subject: common tobuild,1.1689,1.1690 Message-ID: <200507011957.j61Jv6OV027658@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27639 Modified Files: tobuild Log Message: request build of rpms/mercurial/FC-3 mercurial-0_6-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1689 retrieving revision 1.1690 diff -u -r1.1689 -r1.1690 --- tobuild 1 Jul 2005 19:56:23 -0000 1.1689 +++ tobuild 1 Jul 2005 19:57:04 -0000 1.1690 @@ -18,3 +18,4 @@ jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 +katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 21:01:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:01:08 -0400 Subject: devel/aalib aalib-1.4rc5-bug149361.patch, NONE, 1.1 aalib.spec, 1.8, 1.9 Message-ID: <200507012101.j61L18tc029887@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/aalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29862 Modified Files: aalib.spec Added Files: aalib-1.4rc5-bug149361.patch Log Message: * Fri Jul 1 2005 Michael Schwendt 1.4.0-0.rc5.5 - fix missing return value (#149361) aalib-1.4rc5-bug149361.patch: --- NEW FILE aalib-1.4rc5-bug149361.patch --- diff -Nur aalib-1.4.0-orig/src/aalinuxkbd.c aalib-1.4.0/src/aalinuxkbd.c --- aalib-1.4.0-orig/src/aalinuxkbd.c 2001-04-26 16:37:31.000000000 +0200 +++ aalib-1.4.0/src/aalinuxkbd.c 2005-07-01 22:57:59.000000000 +0200 @@ -200,7 +200,7 @@ static int rawmode_init(void) { if (!closed) - return; + return 0; mypid = getpid(); if (tty_fd == -1) { tty_fd = fileno(stdin); Index: aalib.spec =================================================================== RCS file: /cvs/extras/devel/aalib/aalib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aalib.spec 6 Apr 2005 22:10:46 -0000 1.8 +++ aalib.spec 1 Jul 2005 21:01:06 -0000 1.9 @@ -3,7 +3,7 @@ Summary: An ASCII art library. Name: aalib Version: 1.4.0 -Release: 0.%{rc_subver}.4 +Release: 0.%{rc_subver}.5 License: LGPL Group: System Environment/Libraries @@ -11,6 +11,7 @@ Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz Patch0: %{name}-aclocal.patch Patch1: %{name}-config-rpath.patch +Patch2: aalib-1.4rc5-bug149361.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: slang-devel XFree86-devel gpm-devel @@ -39,6 +40,7 @@ %setup -q %patch0 -p0 %patch1 -p0 +%patch2 -p1 -b .bug149361 %build @@ -91,7 +93,10 @@ %{_datadir}/aclocal/aalib.m4 %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 1 2005 Michael Schwendt 1.4.0-0.rc5.5 +- fix missing return value (#149361) + +* Thu Apr 7 2005 Michael Schwendt 1.4.0-0.rc5.4 - rebuilt * Thu Dec 16 2004 Michael Schwendt 1.4.0-0.rc5.3 From fedora-extras-commits at redhat.com Fri Jul 1 21:03:58 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:03:58 -0400 Subject: common tobuild,1.1690,1.1691 Message-ID: <200507012104.j61L4SJG029953@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29936 Modified Files: tobuild Log Message: request build of devel/aalib aalib-1_4_0-0_rc5_5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1690 retrieving revision 1.1691 diff -u -r1.1690 -r1.1691 --- tobuild 1 Jul 2005 19:57:04 -0000 1.1690 +++ tobuild 1 Jul 2005 21:03:56 -0000 1.1691 @@ -19,3 +19,4 @@ katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 +mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel From fedora-extras-commits at redhat.com Fri Jul 1 21:21:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:21:52 -0400 Subject: rpms/meld/FC-3 .cvsignore, 1.4, 1.5 meld.spec, 1.6, 1.7 sources, 1.4, 1.5 meld, 1.2, NONE Message-ID: <200507012121.j61LLq5G030091@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/meld/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30071 Modified Files: .cvsignore meld.spec sources Removed Files: meld Log Message: Sync with FC-4/Devel for erratum (#154918). * Wed Jun 8 2005 Michael Schwendt - 0.9.6-1 - Remove unused meld shell script from src.rpm. - Add scriptlets for scrollkeeper-update. - Use %find_lang macro. - Simplify %install (let included Makefile do the installation). - Update to 0.9.6 (fixes manual). - BR scrollkeeper (#156235). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Feb 2005 02:29:21 -0000 1.4 +++ .cvsignore 1 Jul 2005 21:21:50 -0000 1.5 @@ -1 +1 @@ -meld-0.9.5.tar.bz2 +meld-0.9.6.tar.bz2 Index: meld.spec =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/meld.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- meld.spec 9 Feb 2005 02:29:21 -0000 1.6 +++ meld.spec 1 Jul 2005 21:21:50 -0000 1.7 @@ -1,25 +1,29 @@ Name: meld -Version: 0.9.5 -Release: 1 -Summary: Visual diff and merge tool. +Version: 0.9.6 +# temporarily use 0 for FC-3 erratum +Release: 0%{?dist} +Summary: Visual diff and merge tool -Group: Development/Tools +Group: Development/Tools License: GPL URL: http://meld.sourceforge.net/ -Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-0.9.5.tar.bz2 -Source1: meld +Source0: http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2 Patch0: desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: scrollkeeper Requires: gnome-python2 >= 1.99.14 Requires: gnome-python2-canvas Requires: gnome-python2-gconf Requires: pygtk2 >= 1.99.15 Requires: pygtk2-libglade +Requires(post): scrollkeeper +Requires(postun): scrollkeeper + BuildArch: noarch %description @@ -36,42 +40,60 @@ %build -make +make prefix=%{_prefix} libdir=%{_datadir} %install rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/pixmaps/ -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/meld/po/ -install -p -D -m0755 meld ${RPM_BUILD_ROOT}%{_datadir}/meld/meld -install -p -D -m0644 *.py ${RPM_BUILD_ROOT}%{_datadir}/meld/ -install -p -D -m0644 glade2/*.glade* ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/ -install -p -D -m0644 glade2/pixmaps/* ${RPM_BUILD_ROOT}%{_datadir}/meld/glade2/pixmaps/ -install -p -D -m0644 glade2/pixmaps/icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/meld.png -install -p -D -m0644 po/*.po ${RPM_BUILD_ROOT}%{_datadir}/meld/po/ -install -p -D -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_bindir}/meld +make prefix=%{_prefix} libdir=%{_datadir} \ + DESTDIR=${RPM_BUILD_ROOT} install desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - meld.desktop + --delete-original \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/meld.desktop + +%find_lang %{name} + + +%post +scrollkeeper-update -q || : + + +%postun +scrollkeeper-update -q || : %clean rm -rf ${RPM_BUILD_ROOT} -%files +%files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING +%doc AUTHORS COPYING %{_bindir}/meld -%{_datadir}/meld +%{_datadir}/meld/ %{_datadir}/applications/fedora-meld.desktop +%{_datadir}/application-registry/%{name}* %{_datadir}/pixmaps/meld.png +%{_datadir}/gnome/help/%{name}/ +%{_datadir}/omf/%{name}/ %changelog +* Wed Jun 8 2005 Michael Schwendt - 0.9.6-1 +- Remove unused meld shell script from src.rpm. +- Add scriptlets for scrollkeeper-update. +- Use %%find_lang macro. +- Simplify %%install (let included Makefile do the installation). +- Update to 0.9.6 (fixes manual). +- BR scrollkeeper (#156235). + +* Thu Apr 7 2005 Michael Schwendt - 0.9.5-2 +- rebuilt + * Sun Feb 06 2005 Phillip Compton - 0.9.5-1 - 0.9.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/meld/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Feb 2005 02:29:21 -0000 1.4 +++ sources 1 Jul 2005 21:21:50 -0000 1.5 @@ -1 +1 @@ -dc86bf6f5ed1887da6a28ac1d91eb78d meld-0.9.5.tar.bz2 +73419987b125c0cfbb1f04cfe454a8e5 meld-0.9.6.tar.bz2 --- meld DELETED --- From fedora-extras-commits at redhat.com Fri Jul 1 21:22:31 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 17:22:31 -0400 Subject: common tobuild,1.1691,1.1692 Message-ID: <200507012122.j61LMVP1030156@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30139 Modified Files: tobuild Log Message: request build of rpms/meld/FC-3 meld-0_9_6-0_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1691 retrieving revision 1.1692 diff -u -r1.1691 -r1.1692 --- tobuild 1 Jul 2005 21:03:56 -0000 1.1691 +++ tobuild 1 Jul 2005 21:22:29 -0000 1.1692 @@ -20,3 +20,4 @@ katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel +mschwendt rpms/meld/FC-3 meld-0_9_6-0_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 21:58:50 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 17:58:50 -0400 Subject: common tobuild,1.1692,1.1693 Message-ID: <200507012158.j61LwoCU030232@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30215 Modified Files: tobuild Log Message: mod_suphp enqueued for devel, fc4, fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1692 retrieving revision 1.1693 diff -u -r1.1692 -r1.1693 --- tobuild 1 Jul 2005 21:22:29 -0000 1.1692 +++ tobuild 1 Jul 2005 21:58:48 -0000 1.1693 @@ -21,3 +21,6 @@ katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel mschwendt rpms/meld/FC-3 meld-0_9_6-0_fc3 fc3 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 22:21:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 18:21:28 -0400 Subject: common tobuild,1.1693,1.1694 Message-ID: <200507012221.j61MLSXm031382@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31365 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1693 retrieving revision 1.1694 diff -u -r1.1693 -r1.1694 --- tobuild 1 Jul 2005 21:58:48 -0000 1.1693 +++ tobuild 1 Jul 2005 22:21:26 -0000 1.1694 @@ -1,19 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -corsepiu rpms/perl-Want/devel perl-Want-0_08-3_fc5 devel -bpepple rpms/gramps/devel gramps-2_0_4-1_fc5 devel -bpepple rpms/gramps/FC-4 gramps-2_0_4-1_fc4 fc4 -dwmw2 rpms/exim/devel exim-4_52-1_fc5 devel -dwmw2 rpms/exim/FC-4 exim-4_52-1_fc4 fc4 -orion rpms/python-matplotlib/devel python-matplotlib-0_82-3_fc5 devel -spot rpms/ebtables/FC-3 ebtables-2_0_6-5_fc3 fc3 -spot rpms/ebtables/FC-4 ebtables-2_0_6-5_fc4 fc4 -kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel -Tian rpms/gcfilms/devel gcfilms-5_2-1_fc5 devel -icon rpms/diction/FC-4 diction-1_08-1_fc4 fc4 -icon rpms/diction/devel diction-1_08-1_fc5 devel -mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-11_fc4 fc4 kevin rpms/exo/devel exo-0_3_0-9_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 1 22:31:01 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:01 -0400 Subject: rpms/libpqxx - New directory Message-ID: <200507012231.j61MV1va031511@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31487/libpqxx Log Message: Directory /cvs/extras/rpms/libpqxx added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:31:01 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:01 -0400 Subject: rpms/libpqxx/devel - New directory Message-ID: <200507012231.j61MV1Ga031516@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31487/libpqxx/devel Log Message: Directory /cvs/extras/rpms/libpqxx/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:31:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:31 -0400 Subject: rpms/libpqxx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507012231.j61MVVx9031559@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532 Added Files: Makefile import.log Log Message: Setup of module libpqxx --- NEW FILE Makefile --- # Top level Makefile for module libpqxx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 22:31:32 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:31:32 -0400 Subject: rpms/libpqxx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507012231.j61MVWcf031564@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31532/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libpqxx --- NEW 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 Jul 1 22:34:15 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:34:15 -0400 Subject: rpms/libpqxx import.log,1.1,1.2 Message-ID: <200507012234.j61MYk8h031630@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31596 Modified Files: import.log Log Message: auto-import libpqxx-2.5.4-3 on branch devel from libpqxx-2.5.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libpqxx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 22:31:29 -0000 1.1 +++ import.log 1 Jul 2005 22:34:13 -0000 1.2 @@ -0,0 +1 @@ +libpqxx-2_5_4-3:HEAD:libpqxx-2.5.4-3.src.rpm:1120257235 From fedora-extras-commits at redhat.com Fri Jul 1 22:34:16 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:34:16 -0400 Subject: rpms/libpqxx/devel libpqxx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507012234.j61MYkXM031634@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31596/devel Modified Files: .cvsignore sources Added Files: libpqxx.spec Log Message: auto-import libpqxx-2.5.4-3 on branch devel from libpqxx-2.5.4-3.src.rpm --- NEW FILE libpqxx.spec --- Name: libpqxx Version: 2.5.4 Release: 3 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel BuildRequires: pkgconfig %description C++ client API for PostgreSQL. The standard front-end (in the sense of "language binding") for writing C++ programs that use PostgreSQL. Supersedes older libpq++ interface. %package devel Summary: Development tools for libpqxx Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: postgresql-devel %description devel The libpgxx-devel package contains the header files and static libraries necessary for developing programs which use libpqxx. %prep %setup -q %build %configure --enable-shared # I hate rpath... ;) %{__perl} -pi -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/;' \ libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \; %{__perl} -pi -e 's,-R/usr/lib,,' $RPM_BUILD_ROOT%{_bindir}/pqxx-config %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO VERSION %{_libdir}/libpqxx-2.5.4.so %files devel %doc README-UPGRADE %{_bindir}/pqxx-config %{_libdir}/libpqxx.a %{_libdir}/libpqxx.so %{_includedir}/pqxx %{_libdir}/pkgconfig/libpqxx.pc %changelog * Fri Jul 01 2005 Andreas Bierfert 2.5.4-3 - add postgresql-devel to Requires for devel package - get rid of -R option in pqxx-config - don't need BuildRequires perl * Thu Jun 30 2005 Andreas Bierfert 2.5.4-2 - Drop explicit Requires for ldconfig * Sat Jun 25 2005 Andreas Bierfert 2.5.4-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 22:31:30 -0000 1.1 +++ .cvsignore 1 Jul 2005 22:34:14 -0000 1.2 @@ -0,0 +1 @@ +libpqxx-2.5.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 22:31:30 -0000 1.1 +++ sources 1 Jul 2005 22:34:14 -0000 1.2 @@ -0,0 +1 @@ +b0951e530dc9b35171f8ff015ab43920 libpqxx-2.5.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 1 22:35:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 1 Jul 2005 18:35:04 -0400 Subject: devel/aalib aalib-1.4rc5-bug149361.patch,1.1,1.2 Message-ID: <200507012235.j61MZ41O031686@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/aalib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31666 Modified Files: aalib-1.4rc5-bug149361.patch Log Message: inverted aalib-1.4rc5-bug149361.patch: Index: aalib-1.4rc5-bug149361.patch =================================================================== RCS file: /cvs/extras/devel/aalib/aalib-1.4rc5-bug149361.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aalib-1.4rc5-bug149361.patch 1 Jul 2005 21:01:06 -0000 1.1 +++ aalib-1.4rc5-bug149361.patch 1 Jul 2005 22:35:02 -0000 1.2 @@ -6,7 +6,7 @@ { if (!closed) - return; -+ return 0; ++ return 1; mypid = getpid(); if (tty_fd == -1) { tty_fd = fileno(stdin); From fedora-extras-commits at redhat.com Fri Jul 1 22:36:34 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:36:34 -0400 Subject: rpms/wv2 - New directory Message-ID: <200507012236.j61MaY2v031783@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/wv2 Log Message: Directory /cvs/extras/rpms/wv2 added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:36:34 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:36:34 -0400 Subject: rpms/wv2/devel - New directory Message-ID: <200507012236.j61MaYvL031788@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/wv2/devel Log Message: Directory /cvs/extras/rpms/wv2/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 1 22:37:09 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:37:09 -0400 Subject: rpms/wv2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507012237.j61Mb9D1031831@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804 Added Files: Makefile import.log Log Message: Setup of module wv2 --- NEW FILE Makefile --- # Top level Makefile for module wv2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 1 22:37:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:37:10 -0400 Subject: rpms/wv2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507012237.j61MbAX9031836@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module wv2 --- NEW 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 Jul 1 22:40:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:40:31 -0400 Subject: rpms/wv2 import.log,1.1,1.2 Message-ID: <200507012240.j61MeVjP031899@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31868 Modified Files: import.log Log Message: auto-import wv2-0.2.2-4 on branch devel from wv2-0.2.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/wv2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Jul 2005 22:37:07 -0000 1.1 +++ import.log 1 Jul 2005 22:40:29 -0000 1.2 @@ -0,0 +1 @@ +wv2-0_2_2-4:HEAD:wv2-0.2.2-4.src.rpm:1120257607 From fedora-extras-commits at redhat.com Fri Jul 1 22:40:31 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 1 Jul 2005 18:40:31 -0400 Subject: rpms/wv2/devel wv2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507012240.j61MeVSK031906@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31868/devel Modified Files: .cvsignore sources Added Files: wv2.spec Log Message: auto-import wv2-0.2.2-4 on branch devel from wv2-0.2.2-4.src.rpm --- NEW FILE wv2.spec --- Name: wv2 Version: 0.2.2 Release: 4 Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries License: LGPL URL: http://wvware.sourceforge.net Source0: http://dl.sf.net/wvware/wv2-0.2.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgsf-devel BuildRequires: libxml2-devel BuildRequires: glib2-devel BuildRequires: zlib-devel BuildRequires: pkgconfig %description wv is a library which allows access to Microsoft?? Word files. It can load and parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known internally as Word 9, 8, 7 and 6.) There is some support for reading earlier formats as well: Word 2 docs are converted to plaintext. %package devel Summary: Development tools for programs which will use the wv2 library Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libgsf-devel Requires: glib2-devel Requires: libxml2-devel %description devel The wv2-devel package includes the header files necessary for developing. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB README RELEASE THANKS TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %doc doc/* %{_bindir}/wv2-config %{_libdir}/*.so %{_includedir}/wv2 %changelog * Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 - add some Requires for the devel package - changed some files around - added missing defattr to devel package * Thu Jun 30 2005 Andreas Bierfert 0.2.2-3 - drop explicit Requires for ldconfig * Wed Jun 29 2005 Andreas Bierfert 0.2.2-2 - added trademarks - added missing ldconfig * Sun Jun 26 2005 Andreas Bierfert 0.2.2-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jul 2005 22:37:08 -0000 1.1 +++ .cvsignore 1 Jul 2005 22:40:29 -0000 1.2 @@ -0,0 +1 @@ +wv2-0.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jul 2005 22:37:08 -0000 1.1 +++ sources 1 Jul 2005 22:40:29 -0000 1.2 @@ -0,0 +1 @@ +d05318852b6c599270c7e0376834c413 wv2-0.2.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 23:24:55 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:24:55 -0400 Subject: rpms/moomps import.log,1.3,1.4 Message-ID: <200507012325.j61NPQqt000675@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv641 Modified Files: import.log Log Message: auto-import moomps-5.2-1 on branch FC-4 from moomps-5.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/moomps/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 26 May 2005 19:39:10 -0000 1.3 +++ import.log 1 Jul 2005 23:24:53 -0000 1.4 @@ -1,2 +1,3 @@ moomps-5_0-4:HEAD:moomps-5.0-4.src.rpm:1116618196 moomps-5_1-1:HEAD:moomps-5.1-1.src.rpm:1117136339 +moomps-5_2-1:FC-4:moomps-5.2-1.src.rpm:1120260283 From fedora-extras-commits at redhat.com Fri Jul 1 23:24:56 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:24:56 -0400 Subject: rpms/moomps/FC-4 .cvsignore, 1.3, 1.4 moomps.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507012325.j61NPQ1S000680@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv641/FC-4 Modified Files: .cvsignore moomps.spec sources Log Message: auto-import moomps-5.2-1 on branch FC-4 from moomps-5.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 May 2005 19:39:10 -0000 1.3 +++ .cvsignore 1 Jul 2005 23:24:54 -0000 1.4 @@ -1 +1 @@ -moomps-5.1.tar.bz2 +moomps-5.2.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- moomps.spec 7 Jun 2005 18:21:57 -0000 1.4 +++ moomps.spec 1 Jul 2005 23:24:54 -0000 1.5 @@ -1,10 +1,10 @@ Name: moomps -Version: 5.1 -Release: 6%{?dist} +Version: 5.2 +Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildArchitectures: noarch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -13,7 +13,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 20.1, tclx >= 8.3 +Requires: moodss >= 20.2, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -78,6 +78,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 +- 5.2 source release + * Tue Jun 7 2005 Jean-Luc Fontaine 5.1-6 - at build time, only require tcl 8.4.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 May 2005 19:39:10 -0000 1.3 +++ sources 1 Jul 2005 23:24:54 -0000 1.4 @@ -1 +1 @@ -57d6cb67a9323ca0b83eb401c7323fb7 moomps-5.1.tar.bz2 +d4bbbfa04a5e858be3810ebe7f110a21 moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 1 23:26:36 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:26:36 -0400 Subject: common tobuild,1.1694,1.1695 Message-ID: <200507012326.j61NQagN000806@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv789 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-4 moomps-5_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1694 retrieving revision 1.1695 diff -u -r1.1694 -r1.1695 --- tobuild 1 Jul 2005 22:21:26 -0000 1.1694 +++ tobuild 1 Jul 2005 23:26:34 -0000 1.1695 @@ -11,3 +11,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 +jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 1 23:30:49 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:30:49 -0400 Subject: rpms/moodss/FC-3 moodss.spec,1.8,1.9 Message-ID: <200507012330.j61NUnQs000829@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv812 Modified Files: moodss.spec Log Message: 20.2 source release. Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- moodss.spec 26 May 2005 19:54:54 -0000 1.8 +++ moodss.spec 1 Jul 2005 23:30:47 -0000 1.9 @@ -1,11 +1,11 @@ Name: moodss -Version: 20.1 -Release: 2 +Version: 20.2 +Release: 1 Epoch: 0 Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-20.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: tcl-devel >= 0:8.4.7 @@ -59,6 +59,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 0:20.2-1 +- 20.2 source release + * Sun May 22 2005 Jean-Luc Fontaine 0:20.1-2 - 20.1 source release - require sqlite2-tcl as it is now in extras starting from FC3 From fedora-extras-commits at redhat.com Fri Jul 1 23:32:28 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:32:28 -0400 Subject: rpms/moodss/FC-3 moodss.spec,1.9,1.10 Message-ID: <200507012332.j61NWSes000882@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv865 Modified Files: moodss.spec Log Message: added distribution to release. Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- moodss.spec 1 Jul 2005 23:30:47 -0000 1.9 +++ moodss.spec 1 Jul 2005 23:32:26 -0000 1.10 @@ -1,6 +1,6 @@ Name: moodss Version: 20.2 -Release: 1 +Release: 1%{?dist} Epoch: 0 Summary: Powerful modular monitoring graphical application Group: Applications/System From fedora-extras-commits at redhat.com Fri Jul 1 23:33:05 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:33:05 -0400 Subject: common tobuild,1.1695,1.1696 Message-ID: <200507012333.j61NX5hp000944@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv927 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1695 retrieving revision 1.1696 diff -u -r1.1695 -r1.1696 --- tobuild 1 Jul 2005 23:26:34 -0000 1.1695 +++ tobuild 1 Jul 2005 23:33:03 -0000 1.1696 @@ -12,3 +12,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 1 23:36:34 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:36:34 -0400 Subject: rpms/moomps/FC-3 moomps.spec,1.5,1.6 Message-ID: <200507012336.j61NaYAB000982@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv965 Modified Files: moomps.spec Log Message: 5.2 source release. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/moomps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moomps.spec 7 Jun 2005 18:15:29 -0000 1.5 +++ moomps.spec 1 Jul 2005 23:36:32 -0000 1.6 @@ -1,11 +1,11 @@ Name: moomps -Version: 5.1 -Release: 5%{?dist} +Version: 5.2 +Release: 1%{?dist} Epoch: 0 Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildArchitectures: noarch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -14,7 +14,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 0:20.1, tclx >= 0:8.3 +Requires: moodss >= 0:20.2, tclx >= 0:8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -79,6 +79,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 0:5.2-1 +- 5.2 source release + * Tue Jun 7 2005 Jean-Luc Fontaine 0:5.1-5 - at build time, only require tcl 8.4.7 From fedora-extras-commits at redhat.com Fri Jul 1 23:37:18 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 19:37:18 -0400 Subject: common tobuild,1.1696,1.1697 Message-ID: <200507012337.j61NbI94001049@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1032 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1696 retrieving revision 1.1697 diff -u -r1.1696 -r1.1697 --- tobuild 1 Jul 2005 23:33:03 -0000 1.1696 +++ tobuild 1 Jul 2005 23:37:16 -0000 1.1697 @@ -13,3 +13,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:03:45 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:03:45 -0400 Subject: rpms/moomps/FC-3 sources,1.3,1.4 Message-ID: <200507020003.j6203jQ2002217@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2203 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 May 2005 19:39:10 -0000 1.3 +++ sources 2 Jul 2005 00:03:42 -0000 1.4 @@ -1 +1 @@ -57d6cb67a9323ca0b83eb401c7323fb7 moomps-5.1.tar.bz2 +d4bbbfa04a5e858be3810ebe7f110a21 moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 00:05:36 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:05:36 -0400 Subject: rpms/moodss/FC-3 sources,1.4,1.5 Message-ID: <200507020006.j6206RBR002249@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2227 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 May 2005 20:00:34 -0000 1.4 +++ sources 2 Jul 2005 00:05:17 -0000 1.5 @@ -1 +1 @@ -b55e2aff0ff05e55a6b1f4dff6e58fa9 moodss-20.1.tar.bz2 +151a823de023ddb1961d046d8adfaa0b moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 00:07:45 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:07:45 -0400 Subject: common tobuild,1.1697,1.1698 Message-ID: <200507020007.j6207jKx002308@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2282 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1697 retrieving revision 1.1698 diff -u -r1.1697 -r1.1698 --- tobuild 1 Jul 2005 23:37:16 -0000 1.1697 +++ tobuild 2 Jul 2005 00:07:43 -0000 1.1698 @@ -14,3 +14,4 @@ jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:08:34 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 1 Jul 2005 20:08:34 -0400 Subject: common tobuild,1.1698,1.1699 Message-ID: <200507020008.j6208YDs002351@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2334 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1698 retrieving revision 1.1699 diff -u -r1.1698 -r1.1699 --- tobuild 2 Jul 2005 00:07:43 -0000 1.1698 +++ tobuild 2 Jul 2005 00:08:31 -0000 1.1699 @@ -15,3 +15,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:51:27 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 20:51:27 -0400 Subject: common tobuild,1.1699,1.1700 Message-ID: <200507020051.j620pRfL002515@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2498 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1699 retrieving revision 1.1700 diff -u -r1.1699 -r1.1700 --- tobuild 2 Jul 2005 00:08:31 -0000 1.1699 +++ tobuild 2 Jul 2005 00:51:25 -0000 1.1700 @@ -16,3 +16,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 00:52:14 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 20:52:14 -0400 Subject: common tobuild,1.1700,1.1701 Message-ID: <200507020052.j620qE8K002582@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2565 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1700 retrieving revision 1.1701 diff -u -r1.1700 -r1.1701 --- tobuild 2 Jul 2005 00:51:25 -0000 1.1700 +++ tobuild 2 Jul 2005 00:52:12 -0000 1.1701 @@ -17,3 +17,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 00:52:43 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 1 Jul 2005 20:52:43 -0400 Subject: common tobuild,1.1701,1.1702 Message-ID: <200507020052.j620qhXF002644@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2627 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1701 retrieving revision 1.1702 diff -u -r1.1701 -r1.1702 --- tobuild 2 Jul 2005 00:52:12 -0000 1.1701 +++ tobuild 2 Jul 2005 00:52:41 -0000 1.1702 @@ -18,3 +18,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 01:18:03 2005 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 1 Jul 2005 21:18:03 -0400 Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.1,1.2 Message-ID: <200507020118.j621I3Ts003814@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3797 Modified Files: NetworkManager-vpnc.spec Log Message: * Fri Jul 1 2005 David Zeuthen 0.2-2 - Add missing changelog entry for last commit - Temporarily BuildReq libpng-devel as it is not pulled in by gtk2-devel (should be fixed in Core shortly) - Pull in latest D-BUS (which features automatic reloading of policy files) so users do not have to restart the messagebus after installing this package Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NetworkManager-vpnc.spec 30 Jun 2005 20:25:29 -0000 1.1 +++ NetworkManager-vpnc.spec 2 Jul 2005 01:18:01 -0000 1.2 @@ -1,5 +1,5 @@ %define nm_version 0.4-32.cvs20050629 -%define dbus_version 0.33 +%define dbus_version 0.34 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-1 %define shared_mime_version 0.16-3 @@ -7,7 +7,7 @@ Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc Version: 0.2 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: %{name}-%{version}.tar.gz @@ -19,6 +19,7 @@ BuildRequires: libgnomeui-devel BuildRequires: gnome-keyring-devel BuildRequires: libglade2-devel +BuildRequires: libpng-devel PreReq: /usr/bin/update-desktop-database PreReq: /usr/bin/gtk-update-icon-cache Requires: gtk2 >= %{gtk2_version} @@ -83,6 +84,18 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Fri Jul 1 2005 David Zeuthen 0.2-2 +- Add missing changelog entry for last commit +- Temporarily BuildReq libpng-devel as it is not pulled in by gtk2-devel + (should be fixed in Core shortly) +- Pull in latest D-BUS (which features automatic reloading of policy files) + so users do not have to restart the messagebus after installing this package + +* Thu Jun 30 2005 David Zeuthen 0.2-1 +- New upsteam version +- Add the new gnome-mime-application-x-cisco-vpn-settings.png icon and call + gtk-update-icon-cache as appropriate + * Fri Jun 17 2005 David Zeuthen 0.1-2.cvs20050617 - Add Prereq: /usr/bin/update-desktop-database - Nuke .la and .a files From fedora-extras-commits at redhat.com Sat Jul 2 01:18:24 2005 From: fedora-extras-commits at redhat.com (David Zeuthen (davidz)) Date: Fri, 1 Jul 2005 21:18:24 -0400 Subject: common tobuild,1.1702,1.1703 Message-ID: <200507020118.j621IOL6003878@cvs-int.fedora.redhat.com> Author: davidz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3861 Modified Files: tobuild Log Message: request build of rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1702 retrieving revision 1.1703 diff -u -r1.1702 -r1.1703 --- tobuild 2 Jul 2005 00:52:41 -0000 1.1702 +++ tobuild 2 Jul 2005 01:18:22 -0000 1.1703 @@ -19,3 +19,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 +davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 devel From fedora-extras-commits at redhat.com Sat Jul 2 03:49:03 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 23:49:03 -0400 Subject: common tobuild,1.1703,1.1704 Message-ID: <200507020349.j623n3uu006612@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6595 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1703 retrieving revision 1.1704 diff -u -r1.1703 -r1.1704 --- tobuild 2 Jul 2005 01:18:22 -0000 1.1703 +++ tobuild 2 Jul 2005 03:49:01 -0000 1.1704 @@ -20,3 +20,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 devel +corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 03:49:44 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 1 Jul 2005 23:49:44 -0400 Subject: common tobuild,1.1704,1.1705 Message-ID: <200507020349.j623nisF006644@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6625 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1704 retrieving revision 1.1705 diff -u -r1.1704 -r1.1705 --- tobuild 2 Jul 2005 03:49:01 -0000 1.1704 +++ tobuild 2 Jul 2005 03:49:42 -0000 1.1705 @@ -1,23 +1 @@ -# this is the build control file. the format is -# user repo tag target status -# -kevin rpms/exo/devel exo-0_3_0-9_fc5 devel -jfontain rpms/moodss/FC-4 moodss-20_2-1_fc4 fc4 -katzj rpms/mercurial/devel mercurial-0_6-1_fc5 devel -katzj rpms/mercurial/FC-4 mercurial-0_6-1_fc4 fc4 -katzj rpms/mercurial/FC-3 mercurial-0_6-1_fc3 fc3 -mschwendt devel/aalib aalib-1_4_0-0_rc5_5 devel -mschwendt rpms/meld/FC-3 meld-0_9_6-0_fc3 fc3 -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 -jfontain rpms/moomps/FC-4 moomps-5_2-1_fc4 fc4 -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 -davidz rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0_2-2 devel -corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 +corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 05:08:23 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:08:23 -0400 Subject: common tobuild,1.1705,1.1706 Message-ID: <200507020508.j6258NFF008914@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8897 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1705 retrieving revision 1.1706 diff -u -r1.1705 -r1.1706 --- tobuild 2 Jul 2005 03:49:42 -0000 1.1705 +++ tobuild 2 Jul 2005 05:08:21 -0000 1.1706 @@ -1 +1,2 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 +corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 05:29:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:29:57 -0400 Subject: rpms/perl-Want/devel .cvsignore, 1.2, 1.3 perl-Want.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507020529.j625TvF1008978@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8957 Modified Files: .cvsignore perl-Want.spec sources Log Message: Upstream update to 0.09. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 +++ .cvsignore 2 Jul 2005 05:29:55 -0000 1.3 @@ -1 +1 @@ -Want-0.08.tar.gz +Want-0.09.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/perl-Want.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 +++ perl-Want.spec 2 Jul 2005 05:29:55 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Want -Version: 0.08 -Release: 3%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Sat Jul 02 2005 Ralf Corsepius - 0.09-1 +- Upstream update to 0.09. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-3 - Remove ||: in %%check. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 14:31:31 -0000 1.2 +++ sources 2 Jul 2005 05:29:55 -0000 1.3 @@ -1 +1 @@ -72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz +90ab551867c986b748128609f95b3666 Want-0.09.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 05:32:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:32:18 -0400 Subject: rpms/perl-Want/FC-3 .cvsignore, 1.2, 1.3 perl-Want.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507020532.j625WmTB009024@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8984/FC-3 Modified Files: .cvsignore perl-Want.spec sources Log Message: Upstream update to 0.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 +++ .cvsignore 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -Want-0.08.tar.gz +Want-0.09.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-3/perl-Want.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 +++ perl-Want.spec 2 Jul 2005 05:32:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Want -Version: 0.08 -Release: 3%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Sat Jul 02 2005 Ralf Corsepius - 0.09-1 +- Upstream update to 0.09. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-3 - Remove ||: in %%check. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 14:31:31 -0000 1.2 +++ sources 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz +90ab551867c986b748128609f95b3666 Want-0.09.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 05:32:18 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:32:18 -0400 Subject: rpms/perl-Want/FC-4 .cvsignore, 1.2, 1.3 perl-Want.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507020532.j625WnaR009029@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Want/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8984/FC-4 Modified Files: .cvsignore perl-Want.spec sources Log Message: Upstream update to 0.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 14:31:31 -0000 1.2 +++ .cvsignore 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -Want-0.08.tar.gz +Want-0.09.tar.gz Index: perl-Want.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-4/perl-Want.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Want.spec 1 Jul 2005 15:20:26 -0000 1.2 +++ perl-Want.spec 2 Jul 2005 05:32:16 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Want -Version: 0.08 -Release: 3%{?dist} +Version: 0.09 +Release: 1%{?dist} Summary: Perl module implementing a generalisation of wantarray License: GPL or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ %{_mandir}/man3/* %changelog +* Sat Jul 02 2005 Ralf Corsepius - 0.09-1 +- Upstream update to 0.09. + * Fri Jul 01 2005 Ralf Corsepius - 0.08-3 - Remove ||: in %%check. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Want/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 14:31:31 -0000 1.2 +++ sources 2 Jul 2005 05:32:16 -0000 1.3 @@ -1 +1 @@ -72f9a5b7d9300859c23a61a31c21f91b Want-0.08.tar.gz +90ab551867c986b748128609f95b3666 Want-0.09.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 05:35:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:35:02 -0400 Subject: common tobuild,1.1706,1.1707 Message-ID: <200507020535.j625Z2tY009184@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9167 Modified Files: tobuild Log Message: request build of rpms/perl-Want/devel perl-Want-0_09-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1706 retrieving revision 1.1707 diff -u -r1.1706 -r1.1707 --- tobuild 2 Jul 2005 05:08:21 -0000 1.1706 +++ tobuild 2 Jul 2005 05:35:00 -0000 1.1707 @@ -1,2 +1,3 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 +corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 05:35:33 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:35:33 -0400 Subject: common tobuild,1.1707,1.1708 Message-ID: <200507020535.j625ZXPS009217@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9200 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1707 retrieving revision 1.1708 diff -u -r1.1707 -r1.1708 --- tobuild 2 Jul 2005 05:35:00 -0000 1.1707 +++ tobuild 2 Jul 2005 05:35:30 -0000 1.1708 @@ -1,3 +1,4 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel +corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 05:36:01 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 2 Jul 2005 01:36:01 -0400 Subject: common tobuild,1.1708,1.1709 Message-ID: <200507020536.j625a1kZ009251@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9233 Modified Files: tobuild Log Message: request build of rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1708 retrieving revision 1.1709 diff -u -r1.1708 -r1.1709 --- tobuild 2 Jul 2005 05:35:30 -0000 1.1708 +++ tobuild 2 Jul 2005 05:35:58 -0000 1.1709 @@ -2,3 +2,4 @@ corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 +corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 From rc040203 at freenet.de Sat Jul 2 05:44:13 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sat, 02 Jul 2005 07:44:13 +0200 Subject: rpms/ebtables/devel ebtables.spec, 1.1, 1.2 ebtables.sysv, 1.1, 1.2 In-Reply-To: <200507011627.j61GRDxR021539@cvs-int.fedora.redhat.com> References: <200507011627.j61GRDxR021539@cvs-int.fedora.redhat.com> Message-ID: <1120283053.3741.308.camel@mccallum.corsepiu.local> On Fri, 2005-07-01 at 12:27 -0400, Tom Callaway wrote: > +PreReq: /sbin/chkconfig > +PreReq: /sbin/service Requires(pre): /sbin/chkconfig Requires(pre): /sbin/service Requires(postun): /sbin/service Ralf From fedora-extras-commits at redhat.com Sat Jul 2 07:28:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:28:32 -0400 Subject: rpms/libassuan/FC-4 .cvsignore, 1.3, 1.4 libassuan.spec, 1.7, 1.8 sources, 1.3, 1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE Message-ID: <200507020728.j627SW7J011756@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11721/FC-4 Modified Files: .cvsignore libassuan.spec sources Removed Files: libassuan-0.6.9.tar.gz.sig Log Message: 0.6.10, ack'd by Rex. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:30:20 -0000 1.3 +++ .cvsignore 2 Jul 2005 07:28:30 -0000 1.4 @@ -1 +1,2 @@ -libassuan-0.6.9.tar.gz +libassuan-0.6.10.tar.gz +libassuan-0.6.10.tar.gz.sig Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/libassuan.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libassuan.spec 8 May 2005 19:05:00 -0000 1.7 +++ libassuan.spec 2 Jul 2005 07:28:30 -0000 1.8 @@ -1,10 +1,9 @@ Summary: GnuPG IPC library Name: libassuan -Version: 0.6.9 -Release: 4%{?dist_tag} -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig -Patch0: %{name}-macro.patch +Version: 0.6.10 +Release: 1%{?dist_tag} +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ License: GPL Group: System Environment/Libraries @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -80,6 +78,9 @@ %changelog +* Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 +- 0.6.10, macro patch no longer needed (#162262). + * Sun May 8 2005 Michael Schwendt - 0.6.9-4 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:30:20 -0000 1.3 +++ sources 2 Jul 2005 07:28:30 -0000 1.4 @@ -1 +1,2 @@ -7f8aff75d034159b84faf2358263f444 libassuan-0.6.9.tar.gz +4cde037c3fcb2f0eeb695b1db6e56bba libassuan-0.6.10.tar.gz +c36f1a8597c4836809005325dfa40244 libassuan-0.6.10.tar.gz.sig --- libassuan-0.6.9.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:28:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:28:33 -0400 Subject: rpms/libassuan/devel .cvsignore, 1.3, 1.4 libassuan.spec, 1.7, 1.8 sources, 1.3, 1.4 libassuan-0.6.9.tar.gz.sig, 1.1, NONE Message-ID: <200507020728.j627SXIN011764@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11721/devel Modified Files: .cvsignore libassuan.spec sources Removed Files: libassuan-0.6.9.tar.gz.sig Log Message: 0.6.10, ack'd by Rex. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2005 19:30:20 -0000 1.3 +++ .cvsignore 2 Jul 2005 07:28:31 -0000 1.4 @@ -1 +1,2 @@ -libassuan-0.6.9.tar.gz +libassuan-0.6.10.tar.gz +libassuan-0.6.10.tar.gz.sig Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libassuan.spec 8 May 2005 19:05:00 -0000 1.7 +++ libassuan.spec 2 Jul 2005 07:28:31 -0000 1.8 @@ -1,10 +1,9 @@ Summary: GnuPG IPC library Name: libassuan -Version: 0.6.9 -Release: 4%{?dist_tag} -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz -Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.9.tar.gz.sig -Patch0: %{name}-macro.patch +Version: 0.6.10 +Release: 1%{?dist_tag} +Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz +Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ License: GPL Group: System Environment/Libraries @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -80,6 +78,9 @@ %changelog +* Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 +- 0.6.10, macro patch no longer needed (#162262). + * Sun May 8 2005 Michael Schwendt - 0.6.9-4 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2005 19:30:20 -0000 1.3 +++ sources 2 Jul 2005 07:28:31 -0000 1.4 @@ -1 +1,2 @@ -7f8aff75d034159b84faf2358263f444 libassuan-0.6.9.tar.gz +4cde037c3fcb2f0eeb695b1db6e56bba libassuan-0.6.10.tar.gz +c36f1a8597c4836809005325dfa40244 libassuan-0.6.10.tar.gz.sig --- libassuan-0.6.9.tar.gz.sig DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:29:08 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:29:08 -0400 Subject: common tobuild,1.1709,1.1710 Message-ID: <200507020729.j627T8FF011826@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11809 Modified Files: tobuild Log Message: request build of rpms/libassuan/FC-4 libassuan-0_6_10-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1709 retrieving revision 1.1710 diff -u -r1.1709 -r1.1710 --- tobuild 2 Jul 2005 05:35:58 -0000 1.1709 +++ tobuild 2 Jul 2005 07:29:06 -0000 1.1710 @@ -3,3 +3,4 @@ corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 +scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 07:31:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:31:47 -0400 Subject: rpms/libassuan/FC-4 libassuan.spec,1.8,1.9 Message-ID: <200507020731.j627Vlhm011914@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11885/FC-4 Modified Files: libassuan.spec Log Message: Fix disttag. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/FC-4/libassuan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libassuan.spec 2 Jul 2005 07:28:30 -0000 1.8 +++ libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist_tag} +Release: 1%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ From fedora-extras-commits at redhat.com Sat Jul 2 07:31:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:31:47 -0400 Subject: rpms/libassuan/devel libassuan.spec,1.8,1.9 Message-ID: <200507020731.j627Vlg8011920@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11885/devel Modified Files: libassuan.spec Log Message: Fix disttag. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libassuan.spec 2 Jul 2005 07:28:31 -0000 1.8 +++ libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist_tag} +Release: 1%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ From fedora-extras-commits at redhat.com Sat Jul 2 07:33:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:33:39 -0400 Subject: rpms/libassuan/FC-4 libassuan-macro.patch,1.1,NONE Message-ID: <200507020733.j627XdrH011993@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11971/FC-4 Removed Files: libassuan-macro.patch Log Message: Remove unneeded patch. --- libassuan-macro.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:33:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:33:40 -0400 Subject: rpms/libassuan/devel libassuan-macro.patch,1.1,NONE Message-ID: <200507020733.j627XeFV011998@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11971/devel Removed Files: libassuan-macro.patch Log Message: Remove unneeded patch. --- libassuan-macro.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 07:34:07 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 03:34:07 -0400 Subject: common tobuild,1.1710,1.1711 Message-ID: <200507020734.j627Y72x012035@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12018 Modified Files: tobuild Log Message: request build of rpms/libassuan/devel libassuan-0_6_10-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1710 retrieving revision 1.1711 diff -u -r1.1710 -r1.1711 --- tobuild 2 Jul 2005 07:29:06 -0000 1.1710 +++ tobuild 2 Jul 2005 07:34:04 -0000 1.1711 @@ -4,3 +4,4 @@ corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 +scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 08:26:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 04:26:46 -0400 Subject: rpms/gnupg2/FC-3 gnupg2.spec,1.2,1.3 Message-ID: <200507020826.j628QkJ4013778@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gnupg2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13761/FC-3 Modified Files: gnupg2.spec Log Message: Fix disttag. Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnupg2.spec 2 Feb 2005 17:20:20 -0000 1.2 +++ gnupg2.spec 2 Jul 2005 08:26:44 -0000 1.3 @@ -4,7 +4,7 @@ Name: gnupg2 Epoch: 0 Version: 1.9.15 -Release: 1%{?dist_tag} +Release: 1%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 08:39:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 04:39:53 -0400 Subject: rpms/gnupg2/devel gnupg-1.9.17-lvalue.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnupg2.spec, 1.11, 1.12 sources, 1.4, 1.5 gnupg-1.9.16-signal-info.patch, 1.1, NONE gnupg-1.9.16.tar.bz2.sig, 1.1, NONE Message-ID: <200507020839.j628drpV013905@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881 Modified Files: .cvsignore gnupg2.spec sources Added Files: gnupg-1.9.17-lvalue.patch Removed Files: gnupg-1.9.16-signal-info.patch gnupg-1.9.16.tar.bz2.sig Log Message: 1.9.17 (#162264). gnupg-1.9.17-lvalue.patch: --- NEW FILE gnupg-1.9.17-lvalue.patch --- --- g10/misc.c~ 2005-06-15 18:34:29.000000000 +0300 +++ g10/misc.c 2005-07-01 21:02:05.000000000 +0300 @@ -986,10 +986,10 @@ } else { int rc; - char *buffer; + unsigned char *buffer; rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX, - &(unsigned char*)buffer, NULL, a ); + &buffer, NULL, a ); assert( !rc ); fputs( buffer, fp ); n += strlen(buffer); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 May 2005 16:23:11 -0000 1.3 +++ .cvsignore 2 Jul 2005 08:39:51 -0000 1.4 @@ -1 +1,2 @@ -gnupg-1.9.16.tar.bz2 +gnupg-1.9.17.tar.bz2 +gnupg-1.9.17.tar.bz2.sig Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnupg2.spec 13 May 2005 18:01:21 -0000 1.11 +++ gnupg2.spec 2 Jul 2005 08:39:51 -0000 1.12 @@ -1,7 +1,12 @@ +# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) +# Note: this is just the name of the default shared lib to load in scdaemon, +# it can use other implementations too (including non-pcsc ones). +%define pcsc_lib libpcsclite.so.0 + Summary: GNU utility for secure communication and data storage Name: gnupg2 -Version: 1.9.16 -Release: 4%{?dist} +Version: 1.9.17 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2 @@ -10,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: gnupg-1.9.16-pth.patch -Patch1: gnupg-1.9.16-signal-info.patch +Patch1: gnupg-1.9.17-lvalue.patch Patch2: gnupg-1.9.16-testverbose.patch Obsoletes: newpg < 0.9.5 @@ -28,10 +33,9 @@ BuildRequires: libgcrypt-devel => 1.2.0 BuildRequires: libgpg-error-devel => 1.0 Requires: libgpg-error >= 1.0 -BuildRequires: libassuan-devel >= 0.6.9 +BuildRequires: libassuan-devel >= 0.6.10 BuildRequires: libksba-devel >= 0.9.11 BuildRequires: opensc-devel >= 0.9 -BuildRequires: pcsc-lite-devel BuildRequires: gettext BuildRequires: openldap-devel BuildRequires: libusb-devel @@ -64,9 +68,11 @@ %setup -q -n gnupg-%{version} %patch0 -p1 -b .pth -%patch1 -p1 -b .strsignal +%patch1 -p0 -b .lvalue %patch2 -p1 -b .testverbose +sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c + %build @@ -114,10 +120,10 @@ %{_bindir}/gpg-connect-agent %{_bindir}/gpg-agent %{_bindir}/gpgconf +%{_bindir}/gpgkey2ssh %{_bindir}/gpgsm* %{_bindir}/gpgv2 %{_bindir}/kbxutil -%{_bindir}/sc-copykeys %{_bindir}/scdaemon %{_bindir}/watchgnupg %{_sbindir}/* @@ -132,6 +138,12 @@ %changelog +* Fri Jul 1 2005 Ville Skytt?? - 1.9.17-1 +- 1.9.17, signal info patch applied upstream (#162264). +- Patch to fix lvalue build error with gcc4 (upstream #485). +- Patch scdaemon and pcsc-wrapper to load the versioned (non-devel) + pcsc-lite lib by default. + * Fri May 13 2005 Michael Schwendt - 1.9.16-3 - Include upstream's patch for signal.c. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 May 2005 16:23:11 -0000 1.4 +++ sources 2 Jul 2005 08:39:51 -0000 1.5 @@ -1 +1,2 @@ -1282755dce9cf4a84e904ca0191017a3 gnupg-1.9.16.tar.bz2 +a1bf98c5ec0c5c316b4ae6f017f02fa3 gnupg-1.9.17.tar.bz2 +9c60e57f39a65d7be048344f2c03a4b2 gnupg-1.9.17.tar.bz2.sig --- gnupg-1.9.16-signal-info.patch DELETED --- --- gnupg-1.9.16.tar.bz2.sig DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 08:44:02 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 04:44:02 -0400 Subject: common tobuild,1.1711,1.1712 Message-ID: <200507020844.j628i2Gh013991@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13974 Modified Files: tobuild Log Message: request build of rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1711 retrieving revision 1.1712 diff -u -r1.1711 -r1.1712 --- tobuild 2 Jul 2005 07:34:04 -0000 1.1711 +++ tobuild 2 Jul 2005 08:44:00 -0000 1.1712 @@ -5,3 +5,4 @@ corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel +scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 09:42:36 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:42:36 -0400 Subject: common tobuild,1.1712,1.1713 Message-ID: <200507020942.j629gaZ7015282@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15263 Modified Files: tobuild Log Message: request build of rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1712 retrieving revision 1.1713 diff -u -r1.1712 -r1.1713 --- tobuild 2 Jul 2005 08:44:00 -0000 1.1712 +++ tobuild 2 Jul 2005 09:42:34 -0000 1.1713 @@ -6,3 +6,4 @@ scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel +pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 09:45:19 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:45:19 -0400 Subject: rpms/perl-MailTools/FC-4 perl-MailTools.spec, 1.9, 1.10 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 Message-ID: <200507020945.j629jJaE015334@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15313 Modified Files: perl-MailTools.spec sources .cvsignore Log Message: resync with devel Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-4/perl-MailTools.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-MailTools.spec 6 Apr 2005 22:13:07 -0000 1.9 +++ perl-MailTools.spec 2 Jul 2005 09:45:17 -0000 1.10 @@ -1,19 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - -Summary: MailTools module for Perl +Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.66 -Release: 2 +Version: 1.67 +Release: 1%{?dist} -License: Artistic +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MailTools is a set of Perl modules related to mail applications. @@ -25,26 +23,26 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +%{__rm} -rf "$RPM_BUILD_ROOT" +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';' +%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';' %check || : -make test +%{__make} test %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf "$RPM_BUILD_ROOT" %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog README* examples/ %{perl_vendorlib}/auto/Mail/ %{perl_vendorlib}/Mail/ @@ -52,6 +50,14 @@ %changelog +* Fri Jul 1 2005 Paul Howarth - 1.67-1 +- update to 1.67 (#161830) +- assume perl_vendorlib is set +- license is same as perl (GPL or Artistic) according to README +- don't include module name in summary +- use macros consistently +- add dist tag + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2005 11:50:32 -0000 1.4 +++ sources 2 Jul 2005 09:45:17 -0000 1.5 @@ -1 +1 @@ -fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz +7871c38e42792c5e0920b3817e1523fd MailTools-1.67.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 +++ .cvsignore 2 Jul 2005 09:45:17 -0000 1.5 @@ -1 +1 @@ -MailTools-1.66.tar.gz +MailTools-1.67.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 09:46:01 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:46:01 -0400 Subject: common tobuild,1.1713,1.1714 Message-ID: <200507020946.j629k2Jp015396@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15379 Modified Files: tobuild Log Message: request build of rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1713 retrieving revision 1.1714 diff -u -r1.1713 -r1.1714 --- tobuild 2 Jul 2005 09:42:34 -0000 1.1713 +++ tobuild 2 Jul 2005 09:45:59 -0000 1.1714 @@ -7,3 +7,4 @@ scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel +pghmcfc rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 09:47:09 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:47:09 -0400 Subject: rpms/perl-MailTools/FC-3 perl-MailTools.spec, 1.6, 1.7 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 Message-ID: <200507020947.j629l9lq015429@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-MailTools/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15408 Modified Files: perl-MailTools.spec sources .cvsignore Log Message: resync with devel Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-3/perl-MailTools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-MailTools.spec 22 Jan 2005 11:50:32 -0000 1.6 +++ perl-MailTools.spec 2 Jul 2005 09:47:07 -0000 1.7 @@ -1,19 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - -Summary: MailTools module for Perl +Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.66 -Release: 1 -Epoch: 0 -License: Artistic +Version: 1.67 +Release: 1%{?dist} + +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/MailTools/ -Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-1.66.tar.gz +Source0: http://www.cpan.org/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Net::Domain), perl(Net::SMTP) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description MailTools is a set of Perl modules related to mail applications. @@ -25,26 +23,26 @@ %build %{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +%{__rm} -rf "$RPM_BUILD_ROOT" +%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +%{_bindir}/find $RPM_BUILD_ROOT -type f -name .packlist -exec %{__rm} -f {} ';' +%{_bindir}/find $RPM_BUILD_ROOT -type d -depth -exec %{__rmdir} {} 2>/dev/null ';' %check || : -make test +%{__make} test %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf "$RPM_BUILD_ROOT" %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc ChangeLog README* examples/ %{perl_vendorlib}/auto/Mail/ %{perl_vendorlib}/Mail/ @@ -52,6 +50,17 @@ %changelog +* Fri Jul 1 2005 Paul Howarth - 1.67-1 +- update to 1.67 (#161830) +- assume perl_vendorlib is set +- license is same as perl (GPL or Artistic) according to README +- don't include module name in summary +- use macros consistently +- add dist tag + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sat Jan 22 2005 Ville Skytt?? - 0:1.66-1 - Update to 1.66. @@ -87,5 +96,5 @@ - Modified Summary according to Michael Schwendt suggestion - Modified tarball permissions to 0644 -* Sun Jun 15 2003 Dams +* Sun Jun 15 2003 Dams - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jan 2005 11:50:32 -0000 1.4 +++ sources 2 Jul 2005 09:47:07 -0000 1.5 @@ -1 +1 @@ -fe2dcdb1b58bd7cfc6f92559e6dcc7f7 MailTools-1.66.tar.gz +7871c38e42792c5e0920b3817e1523fd MailTools-1.67.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jan 2005 11:50:32 -0000 1.4 +++ .cvsignore 2 Jul 2005 09:47:07 -0000 1.5 @@ -1 +1 @@ -MailTools-1.66.tar.gz +MailTools-1.67.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 09:47:55 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 05:47:55 -0400 Subject: common tobuild,1.1714,1.1715 Message-ID: <200507020947.j629ltYC015491@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15474 Modified Files: tobuild Log Message: request build of rpms/perl-MailTools/FC-3 perl-MailTools-1_67-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1714 retrieving revision 1.1715 diff -u -r1.1714 -r1.1715 --- tobuild 2 Jul 2005 09:45:59 -0000 1.1714 +++ tobuild 2 Jul 2005 09:47:53 -0000 1.1715 @@ -8,3 +8,4 @@ scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel pghmcfc rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 fc4 +pghmcfc rpms/perl-MailTools/FC-3 perl-MailTools-1_67-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 10:18:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 2 Jul 2005 06:18:04 -0400 Subject: common tobuild,1.1715,1.1716 Message-ID: <200507021018.j62AI4ni016957@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16940 Modified Files: tobuild Log Message: restore table header -- if you clean up the tobuild file, please say so in a comment, so removal of entries doesn't look like an accident Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1715 retrieving revision 1.1716 diff -u -r1.1715 -r1.1716 --- tobuild 2 Jul 2005 09:47:53 -0000 1.1715 +++ tobuild 2 Jul 2005 10:18:02 -0000 1.1716 @@ -1,3 +1,6 @@ +# this is the build control file. the format is +# user repo tag target status +# corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 10:32:49 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Sat, 2 Jul 2005 06:32:49 -0400 Subject: common tobuild,1.1716,1.1717 Message-ID: <200507021032.j62AWnqh017013@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16996 Modified Files: tobuild Log Message: Clean up Build queue is now empty - request those builds! P.S. It wasn't me that deleted the headers... Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1716 retrieving revision 1.1717 diff -u -r1.1716 -r1.1717 --- tobuild 2 Jul 2005 10:18:02 -0000 1.1716 +++ tobuild 2 Jul 2005 10:32:47 -0000 1.1717 @@ -1,14 +1,3 @@ # this is the build control file. the format is # user repo tag target status # -corsepiu rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 fc3 -corsepiu rpms/perl-Want/FC-4 perl-Want-0_08-3_fc4 fc4 -corsepiu rpms/perl-Want/devel perl-Want-0_09-1_fc5 devel -corsepiu rpms/perl-Want/FC-4 perl-Want-0_09-1_fc4 fc4 -corsepiu rpms/perl-Want/FC-3 perl-Want-0_09-1_fc3 fc3 -scop rpms/libassuan/FC-4 libassuan-0_6_10-1 fc4 -scop rpms/libassuan/devel libassuan-0_6_10-1_fc5 devel -scop rpms/gnupg2/devel gnupg2-1_9_17-1_fc5 devel -pghmcfc rpms/perl-MailTools/devel perl-MailTools-1_67-1_fc5 devel -pghmcfc rpms/perl-MailTools/FC-4 perl-MailTools-1_67-1_fc4 fc4 -pghmcfc rpms/perl-MailTools/FC-3 perl-MailTools-1_67-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 10:43:09 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:43:09 -0400 Subject: rpms/moodss/devel moodss.spec,1.15,1.16 sources,1.4,1.5 Message-ID: <200507021043.j62Ah9pp017058@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17039 Modified Files: moodss.spec sources Log Message: Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- moodss.spec 31 May 2005 19:30:47 -0000 1.15 +++ moodss.spec 2 Jul 2005 10:43:07 -0000 1.16 @@ -1,10 +1,10 @@ Name: moodss -Version: 20.1 -Release: 5%{?dist} +Version: 20.2 +Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-20.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: tcl-devel >= 8.4.8 @@ -58,8 +58,8 @@ %changelog -* Tue May 31 2005 Jean-Luc Fontaine 20.1-5 -- increased release above the one in FC-4 +* Sun Jun 26 2005 Jean-Luc Fontaine 20.2-1 +- 20.2 source release * Sun May 22 2005 Jean-Luc Fontaine 20.1-3 - 20.1 source release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 May 2005 19:36:38 -0000 1.4 +++ sources 2 Jul 2005 10:43:07 -0000 1.5 @@ -1 +1 @@ -b55e2aff0ff05e55a6b1f4dff6e58fa9 moodss-20.1.tar.bz2 +151a823de023ddb1961d046d8adfaa0b moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 10:44:13 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:44:13 -0400 Subject: common tobuild,1.1717,1.1718 Message-ID: <200507021044.j62AiDFK017121@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17104 Modified Files: tobuild Log Message: request build of rpms/moodss/devel moodss-20_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1717 retrieving revision 1.1718 diff -u -r1.1717 -r1.1718 --- tobuild 2 Jul 2005 10:32:47 -0000 1.1717 +++ tobuild 2 Jul 2005 10:44:11 -0000 1.1718 @@ -1,3 +1,4 @@ # this is the build control file. the format is # user repo tag target status # +jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 10:45:38 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:45:38 -0400 Subject: rpms/moomps/devel moomps.spec,1.4,1.5 sources,1.3,1.4 Message-ID: <200507021045.j62AjceX017163@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17144 Modified Files: moomps.spec sources Log Message: Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- moomps.spec 11 Jun 2005 13:34:33 -0000 1.4 +++ moomps.spec 2 Jul 2005 10:45:36 -0000 1.5 @@ -1,10 +1,10 @@ Name: moomps -Version: 5.1 -Release: 6%{?dist} +Version: 5.2 +Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.1.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.2.tar.bz2 URL: http://moodss.sourceforge.net/ BuildArchitectures: noarch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -13,7 +13,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 20.1, tclx >= 8.3 +Requires: moodss >= 20.2, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -78,6 +78,9 @@ %changelog +* Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 +- 5.2 source release + * Tue Jun 7 2005 Jean-Luc Fontaine 5.1-6 - at build time, only require tcl 8.4.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 May 2005 19:39:10 -0000 1.3 +++ sources 2 Jul 2005 10:45:36 -0000 1.4 @@ -1 +1 @@ -57d6cb67a9323ca0b83eb401c7323fb7 moomps-5.1.tar.bz2 +d4bbbfa04a5e858be3810ebe7f110a21 moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 2 10:46:20 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 2 Jul 2005 06:46:20 -0400 Subject: common tobuild,1.1718,1.1719 Message-ID: <200507021046.j62AkKD5017229@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17212 Modified Files: tobuild Log Message: request build of rpms/moomps/devel moomps-5_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1718 retrieving revision 1.1719 diff -u -r1.1718 -r1.1719 --- tobuild 2 Jul 2005 10:44:11 -0000 1.1718 +++ tobuild 2 Jul 2005 10:46:18 -0000 1.1719 @@ -2,3 +2,4 @@ # user repo tag target status # jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel +jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 11:28:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 07:28:50 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad-console.perms, NONE, 1.1 kernel-module-thinkpad.modules, NONE, 1.1 kernel-module-thinkpad.spec, 1.7, 1.8 kernel-module-thinkpad-README.Fedora, 1.1, NONE Message-ID: <200507021128.j62BSots018406@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18387 Modified Files: kernel-module-thinkpad.spec Added Files: kernel-module-thinkpad-console.perms kernel-module-thinkpad.modules Removed Files: kernel-module-thinkpad-README.Fedora Log Message: Update according to recent kernel module discussions and new cool stuff in FC4+ --- NEW FILE kernel-module-thinkpad-console.perms --- # console.perms definitions for ThinkPad devices, http://tpctl.sourceforge.net/ 0600 /dev/thinkpad 0600 root --- NEW FILE kernel-module-thinkpad.modules --- #!/bin/sh # Script for loading ThinkPad modules at boot time. modprobe thinkpad >/dev/null 2>&1 Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kernel-module-thinkpad.spec 2 Apr 2005 18:01:09 -0000 1.7 +++ kernel-module-thinkpad.spec 2 Jul 2005 11:28:48 -0000 1.8 @@ -1,48 +1,39 @@ -%{!?kernel: %define kernel %(uname -r)} -%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu} +%{!?kver: %define kver %(uname -r)} + +%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} +%define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 1 -Summary: IBM ThinkPad support kernel modules +Release: 2.%(echo %{kver} | tr - _) +Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL Group: System Environment/Kernel URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz -Source1: %{name}-README.Fedora +Source1: %{name}-console.perms +Source2: %{name}.modules Patch0: %{name}-percpu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i586 i686 -BuildRequires: kernel-devel-%{_target_cpu} = %{kernel} - -%description -IBM ThinkPad support kernel modules. -The following rpmbuild options can be used to build this package -for a specific kernel: ---define "kernel " - Specify the `uname -r` string of the target kernel, for example: - "kernel 2.6.6-1.435.2.3". The default is `uname -r` for the running kernel. ---target - Build for the given architecture instead of the default. - -%package %{kernel} -Summary: %{summary} -Group: System Environment/Kernel -Provides: kernel-module -Provides: %{name} = %{version}-%{release} -Obsoletes: kernel-mod-thinkpad -Requires(pre): %{_sbindir}/groupadd +BuildRequires: kernel-devel-%{_target_cpu} = %{kver} +Requires: kernel-%{_target_cpu} = %{kver} +Requires: pam >= 0.79-8 +Requires: initscripts >= 8.08-1 Requires(post): /sbin/depmod Requires(postun): /sbin/depmod -Requires: kernel-%{_target_cpu} = %{kernel} +Provides: kernel-modules + +%description +This package contains kernel modules that interface the System +Management Application Program Interface (SMAPI) BIOS found in some +ThinkPad?? laptop computers, and drivers for certain ThinkPad hardware +components. -%description %{kernel} -IBM ThinkPad support kernel modules, built for kernel -%{kernel} (%{_target_cpu}). See -%{_docdir}/%{name}-%{kernel}-%{version}/README.Fedora -for post-installation configuration instructions. +ThinkPad is a registered trademark of Lenovo in the United States, +other countries, or both. %prep @@ -53,15 +44,18 @@ %build -make %{?_smp_mflags} -C 2.6/drivers KVER=%{kernel} KSRC=%{ksrc} V=1 +make %{?_smp_mflags} -C 2.6/drivers KVER=%{kver} KSRC=%{ksrc} V=1 %install rm -rf $RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/90-thinkpad.perms +install -Dpm 755 %{SOURCE2} \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/thinkpad.modules +install -dm 755 $RPM_BUILD_ROOT%{moddir}/thinkpad # 744 to allow stripping, will be reset in %%files -install -pm 744 2.6/drivers/*.ko \ - $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad +install -pm 744 2.6/drivers/*.ko $RPM_BUILD_ROOT%{moddir}/thinkpad install -Dpm 644 man/thinkpad.4 $RPM_BUILD_ROOT%{_mandir}/man4/thinkpad.4 @@ -69,30 +63,38 @@ rm -rf $RPM_BUILD_ROOT -%post %{kernel} -/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%post +[ $1 -eq 1 ] && \ +/sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : -%postun %{kernel} -/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || : +%postun +/sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || : -%files %{kernel} +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README* SUPPORTED-MODELS TECHNOTES -%dir /lib/modules/%{kernel}/updates -%dir /lib/modules/%{kernel}/updates/thinkpad -%attr(644,root,root) /lib/modules/%{kernel}/updates/thinkpad/*.ko +%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms +%{_sysconfdir}/sysconfig/modules/thinkpad.modules +%dir %{moddir} +%dir %{moddir}/thinkpad +%attr(644,root,root) %{moddir}/thinkpad/*.ko %{_mandir}/man4/thinkpad.4* %changelog +* Fri Jul 1 2005 Ville Skytt?? - 5.8-2 +- Change towards new (in-progress) kernel module packaging guidelines. +- Automatically load modules at boot time. +- Add console.perms.d snippet, drop obsolete README.Fedora. + * Sat Apr 2 2005 Ville Skytt?? - 5.8-1 - Adjust for FC4 kernel-devel. - Drop console.perms munging, document it in README.Fedora instead. * Sat Jan 8 2005 Ville Skytt?? - 0:5.8-0.fdr.3 - Patch to work with kernel 2.6.10. -- Drop udev stuff and thinkpad group, intruduce console.perms munging. +- Drop udev stuff and thinkpad group, introduce console.perms munging. * Sun Dec 5 2004 Ville Skytt?? - 0:5.8-0.fdr.2 - Drop support for kernels < 2.6, require udev, clean up specfile. --- kernel-module-thinkpad-README.Fedora DELETED --- From fedora-extras-commits at redhat.com Sat Jul 2 11:36:44 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:36:44 -0400 Subject: rpms/pygsl - New directory Message-ID: <200507021136.j62Baiu7018487@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18463/pygsl Log Message: Directory /cvs/extras/rpms/pygsl added to the repository From fedora-extras-commits at redhat.com Sat Jul 2 11:36:44 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:36:44 -0400 Subject: rpms/pygsl/devel - New directory Message-ID: <200507021136.j62Baiwb018492@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18463/pygsl/devel Log Message: Directory /cvs/extras/rpms/pygsl/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 2 11:37:06 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:06 -0400 Subject: rpms/pygsl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507021137.j62Bb63W018535@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508 Added Files: Makefile import.log Log Message: Setup of module pygsl --- NEW FILE Makefile --- # Top level Makefile for module pygsl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 2 11:37:06 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:06 -0400 Subject: rpms/pygsl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507021137.j62Bb6xW018540@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18508/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pygsl --- NEW 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 Jul 2 11:37:56 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:56 -0400 Subject: rpms/pygsl/devel COPYING, NONE, 1.1 pygsl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507021137.j62Bbu15018607@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577/devel Modified Files: .cvsignore sources Added Files: COPYING pygsl.spec Log Message: auto-import pygsl-0.3.2-4 on branch devel from pygsl-0.3.2-4.src.rpm --- NEW FILE COPYING --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE pygsl.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: GNU Scientific Library Interface for python Name: pygsl Version: 0.3.2 Release: 4%{?dist} Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: COPYING License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: python python-numeric gsl >= 1.6 Url: http://pygsl.sourceforge.net BuildRequires: python-numeric gsl-devel >= 1.6 python-devel %description This project provides a python interface for the GNU scientific library (gsl) %prep %setup %build cp %{SOURCE1} . 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 ChangeLog README CREDITS doc/ examples/ %{python_sitearch}/pygsl/ %changelog * Sat Jul 2 2005 Jos?? Matos - 0.3.2-4 - Add license file from cvs. * Fri Jul 1 2005 Jose Matos - 0.3.2-3 - Remove duplicated "setup" entry. * Fri Jul 1 2005 Jose Matos - 0.3.2-2 - Clean spec file. * Thu Jun 30 2005 Jose Matos - 0.3.2-1 - New version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pygsl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Jul 2005 11:37:04 -0000 1.1 +++ .cvsignore 2 Jul 2005 11:37:54 -0000 1.2 @@ -0,0 +1 @@ +pygsl-0.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pygsl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Jul 2005 11:37:04 -0000 1.1 +++ sources 2 Jul 2005 11:37:54 -0000 1.2 @@ -0,0 +1 @@ +dde5f5a23dba8e63818dbfadb12e9a09 pygsl-0.3.2.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 11:37:56 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sat, 2 Jul 2005 07:37:56 -0400 Subject: rpms/pygsl import.log,1.1,1.2 Message-ID: <200507021138.j62BcQL5018620@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/pygsl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18577 Modified Files: import.log Log Message: auto-import pygsl-0.3.2-4 on branch devel from pygsl-0.3.2-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pygsl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Jul 2005 11:37:04 -0000 1.1 +++ import.log 2 Jul 2005 11:37:54 -0000 1.2 @@ -0,0 +1 @@ +pygsl-0_3_2-4:HEAD:pygsl-0.3.2-4.src.rpm:1120304265 From jamatos at fc.up.pt Sat Jul 2 11:23:44 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Sat, 2 Jul 2005 12:23:44 +0100 Subject: APPROVED: pygsl Message-ID: <200507021223.45174.jamatos@fc.up.pt> Name: pygsl python interface for the GNU scientific library (gsl) Reviewer: Tom "spot" Callaway Packager: Jos? Matos -- Jos? Ab?lio From fedora-extras-commits at redhat.com Sat Jul 2 12:27:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 2 Jul 2005 08:27:03 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.8, 1.9 Message-ID: <200507021227.j62CR3FP019936@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19917 Modified Files: kernel-module-thinkpad.spec Log Message: Sacrifice no-args-builds-for-current-kernel for benefit of CVS tag sanity. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kernel-module-thinkpad.spec 2 Jul 2005 11:28:48 -0000 1.8 +++ kernel-module-thinkpad.spec 2 Jul 2005 12:27:01 -0000 1.9 @@ -1,11 +1,9 @@ -%{!?kver: %define kver %(uname -r)} - %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} %define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 2.%(echo %{kver} | tr - _) +Release: 2%{?kver:.%(echo %{kver} | tr - _)} Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL From fedora-extras-commits at redhat.com Sat Jul 2 21:37:58 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:37:58 -0400 Subject: rpms/denyhosts/devel denyhosts-0.6.0-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 denyhosts.cron, 1.1, 1.2 denyhosts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507022137.j62Lbw7g031003@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30977 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Added Files: denyhosts-0.6.0-version.patch Log Message: * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. denyhosts-0.6.0-version.patch: --- NEW FILE denyhosts-0.6.0-version.patch --- --- denyhosts.py.orig 2005-07-02 16:10:46.004999307 -0500 +++ denyhosts.py 2005-07-02 16:11:18.259173082 -0500 @@ -7,7 +7,8 @@ import time import socket from types import ListType, TupleType -from version import VERSION +#from version import VERSION +VERSION = "0.6.0" global DEBUG DEBUG=0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:57:02 -0000 1.2 +++ .cvsignore 2 Jul 2005 21:37:55 -0000 1.3 @@ -1 +1 @@ -DenyHosts-0.5.5.tar.gz +DenyHosts-0.6.0.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.cron 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.cron 2 Jul 2005 21:37:55 -0000 1.2 @@ -1,2 +1,6 @@ +# This defaults to running once every ten minutes, but if your host is being +# heavily attacked then it is reasonable to make it run as frequently as once +# every minute. DenyHosts runs quickly once it has initially processed your +# logs and should not take a significant amount of CPU time. */10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.spec 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.spec 2 Jul 2005 21:37:55 -0000 1.2 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.5.5 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,6 +11,7 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Patch0: denyhosts-0.5.5-workdir.patch +Patch1: denyhosts-0.6.0-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -28,7 +29,8 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,10 @@ %{_initrddir}/denyhosts %changelog +* Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 +- Update to 0.6.0 +- Add fix for "from version import VERSION" issue. + * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:57:02 -0000 1.2 +++ sources 2 Jul 2005 21:37:55 -0000 1.3 @@ -1 +1 @@ -e5b49f8e949d3afd3bbd9d4611267dae DenyHosts-0.5.5.tar.gz +6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 21:38:49 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:38:49 -0400 Subject: rpms/denyhosts/FC-4 .cvsignore, 1.2, 1.3 denyhosts.cron, 1.1, 1.2 denyhosts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507022138.j62LcnCg031037@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31014 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Log Message: * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:57:02 -0000 1.2 +++ .cvsignore 2 Jul 2005 21:38:47 -0000 1.3 @@ -1 +1,2 @@ DenyHosts-0.5.5.tar.gz +DenyHosts-0.6.0.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.cron,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.cron 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.cron 2 Jul 2005 21:38:47 -0000 1.2 @@ -1,2 +1,6 @@ +# This defaults to running once every ten minutes, but if your host is being +# heavily attacked then it is reasonable to make it run as frequently as once +# every minute. DenyHosts runs quickly once it has initially processed your +# logs and should not take a significant amount of CPU time. */10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.spec 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.spec 2 Jul 2005 21:38:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.5.5 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,6 +11,7 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Patch0: denyhosts-0.5.5-workdir.patch +Patch1: denyhosts-0.6.0-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -28,7 +29,8 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,10 @@ %{_initrddir}/denyhosts %changelog +* Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 +- Update to 0.6.0 +- Add fix for "from version import VERSION" issue. + * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:57:02 -0000 1.2 +++ sources 2 Jul 2005 21:38:47 -0000 1.3 @@ -1 +1 @@ -e5b49f8e949d3afd3bbd9d4611267dae DenyHosts-0.5.5.tar.gz +6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 21:40:10 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:40:10 -0400 Subject: rpms/denyhosts/FC-4 denyhosts-0.6.0-version.patch,NONE,1.1 Message-ID: <200507022140.j62LeALq031081@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31058 Added Files: denyhosts-0.6.0-version.patch Log Message: Forgot to add this first. denyhosts-0.6.0-version.patch: --- NEW FILE denyhosts-0.6.0-version.patch --- --- denyhosts.py.orig 2005-07-02 16:10:46.004999307 -0500 +++ denyhosts.py 2005-07-02 16:11:18.259173082 -0500 @@ -7,7 +7,8 @@ import time import socket from types import ListType, TupleType -from version import VERSION +#from version import VERSION +VERSION = "0.6.0" global DEBUG DEBUG=0 From fedora-extras-commits at redhat.com Sat Jul 2 21:41:47 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:41:47 -0400 Subject: rpms/denyhosts/FC-3 denyhosts-0.6.0-version.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 denyhosts.cron, 1.1, 1.2 denyhosts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507022141.j62LflRl031128@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31102 Modified Files: .cvsignore denyhosts.cron denyhosts.spec sources Added Files: denyhosts-0.6.0-version.patch Log Message: * Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 - Update to 0.6.0 - Add fix for "from version import VERSION" issue. denyhosts-0.6.0-version.patch: --- NEW FILE denyhosts-0.6.0-version.patch --- --- denyhosts.py.orig 2005-07-02 16:10:46.004999307 -0500 +++ denyhosts.py 2005-07-02 16:11:18.259173082 -0500 @@ -7,7 +7,8 @@ import time import socket from types import ListType, TupleType -from version import VERSION +#from version import VERSION +VERSION = "0.6.0" global DEBUG DEBUG=0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:57:02 -0000 1.2 +++ .cvsignore 2 Jul 2005 21:41:44 -0000 1.3 @@ -1 +1,2 @@ DenyHosts-0.5.5.tar.gz +DenyHosts-0.6.0.tar.gz Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.cron,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.cron 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.cron 2 Jul 2005 21:41:44 -0000 1.2 @@ -1,2 +1,6 @@ +# This defaults to running once every ten minutes, but if your host is being +# heavily attacked then it is reasonable to make it run as frequently as once +# every minute. DenyHosts runs quickly once it has initially processed your +# logs and should not take a significant amount of CPU time. */10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts.spec 20 May 2005 04:57:02 -0000 1.1 +++ denyhosts.spec 2 Jul 2005 21:41:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 0.5.5 -Release: 2%{?dist} +Version: 0.6.0 +Release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -11,6 +11,7 @@ Source2: denyhosts.init Source3: denyhosts-allowed-hosts Patch0: denyhosts-0.5.5-workdir.patch +Patch1: denyhosts-0.6.0-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch @@ -28,7 +29,8 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 +%patch0 -p0 +%patch1 -p0 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,10 @@ %{_initrddir}/denyhosts %changelog +* Sat Jul 2 2005 Jason L Tibbitts III - 0.6.0-1 +- Update to 0.6.0 +- Add fix for "from version import VERSION" issue. + * Thu May 19 2005 Jason L Tibbitts III - 0.5.5-2 - Use dist tag - Don't automatically enable at install time Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:57:02 -0000 1.2 +++ sources 2 Jul 2005 21:41:44 -0000 1.3 @@ -1 +1 @@ -e5b49f8e949d3afd3bbd9d4611267dae DenyHosts-0.5.5.tar.gz +6d65457ed9c31c548160e2aa74e5a80e DenyHosts-0.6.0.tar.gz From fedora-extras-commits at redhat.com Sat Jul 2 21:42:28 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:42:28 -0400 Subject: common tobuild,1.1719,1.1720 Message-ID: <200507022142.j62LgS9k031190@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31173 Modified Files: tobuild Log Message: request build of rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1719 retrieving revision 1.1720 diff -u -r1.1719 -r1.1720 --- tobuild 2 Jul 2005 10:46:18 -0000 1.1719 +++ tobuild 2 Jul 2005 21:42:26 -0000 1.1720 @@ -3,3 +3,4 @@ # jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel +tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 21:42:57 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:42:57 -0400 Subject: common tobuild,1.1720,1.1721 Message-ID: <200507022142.j62LgvnN031252@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31235 Modified Files: tobuild Log Message: request build of rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1720 retrieving revision 1.1721 diff -u -r1.1720 -r1.1721 --- tobuild 2 Jul 2005 21:42:26 -0000 1.1720 +++ tobuild 2 Jul 2005 21:42:55 -0000 1.1721 @@ -4,3 +4,4 @@ jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 +tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 2 21:43:27 2005 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Sat, 2 Jul 2005 17:43:27 -0400 Subject: common tobuild,1.1721,1.1722 Message-ID: <200507022143.j62LhRcl031314@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31297 Modified Files: tobuild Log Message: request build of rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1721 retrieving revision 1.1722 diff -u -r1.1721 -r1.1722 --- tobuild 2 Jul 2005 21:42:55 -0000 1.1721 +++ tobuild 2 Jul 2005 21:43:25 -0000 1.1722 @@ -5,3 +5,4 @@ jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 +tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 2 22:37:02 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:37:02 -0400 Subject: rpms/gnome-applet-sensors/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-sensors.spec, 1.1, 1.2 Message-ID: <200507022237.j62Mb2VY001143@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-serv1114 Modified Files: .cvsignore sources gnome-applet-sensors.spec Log Message: * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:45:56 -0000 1.2 +++ .cvsignore 2 Jul 2005 22:37:00 -0000 1.3 @@ -1 +1 @@ -sensors-applet-0.7.3.tar.gz +sensors-applet-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:45:56 -0000 1.2 +++ sources 2 Jul 2005 22:37:00 -0000 1.3 @@ -1 +1 @@ -d19c76b4ceeb51664c32d54422b45080 sensors-applet-0.7.3.tar.gz +d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.tar.gz Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/gnome-applet-sensors.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-sensors.spec 20 May 2005 04:45:56 -0000 1.1 +++ gnome-applet-sensors.spec 2 Jul 2005 22:37:00 -0000 1.2 @@ -1,12 +1,12 @@ Name: gnome-applet-sensors -Version: 0.7.3 +Version: 1.0 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops License: GPL URL: http://sensors-applet.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-0.7.3.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Sat Jul 02 2005 Aaron Kurtz - 1.0-1 +- bump to stable release 1.0 + * Wed May 18 2005 Aaron Kurtz - 0.7.3-1 - Minor specfile cleanup From fedora-extras-commits at redhat.com Sat Jul 2 22:40:45 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:40:45 -0400 Subject: rpms/gnome-applet-sensors/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-sensors.spec, 1.1, 1.2 Message-ID: <200507022240.j62MejIV001653@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-serv1632 Modified Files: .cvsignore sources gnome-applet-sensors.spec Log Message: * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:45:56 -0000 1.2 +++ .cvsignore 2 Jul 2005 22:40:43 -0000 1.3 @@ -1 +1 @@ -sensors-applet-0.7.3.tar.gz +sensors-applet-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:45:56 -0000 1.2 +++ sources 2 Jul 2005 22:40:43 -0000 1.3 @@ -1 +1 @@ -d19c76b4ceeb51664c32d54422b45080 sensors-applet-0.7.3.tar.gz +d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-sensors.spec 20 May 2005 04:45:56 -0000 1.1 +++ gnome-applet-sensors.spec 2 Jul 2005 22:40:43 -0000 1.2 @@ -1,12 +1,12 @@ Name: gnome-applet-sensors -Version: 0.7.3 +Version: 1.0 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops License: GPL URL: http://sensors-applet.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-0.7.3.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Sat Jul 02 2005 Aaron Kurtz - 1.0-1 +- bump to stable release 1.0 + * Wed May 18 2005 Aaron Kurtz - 0.7.3-1 - Minor specfile cleanup From fedora-extras-commits at redhat.com Sat Jul 2 22:41:08 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:41:08 -0400 Subject: rpms/gnome-applet-sensors/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 gnome-applet-sensors.spec, 1.1, 1.2 Message-ID: <200507022241.j62Mf8JP001680@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-serv1659 Modified Files: .cvsignore sources gnome-applet-sensors.spec Log Message: * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 May 2005 04:45:56 -0000 1.2 +++ .cvsignore 2 Jul 2005 22:41:06 -0000 1.3 @@ -1 +1 @@ -sensors-applet-0.7.3.tar.gz +sensors-applet-1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 May 2005 04:45:56 -0000 1.2 +++ sources 2 Jul 2005 22:41:06 -0000 1.3 @@ -1 +1 @@ -d19c76b4ceeb51664c32d54422b45080 sensors-applet-0.7.3.tar.gz +d624349d668c7d25f94a042f3da75983 sensors-applet-1.0.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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applet-sensors.spec 20 May 2005 04:45:56 -0000 1.1 +++ gnome-applet-sensors.spec 2 Jul 2005 22:41:06 -0000 1.2 @@ -1,12 +1,12 @@ Name: gnome-applet-sensors -Version: 0.7.3 +Version: 1.0 Release: 1%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops License: GPL URL: http://sensors-applet.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-0.7.3.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/sensors-applet/sensors-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +59,9 @@ %changelog +* Sat Jul 02 2005 Aaron Kurtz - 1.0-1 +- bump to stable release 1.0 + * Wed May 18 2005 Aaron Kurtz - 0.7.3-1 - Minor specfile cleanup From fedora-extras-commits at redhat.com Sat Jul 2 22:41:38 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:41:38 -0400 Subject: common tobuild,1.1722,1.1723 Message-ID: <200507022241.j62MfcMj001742@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1725 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1722 retrieving revision 1.1723 diff -u -r1.1722 -r1.1723 --- tobuild 2 Jul 2005 21:43:25 -0000 1.1722 +++ tobuild 2 Jul 2005 22:41:35 -0000 1.1723 @@ -6,3 +6,4 @@ tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel +dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 2 22:42:03 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Sat, 2 Jul 2005 18:42:03 -0400 Subject: common tobuild,1.1723,1.1724 Message-ID: <200507022242.j62Mg33a001804@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1787 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1723 retrieving revision 1.1724 diff -u -r1.1723 -r1.1724 --- tobuild 2 Jul 2005 22:41:35 -0000 1.1723 +++ tobuild 2 Jul 2005 22:42:00 -0000 1.1724 @@ -7,3 +7,4 @@ tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 +dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 3 02:36:51 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 2 Jul 2005 22:36:51 -0400 Subject: common tobuild,1.1724,1.1725 Message-ID: <200507030236.j632api6006618@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6601 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1724 retrieving revision 1.1725 diff -u -r1.1724 -r1.1725 --- tobuild 2 Jul 2005 22:42:00 -0000 1.1724 +++ tobuild 3 Jul 2005 02:36:49 -0000 1.1725 @@ -8,3 +8,4 @@ tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 3 02:37:25 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 2 Jul 2005 22:37:25 -0400 Subject: common tobuild,1.1725,1.1726 Message-ID: <200507030237.j632bPi6006651@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6634 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1725 retrieving revision 1.1726 diff -u -r1.1725 -r1.1726 --- tobuild 3 Jul 2005 02:36:49 -0000 1.1725 +++ tobuild 3 Jul 2005 02:37:23 -0000 1.1726 @@ -9,3 +9,4 @@ dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 3 02:38:16 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 2 Jul 2005 22:38:16 -0400 Subject: common tobuild,1.1726,1.1727 Message-ID: <200507030238.j632cGbK006684@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6667 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1726 retrieving revision 1.1727 diff -u -r1.1726 -r1.1727 --- tobuild 3 Jul 2005 02:37:23 -0000 1.1726 +++ tobuild 3 Jul 2005 02:38:14 -0000 1.1727 @@ -10,3 +10,4 @@ dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 3 14:07:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 3 Jul 2005 10:07:34 -0400 Subject: rpms/gambas/devel gambas.spec,1.2,1.3 Message-ID: <200507031407.j63E7YMt025058@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019/devel Modified Files: gambas.spec Log Message: Get garbage character out of description, clean up %{_libdir} in %files. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gambas.spec 1 Jul 2005 13:50:49 -0000 1.2 +++ gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 @@ -20,7 +20,7 @@ %description Gambas is a free development environment based on a Basic interpreter -with object extensions, like Visual Basic?(but it is NOT a clone !).. +with object extensions, like Visual Basic (but it is NOT a clone !). With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL databases, pilot KDE applications with DCOP, translate your program into many languages, create network applications easily, and so @@ -95,18 +95,15 @@ %files %defattr(-, root, root, 0755) %doc README AUTHORS COPYING INSTALL README README.REDHAT TODO -%dir %{_libdir}/gambas -%{_libdir}/gambas/*.so.* -%{_libdir}/gambas/lib.gb*.component +# Normally the .so file should be in the -devel package +# However, gambas can't run without it. :P +%{_libdir}/gambas %{_bindir}/gambas %{_bindir}/gbc %{_bindir}/gba %{_bindir}/gbi %{_bindir}/gbx %{_bindir}/gambas-database-manager -# Normally, this file should be in the -devel package -# However, gambas can't run without the .so. :P -%{_libdir}/gambas/*.so %files devel %defattr(-, root, root, 0755) From fedora-extras-commits at redhat.com Sun Jul 3 17:26:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 3 Jul 2005 13:26:04 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.9, 1.10 Message-ID: <200507031726.j63HQ41g028820@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28803 Modified Files: kernel-module-thinkpad.spec Log Message: Really drop README.Fedora, thanks to Thorsten. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kernel-module-thinkpad.spec 2 Jul 2005 12:27:01 -0000 1.9 +++ kernel-module-thinkpad.spec 3 Jul 2005 17:26:02 -0000 1.10 @@ -37,7 +37,6 @@ %prep %setup -q -n thinkpad-%{version} %patch0 -install -pm 644 %{SOURCE1} README.Fedora %{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile @@ -71,7 +70,7 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README* SUPPORTED-MODELS TECHNOTES +%doc AUTHORS ChangeLog COPYING README SUPPORTED-MODELS TECHNOTES %config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms %{_sysconfdir}/sysconfig/modules/thinkpad.modules %dir %{moddir} @@ -81,7 +80,7 @@ %changelog -* Fri Jul 1 2005 Ville Skytt?? - 5.8-2 +* Sun Jul 3 2005 Ville Skytt?? - 5.8-2 - Change towards new (in-progress) kernel module packaging guidelines. - Automatically load modules at boot time. - Add console.perms.d snippet, drop obsolete README.Fedora. From fedora-extras-commits at redhat.com Sun Jul 3 17:48:01 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:48:01 -0400 Subject: rpms/konversation/FC-4 konversation.spec,1.1,1.2 Message-ID: <200507031748.j63Hm19L028899@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/konversation/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28870/FC-4 Modified Files: konversation.spec Log Message: explictly define QT's Include and lib dirs so konversation will build on FC4 and devel x86_64 Index: konversation.spec =================================================================== RCS file: /cvs/extras/rpms/konversation/FC-4/konversation.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- konversation.spec 29 Jun 2005 19:44:46 -0000 1.1 +++ konversation.spec 3 Jul 2005 17:47:59 -0000 1.2 @@ -1,6 +1,6 @@ Name: konversation Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Konversation is a user friendly IRC client for KDE Group: Applications/Internet @@ -27,6 +27,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure make %{?_smp_mflags} @@ -74,6 +75,8 @@ %changelog +* Sun Jul 03 2005 Dennis Gilmore - 0.18-4 +- Explicly export QT lib and include dirs for x86_64 build issue * Tue Jun 28 2005 Dennis Gilmore - 0.18-3 - Destop-file-install, change gcc4 patch to configure remove unneeded build deps. From fedora-extras-commits at redhat.com Sun Jul 3 17:48:02 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:48:02 -0400 Subject: rpms/konversation/devel konversation.spec,1.1,1.2 Message-ID: <200507031748.j63Hm2bd028905@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/konversation/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28870/devel Modified Files: konversation.spec Log Message: explictly define QT's Include and lib dirs so konversation will build on FC4 and devel x86_64 Index: konversation.spec =================================================================== RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- konversation.spec 29 Jun 2005 19:44:46 -0000 1.1 +++ konversation.spec 3 Jul 2005 17:48:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: konversation Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Konversation is a user friendly IRC client for KDE Group: Applications/Internet @@ -27,6 +27,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure make %{?_smp_mflags} @@ -74,6 +75,8 @@ %changelog +* Sun Jul 03 2005 Dennis Gilmore - 0.18-4 +- Explicly export QT lib and include dirs for x86_64 build issue * Tue Jun 28 2005 Dennis Gilmore - 0.18-3 - Destop-file-install, change gcc4 patch to configure remove unneeded build deps. From fedora-extras-commits at redhat.com Sun Jul 3 17:49:04 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:49:04 -0400 Subject: common tobuild,1.1727,1.1728 Message-ID: <200507031749.j63Hn4v5028972@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28955 Modified Files: tobuild Log Message: request build of rpms/konversation/devel konversation-0_18-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1727 retrieving revision 1.1728 diff -u -r1.1727 -r1.1728 --- tobuild 3 Jul 2005 02:38:14 -0000 1.1727 +++ tobuild 3 Jul 2005 17:49:02 -0000 1.1728 @@ -11,3 +11,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 +ausil rpms/konversation/devel konversation-0_18-4_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 3 17:49:27 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sun, 3 Jul 2005 13:49:27 -0400 Subject: common tobuild,1.1728,1.1729 Message-ID: <200507031749.j63HnR5g029049@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29032 Modified Files: tobuild Log Message: request build of rpms/konversation/FC-4 konversation-0_18-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1728 retrieving revision 1.1729 diff -u -r1.1728 -r1.1729 --- tobuild 3 Jul 2005 17:49:02 -0000 1.1728 +++ tobuild 3 Jul 2005 17:49:25 -0000 1.1729 @@ -12,3 +12,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ausil rpms/konversation/devel konversation-0_18-4_fc5 devel +ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 3 18:24:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 3 Jul 2005 14:24:00 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.10, 1.11 Message-ID: <200507031824.j63IO0tA030186@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30169 Modified Files: kernel-module-thinkpad.spec Log Message: Allow building for the current kernel without specifying kver. That results in -debuginfo problems though, and I'm not sure if we need to support that anyway. But here goes at least temporarily for the record. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kernel-module-thinkpad.spec 3 Jul 2005 17:26:02 -0000 1.10 +++ kernel-module-thinkpad.spec 3 Jul 2005 18:23:58 -0000 1.11 @@ -1,9 +1,12 @@ +%{?kver: %define mkver .%(echo %{kver} | tr - _)} +%{!?kver: %define kver %(uname -r)} + %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} %define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 2%{?kver:.%(echo %{kver} | tr - _)} +Release: 2%{?mkver} Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL From fedora-extras-commits at redhat.com Mon Jul 4 05:10:41 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 01:10:41 -0400 Subject: common tobuild,1.1729,1.1730 Message-ID: <200507040510.j645AfdH011210@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11193 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1729 retrieving revision 1.1730 diff -u -r1.1729 -r1.1730 --- tobuild 3 Jul 2005 17:49:25 -0000 1.1729 +++ tobuild 4 Jul 2005 05:10:38 -0000 1.1730 @@ -13,3 +13,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 ausil rpms/konversation/devel konversation-0_18-4_fc5 devel ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 +petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 05:21:44 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 4 Jul 2005 01:21:44 -0400 Subject: common tobuild,1.1730,1.1731 Message-ID: <200507040521.j645LiNN011270@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11253 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1730 retrieving revision 1.1731 diff -u -r1.1730 -r1.1731 --- tobuild 4 Jul 2005 05:10:38 -0000 1.1730 +++ tobuild 4 Jul 2005 05:21:42 -0000 1.1731 @@ -14,3 +14,4 @@ ausil rpms/konversation/devel konversation-0_18-4_fc5 devel ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 05:22:12 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 4 Jul 2005 01:22:12 -0400 Subject: common tobuild,1.1731,1.1732 Message-ID: <200507040522.j645MCka011303@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11286 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1731 retrieving revision 1.1732 diff -u -r1.1731 -r1.1732 --- tobuild 4 Jul 2005 05:21:42 -0000 1.1731 +++ tobuild 4 Jul 2005 05:22:10 -0000 1.1732 @@ -15,3 +15,4 @@ ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From petersen at redhat.com Mon Jul 4 05:39:47 2005 From: petersen at redhat.com (Jens Petersen) Date: Mon, 04 Jul 2005 14:39:47 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> Message-ID: <42C8CBA3.4020703@redhat.com> Chris Ricker wrote: > On Fri, 1 Jul 2005, Jens Petersen wrote: >>-Release: 2%{?dist} >>+Release: 2%{?dist}.1 > > It'd be preferable to increment the release, rather than monkeying around > with new numbers after the dist stuff It would be preferable not to have a cvs system wh > darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a > hypothetical FC 4.1 release > > darcs-1.0.3-3.fc4 is unambiguous True, but it is greater than darcs-1.0.3-2.fc5, which I was trying to avoid. :) Jens From rc040203 at freenet.de Mon Jul 4 05:53:57 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Mon, 04 Jul 2005 07:53:57 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C8CBA3.4020703@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> Message-ID: <1120456437.6657.4.camel@mccallum.corsepiu.local> On Mon, 2005-07-04 at 14:39 +0900, Jens Petersen wrote: > Chris Ricker wrote: > > On Fri, 1 Jul 2005, Jens Petersen wrote: > >>-Release: 2%{?dist} > >>+Release: 2%{?dist}.1 > > > > It'd be preferable to increment the release, rather than monkeying around > > with new numbers after the dist stuff > > It would be preferable not to have a cvs system wh Does FE's CVS still disallow "cvs tag -F"? > > darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a > > hypothetical FC 4.1 release > > > > darcs-1.0.3-3.fc4 is unambiguous > > True, but it is greater than darcs-1.0.3-2.fc5, which I was trying > to avoid. :) "cvs tag -F" would be a work-around. It would allow shifting existing "tags" to where they you actually want them to be. Ralf From paul at city-fan.org Mon Jul 4 06:23:09 2005 From: paul at city-fan.org (Paul Howarth) Date: Mon, 04 Jul 2005 07:23:09 +0100 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <1120456437.6657.4.camel@mccallum.corsepiu.local> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> Message-ID: <1120458190.15736.161.camel@laurel.intra.city-fan.org> On Mon, 2005-07-04 at 07:53 +0200, Ralf Corsepius wrote: > On Mon, 2005-07-04 at 14:39 +0900, Jens Petersen wrote: > > Chris Ricker wrote: > > > On Fri, 1 Jul 2005, Jens Petersen wrote: > > >>-Release: 2%{?dist} > > >>+Release: 2%{?dist}.1 > > > > > > It'd be preferable to increment the release, rather than monkeying around > > > with new numbers after the dist stuff > > > > It would be preferable not to have a cvs system wh > > Does FE's CVS still disallow "cvs tag -F"? > > > > darcs-1.0.3-2.fc4.1 is confusing - it looks like a package for a > > > hypothetical FC 4.1 release > > > > > > darcs-1.0.3-3.fc4 is unambiguous > > > > True, but it is greater than darcs-1.0.3-2.fc5, which I was trying > > to avoid. :) > > "cvs tag -F" would be a work-around. It would allow shifting existing > "tags" to where they you actually want them to be. I've moved tags before; I think I did it with the -F and -r options of the tag command. Paul. -- Paul Howarth From fedora-extras-commits at redhat.com Mon Jul 4 06:36:50 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 4 Jul 2005 02:36:50 -0400 Subject: common tobuild,1.1732,1.1733 Message-ID: <200507040636.j646aoGL012629@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12612 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-3 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1732 retrieving revision 1.1733 diff -u -r1.1732 -r1.1733 --- tobuild 4 Jul 2005 05:22:10 -0000 1.1732 +++ tobuild 4 Jul 2005 06:36:47 -0000 1.1733 @@ -16,3 +16,4 @@ petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel From petersen at redhat.com Mon Jul 4 08:25:09 2005 From: petersen at redhat.com (Jens Petersen) Date: Mon, 04 Jul 2005 17:25:09 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <1120456437.6657.4.camel@mccallum.corsepiu.local> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> Message-ID: <42C8F265.5040607@redhat.com> Ralf Corsepius wrote: > "cvs tag -F" would be a work-around. It would allow shifting existing > "tags" to where they you actually want them to be. What about the case when there is no tag to move? :) darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " For more information on using the Fedora CVS repositories, please visit http://fedoraproject.org/wiki/UsingCvs cvs status: Examining . darcs/FC-4% Jens From fedora-extras-commits at redhat.com Mon Jul 4 08:42:09 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 4 Jul 2005 04:42:09 -0400 Subject: rpms/gnumeric/devel gnumeric.spec,1.3,1.4 Message-ID: <200507040842.j648g99N015679@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15662 Modified Files: gnumeric.spec Log Message: Fixup BuildReqs Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnumeric.spec 17 Jun 2005 18:01:54 -0000 1.3 +++ gnumeric.spec 4 Jul 2005 08:42:06 -0000 1.4 @@ -4,7 +4,7 @@ Summary: A spreadsheet program for GNOME. Name: gnumeric Version: 1.4.3 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: Applications/Productivity @@ -25,9 +25,12 @@ BuildRequires: python-devel BuildRequires: libgsf-devel >= 1.12 BuildRequires: automake autoconf libtool -BuildRequires: intltool scrollkeeper gettext desktop-file-utils +BuildRequires: intltool scrollkeeper gettext BuildRequires: libgnomedb-devel >= 1.0.4 BuildRequires: pango-devel >= 1.4.0 +BuildRequires: gtk2-devel >= 2.2.0 +BuildRequires: libart_lgpl-devel >= 2.3.0 +BuildRequires: pygtk2-devel >= 2.6.0 Patch0: gnumeric-1.4.1-desktop.patch Patch1: gnumeric-1.4.1-excelcrash.patch Patch2: gnumeric-1.4.1-configure.patch @@ -140,6 +143,13 @@ %dir %{_libdir}/gnumeric/%{gnumeric_version} %changelog +* Mon Jul 4 2005 Hans de Goede 1.4.3-4 +- For some reason gtk2-devel no longer gets sucked in by our other + buildrequires so explicitly add it. +- libart_lgpl-devel is now needed for building, so add this. +- I also noticed in the configure output that gnumeric can + use pygtk2, so add this. + * Fri Jun 17 2005 Hans de Goede 1.4.3-3 - Add patch3: fix excell export with libgsf >= 0.12 (bugzilla #160075), Thanks to Caolan McNamara. From fedora-extras-commits at redhat.com Mon Jul 4 08:43:18 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 4 Jul 2005 04:43:18 -0400 Subject: common tobuild,1.1733,1.1734 Message-ID: <200507040843.j648hJSV015797@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1733 retrieving revision 1.1734 diff -u -r1.1733 -r1.1734 --- tobuild 4 Jul 2005 06:36:47 -0000 1.1733 +++ tobuild 4 Jul 2005 08:43:16 -0000 1.1734 @@ -17,3 +17,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel From fedora-extras-commits at redhat.com Mon Jul 4 08:48:21 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 4 Jul 2005 04:48:21 -0400 Subject: rpms/most/devel most.spec,1.7,1.8 Message-ID: <200507040848.j648mL6B015860@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15843 Modified Files: most.spec Log Message: added dist tag Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- most.spec 1 Jul 2005 12:41:26 -0000 1.7 +++ most.spec 4 Jul 2005 08:48:19 -0000 1.8 @@ -1,7 +1,7 @@ Summary: more, less, most Name: most Version: 4.10.1 -Release: 1 +Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text From fedora-extras-commits at redhat.com Mon Jul 4 08:48:45 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 4 Jul 2005 04:48:45 -0400 Subject: common tobuild,1.1734,1.1735 Message-ID: <200507040848.j648mjn8015917@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15900 Modified Files: tobuild Log Message: request build of rpms/most/devel most-4_10_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1734 retrieving revision 1.1735 diff -u -r1.1734 -r1.1735 --- tobuild 4 Jul 2005 08:43:16 -0000 1.1734 +++ tobuild 4 Jul 2005 08:48:43 -0000 1.1735 @@ -18,3 +18,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel +adrian rpms/most/devel most-4_10_1-1_fc5 devel From bugs.michael at gmx.net Mon Jul 4 09:26:49 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Mon, 4 Jul 2005 11:26:49 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C8F265.5040607@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> Message-ID: <20050704112649.3fb76c84.bugs.michael@gmx.net> On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: > Ralf Corsepius wrote: > > > "cvs tag -F" would be a work-around. It would allow shifting existing > > "tags" to where they you actually want them to be. > > What about the case when there is no tag to move? :) > > darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " > For more information on using the Fedora CVS repositories, please visit > http://fedoraproject.org/wiki/UsingCvs > cvs status: Examining . > darcs/FC-4% When there is no tag, "make tag" doesn't fail. But when you cannot tag, because the tag is occupied already, you can move it. Easy as that. Just be careful with option -F. -- Michael Schwendt Fedora Core release 5 (Development) - Linux 2.6.12-1.1411_FC5 loadavg: 1.37 1.18 1.07 From petersen at redhat.com Mon Jul 4 10:21:48 2005 From: petersen at redhat.com (Jens Petersen) Date: Mon, 04 Jul 2005 19:21:48 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <20050704112649.3fb76c84.bugs.michael@gmx.net> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> Message-ID: <42C90DBC.9070103@redhat.com> Michael Schwendt wrote: > On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: > >>Ralf Corsepius wrote: >> >>>"cvs tag -F" would be a work-around. It would allow shifting existing >>>"tags" to where they you actually want them to be. >> >>What about the case when there is no tag to move? :) >> >> darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " >> For more information on using the Fedora CVS repositories, please visit >>http://fedoraproject.org/wiki/UsingCvs >> cvs status: Examining . >> darcs/FC-4% > > When there is no tag, "make tag" doesn't fail. Errm, this is the whole point that "make tag" failed because the pre-tag checking script (or whatever it is on the server side) I assume thought that darcs-1_0_3-2_fc4 was already in use... Perhaps I was unlucky, but I suspect it is reproducible: import new package, modify spec say, run "make tag" (complains about modifications), try to "make tag" (complains tag already used, but it isn't in cvs)... Jens From bugs.michael at gmx.net Mon Jul 4 10:35:50 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Mon, 4 Jul 2005 12:35:50 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C90DBC.9070103@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> <42C90DBC.9070103@redhat.com> Message-ID: <20050704123550.1cb8ef39.bugs.michael@gmx.net> On Mon, 04 Jul 2005 19:21:48 +0900, Jens Petersen wrote: > Michael Schwendt wrote: > > On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: > > > >>Ralf Corsepius wrote: > >> > >>>"cvs tag -F" would be a work-around. It would allow shifting existing > >>>"tags" to where they you actually want them to be. > >> > >>What about the case when there is no tag to move? :) > >> > >> darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " > >> For more information on using the Fedora CVS repositories, please visit > >>http://fedoraproject.org/wiki/UsingCvs > >> cvs status: Examining . > >> darcs/FC-4% > > > > When there is no tag, "make tag" doesn't fail. > > Errm, this is the whole point that "make tag" failed because > the pre-tag checking script (or whatever it is on the server side) I assume > thought that darcs-1_0_3-2_fc4 was already in use... Errm, and then you can move it, because it is "in use", even if you don't see the tag on your checked out files. -- Michael Schwendt Fedora Core release 5 (Development) - Linux 2.6.12-1.1411_FC5 loadavg: 1.21 1.51 1.49 From fedora-extras-commits at redhat.com Mon Jul 4 10:58:34 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Mon, 4 Jul 2005 06:58:34 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.18,1.19 Message-ID: <200507041058.j64AwYeg018325@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18308 Modified Files: bittorrent.spec Log Message: * Mon Jul 04 2005 Paul Howarth 4.1.2-2 - add Provides/Obsoletes for python-khashmir for clean upgrades from split bittorrent packages Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- bittorrent.spec 13 Jun 2005 13:01:12 -0000 1.18 +++ bittorrent.spec 4 Jul 2005 10:58:32 -0000 1.19 @@ -23,6 +23,9 @@ Requires: python Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Provides: python-khashmir +Obsoletes: python-khashmir < %{version} + Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -202,15 +205,19 @@ %{_datadir}/pixmaps/bittorrent.png %changelog -* Mon Jun 13 2005 Paul Howarth 4.1.2-1%{?dist} +* Mon Jul 4 2005 Paul Howarth 4.1.2-2 +- add Provides/Obsoletes for python-khashmir for clean upgrades from split + bittorrent packages + +* Mon Jun 13 2005 Paul Howarth 4.1.2-1 - update to 4.1.2 - add gettext build requirement for translations -* Mon Jun 6 2005 Paul Howarth 4.1.1-3%{?dist} +* Mon Jun 6 2005 Paul Howarth 4.1.1-3 - don't delete user/group torrent on uninstall (see https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg00271.html) -* Thu Jun 2 2005 Paul Howarth 4.1.1-2%{?dist} +* Thu Jun 2 2005 Paul Howarth 4.1.1-2 - tidy up description text - improved initscripts (#158273) - for versions on Fedora Core >= 4 or RHEL, put server data under /srv rather @@ -221,23 +228,23 @@ using python's dist tools and hence doesn't include all dependencies, provide initscripts etc.; this provides a clean upgrade path to Extras -* Tue May 31 2005 Paul Howarth 4.1.1-1%{?dist} +* Tue May 31 2005 Paul Howarth 4.1.1-1 - update to 4.1.1 - add "khashmir" python library - add TRACKERLESS.txt as %%doc - add translations -* Tue May 24 2005 Paul Howarth 4.0.2-1%{?dist} +* 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 From rc040203 at freenet.de Mon Jul 4 11:06:01 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Mon, 04 Jul 2005 13:06:01 +0200 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <42C90DBC.9070103@redhat.com> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> <42C90DBC.9070103@redhat.com> Message-ID: <1120475161.6657.49.camel@mccallum.corsepiu.local> On Mon, 2005-07-04 at 19:21 +0900, Jens Petersen wrote: > > Perhaps I was unlucky, but I suspect it is reproducible: import new package, > modify spec say, run "make tag" (complains about modifications), try to > "make tag" (complains tag already used, but it isn't in cvs)... I think, I've been there - I resorted to increase the release tag and to bite the bullet of an "unnecessary" updates :( Ralf From fedora-extras-commits at redhat.com Mon Jul 4 12:40:47 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Mon, 4 Jul 2005 08:40:47 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.8,1.9 Message-ID: <200507041240.j64CelZq020720@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20703 Modified Files: galeon.spec Log Message: galeon: last rebuild failed Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- galeon.spec 30 Jun 2005 20:44:34 -0000 1.8 +++ galeon.spec 4 Jul 2005 12:40:45 -0000 1.9 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -98,6 +98,9 @@ %changelog +* Sat Jul 2 2005 Dams - 1.3.21 +- Rebuild + * Thu Jun 30 2005 Dams - 1.3.21 - Disabled nautilus view for FC4 - Fixed x86_64 build From fedora-extras-commits at redhat.com Mon Jul 4 12:49:04 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Mon, 4 Jul 2005 08:49:04 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.9,1.10 Message-ID: <200507041249.j64Cn411020831@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20814 Modified Files: galeon.spec Log Message: galeon: Im too stupid to make buildsys rebuild galeon Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- galeon.spec 4 Jul 2005 12:40:45 -0000 1.9 +++ galeon.spec 4 Jul 2005 12:49:02 -0000 1.10 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ From fedora-extras-commits at redhat.com Mon Jul 4 14:34:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:34:40 -0400 Subject: rpms/gambas/devel gambas.spec,1.3,1.4 Message-ID: <200507041434.j64EYeiC023790@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23773/devel Modified Files: gambas.spec Log Message: Post-approval cleanups. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 +++ gambas.spec 4 Jul 2005 14:34:38 -0000 1.4 @@ -1,15 +1,14 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf -BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel -BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel +BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -94,7 +93,7 @@ %files %defattr(-, root, root, 0755) -%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO +%doc AUTHORS COPYING INSTALL README README.REDHAT TODO # Normally the .so file should be in the -devel package # However, gambas can't run without it. :P %{_libdir}/gambas @@ -122,6 +121,10 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 +- clean up BuildRequires +- remove doubling of README in %doc + * Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 - added ExcludeArch for x86_64 and ppc From fedora-extras-commits at redhat.com Mon Jul 4 14:35:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:35:32 -0400 Subject: rpms/gambas/FC-3 gambas.spec,1.3,1.4 Message-ID: <200507041435.j64EZWsl023830@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23801/FC-3 Modified Files: gambas.spec Log Message: Update spec for new branches. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 +++ gambas.spec 4 Jul 2005 14:35:30 -0000 1.4 @@ -1,15 +1,14 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf -BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel -BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel +BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -94,7 +93,7 @@ %files %defattr(-, root, root, 0755) -%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO +%doc AUTHORS COPYING INSTALL README README.REDHAT TODO # Normally the .so file should be in the -devel package # However, gambas can't run without it. :P %{_libdir}/gambas @@ -122,6 +121,10 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 +- clean up BuildRequires +- remove doubling of README in %doc + * Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 - added ExcludeArch for x86_64 and ppc From fedora-extras-commits at redhat.com Mon Jul 4 14:35:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:35:33 -0400 Subject: rpms/gambas/FC-4 gambas.spec,1.3,1.4 Message-ID: <200507041435.j64EZXl7023836@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23801/FC-4 Modified Files: gambas.spec Log Message: Update spec for new branches. Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gambas.spec 3 Jul 2005 14:07:31 -0000 1.3 +++ gambas.spec 4 Jul 2005 14:35:31 -0000 1.4 @@ -1,15 +1,14 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel, libjpeg-devel, automake, autoconf -BuildRequires: qt-devel, SDL-devel, mysql-devel, postgresql-devel, XFree86-devel -BuildRequires: zlib-devel, sqlite2-devel, libxml2-devel, libxslt-devel +BuildRequires: kdelibs-devel, automake, autoconf, SDL-devel +BuildRequires: mysql-devel, postgresql-devel, sqlite2-devel # Code is not 64 bit clean. ExcludeArch: x86_64 # Code is not endian clean. @@ -94,7 +93,7 @@ %files %defattr(-, root, root, 0755) -%doc README AUTHORS COPYING INSTALL README README.REDHAT TODO +%doc AUTHORS COPYING INSTALL README README.REDHAT TODO # Normally the .so file should be in the -devel package # However, gambas can't run without it. :P %{_libdir}/gambas @@ -122,6 +121,10 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 +- clean up BuildRequires +- remove doubling of README in %doc + * Fri Jul 1 2005 Tom "spot" Callaway 1.0.6-2 - added ExcludeArch for x86_64 and ppc From tcallawa at redhat.com Mon Jul 4 14:40:40 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 09:40:40 -0500 Subject: APPROVED: gambas Message-ID: <1120488040.27103.84.camel@localhost.localdomain> Name: gambas Summary: IDE based on a basic interpreter with object extensions Description: Gambas is a free development environment based on a Basic interpreter with object extensions, like Visual Basic (but it is NOT a clone !). With Gambas, you can quickly design your program GUI, access MySQL or PostgreSQL databases, pilot KDE applications with DCOP, translate your program into many languages, create network applications easily, and so on... Reviewed by: Christian Iseli Maintained by: Tom 'spot' Callaway ~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 Mon Jul 4 14:40:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:40:04 -0400 Subject: common tobuild,1.1735,1.1736 Message-ID: <200507041440.j64Ee41V023903@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23886 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-3 gambas-1_0_6-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1735 retrieving revision 1.1736 diff -u -r1.1735 -r1.1736 --- tobuild 4 Jul 2005 08:48:43 -0000 1.1735 +++ tobuild 4 Jul 2005 14:40:01 -0000 1.1736 @@ -19,3 +19,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/most/devel most-4_10_1-1_fc5 devel +spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 14:47:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:47:53 -0400 Subject: common tobuild,1.1736,1.1737 Message-ID: <200507041447.j64ElrrY024046@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24022 Modified Files: tobuild Log Message: request build of rpms/gambas/FC-4 gambas-1_0_6-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1736 retrieving revision 1.1737 diff -u -r1.1736 -r1.1737 --- tobuild 4 Jul 2005 14:40:01 -0000 1.1736 +++ tobuild 4 Jul 2005 14:47:51 -0000 1.1737 @@ -20,3 +20,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/most/devel most-4_10_1-1_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 +spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 14:52:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:52:50 -0400 Subject: rpms/xbase - New directory Message-ID: <200507041452.j64Eqo5j024414@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24390/xbase Log Message: Directory /cvs/extras/rpms/xbase added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 14:52:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:52:51 -0400 Subject: rpms/xbase/devel - New directory Message-ID: <200507041452.j64EqpV0024419@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24390/xbase/devel Log Message: Directory /cvs/extras/rpms/xbase/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 14:53:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:53:12 -0400 Subject: rpms/xbase Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507041453.j64ErClr024466@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24435 Added Files: Makefile import.log Log Message: Setup of module xbase --- NEW FILE Makefile --- # Top level Makefile for module xbase all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 4 14:53:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:53:12 -0400 Subject: rpms/xbase/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507041453.j64ErCSB024471@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24435/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module xbase --- NEW 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 Jul 4 14:54:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:54:34 -0400 Subject: rpms/xbase import.log,1.1,1.2 Message-ID: <200507041454.j64EsYCZ024533@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24502 Modified Files: import.log Log Message: auto-import xbase-2.0.0-2 on branch devel from xbase-2.0.0-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/xbase/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2005 14:53:09 -0000 1.1 +++ import.log 4 Jul 2005 14:54:32 -0000 1.2 @@ -0,0 +1 @@ +xbase-2_0_0-2:HEAD:xbase-2.0.0-2.src.rpm:1120488924 From fedora-extras-commits at redhat.com Mon Jul 4 14:54:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 10:54:34 -0400 Subject: rpms/xbase/devel xbase.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507041454.j64EsYA2024540@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24502/devel Modified Files: .cvsignore sources Added Files: xbase.spec Log Message: auto-import xbase-2.0.0-2 on branch devel from xbase-2.0.0-2.src.rpm --- NEW FILE xbase.spec --- Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 Release: 2%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen %description XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library originally by Gary Kunkel and others (see the AUTHORS file). XBase is useful for accessing data in legacy dBase 3 and 4 database files as well as a general light-weight database engine. It includes support for DBF (dBase version 3 and 4) data files, NDX and NTX indexes, and DBT (dBase version 3 and 4). It supports file and record locking under *nix OS's. %package devel Summary: XBase development libraries and headers Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel Headers and libraries for compiling programs that use the XBase library. %prep %setup -q %build %configure --enable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, 0755) %doc NEWS README TODO AUTHORS COPYING ChangeLog %{_bindir}/checkndx %{_bindir}/copydbf %{_bindir}/dbfxtrct %{_bindir}/deletall %{_bindir}/dumphdr %{_bindir}/dumprecs %{_bindir}/packdbf %{_bindir}/reindex %{_bindir}/undelall %{_bindir}/zap %{_bindir}/dbfutil1 %{_libdir}/*.so.* %files devel %defattr(-, root, root, 0755) %doc docs/html %dir %{_includedir}/xbase %{_includedir}/xbase/* %{_bindir}/xbase-config %{_libdir}/libxbase.a %{_libdir}/libxbase.so %changelog * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) * Thu Jun 16 2005 Tom "spot" Callaway 2.0.0-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2005 14:53:10 -0000 1.1 +++ .cvsignore 4 Jul 2005 14:54:32 -0000 1.2 @@ -0,0 +1 @@ +xbase-2.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2005 14:53:10 -0000 1.1 +++ sources 4 Jul 2005 14:54:32 -0000 1.2 @@ -0,0 +1 @@ +9b29362031716a12491beb9f8cc882f2 xbase-2.0.0.tar.gz From tcallawa at redhat.com Mon Jul 4 15:01:32 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 10:01:32 -0500 Subject: APPROVED: xbase Message-ID: <1120489292.27103.96.camel@localhost.localdomain> Name: xbase Summary: XBase compatible database library and tools Description: XBase is an xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library originally by Gary Kunkel and others (see the AUTHORS file). XBase is useful for accessing data in legacy dBase 3 and 4 database files as well as a general light-weight database engine. It includes support for DBF (dBase version 3 and 4) data files, NDX and NTX indexes, and DBT (dBase version 3 and 4). It supports file and record locking under *nix OS's. Reviewer: Adrian Reber Maintainer: Tom 'spot' Callaway ~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 Mon Jul 4 15:09:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:09:47 -0400 Subject: rpms/ebtables/FC-4 ebtables.spec,1.2,1.3 Message-ID: <200507041510.j64FAHHQ025871@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822/FC-4 Modified Files: ebtables.spec Log Message: Fix ghosted files. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 +++ ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -38,6 +38,9 @@ install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 +- actually touch ghosted files + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 - fix sysv file From fedora-extras-commits at redhat.com Mon Jul 4 15:09:46 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:09:46 -0400 Subject: rpms/ebtables/FC-3 ebtables.spec,1.2,1.3 Message-ID: <200507041510.j64FAHIW025870@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822/FC-3 Modified Files: ebtables.spec Log Message: Fix ghosted files. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebtables.spec 1 Jul 2005 16:27:10 -0000 1.2 +++ ebtables.spec 4 Jul 2005 15:09:44 -0000 1.3 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -38,6 +38,9 @@ install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 +- actually touch ghosted files + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 - fix sysv file From fedora-extras-commits at redhat.com Mon Jul 4 15:09:47 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:09:47 -0400 Subject: rpms/ebtables/devel ebtables.spec,1.2,1.3 Message-ID: <200507041510.j64FAIHa025872@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25822/devel Modified Files: ebtables.spec Log Message: Fix ghosted files. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ebtables.spec 1 Jul 2005 16:27:11 -0000 1.2 +++ ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -38,6 +38,9 @@ install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes install -D -m0644 ebtables.8 $RPM_BUILD_ROOT%{_mandir}/man8/ebtables.8 +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.filter +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.nat +touch $RPM_BUILD_ROOT%{_sysconfdir}/ebtables.broute %clean rm -rf $RPM_BUILD_ROOT @@ -68,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 +- actually touch ghosted files + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.6-5 - fix sysv file From fedora-extras-commits at redhat.com Mon Jul 4 15:15:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:15:42 -0400 Subject: common tobuild,1.1737,1.1738 Message-ID: <200507041515.j64FFgCi025946@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25929 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1737 retrieving revision 1.1738 diff -u -r1.1737 -r1.1738 --- tobuild 4 Jul 2005 14:47:51 -0000 1.1737 +++ tobuild 4 Jul 2005 15:15:40 -0000 1.1738 @@ -21,3 +21,4 @@ adrian rpms/most/devel most-4_10_1-1_fc5 devel spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 +spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 15:16:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:16:24 -0400 Subject: common tobuild,1.1738,1.1739 Message-ID: <200507041516.j64FGOhj026008@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25991 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1738 retrieving revision 1.1739 diff -u -r1.1738 -r1.1739 --- tobuild 4 Jul 2005 15:15:40 -0000 1.1738 +++ tobuild 4 Jul 2005 15:16:22 -0000 1.1739 @@ -22,3 +22,4 @@ spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 +spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 15:18:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:18:32 -0400 Subject: common tobuild,1.1739,1.1740 Message-ID: <200507041518.j64FIW1d026090@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26073 Modified Files: tobuild Log Message: request build of rpms/xbase/FC-3 xbase-2_0_0-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1739 retrieving revision 1.1740 diff -u -r1.1739 -r1.1740 --- tobuild 4 Jul 2005 15:16:22 -0000 1.1739 +++ tobuild 4 Jul 2005 15:18:30 -0000 1.1740 @@ -23,3 +23,4 @@ spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 +spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 15:19:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:19:04 -0400 Subject: common tobuild,1.1740,1.1741 Message-ID: <200507041519.j64FJ4To026154@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26137 Modified Files: tobuild Log Message: request build of rpms/xbase/FC-4 xbase-2_0_0-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1740 retrieving revision 1.1741 diff -u -r1.1740 -r1.1741 --- tobuild 4 Jul 2005 15:18:30 -0000 1.1740 +++ tobuild 4 Jul 2005 15:19:02 -0000 1.1741 @@ -24,3 +24,4 @@ spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 +spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 15:36:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:36:25 -0400 Subject: rpms/R/FC-3 R.spec,1.7,1.8 Message-ID: <200507041536.j64FatY8026347@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300/FC-3 Modified Files: R.spec Log Message: Fix version numbers on supplemental provides, fix postun for FC-3 spec. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- R.spec 20 Jun 2005 14:13:17 -0000 1.7 +++ R.spec 4 Jul 2005 15:36:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: R Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -19,31 +19,31 @@ # depend on one of these submodules rather than just R. These are # provided for packager convenience. Provides: R-base = %{version} -Provides: R-boot = %{version} +Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = %{version} +Provides: R-cluster = 1.10.0 Provides: R-datasets = %{version} -Provides: R-foreign = %{version} +Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = %{version} -Provides: R-lattice = %{version} +Provides: R-KernSmooth = 2.22 +Provides: R-lattice = 0.11 Provides: R-MASS = %{version} Provides: R-methods = %{version} -Provides: R-mgcv = %{version} -Provides: R-nlme = %{version} +Provides: R-mgcv = 1.3 +Provides: R-nlme = 3.1 Provides: R-nnet = %{version} -Provides: R-rpart = %{version} +Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = %{version} +Provides: R-survival = 2.18 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = %{version} +Provides: R-VR = 7.2 # Temporary fix to avoid the SNAFU of the 0.fdr.2.* release Conflicts: R-devel < %{version}-%{release} @@ -187,9 +187,6 @@ done /sbin/ldconfig -%postun -/sbin/ldconfig - # Update package indices %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists > /dev/null 2>/dev/null %__cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt 2>/dev/null @@ -209,6 +206,9 @@ %__rm -f %{_libdir}/R/doc/html/search/index.txt fi +%postun +/sbin/ldconfig + %post -n libRmath /sbin/ldconfig @@ -216,6 +216,9 @@ /sbin/ldconfig %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.1.1-2 +- fix version numbers on supplemental package provides + * Mon Jun 20 2005 Tom "spot" Callaway 2.1.1-1 - bugfix update From fedora-extras-commits at redhat.com Mon Jul 4 15:36:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:36:26 -0400 Subject: rpms/R/devel R.spec,1.6,1.7 Message-ID: <200507041536.j64FauRL026351@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300/devel Modified Files: R.spec Log Message: Fix version numbers on supplemental provides, fix postun for FC-3 spec. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/devel/R.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- R.spec 20 Jun 2005 14:13:21 -0000 1.6 +++ R.spec 4 Jul 2005 15:36:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: R Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -19,31 +19,31 @@ # depend on one of these submodules rather than just R. These are # provided for packager convenience. Provides: R-base = %{version} -Provides: R-boot = %{version} +Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = %{version} +Provides: R-cluster = 1.10.0 Provides: R-datasets = %{version} -Provides: R-foreign = %{version} +Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = %{version} -Provides: R-lattice = %{version} +Provides: R-KernSmooth = 2.22 +Provides: R-lattice = 0.11 Provides: R-MASS = %{version} Provides: R-methods = %{version} -Provides: R-mgcv = %{version} -Provides: R-nlme = %{version} +Provides: R-mgcv = 1.3 +Provides: R-nlme = 3.1 Provides: R-nnet = %{version} -Provides: R-rpart = %{version} +Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = %{version} +Provides: R-survival = 2.18 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = %{version} +Provides: R-VR = 7.2 # Temporary fix to avoid the SNAFU of the 0.fdr.2.* release Conflicts: R-devel < %{version}-%{release} @@ -216,6 +216,9 @@ /sbin/ldconfig %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.1.1-2 +- fix version numbers on supplemental package provides + * Mon Jun 20 2005 Tom "spot" Callaway 2.1.1-1 - bugfix update From fedora-extras-commits at redhat.com Mon Jul 4 15:36:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:36:26 -0400 Subject: rpms/R/FC-4 R.spec,1.6,1.7 Message-ID: <200507041537.j64FauXV026350@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300/FC-4 Modified Files: R.spec Log Message: Fix version numbers on supplemental provides, fix postun for FC-3 spec. Index: R.spec =================================================================== RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- R.spec 20 Jun 2005 14:13:21 -0000 1.6 +++ R.spec 4 Jul 2005 15:36:24 -0000 1.7 @@ -1,6 +1,6 @@ Name: R Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A language for data analysis and graphics URL: http://www.r-project.org Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz @@ -19,31 +19,31 @@ # depend on one of these submodules rather than just R. These are # provided for packager convenience. Provides: R-base = %{version} -Provides: R-boot = %{version} +Provides: R-boot = 1.2 Provides: R-class = %{version} -Provides: R-cluster = %{version} +Provides: R-cluster = 1.10.0 Provides: R-datasets = %{version} -Provides: R-foreign = %{version} +Provides: R-foreign = 0.8 Provides: R-graphics = %{version} Provides: R-grDevices = %{version} Provides: R-grid = %{version} -Provides: R-KernSmooth = %{version} -Provides: R-lattice = %{version} +Provides: R-KernSmooth = 2.22 +Provides: R-lattice = 0.11 Provides: R-MASS = %{version} Provides: R-methods = %{version} -Provides: R-mgcv = %{version} -Provides: R-nlme = %{version} +Provides: R-mgcv = 1.3 +Provides: R-nlme = 3.1 Provides: R-nnet = %{version} -Provides: R-rpart = %{version} +Provides: R-rpart = 3.1 Provides: R-spatial = %{version} Provides: R-splines = %{version} Provides: R-stats = %{version} Provides: R-stats4 = %{version} -Provides: R-survival = %{version} +Provides: R-survival = 2.18 Provides: R-tcltk = %{version} Provides: R-tools = %{version} Provides: R-utils = %{version} -Provides: R-VR = %{version} +Provides: R-VR = 7.2 # Temporary fix to avoid the SNAFU of the 0.fdr.2.* release Conflicts: R-devel < %{version}-%{release} @@ -216,6 +216,9 @@ /sbin/ldconfig %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.1.1-2 +- fix version numbers on supplemental package provides + * Mon Jun 20 2005 Tom "spot" Callaway 2.1.1-1 - bugfix update From fedora-extras-commits at redhat.com Mon Jul 4 15:38:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:38:54 -0400 Subject: common tobuild,1.1741,1.1742 Message-ID: <200507041538.j64FcsrA026428@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26411 Modified Files: tobuild Log Message: request build of rpms/R/FC-3 R-2_1_1-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1741 retrieving revision 1.1742 diff -u -r1.1741 -r1.1742 --- tobuild 4 Jul 2005 15:19:02 -0000 1.1741 +++ tobuild 4 Jul 2005 15:38:52 -0000 1.1742 @@ -25,3 +25,4 @@ spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 +spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 15:39:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 11:39:10 -0400 Subject: common tobuild,1.1742,1.1743 Message-ID: <200507041539.j64FdAX2026510@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26493 Modified Files: tobuild Log Message: request build of rpms/R/FC-4 R-2_1_1-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1742 retrieving revision 1.1743 diff -u -r1.1742 -r1.1743 --- tobuild 4 Jul 2005 15:38:52 -0000 1.1742 +++ tobuild 4 Jul 2005 15:39:08 -0000 1.1743 @@ -26,3 +26,4 @@ spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 +spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 15:39:29 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:39:29 -0400 Subject: rpms/libevent/devel - New directory Message-ID: <200507041539.j64FdT8F026547@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26518/libevent/devel Log Message: Directory /cvs/extras/rpms/libevent/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 15:39:28 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:39:28 -0400 Subject: rpms/libevent - New directory Message-ID: <200507041539.j64FdSQ6026542@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26518/libevent Log Message: Directory /cvs/extras/rpms/libevent added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 15:40:03 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:40:03 -0400 Subject: rpms/libevent Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507041540.j64Fe3Hg026590@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563 Added Files: Makefile import.log Log Message: Setup of module libevent --- NEW FILE Makefile --- # Top level Makefile for module libevent all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 4 15:40:04 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:40:04 -0400 Subject: rpms/libevent/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507041540.j64Fe4rB026595@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libevent --- NEW 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 Jul 4 15:41:27 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:41:27 -0400 Subject: rpms/libevent import.log,1.1,1.2 Message-ID: <200507041541.j64FfRIP026659@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26628 Modified Files: import.log Log Message: auto-import libevent-1.1a-1 on branch devel from libevent-1.1a-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libevent/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2005 15:40:01 -0000 1.1 +++ import.log 4 Jul 2005 15:41:24 -0000 1.2 @@ -0,0 +1 @@ +libevent-1_1a-1:HEAD:libevent-1.1a-1.src.rpm:1120491656 From fedora-extras-commits at redhat.com Mon Jul 4 15:41:27 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:41:27 -0400 Subject: rpms/libevent/devel libevent.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507041541.j64FfRwj026666@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26628/devel Modified Files: .cvsignore sources Added Files: libevent.spec Log Message: auto-import libevent-1.1a-1 on branch devel from libevent-1.1a-1.src.rpm --- NEW FILE libevent.spec --- Name: libevent Version: 1.1a Release: 1%{?dist} Summary: Abstract asynchronous event notification library Group: System Environment/Libraries License: BSD URL: http://monkey.org/~provos/libevent/ Source0: http://monkey.org/~provos/libevent-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. libevent is meant to replace the asynchronous event loop found in event driven network servers. An application just needs to call event_dispatch() and can then add or remove events dynamically without having to change the event loop. %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q %build %configure \ --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la %check make verify %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,0755) %doc README %{_libdir}/libevent-%{version}.so.* %files devel %defattr(-,root,root,0755) %doc sample/*.c %{_includedir}/event.h %{_libdir}/libevent.so %{_libdir}/libevent.a %{_mandir}/man3/* %changelog * Fri Jun 17 2005 Ralf Ertzinger - 1.1a-1%{?dist} - Upstream update * Wed Jun 08 2005 Ralf Ertzinger - 1.1-2%{?dist} - Added some docs - Moved "make verify" into %%check * Mon Jun 06 2005 Ralf Ertzinger - 1.1-1%{?dist} - Initial build for Fedora Extras, based on the package by Dag Wieers Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libevent/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2005 15:40:02 -0000 1.1 +++ .cvsignore 4 Jul 2005 15:41:25 -0000 1.2 @@ -0,0 +1 @@ +libevent-1.1a.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libevent/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2005 15:40:02 -0000 1.1 +++ sources 4 Jul 2005 15:41:25 -0000 1.2 @@ -0,0 +1 @@ +6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz From fedora-extras-commits at redhat.com Mon Jul 4 15:45:13 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Mon, 4 Jul 2005 11:45:13 -0400 Subject: rpms/libevent/devel libevent.spec,1.1,1.2 Message-ID: <200507041545.j64FjDWG026723@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/rpms/libevent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26704 Modified Files: libevent.spec Log Message: Removed unnecessady -r from rm Index: libevent.spec =================================================================== RCS file: /cvs/extras/rpms/libevent/devel/libevent.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libevent.spec 4 Jul 2005 15:41:25 -0000 1.1 +++ libevent.spec 4 Jul 2005 15:45:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: libevent Version: 1.1a -Release: 1%{?dist} +Release: 2%{?dist} Summary: Abstract asynchronous event notification library Group: System Environment/Libraries @@ -42,7 +42,7 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %check make verify @@ -72,6 +72,9 @@ %changelog +* Mon Jul 04 2005 Ralf Ertzinger - 1.1a-2%{?dist} +- Removed unnecessary -r from rm + * Fri Jun 17 2005 Ralf Ertzinger - 1.1a-1%{?dist} - Upstream update From fedora-extras-commits at redhat.com Mon Jul 4 16:00:58 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 12:00:58 -0400 Subject: common tobuild,1.1743,1.1744 Message-ID: <200507041600.j64G0wC7026782@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1743 retrieving revision 1.1744 diff -u -r1.1743 -r1.1744 --- tobuild 4 Jul 2005 15:39:08 -0000 1.1743 +++ tobuild 4 Jul 2005 16:00:56 -0000 1.1744 @@ -27,3 +27,4 @@ spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 +spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 From ed at eh3.com Mon Jul 4 16:52:46 2005 From: ed at eh3.com (Ed Hill) Date: Mon, 04 Jul 2005 12:52:46 -0400 Subject: APPROVED: hdf5 Message-ID: <1120495966.10305.61.camel@ernie> hdf5: A general purpose library and file format for storing scientific data HDF5 is a general purpose library and file format for storing scientific data. HDF5 can store two primary objects: datasets and groups. A dataset is essentially a multidimensional array of data elements, and a group is a structure for organizing objects in an HDF5 file. Using these two basic objects, one can create and store almost any kind of scientific data structure, such as images, arrays of vectors, and structured and unstructured grids. You can also mix and match them in HDF5 files according to your needs. Maintainer: Orion Poplawski Reviewers: Tom 'spot' Callaway, Ed Hill [ And yes, Tom wrote part of the spec and perhaps ought to be listed as a co-author rather than reviewer. Whatever. ;-) ] -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From ed at eh3.com Mon Jul 4 16:55:52 2005 From: ed at eh3.com (Ed Hill) Date: Mon, 04 Jul 2005 12:55:52 -0400 Subject: APPROVED: R-hdf5 Message-ID: <1120496152.10305.66.camel@ernie> R-hdf5 provides an interface to the NCSA HDF5 library for R. Maintainer: Tom 'spot' Callaway Reviewer: Ed Hill -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Mon Jul 4 17:03:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:03:40 -0400 Subject: rpms/R-hdf5 - New directory Message-ID: <200507041703.j64H3eMf029227@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29217/R-hdf5 Log Message: Directory /cvs/extras/rpms/R-hdf5 added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 17:04:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:04:00 -0400 Subject: rpms/R-hdf5/devel - New directory Message-ID: <200507041704.j64H40PL029239@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29217/R-hdf5/devel Log Message: Directory /cvs/extras/rpms/R-hdf5/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 4 17:04:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:04:40 -0400 Subject: rpms/R-hdf5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507041704.j64H4e6T029289@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-hdf5 --- NEW 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 Jul 4 17:04:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:04:36 -0400 Subject: rpms/R-hdf5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507041704.j64H4apR029276@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29262 Added Files: Makefile import.log Log Message: Setup of module R-hdf5 --- NEW FILE Makefile --- # Top level Makefile for module R-hdf5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 4 17:06:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:06:29 -0400 Subject: rpms/R-hdf5 import.log,1.1,1.2 Message-ID: <200507041706.j64H6TTQ029366@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329 Modified Files: import.log Log Message: auto-import R-hdf5-1.6.0-1 on branch devel from R-hdf5-1.6.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/R-hdf5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Jul 2005 17:04:34 -0000 1.1 +++ import.log 4 Jul 2005 17:06:14 -0000 1.2 @@ -0,0 +1 @@ +R-hdf5-1_6_0-1:HEAD:R-hdf5-1.6.0-1.src.rpm:1120496820 From fedora-extras-commits at redhat.com Mon Jul 4 17:06:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:06:29 -0400 Subject: rpms/R-hdf5/devel R-hdf5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507041706.j64H6TcW029364@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29329/devel Modified Files: .cvsignore sources Added Files: R-hdf5.spec Log Message: auto-import R-hdf5-1.6.0-1 on branch devel from R-hdf5-1.6.0-1.src.rpm --- NEW FILE R-hdf5.spec --- %define packrel 0 %define packname hdf5 Name: R-%{packname} Version: 1.6.0 Release: 1%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: GPL version 2 or later URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: Interface to the NCSA HDF5 library BuildRequires: R-devel, tetex-latex, hdf5-devel, zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description R package: Interface to the NCSA HDF5 library %prep %setup -T -c -a 0 %build cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library %{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css %clean rm -rf $RPM_BUILD_ROOT %post %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun %{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %doc DESCRIPTION %{_libdir}/R/library/%{packname} %changelog * Mon Jul 4 2005 Tom "spot" Callaway 1.6.0-1 - Initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-hdf5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Jul 2005 17:04:38 -0000 1.1 +++ .cvsignore 4 Jul 2005 17:06:14 -0000 1.2 @@ -0,0 +1 @@ +hdf5_1.6.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-hdf5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Jul 2005 17:04:38 -0000 1.1 +++ sources 4 Jul 2005 17:06:14 -0000 1.2 @@ -0,0 +1 @@ +f5d078882fc20f6755c625e12df0a10b hdf5_1.6.0.tar.gz From fedora-extras-commits at redhat.com Mon Jul 4 17:09:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:09:48 -0400 Subject: rpms/ebtables/devel ebtables.spec,1.3,1.4 Message-ID: <200507041709.j64H9mYO029685@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29638/devel Modified Files: ebtables.spec Log Message: Buildsystem error requires release increment. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 +++ ebtables.spec 4 Jul 2005 17:09:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -71,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-7 +- buildsystem error requires artificial release bump + * Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 - actually touch ghosted files From fedora-extras-commits at redhat.com Mon Jul 4 17:09:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:09:43 -0400 Subject: rpms/ebtables/FC-3 ebtables.spec,1.3,1.4 Message-ID: <200507041710.j64HADmm029688@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29638/FC-3 Modified Files: ebtables.spec Log Message: Buildsystem error requires release increment. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ebtables.spec 4 Jul 2005 15:09:44 -0000 1.3 +++ ebtables.spec 4 Jul 2005 17:09:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -71,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-7 +- buildsystem error requires artificial release bump + * Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 - actually touch ghosted files From fedora-extras-commits at redhat.com Mon Jul 4 17:09:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:09:43 -0400 Subject: rpms/ebtables/FC-4 ebtables.spec,1.3,1.4 Message-ID: <200507041710.j64HADAN029691@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29638/FC-4 Modified Files: ebtables.spec Log Message: Buildsystem error requires release increment. Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ebtables.spec 4 Jul 2005 15:09:45 -0000 1.3 +++ ebtables.spec 4 Jul 2005 17:09:41 -0000 1.4 @@ -1,6 +1,6 @@ Name: ebtables Version: 2.0.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -71,6 +71,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-7 +- buildsystem error requires artificial release bump + * Mon Jul 4 2005 Tom "spot" Callaway 2.0.6-6 - actually touch ghosted files From fedora-extras-commits at redhat.com Mon Jul 4 17:11:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:11:24 -0400 Subject: common tobuild,1.1744,1.1745 Message-ID: <200507041711.j64HBOX4029754@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29737 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1744 retrieving revision 1.1745 diff -u -r1.1744 -r1.1745 --- tobuild 4 Jul 2005 16:00:56 -0000 1.1744 +++ tobuild 4 Jul 2005 17:11:22 -0000 1.1745 @@ -28,3 +28,4 @@ spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 +spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 17:11:52 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:11:52 -0400 Subject: common tobuild,1.1745,1.1746 Message-ID: <200507041711.j64HBqiH029816@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29799 Modified Files: tobuild Log Message: request build of rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1745 retrieving revision 1.1746 diff -u -r1.1745 -r1.1746 --- tobuild 4 Jul 2005 17:11:22 -0000 1.1745 +++ tobuild 4 Jul 2005 17:11:50 -0000 1.1746 @@ -29,3 +29,4 @@ spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 +spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 17:12:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 4 Jul 2005 13:12:30 -0400 Subject: common tobuild,1.1746,1.1747 Message-ID: <200507041712.j64HCUZi029844@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29827 Modified Files: tobuild Log Message: cleaning up my trash. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1746 retrieving revision 1.1747 diff -u -r1.1746 -r1.1747 --- tobuild 4 Jul 2005 17:11:50 -0000 1.1746 +++ tobuild 4 Jul 2005 17:12:28 -0000 1.1747 @@ -27,6 +27,5 @@ spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 -spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 4 17:29:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 4 Jul 2005 13:29:48 -0400 Subject: devel/libassuan libassuan.spec,1.9,1.10 Message-ID: <200507041729.j64HTnS5029925@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/libassuan In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29908 Modified Files: libassuan.spec Log Message: * Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 - Build PIC only for x86_64. Index: libassuan.spec =================================================================== RCS file: /cvs/extras/devel/libassuan/libassuan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libassuan.spec 2 Jul 2005 07:31:45 -0000 1.9 +++ libassuan.spec 4 Jul 2005 17:29:46 -0000 1.10 @@ -1,7 +1,7 @@ Summary: GnuPG IPC library Name: libassuan Version: 0.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz.sig URL: http://www.gnupg.org/ @@ -18,6 +18,7 @@ Group: Development/Libraries Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description devel This is the IPC library used by GnuPG 1.9, GPGME and a few other packages. @@ -30,9 +31,12 @@ %build +%ifarch x86_64 +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%endif %configure -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %{?_smp_mflags} +make %{?_smp_mflags} %install @@ -78,6 +82,9 @@ %changelog +* Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 +- Build PIC only for x86_64. + * Fri Jul 1 2005 Ville Skytt?? - 0.6.10-1 - 0.6.10, macro patch no longer needed (#162262). From fedora-extras-commits at redhat.com Mon Jul 4 17:31:22 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 4 Jul 2005 13:31:22 -0400 Subject: common tobuild,1.1747,1.1748 Message-ID: <200507041731.j64HVMO1029993@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29976 Modified Files: tobuild Log Message: request build of rpms/libassuan/devel libassuan-0_6_10-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1747 retrieving revision 1.1748 diff -u -r1.1747 -r1.1748 --- tobuild 4 Jul 2005 17:12:28 -0000 1.1747 +++ tobuild 4 Jul 2005 17:31:20 -0000 1.1748 @@ -29,3 +29,4 @@ spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 +mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel From ivazquez at ivazquez.net Mon Jul 4 18:34:03 2005 From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams) Date: Mon, 04 Jul 2005 14:34:03 -0400 Subject: common tobuild,1.1704,1.1705 In-Reply-To: <200507020349.j623nisF006644@cvs-int.fedora.redhat.com> References: <200507020349.j623nisF006644@cvs-int.fedora.redhat.com> Message-ID: <1120502043.15363.31.camel@ignacio.ignacio.lan> On Fri, 2005-07-01 at 23:49 -0400, Ralf Cors?pius wrote: > Author: corsepiu > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6625 > > Modified Files: > tobuild > Log Message: > request build of rpms/perl-Want/FC-3 perl-Want-0_08-3_fc3 for fc3 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.1704 > retrieving revision 1.1705 > diff -u -r1.1704 -r1.1705 > --- tobuild 2 Jul 2005 03:49:01 -0000 1.1704 > +++ tobuild 2 Jul 2005 03:49:42 -0000 1.1705 > @@ -1,23 +1 @@ > -# this is the build control file. the format is > -# user repo tag target status > -# > - [...] > - [...] > - [...] > - [...] > - [...] Whoops. If anyone was wondering why their packages aren't building, this is why. -- Ignacio Vazquez-Abrams http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Mon Jul 4 18:33:38 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 14:33:38 -0400 Subject: common tobuild,1.1748,1.1749 Message-ID: <200507041833.j64IXcrR031178@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31161 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1748 retrieving revision 1.1749 diff -u -r1.1748 -r1.1749 --- tobuild 4 Jul 2005 17:31:20 -0000 1.1748 +++ tobuild 4 Jul 2005 18:33:36 -0000 1.1749 @@ -30,3 +30,4 @@ spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 21:19:54 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 4 Jul 2005 17:19:54 -0400 Subject: common tobuild,1.1749,1.1750 Message-ID: <200507042119.j64LJsD3002374@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2357 Modified Files: tobuild Log Message: request build of rpms/cln/devel cln-1_1_9-8_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1749 retrieving revision 1.1750 diff -u -r1.1749 -r1.1750 --- tobuild 4 Jul 2005 18:33:36 -0000 1.1749 +++ tobuild 4 Jul 2005 21:19:52 -0000 1.1750 @@ -31,3 +31,4 @@ spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel +qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 21:29:02 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Mon, 4 Jul 2005 17:29:02 -0400 Subject: common tobuild,1.1750,1.1751 Message-ID: <200507042129.j64LT2PD002462@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2445 Modified Files: tobuild Log Message: request build of rpms/octave/devel octave-2_1_71-11_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1750 retrieving revision 1.1751 diff -u -r1.1750 -r1.1751 --- tobuild 4 Jul 2005 21:19:52 -0000 1.1750 +++ tobuild 4 Jul 2005 21:29:00 -0000 1.1751 @@ -32,3 +32,4 @@ mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel +qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 21:45:53 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 4 Jul 2005 17:45:53 -0400 Subject: common tobuild,1.1751,1.1752 Message-ID: <200507042145.j64LjrTl002506@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2489 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1751 retrieving revision 1.1752 diff -u -r1.1751 -r1.1752 --- tobuild 4 Jul 2005 21:29:00 -0000 1.1751 +++ tobuild 4 Jul 2005 21:45:50 -0000 1.1752 @@ -1,13 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -jfontain rpms/moodss/devel moodss-20_2-1_fc5 devel -jfontain rpms/moomps/devel moomps-5_2-1_fc5 devel -tibbs rpms/denyhosts/FC-3 denyhosts-0_6_0-1_fc3 fc3 -tibbs rpms/denyhosts/FC-4 denyhosts-0_6_0-1_fc4 fc4 -tibbs rpms/denyhosts/devel denyhosts-0_6_0-1_fc5 devel -dragoon rpms/gnome-applet-sensors/FC-3 gnome-applet-sensors-1_0-1_fc3 fc3 -dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 4 22:52:48 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 18:52:48 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.1,1.2 Message-ID: <200507042252.j64MqmIa004202@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4185/devel Modified Files: mod_suphp.spec Log Message: added correct -n target to %setup Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_suphp.spec 30 Jun 2005 20:21:49 -0000 1.1 +++ mod_suphp.spec 4 Jul 2005 22:52:46 -0000 1.2 @@ -25,7 +25,7 @@ process executing the PHP interpreter. %prep -%setup -q +%setup -q -n suphp-%{version} %build %configure \ From fedora-extras-commits at redhat.com Mon Jul 4 22:54:35 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 18:54:35 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.2,1.3 Message-ID: <200507042254.j64MsZo8004257@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4240 Modified Files: mod_suphp.spec Log Message: bumped release. Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_suphp.spec 4 Jul 2005 22:52:46 -0000 1.2 +++ mod_suphp.spec 4 Jul 2005 22:54:33 -0000 1.3 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,6 +66,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 +- Added correct name to %setup macro + * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Mon Jul 4 22:55:07 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 4 Jul 2005 18:55:07 -0400 Subject: common tobuild,1.1752,1.1753 Message-ID: <200507042255.j64Mt7Yb004319@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1752 retrieving revision 1.1753 diff -u -r1.1752 -r1.1753 --- tobuild 4 Jul 2005 21:45:50 -0000 1.1752 +++ tobuild 4 Jul 2005 22:55:05 -0000 1.1753 @@ -26,3 +26,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 4 23:27:32 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Mon, 4 Jul 2005 19:27:32 -0400 Subject: rpms/balsa/devel .cvsignore, 1.4, 1.5 balsa.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507042327.j64NRWF1005471@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5450 Modified Files: .cvsignore balsa.spec sources Log Message: - update to upstream version 2.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 6 Jun 2005 22:30:17 -0000 1.4 +++ .cvsignore 4 Jul 2005 23:27:30 -0000 1.5 @@ -1,2 +1,2 @@ +balsa-2.3.4.tar.bz2 gmime-2.1.14.tar.bz2 -balsa-2.3.3.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- balsa.spec 14 Jun 2005 17:22:11 -0000 1.7 +++ balsa.spec 4 Jul 2005 23:27:30 -0000 1.8 @@ -2,7 +2,7 @@ %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings --with-ssl --with-gss Name: balsa -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: Mail Client @@ -29,16 +29,20 @@ BuildRequires: desktop-file-utils %description -Balsa is an e-mail reader. This client is part of the GNOME -desktop environment. It supports local mailboxes, POP3 and -IMAP. +Balsa is a GNOME email client which supports mbox, maildir, and mh +local mailboxes, and IMAP4 and POP3 remote mailboxes. Email can be +sent via sendmail or SMTP. Optional multithreading support allows for +non-intrusive retrieval and sending of mail. A finished GUI similar to +that of the Eudora email client supports viewing images inline, saving +message parts, viewing headers, adding attachments, moving messages, +and printing messages. %prep %setup -q -D -a 1 %build -dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-shared && make install; cd $dir +dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-gtk-doc --disable-shared && make install; cd $dir export PKG_CONFIG_PATH="gmime-%{gmimever}:$PKG_CONFIG_PATH" %configure %{config_opts} @@ -89,6 +93,9 @@ %changelog +* Tue Jul 5 2005 Pawel Salek - 2.3.4 +- update to upstream version 2.3.4 + * Tue Jun 14 2005 Pawel Salek - 2.3.3 - directory ownership cleanup (credit to Michael Schwendt). Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 6 Jun 2005 22:30:17 -0000 1.4 +++ sources 4 Jul 2005 23:27:30 -0000 1.5 @@ -1,2 +1,2 @@ +12b1ffb936ac679468adb33b422b72d8 balsa-2.3.4.tar.bz2 ee1c2d0c1f76ae113f0dd70893bbacf4 gmime-2.1.14.tar.bz2 -ac43ab8ca5ccc6782daac21e370b8605 balsa-2.3.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 4 23:32:38 2005 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Mon, 4 Jul 2005 19:32:38 -0400 Subject: common tobuild,1.1753,1.1754 Message-ID: <200507042332.j64NWc3t005528@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5511 Modified Files: tobuild Log Message: request build of rpms/balsa/devel balsa-2_3_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1753 retrieving revision 1.1754 diff -u -r1.1753 -r1.1754 --- tobuild 4 Jul 2005 22:55:05 -0000 1.1753 +++ tobuild 4 Jul 2005 23:32:36 -0000 1.1754 @@ -27,3 +27,4 @@ qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel +pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel From tcallawa at redhat.com Tue Jul 5 00:27:08 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 19:27:08 -0500 Subject: APPROVED: wv2 Message-ID: <1120523228.30349.9.camel@localhost.localdomain> Name: wv2 Summary: A library which allows access to Microsoft? Word files Description: wv is a library which allows access to Microsoft? Word files. It can load and parse Word 2000, 97, 95 and 6 file formats. (These are the file formats known internally as Word 9, 8, 7 and 6.) There is some support for reading earlier formats as well: Word 2 docs are converted to plaintext. Reviewer: Tom 'spot' Callaway Maintainer: Andreas Bierfert ~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 tcallawa at redhat.com Tue Jul 5 00:28:27 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 04 Jul 2005 19:28:27 -0500 Subject: APPROVED: libpqxx Message-ID: <1120523307.30349.12.camel@localhost.localdomain> Name: libpqxx Summary: C++ client API for PostgreSQL Description: C++ client API for PostgreSQL. The standard front-end (in the sense of "language binding") for writing C++ programs that use PostgreSQL. Supersedes older libpq++ interface. Reviewer: Tom 'spot' Callaway Maintainer: Andreas Bierfert ~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 Tue Jul 5 00:33:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 4 Jul 2005 20:33:03 -0400 Subject: devel/gai-temp gai-temp.spec,1.5,1.6 Message-ID: <200507050033.j650X3lH006759@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/gai-temp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6742 Modified Files: gai-temp.spec Log Message: fix typo in changelog - unimportant, but should not make it into a future update Index: gai-temp.spec =================================================================== RCS file: /cvs/extras/devel/gai-temp/gai-temp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gai-temp.spec 28 Jun 2005 16:11:04 -0000 1.5 +++ gai-temp.spec 5 Jul 2005 00:33:01 -0000 1.6 @@ -44,7 +44,7 @@ %changelog * Tue Jun 28 2005 Michael Schwendt -- remove work-around from 1.0.3-5 again, bug has been fixed +- remove work-around from 0.1.1-2 again, bug has been fixed * Mon Jun 27 2005 Michael Schwendt - 0.1.1-2 - temporarily add BR libpng-devel to work around a broken From fedora-extras-commits at redhat.com Tue Jul 5 00:45:49 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 20:45:49 -0400 Subject: rpms/scim/devel .cvsignore, 1.3, 1.4 scim.spec, 1.4, 1.5 sources, 1.3, 1.4 xinput-scim, 1.2, 1.3 Message-ID: <200507050045.j650jn9B006856@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6833 Modified Files: .cvsignore scim.spec sources xinput-scim Log Message: - update to 1.3.2 test release - don't set xinput.d script executable - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 May 2005 01:35:21 -0000 1.3 +++ .cvsignore 5 Jul 2005 00:45:47 -0000 1.4 @@ -1 +1 @@ -scim-1.2.3.tar.gz +scim-1.3.2.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim.spec 20 Jun 2005 14:39:21 -0000 1.4 +++ scim.spec 5 Jul 2005 00:45:47 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -10,7 +10,7 @@ Source1: xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: %{_bindir}/update-gtk-immodules +PreReq: %{_bindir}/update-gtk-immodules BuildRequires: gtk2-devel, desktop-file-utils %description @@ -66,7 +66,7 @@ # install xinput config file. mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d -install -pm 755 %{SOURCE1} \ +install -pm 644 %{SOURCE1} \ ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim @@ -134,6 +134,11 @@ %changelog +* Tue Jul 5 2005 Jens Petersen - 1.3.2-1 +- update to 1.3.2 test release +- don't set xinput.d script executable +- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script + * Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 - Remove one of doubled capplets for setup. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 May 2005 01:35:21 -0000 1.3 +++ sources 5 Jul 2005 00:45:47 -0000 1.4 @@ -1 +1 @@ -9031648718cbeb10aea879726f0e9d5b scim-1.2.3.tar.gz +94a808c6a2d952d7842a4e9bfe71a7bc scim-1.3.2.tar.gz Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xinput-scim 20 Jun 2005 14:39:21 -0000 1.2 +++ xinput-scim 5 Jul 2005 00:45:47 -0000 1.3 @@ -1,6 +1,5 @@ -XMODIFIERS=@im=SCIM XIM=SCIM XIM_PROGRAM=scim XIM_ARGS="-d" GTK_IM_MODULE=scim -QT_IM_MODULES=scim +#QT_IM_MODULE=scim From fedora-extras-commits at redhat.com Tue Jul 5 00:46:22 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 20:46:22 -0400 Subject: common tobuild,1.1754,1.1755 Message-ID: <200507050046.j650kMq3006918@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6901 Modified Files: tobuild Log Message: request build of rpms/scim/devel scim-1_3_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1754 retrieving revision 1.1755 diff -u -r1.1754 -r1.1755 --- tobuild 4 Jul 2005 23:32:36 -0000 1.1754 +++ tobuild 5 Jul 2005 00:46:20 -0000 1.1755 @@ -28,3 +28,4 @@ qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel +petersen rpms/scim/devel scim-1_3_2-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 03:07:24 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 23:07:24 -0400 Subject: rpms/darcs/devel darcs.spec,1.2,1.3 Message-ID: <200507050307.j6537sT7010311@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253 Modified Files: darcs.spec Log Message: drop superfluous doc buildrequires (Karanbir Singh, #162436) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- darcs.spec 1 Jul 2005 05:26:47 -0000 1.2 +++ darcs.spec 5 Jul 2005 03:07:21 -0000 1.3 @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel -# for documentation -BuildRequires: tetex-latex, tetex-dvips, latex2html # for make check BuildRequires: which @@ -85,6 +83,9 @@ %changelog +* Tue Jul 5 2005 Jens Petersen +- drop superfluous doc buildrequires (Karanbir Singh, #162436) + * Fri Jul 1 2005 Jens Petersen - 1.0.3-2 - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and From fedora-extras-commits at redhat.com Tue Jul 5 03:11:17 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 23:11:17 -0400 Subject: rpms/darcs/FC-4 darcs.spec,1.3,1.4 Message-ID: <200507050311.j653BH0w010340@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10323 Modified Files: darcs.spec Log Message: drop superfluous doc buildrequires (Karanbir Singh, #162436) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- darcs.spec 1 Jul 2005 12:18:05 -0000 1.3 +++ darcs.spec 5 Jul 2005 03:11:15 -0000 1.4 @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel -# for documentation -BuildRequires: tetex-latex, tetex-dvips, latex2html # for make check BuildRequires: which @@ -85,6 +83,9 @@ %changelog +* Tue Jul 5 2005 Jens Petersen +- drop superfluous doc buildrequires (Karanbir Singh, #162436) + * Fri Jul 1 2005 Jens Petersen - 1.0.3-2 - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and From fedora-extras-commits at redhat.com Tue Jul 5 03:12:22 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Mon, 4 Jul 2005 23:12:22 -0400 Subject: rpms/darcs/FC-3 darcs.spec,1.2,1.3 Message-ID: <200507050312.j653CMcv010368@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10351 Modified Files: darcs.spec Log Message: drop superfluous doc buildrequires (Karanbir Singh, #162436) Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-3/darcs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- darcs.spec 1 Jul 2005 12:19:43 -0000 1.2 +++ darcs.spec 5 Jul 2005 03:12:20 -0000 1.3 @@ -10,8 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, %{_sbindir}/sendmail, curl-devel, ncurses-devel, zlib-devel -# for documentation -BuildRequires: tetex-latex, tetex-dvips, latex2html # for make check BuildRequires: which @@ -85,6 +83,9 @@ %changelog +* Tue Jul 5 2005 Jens Petersen +- drop superfluous doc buildrequires (Karanbir Singh, #162436) + * Fri Jul 1 2005 Jens Petersen - 1.0.3-2 - fix buildrequires - add sendmail, curl-devel, ncurses-devel, zlib-devel, and From petersen at redhat.com Tue Jul 5 03:44:44 2005 From: petersen at redhat.com (Jens Petersen) Date: Tue, 05 Jul 2005 12:44:44 +0900 Subject: rpms/darcs/FC-4 darcs.spec,1.2,1.3 In-Reply-To: <20050704123550.1cb8ef39.bugs.michael@gmx.net> References: <200507011218.j61CI74X012821@cvs-int.fedora.redhat.com> <42C8CBA3.4020703@redhat.com> <1120456437.6657.4.camel@mccallum.corsepiu.local> <42C8F265.5040607@redhat.com> <20050704112649.3fb76c84.bugs.michael@gmx.net> <42C90DBC.9070103@redhat.com> <20050704123550.1cb8ef39.bugs.michael@gmx.net> Message-ID: <42CA022C.2040808@redhat.com> Michael Schwendt wrote: > On Mon, 04 Jul 2005 19:21:48 +0900, Jens Petersen wrote: > > >>Michael Schwendt wrote: >> >>>On Mon, 04 Jul 2005 17:25:09 +0900, Jens Petersen wrote: >>> >>> >>>>Ralf Corsepius wrote: >>>> >>>> >>>>>"cvs tag -F" would be a work-around. It would allow shifting existing >>>>>"tags" to where they you actually want them to be. >>>> >>>>What about the case when there is no tag to move? :) >>>> >>>>darcs/FC-4% cvs status -v|grep "darcs-1_0_3-2_fc4 " >>>>For more information on using the Fedora CVS repositories, please visit >>>>http://fedoraproject.org/wiki/UsingCvs >>>>cvs status: Examining . >>>>darcs/FC-4% >>> >>>When there is no tag, "make tag" doesn't fail. > > Errm, and then you can move it, because it is "in use", even if > you don't see the tag on your checked out files. Ok, thanks for setting me straight. :) But I'd still really rather not fiddle around with -F. I think this discussion leads to the conclusion that it would be really useful to have a "force-tag" target in Makefile.common, which does the -F invocation for one. (I can say off-the-record that it has proved invaluable under fedora core development.;) Jens Jens From fedora-extras-commits at redhat.com Tue Jul 5 06:26:27 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 02:26:27 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.19,1.20 Message-ID: <200507050626.j656QRkY013781@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13764 Modified Files: bittorrent.spec Log Message: Update release prior to requesting build Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- bittorrent.spec 4 Jul 2005 10:58:32 -0000 1.19 +++ bittorrent.spec 5 Jul 2005 06:26:25 -0000 1.20 @@ -5,7 +5,7 @@ Name: bittorrent Version: 4.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet From fedora-extras-commits at redhat.com Tue Jul 5 06:27:05 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 02:27:05 -0400 Subject: common tobuild,1.1755,1.1756 Message-ID: <200507050627.j656R59e013838@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13821 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1755 retrieving revision 1.1756 diff -u -r1.1755 -r1.1756 --- tobuild 5 Jul 2005 00:46:20 -0000 1.1755 +++ tobuild 5 Jul 2005 06:27:03 -0000 1.1756 @@ -29,3 +29,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel petersen rpms/scim/devel scim-1_3_2-1_fc5 devel +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 08:51:31 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 04:51:31 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.20,1.21 Message-ID: <200507050851.j658pV8d016918@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16901 Modified Files: bittorrent.spec Log Message: * Tue Jul 5 2005 Paul Howarth 4.1.2-3 - obsolete python-khashmir based on version-release, not just version Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bittorrent.spec 5 Jul 2005 06:26:25 -0000 1.20 +++ bittorrent.spec 5 Jul 2005 08:51:29 -0000 1.21 @@ -5,7 +5,7 @@ Name: bittorrent Version: 4.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -24,7 +24,7 @@ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Provides: python-khashmir -Obsoletes: python-khashmir < %{version} +Obsoletes: python-khashmir < %{version}-%{release} Requires(pre): %{_sbindir}/useradd Requires(post): /sbin/chkconfig @@ -205,6 +205,9 @@ %{_datadir}/pixmaps/bittorrent.png %changelog +* Tue Jul 5 2005 Paul Howarth 4.1.2-3 +- obsolete python-khashmir based on version-release, not just version + * Mon Jul 4 2005 Paul Howarth 4.1.2-2 - add Provides/Obsoletes for python-khashmir for clean upgrades from split bittorrent packages From fedora-extras-commits at redhat.com Tue Jul 5 10:20:50 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Tue, 5 Jul 2005 06:20:50 -0400 Subject: common tobuild,1.1756,1.1757 Message-ID: <200507051020.j65AKowQ019260@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19243 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1756 retrieving revision 1.1757 diff -u -r1.1756 -r1.1757 --- tobuild 5 Jul 2005 06:27:03 -0000 1.1756 +++ tobuild 5 Jul 2005 10:20:48 -0000 1.1757 @@ -30,3 +30,4 @@ pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel petersen rpms/scim/devel scim-1_3_2-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 10:45:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:45:37 -0400 Subject: rpms/wv2/FC-4 wv2.spec,1.1,1.2 Message-ID: <200507051045.j65Ajbjh019376@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19359 Modified Files: wv2.spec Log Message: - add dist tag Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/FC-4/wv2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wv2.spec 1 Jul 2005 22:40:29 -0000 1.1 +++ wv2.spec 5 Jul 2005 10:45:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 4 +Release: 5{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries @@ -67,6 +67,9 @@ %{_includedir}/wv2 %changelog +* Tue Jul 05 2005 Andreas Bierfert 0.2.2-5 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 - add some Requires for the devel package - changed some files around From fedora-extras-commits at redhat.com Tue Jul 5 10:46:17 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:46:17 -0400 Subject: rpms/wv2/FC-4 wv2.spec,1.2,1.3 Message-ID: <200507051046.j65AkHek019401@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384 Modified Files: wv2.spec Log Message: - fix typo Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/FC-4/wv2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wv2.spec 5 Jul 2005 10:45:35 -0000 1.2 +++ wv2.spec 5 Jul 2005 10:46:15 -0000 1.3 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 5{?dist} +Release: 5%{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Jul 5 10:47:10 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:47:10 -0400 Subject: common tobuild,1.1757,1.1758 Message-ID: <200507051047.j65AlAWn019463@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19446 Modified Files: tobuild Log Message: request build of rpms/wv2/FC-4 wv2-0_2_2-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1757 retrieving revision 1.1758 diff -u -r1.1757 -r1.1758 --- tobuild 5 Jul 2005 10:20:48 -0000 1.1757 +++ tobuild 5 Jul 2005 10:47:08 -0000 1.1758 @@ -31,3 +31,4 @@ petersen rpms/scim/devel scim-1_3_2-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 10:47:42 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:47:42 -0400 Subject: rpms/wv2/devel wv2.spec,1.1,1.2 Message-ID: <200507051047.j65Alg1u019488@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19469 Modified Files: wv2.spec Log Message: - add dist tag Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wv2.spec 1 Jul 2005 22:40:29 -0000 1.1 +++ wv2.spec 5 Jul 2005 10:47:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 4 +Release: 5%{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries @@ -67,6 +67,9 @@ %{_includedir}/wv2 %changelog +* Tue Jul 05 2005 Andreas Bierfert 0.2.2-5 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 0.2.2-4 - add some Requires for the devel package - changed some files around From fedora-extras-commits at redhat.com Tue Jul 5 10:48:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:48:14 -0400 Subject: common tobuild,1.1758,1.1759 Message-ID: <200507051048.j65AmEmk019553@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19535 Modified Files: tobuild Log Message: request build of rpms/wv2/devel wv2-0_2_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1758 retrieving revision 1.1759 diff -u -r1.1758 -r1.1759 --- tobuild 5 Jul 2005 10:47:08 -0000 1.1758 +++ tobuild 5 Jul 2005 10:48:12 -0000 1.1759 @@ -32,3 +32,4 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 +awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 10:49:05 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 06:49:05 -0400 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.1,1.2 Message-ID: <200507051049.j65An5Ri019612@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19595 Modified Files: mod_suphp.spec Log Message: bumped release Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-3/mod_suphp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_suphp.spec 30 Jun 2005 20:21:49 -0000 1.1 +++ mod_suphp.spec 5 Jul 2005 10:49:02 -0000 1.2 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -25,7 +25,7 @@ process executing the PHP interpreter. %prep -%setup -q +%setup -q -n suphp-%{version} %build %configure \ @@ -66,6 +66,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 +- Added correct name to %setup macro + * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 10:49:35 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:49:35 -0400 Subject: rpms/libpqxx/FC-4 libpqxx.spec,1.1,1.2 Message-ID: <200507051049.j65AnZ0A019670@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19653 Modified Files: libpqxx.spec Log Message: - add dist tag Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/FC-4/libpqxx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpqxx.spec 1 Jul 2005 22:34:14 -0000 1.1 +++ libpqxx.spec 5 Jul 2005 10:49:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.4 -Release: 3 +Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 2.5.4-3 - add postgresql-devel to Requires for devel package - get rid of -R option in pqxx-config From fedora-extras-commits at redhat.com Tue Jul 5 10:50:11 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:50:11 -0400 Subject: common tobuild,1.1759,1.1760 Message-ID: <200507051050.j65AoB9o019754@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19735 Modified Files: tobuild Log Message: request build of rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1759 retrieving revision 1.1760 diff -u -r1.1759 -r1.1760 --- tobuild 5 Jul 2005 10:48:12 -0000 1.1759 +++ tobuild 5 Jul 2005 10:50:09 -0000 1.1760 @@ -33,3 +33,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel +awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 10:50:28 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 06:50:28 -0400 Subject: rpms/libpqxx/devel libpqxx.spec,1.1,1.2 Message-ID: <200507051050.j65AoSb1019779@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libpqxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762 Modified Files: libpqxx.spec Log Message: - add dist tag Index: libpqxx.spec =================================================================== RCS file: /cvs/extras/rpms/libpqxx/devel/libpqxx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libpqxx.spec 1 Jul 2005 22:34:14 -0000 1.1 +++ libpqxx.spec 5 Jul 2005 10:50:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: libpqxx Version: 2.5.4 -Release: 3 +Release: 4%{?dist} Summary: C++ client API for PostgreSQL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %{_libdir}/pkgconfig/libpqxx.pc %changelog +* Tue Jul 05 2005 Andreas Bierfert 2.5.4-4 +- add dist tag + * Fri Jul 01 2005 Andreas Bierfert 2.5.4-3 - add postgresql-devel to Requires for devel package - get rid of -R option in pqxx-config From fedora-extras-commits at redhat.com Tue Jul 5 10:50:37 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 06:50:37 -0400 Subject: rpms/mod_suphp/FC-4 mod_suphp.spec,1.1,1.2 Message-ID: <200507051050.j65Aob3L019801@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19758 Modified Files: mod_suphp.spec Log Message: bumped release Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-4/mod_suphp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_suphp.spec 30 Jun 2005 20:21:49 -0000 1.1 +++ mod_suphp.spec 5 Jul 2005 10:50:35 -0000 1.2 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -25,7 +25,7 @@ process executing the PHP interpreter. %prep -%setup -q +%setup -q -n suphp-%{version} %build %configure \ @@ -66,6 +66,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 +- Added correct name to %setup macro + * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 10:51:17 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 06:51:17 -0400 Subject: common tobuild,1.1760,1.1761 Message-ID: <200507051051.j65ApH0n019906@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19886 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1760 retrieving revision 1.1761 diff -u -r1.1760 -r1.1761 --- tobuild 5 Jul 2005 10:50:09 -0000 1.1760 +++ tobuild 5 Jul 2005 10:51:15 -0000 1.1761 @@ -34,3 +34,4 @@ awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 From rc040203 at freenet.de Tue Jul 5 10:53:14 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Tue, 05 Jul 2005 12:53:14 +0200 Subject: APPROVED: perl-Tree-DAG_Node Message-ID: <1120560795.30532.13.camel@mccallum.corsepiu.local> %description This class encapsulates/makes/manipulates objects that represent nodes in a tree structure. The tree structure is not an object itself, but is emergent from the linkages you create between nodes. This class provides the methods for making linkages that can be used to build up a tree, while preventing you from ever making any kinds of linkages which are not allowed in a tree (such as having a node be its own mother or ancestor, or having a node have two mothers). Maintainer: Jose Pedro Oliveira Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Tue Jul 5 14:23:52 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 5 Jul 2005 10:23:52 -0400 Subject: common tobuild,1.1761,1.1762 Message-ID: <200507051423.j65ENqRN024933@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24916 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1761 retrieving revision 1.1762 diff -u -r1.1761 -r1.1762 --- tobuild 5 Jul 2005 10:51:15 -0000 1.1761 +++ tobuild 5 Jul 2005 14:23:50 -0000 1.1762 @@ -35,3 +35,4 @@ awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 14:46:24 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Tue, 5 Jul 2005 10:46:24 -0400 Subject: common tobuild,1.1762,1.1763 Message-ID: <200507051446.j65EkOFT025047@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029 Modified Files: tobuild Log Message: request build of rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1762 retrieving revision 1.1763 diff -u -r1.1762 -r1.1763 --- tobuild 5 Jul 2005 14:23:50 -0000 1.1762 +++ tobuild 5 Jul 2005 14:46:22 -0000 1.1763 @@ -36,3 +36,4 @@ awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel +byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 14:53:49 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Tue, 5 Jul 2005 10:53:49 -0400 Subject: common tobuild,1.1763,1.1764 Message-ID: <200507051453.j65ErnE9025146@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25132 Modified Files: tobuild Log Message: request build of rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1763 retrieving revision 1.1764 diff -u -r1.1763 -r1.1764 --- tobuild 5 Jul 2005 14:46:22 -0000 1.1763 +++ tobuild 5 Jul 2005 14:53:47 -0000 1.1764 @@ -37,3 +37,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 +byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 15:05:29 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 5 Jul 2005 11:05:29 -0400 Subject: common tobuild,1.1764,1.1765 Message-ID: <200507051505.j65F5xq5026281@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26261 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1764 retrieving revision 1.1765 diff -u -r1.1764 -r1.1765 --- tobuild 5 Jul 2005 14:53:47 -0000 1.1764 +++ tobuild 5 Jul 2005 15:05:08 -0000 1.1765 @@ -38,3 +38,4 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel From fedora-extras-commits at redhat.com Tue Jul 5 15:30:45 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 5 Jul 2005 11:30:45 -0400 Subject: common tobuild,1.1765,1.1766 Message-ID: <200507051530.j65FUjX6026417@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26400 Modified Files: tobuild Log Message: request build of rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1765 retrieving revision 1.1766 diff -u -r1.1765 -r1.1766 --- tobuild 5 Jul 2005 15:05:08 -0000 1.1765 +++ tobuild 5 Jul 2005 15:30:42 -0000 1.1766 @@ -39,3 +39,4 @@ byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel +qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 15:42:05 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 5 Jul 2005 11:42:05 -0400 Subject: rpms/most/FC-4 .cvsignore, 1.2, 1.3 most.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200507051542.j65Fg5bK026468@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26446 Modified Files: .cvsignore most.spec sources Log Message: updated to 4.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:52:46 -0000 1.2 +++ .cvsignore 5 Jul 2005 15:42:03 -0000 1.3 @@ -1 +1 @@ -most-4.9.5.tar.gz +most-4.10.1.tar.bz2 Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/most.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- most.spec 30 Mar 2005 14:32:43 -0000 1.6 +++ most.spec 5 Jul 2005 15:42:03 -0000 1.7 @@ -1,13 +1,13 @@ -Summary: more, less, most -Name: most -Version: 4.9.5 -Release: 4 -License: GPL -URL: ftp://space.mit.edu/pub/davis/most/ -Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: slang-devel +Summary: more, less, most +Name: most +Version: 4.10.1 +Release: 1%{?dist} +License: GPL +URL: ftp://space.mit.edu/pub/davis/most/ +Group: Applications/Text +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: slang-devel %description most is a paging program that displays, one windowful at a time, the @@ -43,6 +43,9 @@ %changelog +* Fri Jul 01 2005 Adrian Reber - 4.10.1-1 +- updated to 4.10.1 + * Wed Mar 30 2005 Adrian Reber - 4.9.5-4 - fix build on ppc/ppc64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:52:46 -0000 1.2 +++ sources 5 Jul 2005 15:42:03 -0000 1.3 @@ -1 +1 @@ -5c0922952485b0a5822ef994603dcc2f most-4.9.5.tar.gz +9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 5 15:46:50 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 5 Jul 2005 11:46:50 -0400 Subject: common tobuild,1.1766,1.1767 Message-ID: <200507051546.j65Fkovt026535@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26518 Modified Files: tobuild Log Message: request build of rpms/most/FC-4 most-4_10_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1766 retrieving revision 1.1767 diff -u -r1.1766 -r1.1767 --- tobuild 5 Jul 2005 15:30:42 -0000 1.1766 +++ tobuild 5 Jul 2005 15:46:48 -0000 1.1767 @@ -40,3 +40,4 @@ byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel +adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 From ville.skytta at iki.fi Tue Jul 5 16:16:46 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Tue, 05 Jul 2005 19:16:46 +0300 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.1,1.2 In-Reply-To: <200507051049.j65An5Ri019612@cvs-int.fedora.redhat.com> References: <200507051049.j65An5Ri019612@cvs-int.fedora.redhat.com> Message-ID: <1120580206.6862.27.camel@localhost.localdomain> On Tue, 2005-07-05 at 06:49 -0400, Andreas Thienemann wrote: > %changelog > +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 > +- Added correct name to %setup macro Careful here, macros are expanded in %changelog too. Use %%setup in this case. From fedora-extras-commits at redhat.com Tue Jul 5 16:39:41 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 12:39:41 -0400 Subject: devel/common tobuild,1.1767,1.1768 Message-ID: <200507051639.j65GdfCK028265@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28248 Modified Files: tobuild Log Message: request build of devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1767 retrieving revision 1.1768 diff -u -r1.1767 -r1.1768 --- tobuild 5 Jul 2005 15:46:48 -0000 1.1767 +++ tobuild 5 Jul 2005 16:39:39 -0000 1.1768 @@ -41,3 +41,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 +kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 16:40:42 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 12:40:42 -0400 Subject: common tobuild,1.1768,1.1769 Message-ID: <200507051640.j65GegJa028332@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28315 Modified Files: tobuild Log Message: request build of rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1768 retrieving revision 1.1769 diff -u -r1.1768 -r1.1769 --- tobuild 5 Jul 2005 16:39:39 -0000 1.1768 +++ tobuild 5 Jul 2005 16:40:40 -0000 1.1769 @@ -42,3 +42,4 @@ qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel +kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 16:41:24 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 12:41:24 -0400 Subject: common tobuild,1.1769,1.1770 Message-ID: <200507051641.j65GfOWj028399@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28382 Modified Files: tobuild Log Message: request build of rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1769 retrieving revision 1.1770 diff -u -r1.1769 -r1.1770 --- tobuild 5 Jul 2005 16:40:40 -0000 1.1769 +++ tobuild 5 Jul 2005 16:41:22 -0000 1.1770 @@ -43,3 +43,4 @@ adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 +kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 16:50:45 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:50:45 -0400 Subject: rpms/tkcvs/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tkcvs.spec, 1.9, 1.10 Message-ID: <200507051650.j65GojSm028454@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28433 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 7.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Feb 2005 13:23:15 -0000 1.3 +++ .cvsignore 5 Jul 2005 16:50:43 -0000 1.4 @@ -1 +1 @@ -tkcvs_7_2_2.tar.gz +tkcvs_7_2_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Feb 2005 13:23:15 -0000 1.3 +++ sources 5 Jul 2005 16:50:43 -0000 1.4 @@ -1 +1 @@ -8cf12b4e30209228eb8050ac6ee2da80 tkcvs_7_2_2.tar.gz +ef7bf5114a083bd36c2bc793d1ca23c5 tkcvs_7_2_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tkcvs.spec 6 Apr 2005 22:13:34 -0000 1.9 +++ tkcvs.spec 5 Jul 2005 16:50:43 -0000 1.10 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.2 -Release: 3 +Version: 7.2.3 +Release: 1 Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_2.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_2 +%setup -q -n tkcvs_7_2_3 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 +- New Version 2.7.3 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 5 16:51:16 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:51:16 -0400 Subject: common tobuild,1.1770,1.1771 Message-ID: <200507051651.j65GpG9w028519@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28502 Modified Files: tobuild Log Message: request build of rpms/tkcvs/FC-4 tkcvs-7_2_3-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1770 retrieving revision 1.1771 diff -u -r1.1770 -r1.1771 --- tobuild 5 Jul 2005 16:41:22 -0000 1.1770 +++ tobuild 5 Jul 2005 16:51:14 -0000 1.1771 @@ -44,3 +44,4 @@ kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 +gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 16:51:34 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:51:34 -0400 Subject: rpms/tkcvs/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tkcvs.spec, 1.9, 1.10 Message-ID: <200507051651.j65GpYJm028546@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28525 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 7.2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Feb 2005 13:23:15 -0000 1.3 +++ .cvsignore 5 Jul 2005 16:51:32 -0000 1.4 @@ -1 +1 @@ -tkcvs_7_2_2.tar.gz +tkcvs_7_2_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Feb 2005 13:23:15 -0000 1.3 +++ sources 5 Jul 2005 16:51:32 -0000 1.4 @@ -1 +1 @@ -8cf12b4e30209228eb8050ac6ee2da80 tkcvs_7_2_2.tar.gz +ef7bf5114a083bd36c2bc793d1ca23c5 tkcvs_7_2_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tkcvs.spec 6 Apr 2005 22:13:34 -0000 1.9 +++ tkcvs.spec 5 Jul 2005 16:51:32 -0000 1.10 @@ -1,13 +1,13 @@ Name: tkcvs -Version: 7.2.2 -Release: 3 +Version: 7.2.3 +Release: 2 Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://www.twobarleycorns.net/tkcvs_7_2_2.tar.gz +Source: http://www.twobarleycorns.net/tkcvs_7_2_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tk, tcl, cvs BuildArch: noarch @@ -20,7 +20,7 @@ merging your changes. %prep -%setup -q -n tkcvs_7_2_2 +%setup -q -n tkcvs_7_2_3 %build perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl @@ -51,6 +51,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 5 2005 Gerard Milmeister - 7.2.3-1 +- New Version 2.7.3 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 5 16:52:05 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:52:05 -0400 Subject: common tobuild,1.1771,1.1772 Message-ID: <200507051652.j65Gq5cl028625@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28608 Modified Files: tobuild Log Message: request build of rpms/tkcvs/devel tkcvs-7_2_3-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1771 retrieving revision 1.1772 diff -u -r1.1771 -r1.1772 --- tobuild 5 Jul 2005 16:51:14 -0000 1.1771 +++ tobuild 5 Jul 2005 16:52:03 -0000 1.1772 @@ -45,3 +45,4 @@ kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 +gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel From fedora-extras-commits at redhat.com Tue Jul 5 16:59:16 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 12:59:16 -0400 Subject: rpms/global/FC-4 .cvsignore, 1.4, 1.5 global.spec, 1.9, 1.10 sources, 1.4, 1.5 global-4.8.4-gcc4.patch, 1.1, NONE Message-ID: <200507051659.j65GxGHD028688@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/global/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28667 Modified Files: .cvsignore global.spec sources Removed Files: global-4.8.4-gcc4.patch Log Message: new version 4.8.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/global/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Mar 2005 21:36:38 -0000 1.4 +++ .cvsignore 5 Jul 2005 16:59:14 -0000 1.5 @@ -1 +1 @@ -global-4.8.4.tar.gz +global-4.8.6.tar.gz Index: global.spec =================================================================== RCS file: /cvs/extras/rpms/global/FC-4/global.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- global.spec 25 May 2005 22:03:21 -0000 1.9 +++ global.spec 5 Jul 2005 16:59:14 -0000 1.10 @@ -1,14 +1,13 @@ Name: global -Version: 4.8.4 -Release: 4 +Version: 4.8.6 +Release: 1%{?dist} Summary: Source code tag system Group: Development/Tools License: GPL/BSD URL: http://www.gnu.org/software/global -Source: http://tamacom.com/global/global-4.8.4.tar.gz -Patch0: global-4.8.4-gcc4.patch +Source: http://tamacom.com/global/global-4.8.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -18,7 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 %build %configure @@ -50,6 +48,9 @@ %{_datadir}/gtags %changelog +* Tue Jul 5 2005 Gerard Milmeister - 4.8.6-1 +- New Version 4.8.6 + * Wed May 25 2005 Jeremy Katz - 4.8.4-4 - fix build with gcc4 (#156212) Index: sources =================================================================== RCS file: /cvs/extras/rpms/global/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Mar 2005 21:36:38 -0000 1.4 +++ sources 5 Jul 2005 16:59:14 -0000 1.5 @@ -1 +1 @@ -060d43cf74e297c154a5a53ba43c52fb global-4.8.4.tar.gz +99b9020788746942b22741c3b2f59bdc global-4.8.6.tar.gz --- global-4.8.4-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 17:00:06 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:00:06 -0400 Subject: common tobuild,1.1772,1.1773 Message-ID: <200507051700.j65H06Tp028756@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28739 Modified Files: tobuild Log Message: request build of rpms/global/FC-4 global-4_8_6-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1772 retrieving revision 1.1773 diff -u -r1.1772 -r1.1773 --- tobuild 5 Jul 2005 16:52:03 -0000 1.1772 +++ tobuild 5 Jul 2005 17:00:04 -0000 1.1773 @@ -46,3 +46,4 @@ kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel +gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:00:46 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:00:46 -0400 Subject: rpms/global/devel .cvsignore, 1.4, 1.5 global.spec, 1.9, 1.10 sources, 1.4, 1.5 global-4.8.4-gcc4.patch, 1.1, NONE Message-ID: <200507051700.j65H0knq028801@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/global/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28780 Modified Files: .cvsignore global.spec sources Removed Files: global-4.8.4-gcc4.patch Log Message: new version 4.8.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/global/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Mar 2005 21:36:38 -0000 1.4 +++ .cvsignore 5 Jul 2005 17:00:43 -0000 1.5 @@ -1 +1 @@ -global-4.8.4.tar.gz +global-4.8.6.tar.gz Index: global.spec =================================================================== RCS file: /cvs/extras/rpms/global/devel/global.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- global.spec 25 May 2005 22:03:21 -0000 1.9 +++ global.spec 5 Jul 2005 17:00:43 -0000 1.10 @@ -1,14 +1,13 @@ Name: global -Version: 4.8.4 -Release: 4 +Version: 4.8.6 +Release: 1%{?dist} Summary: Source code tag system Group: Development/Tools License: GPL/BSD URL: http://www.gnu.org/software/global -Source: http://tamacom.com/global/global-4.8.4.tar.gz -Patch0: global-4.8.4-gcc4.patch +Source: http://tamacom.com/global/global-4.8.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -18,7 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 %build %configure @@ -50,6 +48,9 @@ %{_datadir}/gtags %changelog +* Tue Jul 5 2005 Gerard Milmeister - 4.8.6-1 +- New Version 4.8.6 + * Wed May 25 2005 Jeremy Katz - 4.8.4-4 - fix build with gcc4 (#156212) Index: sources =================================================================== RCS file: /cvs/extras/rpms/global/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Mar 2005 21:36:38 -0000 1.4 +++ sources 5 Jul 2005 17:00:43 -0000 1.5 @@ -1 +1 @@ -060d43cf74e297c154a5a53ba43c52fb global-4.8.4.tar.gz +99b9020788746942b22741c3b2f59bdc global-4.8.6.tar.gz --- global-4.8.4-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 17:01:55 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:01:55 -0400 Subject: common tobuild,1.1773,1.1774 Message-ID: <200507051701.j65H1tgb029904@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29886 Modified Files: tobuild Log Message: request build of rpms/global/devel global-4_8_6-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1773 retrieving revision 1.1774 diff -u -r1.1773 -r1.1774 --- tobuild 5 Jul 2005 17:00:04 -0000 1.1773 +++ tobuild 5 Jul 2005 17:01:33 -0000 1.1774 @@ -47,3 +47,4 @@ gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 +gemi rpms/global/devel global-4_8_6-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 17:06:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 5 Jul 2005 13:06:18 -0400 Subject: devel/sylpheed .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sylpheed.spec, 1.15, 1.16 sylpheed-0.8.9-ck.patch, 1.1, NONE Message-ID: <200507051706.j65H6IUs029987@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29957 Modified Files: .cvsignore sources sylpheed.spec Removed Files: sylpheed-0.8.9-ck.patch Log Message: update to next beta release Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jun 2005 13:50:45 -0000 1.7 +++ .cvsignore 5 Jul 2005 17:05:40 -0000 1.8 @@ -1 +1 @@ -sylpheed-2.0.0beta3.tar.bz2 +sylpheed-2.0.0beta4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jun 2005 13:50:45 -0000 1.7 +++ sources 5 Jul 2005 17:06:03 -0000 1.8 @@ -1 +1 @@ -9c04acc3690af6ceddf1a2b55a1cbb6e sylpheed-2.0.0beta3.tar.bz2 +675b998ac6e4d2d6c0dce1442209de83 sylpheed-2.0.0beta4.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sylpheed.spec 28 Jun 2005 16:11:05 -0000 1.15 +++ sylpheed.spec 5 Jul 2005 17:06:03 -0000 1.16 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.2.beta3 +Release: 0.2.beta4 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -17,10 +17,9 @@ %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} BuildRequires: autoconf -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta3.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta4.tar.bz2 Source1: sylpheed.1 -Patch0: %{name}-0.8.9-ck.patch Patch2: sylpheed-default-browser.patch Patch3: sylpheed-1.9.10-desktop.patch @@ -40,8 +39,7 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta3 -#%patch0 -p1 -b .ck +%setup -q -n %{name}-2.0.0beta4 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop @@ -85,8 +83,11 @@ %{_mandir}/man1 %changelog +* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.2.beta4 +- Update to 2.0.0beta4. + * Tue Jun 28 2005 Michael Schwendt -- remove work-around from 1.0.3-5 again, bug has been fixed +- remove work-around from previous entry again, bug has been fixed * Sun Jun 26 2005 Michael Schwendt - 2.0.0-0.2.beta3 - temporarily add BR libpng-devel to work around a broken cairo-devel --- sylpheed-0.8.9-ck.patch DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 17:16:17 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 13:16:17 -0400 Subject: devel/common tobuild,1.1774,1.1775 Message-ID: <200507051716.j65HGHir030143@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30126 Modified Files: tobuild Log Message: clean up built stuff Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1774 retrieving revision 1.1775 diff -u -r1.1774 -r1.1775 --- tobuild 5 Jul 2005 17:01:33 -0000 1.1774 +++ tobuild 5 Jul 2005 17:16:15 -0000 1.1775 @@ -1,49 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-5_fc4 fc4 -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-5_fc3 fc3 -ausil rpms/konversation/devel konversation-0_18-4_fc5 devel -ausil rpms/konversation/FC-4 konversation-0_18-4_fc4 fc4 -petersen rpms/scim-anthy/FC-3 scim-anthy-0_5_0-1_fc3 fc3 -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-3 devel -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel -adrian rpms/most/devel most-4_10_1-1_fc5 devel -spot rpms/gambas/FC-3 gambas-1_0_6-3_fc3 fc3 -spot rpms/gambas/FC-4 gambas-1_0_6-3_fc4 fc4 -spot rpms/ebtables/FC-3 ebtables-2_0_6-6_fc3 fc3 -spot rpms/ebtables/FC-4 ebtables-2_0_6-6_fc4 fc4 -spot rpms/xbase/FC-3 xbase-2_0_0-2_fc3 fc3 -spot rpms/xbase/FC-4 xbase-2_0_0-2_fc4 fc4 -spot rpms/R/FC-3 R-2_1_1-2_fc3 fc3 -spot rpms/R/FC-4 R-2_1_1-2_fc4 fc4 -spot rpms/ebtables/FC-3 ebtables-2_0_6-7_fc3 fc3 -spot rpms/ebtables/FC-4 ebtables-2_0_6-7_fc4 fc4 -mschwendt rpms/libassuan/devel libassuan-0_6_10-2_fc5 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-5_fc5 devel -qspencer rpms/cln/devel cln-1_1_9-8_fc5 devel -qspencer rpms/octave/devel octave-2_1_71-11_fc5 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-6_fc5 devel -pawsa rpms/balsa/devel balsa-2_3_4-1_fc5 devel -petersen rpms/scim/devel scim-1_3_2-1_fc5 devel -pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-2_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -awjb rpms/wv2/FC-4 wv2-0_2_2-5_fc4 fc4 -awjb rpms/wv2/devel wv2-0_2_2-5_fc5 devel -awjb rpms/libpqxx/FC-4 libpqxx-2_5_4-4_fc4 fc4 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-6_fc4 fc4 -pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-3_fc5 devel -byte rpms/gaim-guifications/FC-4 gaim-guifications-2_10-4_fc4 fc4 -byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel -qspencer rpms/GiNaC/devel GiNaC-1_3_1-6_fc5 devel -adrian rpms/most/FC-4 most-4_10_1-1_fc4 fc4 -kaboom devel/perl-Time-modules perl-Time-modules-2003_1126-2_fc5 devel -kaboom rpms/perl-Time-modules/FC-4 perl-Time-modules-2003_1126-2_fc4 fc4 -kaboom rpms/perl-Time-modules/FC-3 perl-Time-modules-2003_1126-2_fc3 fc3 gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:42:46 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:42:46 -0400 Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.10, 1.11 TeXmacs.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200507051742.j65HgkAJ030237@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30215 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Jun 2005 17:12:02 -0000 1.10 +++ .cvsignore 5 Jul 2005 17:42:44 -0000 1.11 @@ -1 +1 @@ -TeXmacs-1.0.5.4-src.tar.gz +TeXmacs-1.0.5.5-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- TeXmacs.spec 21 Jun 2005 17:12:02 -0000 1.15 +++ TeXmacs.spec 5 Jul 2005 17:42:44 -0000 1.16 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.4 +Version: 1.0.5.5 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.4-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.5-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 @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 5 2005 Gerard Milmeister - 1.0.5.5 +- New Version 1.0.5.5 + * Tue Jun 21 2005 Gerard Milmeister - 1.0.5.4 - New Version 1.0.5.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Jun 2005 17:12:02 -0000 1.10 +++ sources 5 Jul 2005 17:42:44 -0000 1.11 @@ -1 +1 @@ -e589b4ae5ec04906e6f346b6de0db69c TeXmacs-1.0.5.4-src.tar.gz +492bf5f75791c80d64a727767fedb8bc TeXmacs-1.0.5.5-src.tar.gz From fedora-extras-commits at redhat.com Tue Jul 5 17:43:15 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:43:15 -0400 Subject: common tobuild,1.1775,1.1776 Message-ID: <200507051743.j65HhFRv030299@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30282 Modified Files: tobuild Log Message: request build of rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1775 retrieving revision 1.1776 diff -u -r1.1775 -r1.1776 --- tobuild 5 Jul 2005 17:16:15 -0000 1.1775 +++ tobuild 5 Jul 2005 17:43:12 -0000 1.1776 @@ -5,3 +5,4 @@ gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 gemi rpms/global/devel global-4_8_6-1_fc5 devel +gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:44:00 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 13:44:00 -0400 Subject: common tobuild,1.1776,1.1777 Message-ID: <200507051744.j65Hi0uT030346@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30329 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1776 retrieving revision 1.1777 diff -u -r1.1776 -r1.1777 --- tobuild 5 Jul 2005 17:43:12 -0000 1.1776 +++ tobuild 5 Jul 2005 17:43:58 -0000 1.1777 @@ -6,3 +6,4 @@ gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 gemi rpms/global/devel global-4_8_6-1_fc5 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 +dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 17:44:12 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:44:12 -0400 Subject: rpms/TeXmacs/devel .cvsignore, 1.10, 1.11 TeXmacs.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200507051744.j65HiCbp030374@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30352 Modified Files: .cvsignore TeXmacs.spec sources Log Message: new version 1.0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 21 Jun 2005 17:15:55 -0000 1.10 +++ .cvsignore 5 Jul 2005 17:44:10 -0000 1.11 @@ -1 +1 @@ -TeXmacs-1.0.5.4-src.tar.gz +TeXmacs-1.0.5.5-src.tar.gz Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- TeXmacs.spec 21 Jun 2005 17:15:55 -0000 1.15 +++ TeXmacs.spec 5 Jul 2005 17:44:10 -0000 1.16 @@ -1,12 +1,12 @@ Name: TeXmacs -Version: 1.0.5.4 +Version: 1.0.5.5 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.4-src.tar.gz +Source: ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.5-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 @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 5 2005 Gerard Milmeister - 1.0.5.5 +- New Version 1.0.5.5 + * Tue Jun 21 2005 Gerard Milmeister - 1.0.5.4 - New Version 1.0.5.4 Index: sources =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 21 Jun 2005 17:15:55 -0000 1.10 +++ sources 5 Jul 2005 17:44:10 -0000 1.11 @@ -1 +1 @@ -e589b4ae5ec04906e6f346b6de0db69c TeXmacs-1.0.5.4-src.tar.gz +492bf5f75791c80d64a727767fedb8bc TeXmacs-1.0.5.5-src.tar.gz From fedora-extras-commits at redhat.com Tue Jul 5 17:44:52 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 5 Jul 2005 13:44:52 -0400 Subject: common tobuild,1.1777,1.1778 Message-ID: <200507051745.j65HjMKp030440@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30420 Modified Files: tobuild Log Message: request build of rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1777 retrieving revision 1.1778 diff -u -r1.1777 -r1.1778 --- tobuild 5 Jul 2005 17:43:58 -0000 1.1777 +++ tobuild 5 Jul 2005 17:44:50 -0000 1.1778 @@ -7,3 +7,4 @@ gemi rpms/global/devel global-4_8_6-1_fc5 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 +gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 17:48:40 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Tue, 5 Jul 2005 13:48:40 -0400 Subject: common tobuild,1.1778,1.1779 Message-ID: <200507051748.j65HmeJ3030510@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30490 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1778 retrieving revision 1.1779 diff -u -r1.1778 -r1.1779 --- tobuild 5 Jul 2005 17:44:50 -0000 1.1778 +++ tobuild 5 Jul 2005 17:48:38 -0000 1.1779 @@ -8,3 +8,4 @@ gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 18:07:39 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:07:39 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.3,1.4 Message-ID: <200507051807.j65I7dFu031806@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/devel Modified Files: mod_suphp.spec Log Message: bumped up releasever Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_suphp.spec 4 Jul 2005 22:54:33 -0000 1.3 +++ mod_suphp.spec 5 Jul 2005 18:07:37 -0000 1.4 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,8 +66,11 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 +- Bumped up the releasever + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 -- Added correct name to %setup macro +- Added correct name to %%setup macro * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 18:07:33 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:07:33 -0400 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.2,1.3 Message-ID: <200507051808.j65I83ev031809@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/FC-3 Modified Files: mod_suphp.spec Log Message: bumped up releasever Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-3/mod_suphp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_suphp.spec 5 Jul 2005 10:49:02 -0000 1.2 +++ mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,8 +66,11 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 +- Bumped up the releasever + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 -- Added correct name to %setup macro +- Added correct name to %%setup macro * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 18:07:33 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:07:33 -0400 Subject: rpms/mod_suphp/FC-4 mod_suphp.spec,1.2,1.3 Message-ID: <200507051808.j65I84ft031812@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759/FC-4 Modified Files: mod_suphp.spec Log Message: bumped up releasever Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-4/mod_suphp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_suphp.spec 5 Jul 2005 10:50:35 -0000 1.2 +++ mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -66,8 +66,11 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 +- Bumped up the releasever + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-6 -- Added correct name to %setup macro +- Added correct name to %%setup macro * Thu Jun 30 2005 Andreas Thienemann 0.5.2-5 - Rollback of namechange. Now we're mod_suphp again. From fedora-extras-commits at redhat.com Tue Jul 5 18:09:26 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:09:26 -0400 Subject: common tobuild,1.1779,1.1780 Message-ID: <200507051809.j65I9QHv031881@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1779 retrieving revision 1.1780 diff -u -r1.1779 -r1.1780 --- tobuild 5 Jul 2005 17:48:38 -0000 1.1779 +++ tobuild 5 Jul 2005 18:09:24 -0000 1.1780 @@ -9,3 +9,4 @@ dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 18:10:06 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:10:06 -0400 Subject: common tobuild,1.1780,1.1781 Message-ID: <200507051810.j65IA6I0031948@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31931 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1780 retrieving revision 1.1781 diff -u -r1.1780 -r1.1781 --- tobuild 5 Jul 2005 18:09:24 -0000 1.1780 +++ tobuild 5 Jul 2005 18:10:04 -0000 1.1781 @@ -10,3 +10,4 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 18:10:46 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 5 Jul 2005 14:10:46 -0400 Subject: common tobuild,1.1781,1.1782 Message-ID: <200507051810.j65IAktL032010@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31993 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1781 retrieving revision 1.1782 diff -u -r1.1781 -r1.1782 --- tobuild 5 Jul 2005 18:10:04 -0000 1.1781 +++ tobuild 5 Jul 2005 18:10:44 -0000 1.1782 @@ -11,3 +11,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 19:33:09 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 5 Jul 2005 15:33:09 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.11, 1.12 Message-ID: <200507051933.j65JX9dZ000766@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv747 Modified Files: kernel-module-thinkpad.spec Log Message: Another approach: - local rebuilders get to --define kver - the one who requests the rebuild in FE needs to tune the default value of kver in the specfile explicitly and separately for each {,smp,xen0,xenU} - we ship many kind-of-duplicate source rpms for these builds, do we care? - only buildsys change needed would be to be able to specify the target arch(s) Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kernel-module-thinkpad.spec 3 Jul 2005 18:23:58 -0000 1.11 +++ kernel-module-thinkpad.spec 5 Jul 2005 19:33:06 -0000 1.12 @@ -1,12 +1,11 @@ -%{?kver: %define mkver .%(echo %{kver} | tr - _)} -%{!?kver: %define kver %(uname -r)} +%{!?kver: %define kver 2.6.11-1.1369_FC4} %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} %define moddir /lib/modules/%{kver}/updates Name: kernel-module-thinkpad Version: 5.8 -Release: 2%{?mkver} +Release: 2.%(echo %{kver} | tr - _) Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL From fedora-extras-commits at redhat.com Tue Jul 5 20:19:09 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:09 -0400 Subject: rpms/hdf5 - New directory Message-ID: <200507052019.j65KJ9g3002024@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/hdf5 Log Message: Directory /cvs/extras/rpms/hdf5 added to the repository From fedora-extras-commits at redhat.com Tue Jul 5 20:19:10 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:10 -0400 Subject: rpms/hdf5/devel - New directory Message-ID: <200507052019.j65KJAa1002029@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/hdf5/devel Log Message: Directory /cvs/extras/rpms/hdf5/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 5 20:19:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:18 -0400 Subject: rpms/hdf5 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507052019.j65KJICv002072@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045 Added Files: Makefile import.log Log Message: Setup of module hdf5 --- NEW FILE Makefile --- # Top level Makefile for module hdf5 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 5 20:19:19 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:19:19 -0400 Subject: rpms/hdf5/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507052019.j65KJJ4D002077@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module hdf5 --- NEW 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 Jul 5 20:20:18 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:20:18 -0400 Subject: rpms/hdf5 import.log,1.1,1.2 Message-ID: <200507052020.j65KKI1Z002176@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2139 Modified Files: import.log Log Message: auto-import hdf5-1.6.4-4 on branch devel from hdf5-1.6.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/hdf5/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Jul 2005 20:19:16 -0000 1.1 +++ import.log 5 Jul 2005 20:20:16 -0000 1.2 @@ -0,0 +1 @@ +hdf5-1_6_4-4:HEAD:hdf5-1.6.4-4.src.rpm:1120594813 From fedora-extras-commits at redhat.com Tue Jul 5 20:20:19 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:20:19 -0400 Subject: rpms/hdf5/devel hdf5-1.6.4-destdir.patch, NONE, 1.1 hdf5-1.6.4-gcc4.patch, NONE, 1.1 hdf5-1.6.4-h5diff_attr.patch, NONE, 1.1 hdf5-1.6.4-norpath.patch, NONE, 1.1 hdf5-1.6.4-testh5repack.patch, NONE, 1.1 hdf5.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507052020.j65KKJsl002188@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2139/devel Modified Files: .cvsignore sources Added Files: hdf5-1.6.4-destdir.patch hdf5-1.6.4-gcc4.patch hdf5-1.6.4-h5diff_attr.patch hdf5-1.6.4-norpath.patch hdf5-1.6.4-testh5repack.patch hdf5.spec Log Message: auto-import hdf5-1.6.4-4 on branch devel from hdf5-1.6.4-4.src.rpm hdf5-1.6.4-destdir.patch: --- NEW FILE hdf5-1.6.4-destdir.patch --- --- hdf5-1.6.4/config/commence.in.BAD 2005-04-03 13:52:00.000000000 -0500 +++ hdf5-1.6.4/config/commence.in 2005-04-03 13:52:53.000000000 -0500 @@ -35,11 +35,11 @@ TRACE=: ## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -docdir=@exec_prefix@/doc +prefix=$(DESTDIR)@prefix@ +exec_prefix=$(DESTDIR)@exec_prefix@ +bindir=$(DESTDIR)@bindir@ +libdir=$(DESTDIR)@libdir@ +includedir=$(DESTDIR)@includedir@ +docdir=$(DESTDIR)@exec_prefix@/doc PUB_LIB=$(LIB) --- hdf5-1.6.4/fortran/config/commence.in.BAD 2005-04-03 14:08:27.000000000 -0500 +++ hdf5-1.6.4/fortran/config/commence.in 2005-04-03 14:08:48.000000000 -0500 @@ -40,11 +40,11 @@ TRACE=: ## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -docdir=@exec_prefix@/doc +prefix=$(DESTDIR)@prefix@ +exec_prefix=$(DESTDIR)@exec_prefix@ +bindir=$(DESTDIR)@bindir@ +libdir=$(DESTDIR)@libdir@ +includedir=$(DESTDIR)@includedir@ +docdir=$(DESTDIR)@exec_prefix@/doc PUB_LIB=$(LIB) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 14:07:10.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 14:07:35.000000000 -0500 @@ -32,11 +32,11 @@ TRACE=: ## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -docdir=@exec_prefix@/doc +prefix=$(DESTDIR)@prefix@ +exec_prefix=$(DESTDIR)@exec_prefix@ +bindir=$(DESTDIR)@bindir@ +libdir=$(DESTDIR)@libdir@ +includedir=$(DESTDIR)@includedir@ +docdir=$(DESTDIR)@exec_prefix@/doc PUB_LIB=$(LIB) hdf5-1.6.4-gcc4.patch: --- NEW FILE hdf5-1.6.4-gcc4.patch --- --- hdf5-1.6.4/fortran/config/linux-gnulibc1.BAD 2005-04-03 12:55:55.000000000 -0500 +++ hdf5-1.6.4/fortran/config/linux-gnulibc1 2005-04-03 12:56:50.000000000 -0500 @@ -25,7 +25,11 @@ # The default Fortran 90 compiler if test "X-" = "X-$F9X"; then case $CC_BASENAME in - gcc*|pgcc*) + gcc*) + F9X=gfortran + F9X_BASENAME=gfortran + ;; + pgcc*) F9X=pgf90 F9X_BASENAME=pgf90 ;; hdf5-1.6.4-h5diff_attr.patch: --- NEW FILE hdf5-1.6.4-h5diff_attr.patch --- --- hdf5-1.6.4/tools/lib/h5diff_attr.c.orig 2005-07-01 08:47:12.000000000 -0600 +++ hdf5-1.6.4/tools/lib/h5diff_attr.c 2005-07-01 09:01:59.000000000 -0600 @@ -61,8 +61,8 @@ int rank2; /* rank of dataset */ hsize_t dims1[H5S_MAX_RANK];/* dimensions of dataset */ hsize_t dims2[H5S_MAX_RANK];/* dimensions of dataset */ - char name1[255]; - char name2[255]; + char name1[255],np1[512]; + char name2[255],np2[512]; int n1, n2, i, j; int ret=0; hsize_t nfound; @@ -191,21 +191,21 @@ * array compare *------------------------------------------------------------------------- */ - sprintf(name1,"%s of <%s>",name1,path1); - sprintf(name2,"%s of <%s>",name2,path2); + snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1); + snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2); /* always print name */ if (options->m_verbose) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -225,8 +225,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -234,15 +234,15 @@ options->m_quiet=0; if (nfound) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -258,8 +258,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); hdf5-1.6.4-norpath.patch: --- NEW FILE hdf5-1.6.4-norpath.patch --- --- hdf5-1.6.4/config/commence.in.BAD 2005-04-03 18:55:35.000000000 -0500 +++ hdf5-1.6.4/config/commence.in 2005-04-03 18:55:54.000000000 -0500 @@ -48,8 +48,8 @@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ LT=$(top_builddir)/libtool LT_COMPILE=$(LT) --mode=compile $(CC) LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS) -LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS) +LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) --- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 +++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 @@ -1383,7 +1383,7 @@ if test "$ld_shlibs" = yes; then runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + hardcode_libdir_flag_spec='' export_dynamic_flag_spec='${wl}--export-dynamic' case $host_os in cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ LT=$(top_builddir)/libtool LT_COMPILE=$(LT) --mode=compile $(CXX) LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS) -LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) +LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) --- hdf5-1.6.4/fortran/config/commence.in.BAD 2005-04-03 20:05:38.000000000 -0500 +++ hdf5-1.6.4/fortran/config/commence.in 2005-04-03 20:05:48.000000000 -0500 @@ -54,7 +54,7 @@ LT=$(top_builddir)/libtool LT_CCOMPILE=$(LT) --mode=compile $(CC) LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir) -LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir) +LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) hdf5-1.6.4-testh5repack.patch: --- NEW FILE hdf5-1.6.4-testh5repack.patch --- --- hdf5-1.6.4/tools/h5repack/testh5repack_make.c.bad 2005-06-30 14:50:32.000000000 -0600 +++ hdf5-1.6.4/tools/h5repack/testh5repack_make.c 2005-06-30 14:45:48.000000000 -0600 @@ -896,7 +896,7 @@ hsize_t chunk_dims[RANK]={CDIM1,CDIM2}; int buf[DIM1][DIM2]; int i, j, n; - char name[5]; + char name[6]; for (i=n=0; i 1.6.4-4 - Make example scripts executable * Wed Jul 01 2005 Orion Poplawski 1.6.4-3 - Add --enable-threads --with-pthreads to configure - Add %check - Add some %docs - Use %makeinstall - Add patch to fix test for h5repack - Add patch to fix h5diff_attr.c * Mon Jun 27 2005 Tom "spot" Callaway 1.6.4-2 - remove szip from spec, since szip license doesn't meet Fedora standards * Sun Apr 3 2005 Tom "spot" Callaway 1.6.4-1 - inital package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Jul 2005 20:19:17 -0000 1.1 +++ .cvsignore 5 Jul 2005 20:20:17 -0000 1.2 @@ -0,0 +1 @@ +hdf5-1.6.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Jul 2005 20:19:17 -0000 1.1 +++ sources 5 Jul 2005 20:20:17 -0000 1.2 @@ -0,0 +1 @@ +a837391b633fc4c6681905d89047c032 hdf5-1.6.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 5 20:23:34 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 16:23:34 -0400 Subject: common tobuild,1.1782,1.1783 Message-ID: <200507052023.j65KNYY4002300@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283 Modified Files: tobuild Log Message: request build of rpms/hdf5/devel hdf5-1_6_4-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1782 retrieving revision 1.1783 diff -u -r1.1782 -r1.1783 --- tobuild 5 Jul 2005 18:10:44 -0000 1.1782 +++ tobuild 5 Jul 2005 20:23:32 -0000 1.1783 @@ -12,3 +12,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 +orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 20:33:41 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 5 Jul 2005 16:33:41 -0400 Subject: web/html/download mirrors.php,1.17,1.18 Message-ID: <200507052033.j65KXfhY002355@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321 Modified Files: mirrors.php Log Message: Added rsync for jaist mirror fixed link for muohio ftp mirror and added three new mirrors. (3ccc Taiwan, inode Austria, optus Australia) Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- mirrors.php 30 Jun 2005 21:15:20 -0000 1.17 +++ mirrors.php 5 Jul 2005 20:33:39 -0000 1.18 @@ -36,7 +36,7 @@
  • rsync://distro.ibiblio.org/fedora-linux-core/
  • ftp://ftp.cse.buffalo.edu/pub/fedora/linux/core/
  • http://mirror.eas.muohio.edu/fedora/linux/core/
    • -
  • ftp://mirror.eas.muohio.edu/pub/fedora/linux/core/
    • +
  • ftp://mirror.eas.muohio.edu/fedora/linux/core/
  • http://mirror.hiwaay.net/redhat/fedora/linux/core/
  • ftp://mirror.hiwaay.net/redhat/fedora/linux/core/
  • rsync://mirror.hiwaay.net/fedora-linux-core/
    • @@ -174,6 +174,8 @@
  • rsync://ftp.univie.ac.at/fedora/
  • ftp://ftp.tugraz.at/mirror/redhat-linux/fedora/linux/core/
  • ftp://ftp.uni-klu.ac.at/linux/fedora/linux/core/
    • +
  • http://fedora.inode.at/
    • +
  • ftp://fedora.inode.at/
  • Belgium @@ -484,6 +486,8 @@
  • ftp://ftp.netcraft.com.au/pub/fedora/linux/core/
  • http://mirror.pacific.net.au/linux/redhat/fedora/
  • ftp://mirror.pacific.net.au/linux/redhat/fedora/
    • +
  • http://mirror.optus.net/fedora/core/
    • +
  • ftp://mirror.optus.net/fedora/core/
  • Hong Kong @@ -506,6 +510,7 @@
  • rsync://ftp.riken.jp/fedora/
  • http://ftp.jaist.ac.jp/pub/Linux/Fedora/core/
  • ftp://ftp.jaist.ac.jp/pub/Linux/Fedora/core/
    • +
  • rsync://ftp.jaist.ac.jp/pub/Linux/Fedora/core/
  • ftp://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
  • http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
  • rsync://ftp.nara.wide.ad.jp/fedora/
    • @@ -542,6 +547,8 @@ From fedora-extras-commits at redhat.com Tue Jul 5 20:52:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 5 Jul 2005 16:52:08 -0400 Subject: common tobuild,1.1783,1.1784 Message-ID: <200507052052.j65Kq8XF002534@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2516 Modified Files: tobuild Log Message: request build of rpms/scrub/FC-4 scrub-1_6-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1783 retrieving revision 1.1784 diff -u -r1.1783 -r1.1784 --- tobuild 5 Jul 2005 20:23:32 -0000 1.1783 +++ tobuild 5 Jul 2005 20:52:05 -0000 1.1784 @@ -13,3 +13,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel +spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 20:55:29 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Tue, 5 Jul 2005 16:55:29 -0400 Subject: web/html/participate/communicate index.php,1.2,1.3 Message-ID: <200507052055.j65KtT8m002592@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/participate/communicate In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2575 Modified Files: index.php Log Message: Add fedora-perl-devel-list Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/participate/communicate/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 4 May 2005 11:25:19 -0000 1.2 +++ index.php 5 Jul 2005 20:55:27 -0000 1.3 @@ -104,6 +104,8 @@ - For discussions about desktop issues such as user interfaces, artwork, and usability
  • fedora-config-list - For discussions about the development of configuration tools
    • +
  • fedora-perl-devel-list +- For discussions about packages relating to the perl programming language
  • fedora-tools-list - For discussions about the toolchain (gcc, gdb, etc...) within Fedora
  • fedora-devel-java-list From fedora-extras-commits at redhat.com Tue Jul 5 21:00:55 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 17:00:55 -0400 Subject: common tobuild,1.1784,1.1785 Message-ID: <200507052100.j65L0tN8002637@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2620 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1784 retrieving revision 1.1785 diff -u -r1.1784 -r1.1785 --- tobuild 5 Jul 2005 20:52:05 -0000 1.1784 +++ tobuild 5 Jul 2005 21:00:53 -0000 1.1785 @@ -14,3 +14,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 +dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 21:08:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:08:05 -0400 Subject: extras-buildsys/server ArchJob.py, NONE, 1.1 Builder.py, NONE, 1.1 BuilderManager.py, NONE, 1.1 PackageJob.py, NONE, 1.1 main.py, NONE, 1.1 BuildMaster.py, 1.9, 1.10 CONFIG.py, 1.14, 1.15 Makefile, 1.4, 1.5 Repo.py, 1.4, 1.5 UserInterface.py, 1.14, 1.15 BuildJob.py, 1.15, NONE buildserver.py, 1.12, NONE client_manager.py, 1.27, NONE Message-ID: <200507052108.j65L85U7003868@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/server Modified Files: BuildMaster.py CONFIG.py Makefile Repo.py UserInterface.py Added Files: ArchJob.py Builder.py BuilderManager.py PackageJob.py main.py Removed Files: BuildJob.py buildserver.py client_manager.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. --- NEW FILE ArchJob.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import time import string import xmlrpclib import sys import socket import os import threading import urllib from plague import FileDownloader from plague import CommonErrors from M2Crypto import SSL # Load in the config execfile("/etc/plague/server/CONFIG.py") # SSL certificate and key filenames certs = {} certs['key_and_cert'] = config_opts['server_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] class ArchJob: """ Tracks a single build instance for a single arch on a builder """ def __init__(self, builder, server, par_job, jobid, target, arch): self.par_job = par_job self.builder = builder self._server = server self.jobid = jobid self.status = 'running' self.builder_status = '' self.target = target self.arch = arch self._builder_gone = False self.downloads = {} self.starttime = time.time() def _builder_finished(self): if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed': return True return False def builder_failed(self): if self.builder_status == 'killed' or self.builder_status == 'failed': return True return False def builder_prepping(self): if self.builder_status == 'prepping': return True return False def set_builder_status(self, status): if status != 'idle': self.builder_status = status if status == 'killed' or status == 'failed': self.par_job.wake() def _send_repo_unlocked(self): try: self._server.repo_unlocked(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, self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass def _dl_files(self): files = [] try: 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, self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass return files def process(self): if self.status == 'done': return elif self.status == 'running': # Clients pause before they enter the 'prep' state (which accesses # the repo for this target), and wait for the server to allow them # to proceed when the repo is unlocked. if self.builder_status == 'downloaded': if not self.par_job.repo.locked(): self._send_repo_unlocked() # if the builder is done, grab list of files to download if self._builder_finished(): self.status = 'downloading' for f in self._dl_files(): uf = urllib.unquote(f) self.downloads[uf] = 0 elif self.status == 'downloading': # Start grabbing the next undownloaded file, but only # if we aren't already pulling one down # # Download states: # 0: waiting # 1: in progress # 2: error # 3: done undownloaded = False for url in self.downloads.keys(): dl_status = self.downloads[url] if dl_status == 0: # spawn the download target_dir = os.path.join(self.par_job.get_stage_dir(), self.arch) if not os.path.exists(target_dir): os.makedirs(target_dir) if config_opts['ssl_builders']: dl_thread = FileDownloader.FileDownloader(self.dl_callback, url, url, target_dir, ['.rpm', '.log'], 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 break elif dl_status == 1: # in progress undownloaded = True break elif dl_status == 2: # error continue elif dl_status == 3: # this one is done continue # All done downloading? if not undownloaded: self._print_downloaded_files() self.status = 'done' self.par_job.wake() def _print_downloaded_files(self): file_string = "" ndownloads = len(self.downloads.keys()) for url in self.downloads.keys(): filename = os.path.basename(url) string = "'" + filename + "'" if self.downloads[url] == 2: string = string + " (failed)" file_string = file_string + string if url != self.downloads.keys()[ndownloads - 1]: file_string = file_string + ", " print "%s (%s/%s): Build result files - [ %s ]" % (self.par_job.uid, self.par_job.package, self.arch, file_string) def dl_callback(self, status, cb_data): url = cb_data if status == 'done': self.downloads[url] = 3 elif status == 'failed': self.downloads[url] = 2 def get_status(self): return self.status def get_files(self): files = [] for url in self.downloads.keys(): fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) if fname and self.downloads[url] == 3: files.append(fname) return files def set_download_status(self, url, status): if self.downloads.has_key(url): self.downloads[url] = status def builder_gone(self): if self.status != 'done': self._par_job.remove_arch_job(self) def die(self): if self.status == 'initialize' or self.status == 'running': self._server.die(self.jobid) self.status = 'done' --- NEW FILE Builder.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import time import string import xmlrpclib import sys import socket import os import threading from plague import XMLRPCServerProxy from plague import CommonErrors from M2Crypto import SSL import ArchJob # Load in the config execfile("/etc/plague/server/CONFIG.py") # SSL certificate and key filenames certs = {} certs['key_and_cert'] = config_opts['server_key_and_cert'] certs['ca_cert'] = config_opts['ca_cert'] certs['peer_ca_cert'] = config_opts['ca_cert'] class Builder(threading.Thread): """ Tracks all jobs on a builder instance """ def __init__(self, manager, address): self._cur_jobid = None self._manager = manager self._jobs = {} self._address = address if config_opts['ssl_builders']: self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, certs) else: self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, None) self._unavail_count = 0 self._arches = [] try: self._arches = self._server.supported_arches() except (socket.error, SSL.SSLError): raise RuntimeError self._alive = True self._arches.append('noarch') self._server_lock = threading.Lock() self._stop = False self._prepping_jobs = False threading.Thread.__init__(self) def arches(self): return self._arches def can_build_arch(self, arch): if arch in self._arches: return True return False def address(self): return self._address def alive(self): """ Is the builder responding to requests? """ return self._alive def start_job(self, par_job, target, arch, srpm_url): if not arch in self._arches or not self.available(): raise RuntimeError self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() if jobid == 0: raise RuntimeError job = ArchJob.ArchJob(self, self._server, par_job, jobid, target, arch) self._jobs[jobid] = job self._update_cur_job() return job def _update_cur_job(self): cur_jobid = None self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 self._server_lock.release() # Update the current job's status if self._unavail_count == 0: try: job = self._jobs[jobid] job.set_builder_status(status) except KeyError: pass self._cur_jobid = jobid if status == 'prepping': self._prepping_jobs = True else: self._prepping_jobs = False def stop(self): self._stop = True def run(self): while not self._stop: self._update_cur_job() # Kill all jobs on the client if it went away if self._unavail_count > 2: for jobid in self._jobs.keys(): job = self._jobs[jobid] job.builder_gone() del self._jobs[jobid] self._alive = False self._stop = True self._manager.builder_gone() continue # Update status of all jobs for j in self._jobs.values(): j.process() time.sleep(3) def available(self): """ Can the builder start a new job right now? """ if self._unavail_count > 2 or not self._alive: return False if self._cur_jobid: return False return True def any_prepping_jobs(self): return self._prepping_jobs def to_dict(self): client_dict = {} client_dict['address'] = self._address client_dict['arches'] = self._arches if self._cur_jobid: client_dict['status'] = 'building' else: client_dict['status'] = 'idle' return client_dict --- NEW FILE BuilderManager.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import time import string import xmlrpclib import sys import socket import os import threading import Builder # Load in the config execfile("/etc/plague/server/CONFIG.py") class BuilderManager: """ Tracks individual builder instances. """ def __init__(self): self._builders_lock = threading.Lock() # List of addresses of possible builders self.possible_builders = config_opts['builders'] self.running_builders = [] builder_list = self.update_builders() # Print out builder list when starting up print "\nBuilders:" print "-" * 60 for builder in builder_list: string = " " + builder['address'] string = string + " " * (40 - len(builder['address'])) for arch in builder['arches']: string = string + arch + " " print string print "" self._queue_lock = threading.Lock() self._queue = [] self._have_work = False def __del__(self): for builder in self.running_builders: builder.stop() time.sleep(2) for builder in self.running_builders: del builder def set_build_master(self, build_master): self._build_master = build_master def update_builders(self): self._builders_lock.acquire() builder_list = [] for address in self.possible_builders: # If the address is "https" but we aren't set up for SSL, exit if address.startswith('https') and not config_opts['ssl_builders']: print "Builder address (%s) starts with 'https', but the 'ssl_builders' option is set to False." % address os._exit(1) # If the address is already in our running_builders list, skip it skip = False for builder in self.running_builders: if address == builder.address(): skip = True if skip == True: continue # Try to connect to builder and add it to our builder # list if we can try: builder = Builder.Builder(self, address) except RuntimeError: pass else: builder_list.append(builder.to_dict()) builder.start() self.running_builders.append(builder) self._builders_lock.release() return builder_list def list_builders(self): builder_list = [] for builder in self.running_builders: builder_list.append(builder.to_dict()) return builder_list def have_work(self): avail = False for builder in self.running_builders: if builder.available(): avail = True if len(self._queue) > 0 and avail: return True return self._have_work def builder_gone(self): self._have_work = True def process(self): self._have_work = False # Deal with dead/unreachable builders for builder in self.running_builders: if not builder.alive(): print "Removing builder '%s' because it timed out." % builder.address() builder.stop() self.running_builders.remove(builder) # Deal with new arch jobs self._queue_lock.acquire() new_jobs = {} for req in self._queue: parent = req['parent'] stage = parent.get_cur_stage() if (stage != 'prep') and (stage != 'building'): self._queue.remove(req) continue # Find a free builder for this request for builder in self.running_builders: if builder.available() and builder.can_build_arch(req['arch']): try: job = builder.start_job(parent, req['target'], req['arch'], req['srpm_url']) except RuntimeError: pass else: if not new_jobs.has_key(parent): new_jobs[parent] = [] new_jobs[parent].append(job) self._queue.remove(req) break self._queue_lock.release() # Notify the parent jobs of their new archjobs. Have to do this outside _queue_lock # for locking reasons for parent in new_jobs.keys(): for job in new_jobs[parent]: parent.add_arch_job(job) if len(self._queue) > 0: time.sleep(0.25) def request_arch_job(self, par_job, target, arch, srpm_url): req = {} req['parent'] = par_job req['target'] = target req['arch'] = arch req['srpm_url'] = srpm_url self._queue_lock.acquire() self._queue.append(req) self._queue_lock.release() def any_prepping_builders(self): # query each build builder for any jobs that are in the 'prepping' state for builder in self.running_builders: if builder.alive() and builder.any_prepping_jobs(): return True return False --- NEW FILE PackageJob.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. import os import os.path import sys import commands import threading import time import popen2 import rpmUtils import exceptions import shutil import tempfile import smtplib from email.MIMEText import MIMEText import string import SimpleXMLRPCServer import xmlrpclib import socket import BuilderManager import ArchJob # Load in the config execfile("/etc/plague/server/CONFIG.py") os.environ['CVSROOT'] = config_opts['pkg_cvs_root'] if len(config_opts['pkg_cvs_rsh']) > 0: os.environ['CVS_RSH'] = config_opts['pkg_cvs_rsh'] DEBUG = False def debugprint(stuff=''): if DEBUG: print stuff def log(stuff=''): print stuff class PrepError(exceptions.Exception): def __init__(self, errno=0, args=None): exceptions.Exception.__init__(self) self.args = args self.errno = errno def __str__(self): return self.args class BuildError(exceptions.Exception): def __init__(self, errno=0, args=None): exceptions.Exception.__init__(self) self.args = args self.errno = errno def __str__(self): return self.args http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") def is_build_job_stage_valid(stage): """ Validate a job stage. """ stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'cleanup', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] if stage in stages: return True return False class PackageJob(threading.Thread): """ Controller object for building 1 SRPM on multiple arches """ def __init__(self, uid, username, package, cvs_tag, repo, buildmaster, hostname): self.curstage = 'initialize' self.bm = buildmaster self.hostname = hostname self.uid = uid self.username = username self.starttime = time.time() self.endtime = None self.package = package self.name = None self.target = repo.target() self.repo = repo self.failed = False self.no_cvs = config_opts['use_srpm_not_cvs'] self.cvs_tag = cvs_tag self.stage_dir = None self.srpm_path = None self.srpm_http_path = None # Deal with straight SRPM builds if self.no_cvs and self.curstage is 'initialize': self._set_cur_stage('make_srpm') self.repofiles = {} self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() threading.Thread.__init__(self) def get_cur_stage(self): return self.curstage def _set_cur_stage(self, stage): """ Update our internal job stage, and notify the BuildMaster that we've changed as well. """ oldstage = self.curstage self.curstage = stage if oldstage != stage: self.bm.queue_job_status_update(self.uid, stage) def get_uid(self): return self.uid def arch_handling(self, hdr): # Associate sub-architectures with their "master" architecture. # This is only used to determine which arches to build on by default, # so that if we have an Additional Package Arches file that specifies # 'sparcv9' for a package that we don't try to build sparcv9 for that # package unless 'sparc' is listed in our 'targets' config option. sub_arches = { 'athlon' : 'i386', 'i686' : 'i386', 'i586' : 'i386', 'i486' : 'i386', 'amd64' : 'x86_64', 'ia32e' : 'x86_64', 'ppc32' : 'ppc', 'sparcv8' : 'sparc', 'sparcv9' : 'sparc' } # Grab additional build arches out of the Additional Package # Arches file apa_file_name = self.target + "addl-arches" apa_file = os.path.join(config_opts['addl_package_arches_dir'], apa_file_name) addl_arches = [] try: f = open(apa_file, "r") except IOError, e: pass else: for line in f.readlines(): line = line.strip() tmp_split = line.split(':') if len(tmp_split) == 2: package = tmp_split[0] if package == self.name: tmp_arches = tmp_split[1] tmp_arches = tmp_arches.strip() addl_arches = tmp_arches.split(' ') break targets = config_opts['targets'] buildable_arches = targets[self.target] target_opt_arches = config_opts['target_optional_arches'] opt_arches = [] if target_opt_arches.has_key(self.target): opt_arches = target_opt_arches[self.target] # Remove arches we don't support from addl_arches for arch in addl_arches: if sub_arches.has_key(arch): master_addl_arch = sub_arches[arch] if master_addl_arch not in buildable_arches: if master_addl_arch not in opt_arches: addl_arches.remove(arch) ba = hdr['buildarchs'] exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] arches = {} if ba == ['noarch']: arches['noarch'] = None return arches # default to building all base arches the 'target' # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target tmparchs = [] allowed_arches = [] for arch in buildable_arches: tmparchs.append(arch) allowed_arches.append(arch) for arch in addl_arches: tmparchs.append(arch) allowed_arches.append(arch) # Optional arches don't get built by default but are "allowed" for arch in opt_arches: allowed_arches.append(arch) if ba: tmparchs = ba else: if exclusive: tmparchs = exclusive if exclude: for arch in exclude: if arch in tmparchs: tmparchs.remove(arch) # we probably need to check the archs, and make sure they are what # we can build for for thisarch in tmparchs: if thisarch in allowed_arches: arches[thisarch] = None return arches def _make_stage_dir(self, rootdir): # The dir will look like this: # /devel/95-foo-1.1.0-23 pkgsubdir = '%d-%s-%s-%s' % (self.uid, self.name, self.ver, self.release) stage_dir = os.path.join(rootdir, self.target, pkgsubdir) if os.path.exists(stage_dir): shutil.rmtree(stage_dir, ignore_errors=True) os.makedirs(stage_dir) return stage_dir def _checkout(self): self._set_cur_stage('checkout') dir_prefix = self.cvs_tag + "-" self.checkout_tmpdir = tempfile.mkdtemp(prefix=dir_prefix, dir=config_opts['tmpdir']) os.chdir(self.checkout_tmpdir) # Checkout the module cmd = '%s co -r %s %s' % (config_opts['cvs_cmd'], self.cvs_tag, self.package) debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return # Just in case the 'common' directory didn't come along for the ride, # get it from CVS pkg_path = os.path.join(self.checkout_tmpdir, self.package) if not os.path.exists(os.path.join(pkg_path, "common")): os.chdir(pkg_path) cmd = '%s co common' % config_opts['cvs_cmd'] debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) os.chdir(self.checkout_tmpdir) if s != 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return def _make_srpm(self): self._set_cur_stage('make_srpm') self.srpm_path = None srpm_dir = os.path.join(self.checkout_tmpdir, self.package, self.target) if not os.path.exists(srpm_dir): subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return os.chdir(srpm_dir) cmd = '%s srpm' % config_opts['make_cmd'] debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir)) s, o = commands.getstatusoutput(cmd) if s != 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not make srpm for %s - output was:\n %s" % (self.cvs_tag, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return srpmpath = None for line in o.split("\n"): if line.startswith("Wrote:"): line.replace("\n", "") (garbage, path) = line.split(':') srpmpath = path.strip() break if not srpmpath: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find srpm for %s - output was:\n %s" % (self.cvs_tag, o) self.email_result(resultstring=msg, subject=subj) self._set_cur_stage('finished') self.failed = True shutil.rmtree(self.checkout_tmpdir, True) return self.srpm_path = srpmpath def _prep(self): self._set_cur_stage('prep') # In SRPM-only mode, cvs_tag is path to the SRPM to build if self.no_cvs: self.srpm_path = self.cvs_tag ts = rpmUtils.transaction.initReadOnlyTransaction() hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.srpm_path) self.name = hdr['name'] self.ver = hdr['version'] self.release = hdr['release'] self.archjobs = self.arch_handling(hdr) del hdr del ts if len(self.archjobs) == 0: subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find any architectures to build for %s - output was:\n" % (self.cvs_tag) self.email_result(resultstring=msg, subject=subj) self.failed = True self._set_cur_stage('finished') return self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) for arch in self.archjobs.keys(): thisdir = os.path.join(self.stage_dir, arch) if not os.path.exists(thisdir): os.makedirs(thisdir) # Copy the SRPM to the final package product dir srpm = os.path.basename(self.srpm_path) srpm_in_dir = os.path.join(self.stage_dir, srpm) if os.path.exists(srpm_in_dir): os.unlink(srpm_in_dir) shutil.copy(self.srpm_path, self.stage_dir) # Must also copy SRPM to where the build client can get it over HTTP http_pkg_path = self._make_stage_dir(http_dir) self.srpm_http_path = os.path.join(http_pkg_path, srpm) shutil.copy(self.srpm_path, self.srpm_http_path) self.srpm_path = srpm_in_dir # Remove CVS checkout and make_srpm dirs if not self.no_cvs: shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) self._request_arch_jobs() def _request_one_arch_job(self, arch): # Construct SPRM URL srpm_http_base = self.srpm_http_path[len(http_dir):] if config_opts['ssl_builders'] == True: method = "https://" else: method = "http://" srpm_url = method + self.hostname + ":8886/" + srpm_http_base self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url) def _request_arch_jobs(self): # Queue requests for build jobs self._archjobs_lock.acquire() for arch in self.archjobs.keys(): if self.archjobs[arch]: continue self._request_one_arch_job(arch) self._archjobs_lock.release() def add_arch_job(self, job): """ Called by the BuilderManager when it's started a new arch job for us """ self._archjobs_lock.acquire() if self.archjobs[job.arch] != None: log("%s (%s/%s): Already have archjob for this arch (%s). New job UID is %s." % (self.uid, self.package, job.arch, self.archjobs[job.arch].jobid, job.jobid)) self.archjobs[job.arch] = job self._archjobs_lock.release() log("%s (%s/%s): Builder UID is %s" % (self.uid, self.package, job.arch, job.jobid)) def remove_arch_job(self, job): """ Removes an arch job when its builder is no longer responding """ self._archjobs_lock.acquire() print "%s (%s/%s): Builder disappeared. Requeuing arch..." % (self.uid, self.package, job.arch) self.archjobs[job.arch] = None self._request_one_arch_job(job.arch) self._archjobs_lock.release() def is_done(self): if self.curstage == 'needsign' or self.curstage == 'failed' or self.curstage == 'killed': return True return False def die(self, username): # Kill any building jobs self._set_cur_stage('killed') self._archjobs_lock.acquire() for job in self.archjobs.values(): if job: job.die() self.archjobs = {} self._archjobs_lock.release() resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username) self.email_result(resultstring) self.bm.notify_job_done(self) def wake(self): self._event.set() def run(self): while not self.is_done(): # Advance to next stage based on current stage wait = False if self.curstage == 'initialize': self._checkout() elif self.curstage == 'checkout': self._make_srpm() elif self.curstage == 'make_srpm': self._prep() elif self.curstage == 'prep' or self.curstage == 'building': wait = self._monitor() elif self.curstage == 'finished': self._cleanup() elif self.curstage == 'cleanup': if self.failed: self._failed() else: self._add_to_repo() elif self.curstage == 'addtorepo': wait = True elif self.curstage == 'repodone': self._succeeded() if wait: while not self._event.isSet(): self._event.wait() self._event.clear() def _monitor(self): self._set_cur_stage('building') # Count failed and completed jobs completed_jobs = 0 for job in self.archjobs.values(): if not job: continue if job.get_status() is 'done': if job.builder_failed(): self.failed = True else: completed_jobs = completed_jobs + 1 # If any jobs have failed, or if all jobs have completed successfully, advance if self.failed or (completed_jobs == len(self.archjobs)): self._set_cur_stage('finished') return False # Don't want to wait return True def _cleanup(self): self._set_cur_stage('cleanup') if self.failed: # Kill remaining jobs on other arches for job in self.archjobs.values(): if job: job.die() def get_stage_dir(self): return self.stage_dir def _failed(self): self._set_cur_stage('failed') resultstring = """ %s (%s): %s on %s failed to complete on one or more archs. """ % (self.uid, self.package, self.cvs_tag, self.target) resultstring = resultstring + "\n" # Add each arch job and its result: for job in self.archjobs.values(): if job and job.builder_status != 'killed': resultstring = resultstring + " " + "%s - %s: %s" % (job.arch, job.jobid, job.builder_status) + "\n" resultstring = resultstring + "\n" self.email_result(resultstring) self.bm.notify_job_done(self) def _add_to_repo(self): self._set_cur_stage('addtorepo') # Create a list of files that the repo should copy to # the repo dir for job in self.archjobs.values(): if not job: continue file_list = job.get_files() for f in file_list: if not f.endswith(".rpm"): continue src_file = os.path.join(self.stage_dir, job.arch, f) verrel = "%s-%s" % (self.ver, self.release) if f.endswith(".src.rpm"): dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, "SRPM") else: dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, job.arch) self.repofiles[src_file] = dst_path self._event.clear() # Request the repo copy our files. It will get the file # list from this object directly when the copy operation # happens if len(self.repofiles): self.repo.request_copy(self) def repo_add_callback(self): self._set_cur_stage('repodone') self.wake() def _succeeded(self): self._set_cur_stage('needsign') resultstring = "%s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target) self.email_result(resultstring) self.bm.notify_job_done(self) def email_result(self, resultstring, subject=None): """send 'resultstring' to self.email from self.email_from""" msg = MIMEText(resultstring) if not subject: name = self.name if not name: name = self.package subject = 'Build Result: %d - %s on %s' % (self.uid, name, self.target) msg['Subject'] = subject msg['From'] = config_opts['email_from'] msg['To'] = self.username s = smtplib.SMTP() s.connect() s.sendmail(config_opts['email_from'], [self.username], msg.as_string()) s.close() --- NEW FILE main.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 Duke University # written by Seth Vidal import sys import os from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer import SimpleXMLRPCServer from M2Crypto import threading as m2thread sys.path.append('/usr/share/plague/server') import User import BuildMaster import BuilderManager from UserInterface import UserInterfaceSSLAuth from UserInterface import UserInterfaceNoAuth # Load in the config execfile("/etc/plague/server/CONFIG.py") use_lighttpd = True class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer): """ SSL XMLRPC server that authenticates clients based on their certificate. """ def __init__(self, address, certs): AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs) self.authenticator = User.Authenticator() def auth_cb(self, request, client_address): """ Authenticate the user and determine user's privs. TODO: pull user privs from a DB """ peer_cert = request.get_peer_cert() # m2crypto 0.9 only supports 'Email' so fall through # to that if emailAddress doesn't work try: email = peer_cert.get_subject().emailAddress except AttributeError: email = peer_cert.get_subject().Email user = None try: user = self.authenticator.new_authed_user(email, client_address) except Exception: pass return user ################################################################# if __name__ == '__main__': if len(sys.argv) < 2: print "Usage:\n" print " %s \n" % sys.argv[0] sys.exit(1) hostname = sys.argv[1] m2thread.init() builder_manager = BuilderManager.BuilderManager() # Create the BuildMaster thread bm = BuildMaster.BuildMaster(hostname, builder_manager) bm.start() # Create the BuildMaster XMLRPC server UI_PORT = 8887 ui = None if config_opts['ssl_frontend'] == True: ui_certs = {} ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] ui_certs['ca_cert'] = config_opts['ca_cert'] ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] ui = UserInterfaceSSLAuth(builder_manager, bm) bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) else: ui = UserInterfaceNoAuth(builder_manager, bm) bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) bm_server.register_instance(ui) # SRPM fileserver SRPM_SERVER_PORT = 8886 http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") if use_lighttpd: http_cnf_file = "/var/tmp/plague-server.conf" if config_opts['ssl_builders']: key_and_cert = config_opts['server_key_and_cert'] else: key_and_cert = None srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, SRPM_SERVER_PORT, http_dir, False, key_and_cert) else: if config_opts['ssl_builders']: srpm_server_certs = {} srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] srpm_server_certs['ca_cert'] = config_opts['ca_cert'] srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) else: srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) srpm_server.start() print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) try: bm_server.serve_forever() except KeyboardInterrupt: # Make sure the BuildMaster thread shuts down print "Shutting down..." bm.stop() srpm_server.stop() del bm print "Done." m2thread.cleanup() os._exit(0) Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BuildMaster.py 29 Jun 2005 05:23:00 -0000 1.9 +++ BuildMaster.py 5 Jul 2005 21:08:03 -0000 1.10 @@ -1,4 +1,3 @@ -#!/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 @@ -13,15 +12,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # copyright 2005 Duke University -# written by Seth Vidal +# +# Copyright 2005 Dan Williams and Red Hat, Inc. import time -import BuildJob +import PackageJob import sqlite import threading import os import Repo +import copy # Load in the config @@ -69,13 +70,13 @@ class BuildMaster(threading.Thread): - def __init__(self, hostname, client_manager): - self.bcm = client_manager + def __init__(self, hostname, builder_manager): + self.builder_manager = builder_manager self.hostname = hostname self.should_stop = False self.repos = {} for target in config_opts['targets'].keys(): - repo = Repo.Repo(target, client_manager) + repo = Repo.Repo(target, builder_manager) self.repos[target] = repo repo.start() @@ -106,7 +107,6 @@ def __del__(self): self.dbcx.close() - del self.bcm def stop(self): self.should_stop = True @@ -142,7 +142,9 @@ def queue_job_status_update(self, uid, status): self._status_updates_lock.acquire() - self._status_updates[uid] = status + lcl_uid = copy.copy(uid) + lcl_status = copy.copy(status) + self._status_updates[lcl_uid] = lcl_status self._status_updates_lock.release() def notify_job_done(self, job): @@ -164,9 +166,6 @@ self._done_queue = [] self._done_queue_lock.release() - def getClientManager(self): - return self.bcm - def _write_status_to_db(self, uid, status): try: self.curs.execute('UPDATE jobs SET status="%s" WHERE uid=%d' \ @@ -218,7 +217,7 @@ # to make sure we pick the last result to get the correct one row = data[len(data) - 1] repo = self.repos[item['target']] - job = BuildJob.BuildJob(row['uid'], item['email'], item['package'], + job = PackageJob.PackageJob(row['uid'], item['email'], item['package'], locator, repo, self, self.hostname) print "%s (%s): Starting tag '%s' on target '%s'" % (row['uid'], \ @@ -278,6 +277,9 @@ if have_work: return True + if self.builder_manager.have_work(): + return True + return False def get_job(self, jobid): @@ -295,8 +297,8 @@ # Write update status for jobs to the database self._save_job_status() - # Update all build clients and known jobs - self.bcm.process() + if self.builder_manager.have_work(): + self.builder_manager.process() # Clean up jobs that have finished self._process_finished_jobs() Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- CONFIG.py 1 Jul 2005 11:51:33 -0000 1.14 +++ CONFIG.py 5 Jul 2005 21:08:03 -0000 1.15 @@ -16,7 +16,7 @@ config_opts['ssl_frontend'] = True # ssl_buildclients: True = all communication between server & build client # be over an SSL connecction -config_opts['ssl_buildclients'] = True +config_opts['ssl_builders'] = False SERVER_BASE_DIR = "/etc/plague/server" @@ -87,6 +87,6 @@ # Builder Clients -config_opts['builders'] = [ 'https://127.0.0.1:8888' ] +config_opts['builders'] = [ 'http://127.0.0.1:8888' ] Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 28 Jun 2005 16:46:13 -0000 1.4 +++ Makefile 5 Jul 2005 21:08:03 -0000 1.5 @@ -10,9 +10,11 @@ rm -f *.pyc *.pyo *~ *.bak FILES = \ - BuildJob.py \ + ArchJob.py \ + BuilderManager.py \ + Builder.py \ BuildMaster.py \ - client_manager.py \ + PackageJob.py \ Repo.py \ UserInterface.py \ User.py @@ -22,7 +24,7 @@ install: $(MKDIR) -p $(DESTDIR)/$(BINDIR) - $(INSTALL) -m 755 buildserver.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-server + $(INSTALL) -m 755 main.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-server $(MKDIR) -p $(OTHERINSTDIR) for file in $(FILES); do $(INSTALL) -m 644 $$file $(OTHERINSTDIR)/$$file; done $(MKDIR) -p $(CONFIGDIR) Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Repo.py 29 Jun 2005 18:06:12 -0000 1.4 +++ Repo.py 5 Jul 2005 21:08:03 -0000 1.5 @@ -28,8 +28,8 @@ class Repo(threading.Thread): """ Represents an on-disk repository of RPMs and manages updates to the repo. """ - def __init__(self, target, client_manager): - self._bcm = client_manager + def __init__(self, target, builder_manager): + self._builder_manager = builder_manager self._target = target self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): @@ -79,7 +79,7 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() - s, o = commands.getstatusoutput('/usr/bin/createrepo -q %s' % self._repodir) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q %s' % self._repodir) if s != 0: print "createrepo failed with exit status %d!" % s @@ -92,7 +92,7 @@ # 2 until all clients have finished their 'prep' state. Only then do we # copy RPMs to the repo and run createrepo on it. - prepping_clients = self._bcm.any_prepping_clients() + prepping_builders = self._builder_manager.any_prepping_builders() self._lock.acquire() @@ -105,7 +105,7 @@ # Enter lock level 2 if there are no build clients in the # 'prep' state and we are already at lock level 1 - if not prepping_clients and self._lock_count == 1: + if not prepping_builders and self._lock_count == 1: self._lock_count = 2 self._lock.release() Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- UserInterface.py 29 Jun 2005 21:32:33 -0000 1.14 +++ UserInterface.py 5 Jul 2005 21:08:03 -0000 1.15 @@ -23,7 +23,7 @@ import os import copy import BuildMaster -import BuildJob +import PackageJob # Load in the config execfile("/etc/plague/server/CONFIG.py") @@ -50,8 +50,8 @@ Base UserInterface class. NO AUTHENTICATION. Subclass this to provide some. """ - def __init__(self, client_manager, build_master): - self._cm = client_manager + def __init__(self, builder_manager, build_master): + self._builder_manager = builder_manager self._bm = build_master @@ -92,6 +92,12 @@ "%s: try using a shorter path to the SRPM (< 255 chars)." % (srpm_file, target)) return (-1, "Pathname to SRPM is limited to 255 characters.") + srpm_file = os.path.abspath(srpm_file) + if not srpm_file or not os.access(srpm_file, os.R_OK): + email_result(email, srpm_file, "Error setting up build for %s on "\ + "%s: The SRPM does not exist, or is not accessible. Remember to use absolute paths." % (srpm_file, target)) + return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.") + print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" \ % (package, srpm_file, target, email) targets = config_opts['targets'] @@ -131,7 +137,7 @@ if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] - if BuildJob.is_build_job_stage_valid(status): + if PackageJob.is_build_job_stage_valid(status): if first: search = search + " WHERE " first = False @@ -164,16 +170,16 @@ return (ret, msg, job_list) - def update_clients(self): + def update_builders(self): execfile("/etc/plague/server/CONFIG.py") - client_list = self._cm.update_clients() - return (0, "Success.", client_list) + builder_list = self._builder_manager.update_builders() + return (0, "Success.", builder_list) - def list_clients(self): + def list_builders(self): execfile("/etc/plague/server/CONFIG.py") - client_list = self._cm.list_clients() - return (0, "Success.", client_list) + builder_list = self._builder_manager.list_builders() + return (0, "Success.", builder_list) class UserInterfaceSSLAuth(UserInterface): @@ -209,15 +215,15 @@ return UserInterface.list_jobs(self, args_dict) - def update_clients(self, user): + def update_builders(self, user): if not user.server_admin: return (-1, "Insufficient privileges.") - return UserInterface.update_clients(self) + return UserInterface.update_builders(self) - def list_clients(self, user): + def list_builders(self, user): if not user.server_admin: return (-1, "Insufficient privileges.") - return UserInterface.list_clients(self) + return UserInterface.list_builders(self) class UserInterfaceNoAuth(UserInterface): --- BuildJob.py DELETED --- --- buildserver.py DELETED --- --- client_manager.py DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 21:07:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:07:53 -0400 Subject: extras-buildsys ChangeLog,1.42,1.43 Message-ID: <200507052108.j65L8NIb003876@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768 Modified Files: ChangeLog Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ChangeLog 1 Jul 2005 11:51:26 -0000 1.42 +++ ChangeLog 5 Jul 2005 21:07:51 -0000 1.43 @@ -1,3 +1,15 @@ +2005-07-05 Dan Williams + + * Rework a bunch of stuff so the build server doesn't use quite as much CPU, + also split out stuff from server/client_manager.py + + * Generalize the common/ classes to provide both SSL and non-SSL facilities, + renaming a lot of those files in the process + + * Fix non-SSL builder/server and client/server communication + + Note: At this time, SSL may be broken. + 2005-07-01 Dan Williams * We now use lighttpd as the fileserver in both the server and the builder. It's From fedora-extras-commits at redhat.com Tue Jul 5 21:07:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:07:59 -0400 Subject: extras-buildsys/client client.py,1.5,1.6 Message-ID: <200507052108.j65L8TVg003883@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/client Modified Files: client.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- client.py 1 Jul 2005 11:51:27 -0000 1.5 +++ client.py 5 Jul 2005 21:07:57 -0000 1.6 @@ -17,7 +17,7 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import sys, os -from plague import SSLXMLRPCServerProxy +from plague import XMLRPCServerProxy import ConfigParser import M2Crypto import M2Crypto.m2xmlrpclib @@ -39,7 +39,7 @@ config.set('User', 'email', 'foo at it.com') -config_file_path = os.path.expanduser('~/.plague-builder.cfg') +config_file_path = os.path.expanduser('~/.plague-client.cfg') config.read([config_file_path]) @@ -128,46 +128,46 @@ print msg -def print_clients(banner, client_list): +def print_builders(banner, builder_list): print "\n%s:" % banner print "-" * 70 - for client in client_list: - string = " " + client['address'] - string = string + " " * (40 - len(client['address'])) - for arch in client['arches']: + for builder in builder_list: + string = " " + builder['address'] + string = string + " " * (40 - len(builder['address'])) + for arch in builder['arches']: string = string + arch + " " - string = string + " " + client['status'] + string = string + " " + builder['status'] print string print "" -def update_clients(server, email): +def update_builders(server, email): """ - Tell the build server to requery its build client list and re-add dropped - clients that are now alive. + Tell the build server to requery its builder list and re-add dropped + builders that are now alive. """ try: - (e, msg, client_list) = server.update_clients() - if len(client_list) > 0: - print_clients("New Build Clients", client_list) + (e, msg, builder_list) = server.update_builders() + if len(builder_list) > 0: + print_builders("New Builders", builder_list) else: - print "No new build clients found." + print "No new builders found." except (M2Crypto.SSL.SSLError, socket.error), e: print "Error connecting to build server: '%s'" % e -def list_clients(server, email): +def list_builders(server, email): """ - Get a list of currently active build clients. + Get a list of currently active builders. """ try: - (e, msg, client_list) = server.list_clients() - if len(client_list) > 0: - print_clients("Active Build Clients", client_list) + (e, msg, builder_list) = server.list_builders() + if len(builder_list) > 0: + print_builders("Active Builders", builder_list) else: - print "No active build clients found." + print "No active builders found." except (M2Crypto.SSL.SSLError, socket.error), e: print "Error connecting to build server: '%s'" % e @@ -189,7 +189,7 @@ certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert')) certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert')) - server = SSLXMLRPCServerProxy.SSLXMLRPCServerProxy(certs, config.get('Server', 'address')) + server = XMLRPCServerProxy.XMLRPCServerProxy(addr, certs) elif use_ssl == 'false': if addr.startswith("https:"): raise ServerException("Error: '%s' is an SSL server, but the use_ssl config option set to False. See %s" % (addr, config_file_path)) @@ -236,8 +236,8 @@ print " list " print " list " print " kill " - print " update_clients" - print " list_clients" + print " update_builders" + print " list_builders" print "" sys.exit(1) @@ -284,10 +284,10 @@ sys.exit(1) jobid = sys.argv[2] kill(server, email, jobid) - elif cmd == 'update_clients': - update_clients(server, email) - elif cmd == 'list_clients': - list_clients(server, email) + elif cmd == 'update_builders': + update_builders(server, email) + elif cmd == 'list_builders': + list_builders(server, email) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Tue Jul 5 21:07:54 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:07:54 -0400 Subject: extras-buildsys/builder CONFIG.py,1.3,1.4 builder.py,1.4,1.5 Message-ID: <200507052108.j65L8OwE003878@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CONFIG.py 1 Jul 2005 11:51:27 -0000 1.3 +++ CONFIG.py 5 Jul 2005 21:07:52 -0000 1.4 @@ -18,6 +18,7 @@ config_opts['distro_name'] = "fedora" config_opts['repo_name'] = "core" +config_opts['ssl_buildserver'] = False config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 @@ -34,3 +35,6 @@ # WARNING: this directory is world-readable via HTTP! config_opts['builder_work_dir'] = "/tmp/builder_work" +# User to drop privilege level to since we can't run mock as root, +# but we have to run the HTTP server as root so it can chroot +config_opts['builder_user'] = "builder" Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- builder.py 1 Jul 2005 11:51:27 -0000 1.4 +++ builder.py 5 Jul 2005 21:07:52 -0000 1.5 @@ -31,9 +31,9 @@ import urllib import errno from plague import FileDownloader -from plague import SimpleSSLXMLRPCServer +from plague import AuthedXMLRPCServer from plague import lighttpdManager -from plague import SimpleHTTPSServer +from plague import HTTPServer from M2Crypto import threading as m2thread @@ -57,11 +57,15 @@ return None file_part = file_path[len(config_opts["builder_work_dir"]) + 1:] port = "%s" % config_opts['fileserver_port'] - full_url = "https://" + g_our_hostname + ":" + port + "/" + file_part + if config_opts['ssl_buildserver']: + method = "https://" + else: + method = "http://" + full_url = method + g_our_hostname + ":" + port + "/" + file_part return urllib.quote(full_url) -class BuildClientMock: +class BuilderMock: """puts things together for an arch - baseclass for handling builds for other arches""" @@ -372,47 +376,47 @@ return False -class i386Arch(BuildClientMock): +class i386Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-i386-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '/usr/bin/setarch i686' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class x86_64Arch(BuildClientMock): +class x86_64Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-x86_64-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class PPCArch(BuildClientMock): +class PPCArch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-ppc-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class PPC64Arch(BuildClientMock): +class PPC64Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-ppc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class SparcArch(BuildClientMock): +class SparcArch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-sparc-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '/usr/bin/sparc32' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) -class Sparc64Arch(BuildClientMock): +class Sparc64Arch(BuilderMock): def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = '%s-%s-sparc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name']) self.buildarch = buildarch self.arch_command = '/usr/bin/sparc64' - BuildClientMock.__init__(self, uniqid, target, srpm_url) + BuilderMock.__init__(self, uniqid, target, srpm_url) # Keep this global scope, used in __main__ builder_dict = {'i386': i386Arch, @@ -432,7 +436,7 @@ 'sparc64': Sparc64Arch } -def getBuildClient(uniqid, target, buildarch, srpm_url, localarches): +def getArchBuilder(uniqid, target, buildarch, srpm_url, localarches): """hand it an arch it hands you back the builder instance you need""" if not builder_dict.has_key(buildarch): @@ -454,7 +458,7 @@ if config_opts['debug']: print string -class XMLRPCBuildClientServer: +class XMLRPCBuilderServer: def __init__(self, localarches): self.ids = {} # unique id => awclass instance self.localarches = localarches @@ -462,75 +466,122 @@ def process(self): # Give jobs some time to update their status and do their thing - job = 0 - for (uniqid, bcp) in self.ids.iteritems(): - if not bcp.is_done_status(): - bcp.process() - job = uniqid - self.cur_job = job # Update current job + jobid = 0 + for (uniqid, job) in self.ids.iteritems(): + if not job.is_done_status(): + job.process() + jobid = uniqid + self.cur_job = jobid # Update current job - def start(self, target, buildarch, srpm_url): + def start(self, target, arch, srpm_url): if self.cur_job != 0: log("Tried to build '%s' when already buiding something" % srpm_url) return 0 cur_time = time.time() - check = '%d %s %s %s' % (cur_time, target, buildarch, srpm_url) + check = '%d %s %s %s' % (cur_time, target, arch, srpm_url) sum = sha.new() sum.update(check) uniqid = sum.hexdigest() if target == 'devel': target = 'development' - bcp = getBuildClient(uniqid, target, buildarch, srpm_url, self.localarches) - if bcp != None: - self.ids[uniqid] = bcp - bcp.start() + job = getArchBuilder(uniqid, target, arch, srpm_url, self.localarches) + if job != None: + self.ids[uniqid] = job + job.start() filename = os.path.basename(srpm_url) log("%s: started %s on %s arch %s at time %d" % (uniqid, filename, - target, buildarch, cur_time)) + target, arch, cur_time)) else: log("%s: Failed request for %s on %s UNSUPPORTED arch %s at time %d" % - (uniqid, srpm_url, target, buildarch, cur_time)) + (uniqid, srpm_url, target, arch, cur_time)) uniqid = 0 self.cur_job = uniqid return uniqid - def status(self, uniqid=None): - if not uniqid: - uniqid = self.cur_job - if not uniqid: - return 'idle' - try: - bcp = self.ids[uniqid] - except KeyError, e: - bcp = None - if not bcp: - return 'idle' - return bcp.status() - def die(self, uniqid): - bcp = self.ids[uniqid] - return bcp.die() + job = self.ids[uniqid] + return job.die() def files(self, uniqid): - bcp = self.ids[uniqid] - return bcp.files() + job = self.ids[uniqid] + return job.files() def repo_unlocked(self, uniqid): - bcp = self.ids[uniqid] - return bcp.repo_unlocked() + job = self.ids[uniqid] + return job.repo_unlocked() def listjobs(self): return self.ids.keys() def get_cur_job(self): """ Are we currently building something? """ - return self.cur_job + status = 'idle' + try: + job = self.ids[self.cur_job] + status = job.status() + except KeyError: + status = 'idle' + return (self.cur_job, status) def supported_arches(self): return self.localarches +def drop_privs(): + """ + We can't and shouldn't run mock as root, so we drop privs. + We have to run the HTTP server as root though so it can chroot + to the fileserver directory. + """ + + if os.getuid() != 0: + return + + import pwd + import grp + + eu = config_opts['builder_user'] + try: + uid = int(eu) + except ValueError: + try: + pwrec = pwd.getpwnam(eu) + except KeyError: + print "Username '%s' does not exist." % eu + return -1 + uid = pwrec[2] + else: + try: + pwrec = pwd.getpwuid(uid) + except KeyError: + print "User ID %d doesn't exist." % uid + return -1 + gid = pwrec[3] + + if uid == 0: + print "You cannot use the superuser as the 'builder_user' option." + return -1 + + # Make ourself members of the mock group build_user's group + try: + mock_req = grp.getgrnam('mock') + except KeyError: + print "Mock group doesn't exist." + return -1 + groups = [mock_req[2], gid] + os.setgroups(groups) + + try: + os.setgid(gid) + except OSError: + print "Could drop group privileges. Error: '%s'" % sys.exc_info() + return -1 + + os.setuid(uid) + return 0 + + if __name__ == '__main__': if len(sys.argv) < 3: print "Usage:\n" @@ -552,26 +603,46 @@ g_our_hostname = sys.argv[1] localarches = sys.argv[2:] - print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + work_dir = config_opts['builder_work_dir'] + if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): + print "%s does not exist or is not readable." % work_dir + os._exit(1) m2thread.init() - xmlrpc_port = config_opts['xmlrpc_port'] - xmlserver = SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer(certs, (g_our_hostname, xmlrpc_port)) - bcs = XMLRPCBuildClientServer(localarches) - xmlserver.register_instance(bcs) - # Start up the HTTP server thread which the build server # pulls completed RPMs from - work_dir = config_opts['builder_work_dir'] port = config_opts['fileserver_port'] if use_lighttpd: http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid() - http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, config_opts['builder_key_and_cert']) + if config_opts['ssl_buildserver']: + key_and_cert = config_opts['builder_key_and_cert'] + else: + key_and_cert = None + http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: - http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, port), work_dir) + if config_opts['ssl_buildserver']: + http_server = HTTPServer.HTTPServer(certs, (g_our_hostname, port), work_dir, certs) + else: + http_server = HTTPServer.HTTPServer((g_our_hostname, port), work_dir, None) http_server.start() + # Stop running as root + if drop_privs() == -1: + http_server.stop() + time.sleep(1) + m2thread.cleanup() + os._exit(1) + + print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + xmlrpc_port = config_opts['xmlrpc_port'] + if config_opts['ssl_buildserver']: + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), certs) + else: + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port)) + bcs = XMLRPCBuilderServer(localarches) + xmlserver.register_instance(bcs) + last_time = time.time() while True: try: From fedora-extras-commits at redhat.com Tue Jul 5 21:08:00 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 5 Jul 2005 17:08:00 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, NONE, 1.1 HTTPServer.py, NONE, 1.1 XMLRPCServerProxy.py, NONE, 1.1 FileDownloader.py, 1.9, 1.10 Makefile, 1.3, 1.4 SSLCommon.py, 1.7, 1.8 lighttpdManager.py, 1.1, 1.2 SSLXMLRPCServerProxy.py, 1.3, NONE SimpleHTTPSServer.py, 1.6, NONE SimpleSSLXMLRPCServer.py, 1.7, NONE Message-ID: <200507052108.j65L80FM003840@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3768/common Modified Files: FileDownloader.py Makefile SSLCommon.py lighttpdManager.py Added Files: AuthedXMLRPCServer.py HTTPServer.py XMLRPCServerProxy.py Removed Files: SSLXMLRPCServerProxy.py SimpleHTTPSServer.py SimpleSSLXMLRPCServer.py Log Message: 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, also split out stuff from server/client_manager.py * Generalize the common/ classes to provide both SSL and non-SSL facilities, renaming a lot of those files in the process * Fix non-SSL builder/server and client/server communication Note: At this time, SSL may be broken. --- NEW FILE AuthedXMLRPCServer.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 Konstantin Ryabitsev # Modified by Dan Williams import os, sys import socket import time import SocketServer from M2Crypto import SSL import xmlrpclib import SimpleXMLRPCServer import SSLCommon class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): def do_POST(self): """ See documentation on SimpleXMLRPCRequestHandler. Modifications include the ability to pass through local request-specific data, and removal of code to deal with historical _dispatch methods. """ if 0: # ONLY FOR DEBUGGING, so we can see exceptions on the console # get arguments data = self.rfile.read(int(self.headers["content-length"])) authinfo = self.server.get_authinfo(self.request, self.client_address) response = self.server._marshaled_dispatch(data, authinfo) # got a valid XML RPC response self.send_response(200) self.send_header("Content-type", "text/xml") self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) # shut down the connection self.wfile.flush() self.connection.shutdown(1) else: try: # get arguments data = self.rfile.read(int(self.headers["content-length"])) authinfo = self.server.get_authinfo(self.request, self.client_address) response = self.server._marshaled_dispatch(data, authinfo) except: # This should only happen if the module is buggy # internal error, report as HTTP server error self.send_response(500) self.end_headers() else: # got a valid XML RPC response self.send_response(200) self.send_header("Content-type", "text/xml") self.send_header("Content-length", str(len(response))) self.end_headers() self.wfile.write(response) # shut down the connection self.wfile.flush() self.connection.shutdown(1) class BaseAuthedXMLRPCServer: def __init__(self, address, authinfo_callback=None): self.allow_reuse_address = 1 self.logRequests = 0 self.authinfo_callback = authinfo_callback if sys.version_info[:3] > (2, 2, 3): SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) def get_authinfo(self, request, client_address): if self.authinfo_callback: return self.authinfo_callback(request, client_address) return None def verify_request(self, request, client_address): """ Allow ourselves a chance to verify the client """ if self.authinfo_callback: authinfo = self.get_authinfo(request, client_address) if authinfo: return True return False # Allow all requests if there's no authinfo_callback return True def _marshaled_dispatch(self, data, authinfo): """ Allow the ability to pass request-dependent objects into the handler instance. """ params, method = xmlrpclib.loads(data) # generate response try: response = self._dispatch(authinfo, method, params) # wrap response in a singleton tuple response = (response,) response = xmlrpclib.dumps(response, methodresponse=1) except xmlrpclib.Fault, fault: response = xmlrpclib.dumps(fault) except: # report exception back to server response = xmlrpclib.dumps( xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)) ) return response def _dispatch(self, authinfo, method, params): """ Allow the ability to pass request-dependent objects into the handler instance. """ func = None try: # check to see if a matching function has been registered func = self.funcs[method] except KeyError: if self.instance is not None: # call instance method directly try: func = self.lcl_resolve_dotted_attribute(method) except AttributeError: pass if func is not None: # Only pass authinfo into Instance if we have are set # up to get authinfo if self.authinfo_callback is not None: return func(authinfo, *params) else: return func(*params) else: raise Exception('method "%s" is not supported' % method) # Sigh. Different versions of M2Crypto have this in different places def lcl_resolve_dotted_attribute(self, method): pyver = sys.version_info[:3] if pyver <= (2, 3, 4): return SimpleXMLRPCServer.resolve_dotted_attribute( self.instance, method) elif pyver > (2, 3, 4): return SimpleXMLRPCServer.resolve_dotted_attribute( self.instance, method, self.allow_dotted_names) def serve_forever(self): while True: try: self.handle_request() except KeyboardInterrupt, e: print "Shutting down..." break except socket.error, e: if e[0] == 11: #Resource temporarily unavailable try: time.sleep(0.1) except KeyboardInterrupt, e: print "Shutting down..." break class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.QuietSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): """ Extension to allow more fine-tuned SSL handling """ def __init__(self, address, authinfo_callback=None, certs=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) ctx = SSLCommon.getSSLContext(certs) SSLCommon.QuietSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, ctx) class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SocketServer.ThreadingTCPServer, SimpleXMLRPCServer.SimpleXMLRPCServer): def __init__(self, address, authinfo_callback=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) SocketServer.ThreadingTCPServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) --- NEW FILE HTTPServer.py --- #!/usr/bin/python -t # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. # import SimpleHTTPServer import SocketServer import threading import urllib import posixpath import os, sys from SimpleHTTPServer import SimpleHTTPRequestHandler from M2Crypto import Rand, SSL from M2Crypto.SSL.SSLServer import ThreadingSSLServer import SSLCommon import socket import time from M2Crypto import threading as m2thread class HttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): def __init__(self, request, client_address, server): self._server = server SimpleHTTPServer.SimpleHTTPRequestHandler.__init__(self, request, client_address, server) def list_directory(self, path): self.send_error(404, "No permission to list directory") def log_request(self, code='-', size='-'): # Don't log requests pass def translate_path(self, path): """Translate a /-separated PATH to the local filename syntax. Components that mean special things to the local file system (e.g. drive or directory names) are ignored. (XXX They should probably be diagnosed.) This code is lifted from SimpleHTTPRequestHandler so that we can make sure the request is always based in our download directory, not the current directory. """ path = posixpath.normpath(urllib.unquote(path)) words = path.split('/') words = filter(None, words) path = self._server.http_dir for word in words: drive, word = os.path.splitdrive(word) head, word = os.path.split(word) if word in (os.curdir, os.pardir): continue path = os.path.join(path, word) return path def do_GET(self): SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) # try: # SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) # except Exception, e: # # We get an exception if the client drops the transfer # pass class ThreadingHTTPSServer(ThreadingSSLServer): """ SSL-enabled variant """ def __init__(self, server_addr, http_dir, certs): self.allow_reuse_address = 1 self.http_dir = http_dir self.ctx = SSLCommon.getSSLContext(certs) ThreadingSSLServer.__init__(self, server_addr, HttpRequestHandler, self.ctx) self.server_name = server_addr[0] self.server_port = server_addr[1] # About the last thing we want is a client blocking the server # because it hung or tracebacked timeout = SSL.timeout(10) self.socket.set_socket_read_timeout(timeout) self.socket.set_socket_write_timeout(timeout) def finish(self): if self.request: self.request.set_shutdown(SSL.SSL_RECEIVED_SHUTDOWN | SSL.SSL_SENT_SHUTDOWN) self.request.close() def serve_forever(self): while True: try: self.handle_request() except KeyboardInterrupt, e: print "Shutting down..." break except socket.error, e: if e[0] == 11: # Resource temporarily unavailable try: time.sleep(0.1) except KeyboardInterrupt, e: print "Shutting down..." break class ThreadingHTTPServer(SocketServer.ThreadingTCPServer): """ Non-SSL variant """ def __init__(self, certs, server_addr, http_dir): self.allow_reuse_address = 1 self.http_dir = http_dir ThreadingTCPServer.__init__(self, server_addr, HttpRequestHandler) def serve_forever(self): while True: try: self.handle_request() except KeyboardInterrupt, e: print "Shutting down..." break except socket.error, e: if e[0] == 11: # Resource temporarily unavailable try: time.sleep(0.1) except KeyboardInterrupt, e: print "Shutting down..." break class HTTPServer(threading.Thread): def __init__(self, addr, http_dir, certs): if certs and len(certs) > 0: self._server = ThreadingHTTPSServer(addr, http_dir, certs) else: self._server = ThreadingHTTPServer(addr, http_dir) self._stop = False threading.Thread.__init__(self) def run(self): while not self._stop: self._server.handle_request() def stop(self): self._stop = True ########################################################### # Testing stuff ########################################################### if __name__ == '__main__': if len(sys.argv) < 4: print "Usage: python SimpleHTTPSServer.py key_and_cert ca_cert peer_ca_cert" sys.exit(1) certs = {} certs['key_and_cert'] = sys.argv[1] certs['ca_cert'] = sys.argv[2] certs['peer_ca_cert'] = sys.argv[3] print "Starting..." srcdir = os.path.join("/tmp", "server_dir") if not os.path.exists(srcdir): os.makedirs(srcdir) print "Creating random test data..." f = open(os.path.join(srcdir, "testfile.dat"), "w") x = 1 while x < 10000: f.write(os.urandom(50)) x = x + 1 f.close() m2thread.init() print "Starting the server." server = SimpleHTTPSServer(certs, ('localhost', 8886), srcdir) server.start() while True: try: time.sleep(1) except KeyboardInterrupt: print "Quitting..." m2thread.cleanup() os._exit(0) --- NEW FILE XMLRPCServerProxy.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. # # Modified by Dan Williams import os, sys from M2Crypto import SSL from M2Crypto.m2xmlrpclib import SSL_Transport, ServerProxy import SSLCommon class XMLRPCServerProxy(ServerProxy): def __init__(self, uri, certs): if certs and len(certs) > 0: self.ctx = SSLCommon.getSSLContext(certs) ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) else: ServerProxy.__init__(self, uri) Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- FileDownloader.py 1 Jul 2005 11:51:33 -0000 1.9 +++ FileDownloader.py 5 Jul 2005 21:07:57 -0000 1.10 @@ -83,7 +83,10 @@ self._filename = get_base_filename_from_url(self._url, legal_exts) if not self._filename: print "Couldn't get base filename from url!! target_dir=%s, url=%s" % (target_dir, url) - self._opener = HTTPSURLopener.HTTPSURLopener(certs) + if certs and len(certs) > 0: + self._opener = HTTPSURLopener.HTTPSURLopener(certs) + else: + self._opener = urllib.URLopener() threading.Thread.__init__(self) def run(self): Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 1 Jul 2005 11:51:33 -0000 1.3 +++ Makefile 5 Jul 2005 21:07:57 -0000 1.4 @@ -11,10 +11,10 @@ CommonErrors.py \ FileDownloader.py \ HTTPSURLopener.py \ - SimpleHTTPSServer.py \ - SimpleSSLXMLRPCServer.py \ + HTTPServer.py \ + AuthedXMLRPCServer.py \ SSLCommon.py \ - SSLXMLRPCServerProxy.py \ + XMLRPCServerProxy.py \ lighttpdManager.py \ __init__.py Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SSLCommon.py 1 Jul 2005 11:51:33 -0000 1.7 +++ SSLCommon.py 5 Jul 2005 21:07:57 -0000 1.8 @@ -51,7 +51,11 @@ class QuietSSLServer(SSL.ThreadingSSLServer): def __init__(self, server_address, RequestHandlerClass, ssl_context): - SSL.SSLServer.__init__(self, server_address, RequestHandlerClass, ssl_context) + try: + SSL.SSLServer.__init__(self, server_address, RequestHandlerClass, ssl_context) + except socket.error, e: + if e[0] == 49: # Cannot assign requested address + print "Error: requested address '%s' couldn't be used." % server_address # About the last thing we want is a client blocking the server # because it hung or tracebacked Index: lighttpdManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/lighttpdManager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lighttpdManager.py 1 Jul 2005 11:51:33 -0000 1.1 +++ lighttpdManager.py 5 Jul 2005 21:07:58 -0000 1.2 @@ -25,7 +25,7 @@ class lighttpdManager(threading.Thread): - def __init__(self, conffile, hostname, port, basedir, key_and_cert): + def __init__(self, conffile, hostname, port, basedir, exit_if_dead, key_and_cert): self._stop = False self._pobj = None self._conffile = conffile @@ -33,6 +33,7 @@ self._hostname = hostname self._basedir = basedir self._key_and_cert = key_and_cert + self._exit_if_dead = exit_if_dead threading.Thread.__init__(self) if not self._setup(): os._exit(1) @@ -41,7 +42,7 @@ def _setup(self): if not os.path.exists(self._basedir): os.makedirs(self._basedir) - if not os.access(self._key_and_cert, os.R_OK): + if self._key_and_cert and not os.access(self._key_and_cert, os.R_OK): print "%s does not exist or is not readable." % self._key_and_cert return False if not os.path.exists(os.path.dirname(self._conffile)): @@ -59,9 +60,13 @@ server.username = "lighttpd" server.groupname = "lighttpd" server.dir-listing = "disable" +''' % (self._basedir, self._port, self._hostname) + + if self._key_and_cert: + cnf = cnf + ''' ssl.engine = "enable" ssl.pemfile = "%s" -''' % (self._basedir, self._port, self._hostname, self._key_and_cert) +''' % (self._key_and_cert) f = open(self._conffile, "w") f.write(cnf) @@ -79,21 +84,27 @@ st = self._pobj.poll() # Restart it if it fails if st >= 0: - print "HTTP server failed, trying to restart..." - print "----------------------------------------" - for line in self._pobj.fromchild.readlines(): - print line - print "----------------------------------------\n" - del self._pobj - if not self._setup(): + if self._exit_if_dead: + print "HTTP server failed! exiting..." os._exit(1) - self._start_server() + else: + print "HTTP server failed, trying to restart..." + print "----------------------------------------" + for line in self._pobj.fromchild.readlines(): + print line + print "----------------------------------------\n" + del self._pobj + if not self._setup(): + os._exit(1) + self._start_server() time.sleep(5) if self._pobj: - os.kill(self._pobj.pid, 15) - os.remove(self._conffile) - + try: + os.kill(self._pobj.pid, 15) + os.remove(self._conffile) + except: + pass def stop(self): self._stop = True --- SSLXMLRPCServerProxy.py DELETED --- --- SimpleHTTPSServer.py DELETED --- --- SimpleSSLXMLRPCServer.py DELETED --- From fedora-extras-commits at redhat.com Tue Jul 5 21:15:05 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 5 Jul 2005 17:15:05 -0400 Subject: common tobuild,1.1785,1.1786 Message-ID: <200507052115.j65LF5Ma003946@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3927 Modified Files: tobuild Log Message: request build of rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1785 retrieving revision 1.1786 diff -u -r1.1785 -r1.1786 --- tobuild 5 Jul 2005 21:00:53 -0000 1.1785 +++ tobuild 5 Jul 2005 21:15:03 -0000 1.1786 @@ -15,3 +15,4 @@ orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel +awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 21:51:04 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 17:51:04 -0400 Subject: common tobuild,1.1786,1.1787 Message-ID: <200507052151.j65Lp5qR004514@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4497 Modified Files: tobuild Log Message: request build of rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1786 retrieving revision 1.1787 diff -u -r1.1786 -r1.1787 --- tobuild 5 Jul 2005 21:15:03 -0000 1.1786 +++ tobuild 5 Jul 2005 21:51:02 -0000 1.1787 @@ -16,3 +16,4 @@ spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 +orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 5 21:51:22 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 5 Jul 2005 17:51:22 -0400 Subject: common tobuild,1.1787,1.1788 Message-ID: <200507052151.j65LpMJ0004576@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4559 Modified Files: tobuild Log Message: request build of rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1787 retrieving revision 1.1788 diff -u -r1.1787 -r1.1788 --- tobuild 5 Jul 2005 21:51:02 -0000 1.1787 +++ tobuild 5 Jul 2005 21:51:19 -0000 1.1788 @@ -17,3 +17,4 @@ dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 +orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 5 22:04:27 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Tue, 5 Jul 2005 18:04:27 -0400 Subject: CVSROOT avail,1.7,1.8 Message-ID: <200507052205.j65M5F8K005669@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5650 Modified Files: avail Log Message: Add acls for fedora-security module Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- avail 14 Jun 2005 19:11:19 -0000 1.7 +++ avail 5 Jul 2005 22:04:21 -0000 1.8 @@ -42,3 +42,6 @@ avail | riel | web/html/projects/virtualisation avail | ezannoni | web/html/projects/systemtap avail | harald | web/html/docs/udev + +unavail | | fedora-security +avail | mjc,bressers,jorton,notting,gafton,sopwith,katzj | fedora-security From fedora-extras-commits at redhat.com Tue Jul 5 22:09:24 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 5 Jul 2005 18:09:24 -0400 Subject: rpms/octave/devel octave.spec,1.10,1.11 Message-ID: <200507052209.j65M9OPM005737@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5720 Modified Files: octave.spec Log Message: Build with HDF5 support. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- octave.spec 22 Jun 2005 20:24:50 -0000 1.10 +++ octave.spec 5 Jul 2005 22:09:22 -0000 1.11 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -14,7 +14,7 @@ Requires: gnuplot less info texinfo Requires: /sbin/install-info BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas -BuildPrereq: ncurses-devel zlib-devel libtermcap-devel +BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +128,9 @@ %changelog +* Tue Jul 05 2005 Quentin Spencer 2.1.71-12 +- Require hdf5-devel for build. + * Wed Jun 22 2005 Quentin Spencer 2.1.71-11 - Force octave-devel to require readline-devel. - Add _libdir to configure command (fixes broken mkoctfile on x86_64). From fedora-extras-commits at redhat.com Tue Jul 5 22:10:35 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 5 Jul 2005 18:10:35 -0400 Subject: common tobuild,1.1788,1.1789 Message-ID: <200507052210.j65MAZgl005803@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5785 Modified Files: tobuild Log Message: request build of rpms/octave/devel octave-2_1_71-12_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1788 retrieving revision 1.1789 diff -u -r1.1788 -r1.1789 --- tobuild 5 Jul 2005 21:51:19 -0000 1.1788 +++ tobuild 5 Jul 2005 22:10:33 -0000 1.1789 @@ -18,3 +18,4 @@ awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 +qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 5 23:04:29 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 19:04:29 -0400 Subject: rpms/gnome-applet-sensors/devel gnome-applet-sensors.spec,1.2,1.3 Message-ID: <200507052304.j65N4xTd006972@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-serv6955 Modified Files: gnome-applet-sensors.spec Log Message: * Tue Jul 05 2005 Aaron Kurtz - 1.0-2 - rawhide Cairo dependencies Index: gnome-applet-sensors.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-sensors/devel/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:37:00 -0000 1.2 +++ gnome-applet-sensors.spec 5 Jul 2005 23:04:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: gnome-applet-sensors Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome panel applet for hardware sensors Group: User Interface/Desktops @@ -12,7 +12,8 @@ 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 @@ -59,6 +60,9 @@ %changelog +* Tue Jul 05 2005 Aaron Kurtz - 1.0-2 +- rawhide Cairo dependencies + * Sat Jul 02 2005 Aaron Kurtz - 1.0-1 - bump to stable release 1.0 From fedora-extras-commits at redhat.com Tue Jul 5 23:07:47 2005 From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon)) Date: Tue, 5 Jul 2005 19:07:47 -0400 Subject: common tobuild,1.1789,1.1790 Message-ID: <200507052307.j65N7lDj007068@cvs-int.fedora.redhat.com> Author: dragoon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7051 Modified Files: tobuild Log Message: request build of rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1789 retrieving revision 1.1790 diff -u -r1.1789 -r1.1790 --- tobuild 5 Jul 2005 22:10:33 -0000 1.1789 +++ tobuild 5 Jul 2005 23:07:45 -0000 1.1790 @@ -19,3 +19,4 @@ orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel +dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 00:46:11 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Tue, 5 Jul 2005 20:46:11 -0400 Subject: common tobuild,1.1790,1.1791 Message-ID: <200507060046.j660kBD3008368@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8351 Modified Files: tobuild Log Message: request build of rpms/konversation/FC-3 konversation-0_18-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1790 retrieving revision 1.1791 diff -u -r1.1790 -r1.1791 --- tobuild 5 Jul 2005 23:07:45 -0000 1.1790 +++ tobuild 6 Jul 2005 00:46:09 -0000 1.1791 @@ -20,3 +20,4 @@ orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel +ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 6 01:45:33 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 21:45:33 -0400 Subject: devel/qgo .cvsignore,1.2,1.3 qgo.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200507060145.j661jXVP009537@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/qgo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9516 Modified Files: .cvsignore qgo.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/qgo/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2005 04:10:28 -0000 1.2 +++ .cvsignore 6 Jul 2005 01:45:31 -0000 1.3 @@ -1 +1 @@ -qgo-1.0.1.tar.gz +qgo-1.0.2.tar.gz Index: qgo.spec =================================================================== RCS file: /cvs/extras/devel/qgo/qgo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qgo.spec 25 Jun 2005 19:11:43 -0000 1.6 +++ qgo.spec 6 Jul 2005 01:45:31 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Graphical Go client and SGF editor Name: qgo -Version: 1.0.1 -Release: 6%{?dist} +Version: 1.0.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://qgo.sourceforge.net/ @@ -55,6 +55,9 @@ %{_datadir}/mimelnk/text/sgf.desktop %changelog +* Tue Jul 05 2005 Chris Ricker 1.0.2-1 +- New upstream release + * Sat Jun 25 2005 Chris Ricker 1.0.1-6 - *really* fix desktop file (BZ#160007) - fix dist tagging Index: sources =================================================================== RCS file: /cvs/extras/devel/qgo/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 May 2005 04:10:28 -0000 1.2 +++ sources 6 Jul 2005 01:45:31 -0000 1.3 @@ -1 +1 @@ -6bc17460c17cc0e19af01c991bfbd128 qgo-1.0.1.tar.gz +c202a232d1902a902683c421f0177b8c qgo-1.0.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 01:46:02 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 21:46:02 -0400 Subject: devel/common tobuild,1.1791,1.1792 Message-ID: <200507060146.j661k2o4009601@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9584 Modified Files: tobuild Log Message: request build of devel/qgo qgo-1_0_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.1791 retrieving revision 1.1792 diff -u -r1.1791 -r1.1792 --- tobuild 6 Jul 2005 00:46:09 -0000 1.1791 +++ tobuild 6 Jul 2005 01:46:00 -0000 1.1792 @@ -21,3 +21,4 @@ qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 +kaboom devel/qgo qgo-1_0_2-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 01:54:57 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Tue, 5 Jul 2005 21:54:57 -0400 Subject: rpms/qgo/FC-4 .cvsignore,1.2,1.3 qgo.spec,1.6,1.7 sources,1.2,1.3 Message-ID: <200507060154.j661sv2i009649@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/qgo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9628 Modified Files: .cvsignore qgo.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgo/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 May 2005 04:10:28 -0000 1.2 +++ .cvsignore 6 Jul 2005 01:54:54 -0000 1.3 @@ -1 +1 @@ -qgo-1.0.1.tar.gz +qgo-1.0.2.tar.gz Index: qgo.spec =================================================================== RCS file: /cvs/extras/rpms/qgo/FC-4/qgo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qgo.spec 25 Jun 2005 19:04:49 -0000 1.6 +++ qgo.spec 6 Jul 2005 01:54:54 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Graphical Go client and SGF editor Name: qgo -Version: 1.0.1 -Release: 6%{?dist} +Version: 1.0.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://qgo.sourceforge.net/ @@ -55,6 +55,9 @@ %{_datadir}/mimelnk/text/sgf.desktop %changelog +* Tue Jul 05 2005 Chris Ricker 1.0.2-1 +- New upstream release + * Sat Jun 25 2005 Chris Ricker 1.0.1-6 - *really* fix desktop file (BZ#160007) - fix dist tagging Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgo/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 May 2005 04:10:28 -0000 1.2 +++ sources 6 Jul 2005 01:54:54 -0000 1.3 @@ -1 +1 @@ -6bc17460c17cc0e19af01c991bfbd128 qgo-1.0.1.tar.gz +c202a232d1902a902683c421f0177b8c qgo-1.0.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 04:12:42 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 00:12:42 -0400 Subject: rpms/octave/FC-4 octave.spec,1.15,1.16 Message-ID: <200507060412.j664CgBr013193@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13171 Modified Files: octave.spec Log Message: Add HDF5 support. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- octave.spec 22 Jun 2005 18:21:58 -0000 1.15 +++ octave.spec 6 Jul 2005 04:12:39 -0000 1.16 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -14,7 +14,7 @@ Requires: gnuplot less info texinfo Requires: /sbin/install-info BuildPrereq: gnuplot bison flex less tetex gcc-gfortran lapack blas -BuildPrereq: ncurses-devel zlib-devel libtermcap-devel +BuildPrereq: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildPrereq: readline-devel glibc-devel fftw3-devel autoconf gperf Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -128,6 +128,9 @@ %changelog +* Tue Jul 05 2005 Quentin Spencer 2.1.71-13 +- Require hdf5-devel for build. + * Wed Jun 22 2005 Quentin Spencer 2.1.71-12 - Add _libdir to configure command (fixes broken mkoctfile on x86_64). From fedora-extras-commits at redhat.com Wed Jul 6 04:13:26 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 00:13:26 -0400 Subject: common tobuild,1.1792,1.1793 Message-ID: <200507060413.j664DQDf013255@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13238 Modified Files: tobuild Log Message: request build of rpms/octave/FC-4 octave-2_1_71-13_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1792 retrieving revision 1.1793 diff -u -r1.1792 -r1.1793 --- tobuild 6 Jul 2005 01:46:00 -0000 1.1792 +++ tobuild 6 Jul 2005 04:13:24 -0000 1.1793 @@ -22,3 +22,4 @@ dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 kaboom devel/qgo qgo-1_0_2-1_fc5 devel +qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 05:36:20 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:36:20 -0400 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.7, 1.8 perl-Module-Build.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200507060536.j665aKwG014443@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-serv14422 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: * Wed Jul 06 2005 Steven Pritchard - 0.2611-1 - Update to 0.2611 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Apr 2005 12:31:28 -0000 1.7 +++ .cvsignore 6 Jul 2005 05:36:18 -0000 1.8 @@ -1 +1 @@ -Module-Build-0.2610.tar.gz +Module-Build-0.2611.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Module-Build.spec 7 May 2005 19:06:22 -0000 1.11 +++ perl-Module-Build.spec 6 Jul 2005 05:36:18 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Module-Build -Version: 0.2610 -Release: 3 +Version: 0.2611 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules Group: Development/Libraries @@ -52,6 +52,9 @@ %changelog +* Wed Jul 06 2005 Steven Pritchard - 0.2611-1 +- Update to 0.2611 + * Sat May 7 2005 Ville Skytt?? - 0.2610-3 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 16 Apr 2005 12:31:28 -0000 1.7 +++ sources 6 Jul 2005 05:36:18 -0000 1.8 @@ -1 +1 @@ -a21addf2dbd1725b6b035fbfe65cb30f Module-Build-0.2610.tar.gz +d0fa9a7917ed43d1c1f8b707e86b6061 Module-Build-0.2611.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 05:36:33 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:36:33 -0400 Subject: common tobuild,1.1793,1.1794 Message-ID: <200507060536.j665aXeK014505@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14488 Modified Files: tobuild Log Message: request build of rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1793 retrieving revision 1.1794 diff -u -r1.1793 -r1.1794 --- tobuild 6 Jul 2005 04:13:24 -0000 1.1793 +++ tobuild 6 Jul 2005 05:36:31 -0000 1.1794 @@ -23,3 +23,4 @@ ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 kaboom devel/qgo qgo-1_0_2-1_fc5 devel qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 +steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 05:58:43 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:58:43 -0400 Subject: rpms/perl-IPC-ShareLite/devel perl-IPC-ShareLite.spec,1.6,1.7 Message-ID: <200507060558.j665whtp014593@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-serv14576 Modified Files: perl-IPC-ShareLite.spec Log Message: Add %{?dist} to differentiate devel branch. Index: perl-IPC-ShareLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IPC-ShareLite/devel/perl-IPC-ShareLite.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-IPC-ShareLite.spec 6 Apr 2005 22:12:46 -0000 1.6 +++ perl-IPC-ShareLite.spec 6 Jul 2005 05:58:41 -0000 1.7 @@ -2,7 +2,7 @@ Name: perl-IPC-ShareLite Version: 0.09 -Release: 5 +Release: 5%{?dist} Summary: Light-weight Perl interface to shared memory From fedora-extras-commits at redhat.com Wed Jul 6 05:59:40 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 6 Jul 2005 01:59:40 -0400 Subject: rpms/perl-Text-Reform/devel perl-Text-Reform.spec,1.6,1.7 Message-ID: <200507060559.j665xeFp014621@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-serv14604 Modified Files: perl-Text-Reform.spec Log Message: Add %{?dist} to differentiate devel branch. Index: perl-Text-Reform.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Reform/devel/perl-Text-Reform.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Text-Reform.spec 6 Apr 2005 22:13:09 -0000 1.6 +++ perl-Text-Reform.spec 6 Jul 2005 05:59:38 -0000 1.7 @@ -2,7 +2,7 @@ Name: perl-Text-Reform Version: 1.11 -Release: 4 +Release: 4%{?dist} Summary: Manual text wrapping and reformatting From fedora-extras-commits at redhat.com Wed Jul 6 06:08:05 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 6 Jul 2005 02:08:05 -0400 Subject: rpms/most/FC-3 .cvsignore, 1.2, 1.3 most.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507060608.j66685nF015741@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15720 Modified Files: .cvsignore most.spec sources Log Message: updated to 4.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:52:46 -0000 1.2 +++ .cvsignore 6 Jul 2005 06:08:02 -0000 1.3 @@ -1 +1 @@ -most-4.9.5.tar.gz +most-4.10.1.tar.bz2 Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/most.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- most.spec 12 Feb 2005 14:00:37 -0000 1.4 +++ most.spec 6 Jul 2005 06:08:02 -0000 1.5 @@ -1,16 +1,13 @@ -# $Id$ - -Summary: more, less, most -Name: most -Version: 4.9.5 -Release: 3 -Epoch: 0 -License: GPL -URL: ftp://space.mit.edu/pub/davis/most/ -Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: slang-devel +Summary: more, less, most +Name: most +Version: 4.10.1 +Release: 1%{?dist} +License: GPL +URL: ftp://space.mit.edu/pub/davis/most/ +Group: Applications/Text +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: slang-devel %description most is a paging program that displays, one windowful at a time, the @@ -23,7 +20,7 @@ %build sed -i 's!s\%@RPATH@\%.*!s\%@RPATH@\%\%g!' configure -%ifarch x86_64 +%ifarch x86_64 ppc ppc64 sed -i 's|/usr/lib|%{_libdir}|g' configure %endif chmod +x configure @@ -46,8 +43,14 @@ %changelog +* Fri Jul 01 2005 Adrian Reber - 4.10.1-1 +- updated to 4.10.1 + +* Wed Mar 30 2005 Adrian Reber - 4.9.5-4 +- fix build on ppc/ppc64 + * Sat Feb 12 2005 Thorsten Leemhuis - 4.9.5-3 -- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build; +- sed -i 's|/usr/lib|%%{_libdir}|g' configure fixes x86_64 build; * Mon Jul 19 2004 Adrian Reber - 0:4.9.5-0.fdr.2 - removed chrpath dependency Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:52:46 -0000 1.2 +++ sources 6 Jul 2005 06:08:02 -0000 1.3 @@ -1 +1 @@ -5c0922952485b0a5822ef994603dcc2f most-4.9.5.tar.gz +9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 6 06:08:31 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 6 Jul 2005 02:08:31 -0400 Subject: common tobuild,1.1794,1.1795 Message-ID: <200507060608.j6668Vtx015801@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15782 Modified Files: tobuild Log Message: request build of rpms/most/FC-3 most-4_10_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1794 retrieving revision 1.1795 diff -u -r1.1794 -r1.1795 --- tobuild 6 Jul 2005 05:36:31 -0000 1.1794 +++ tobuild 6 Jul 2005 06:08:28 -0000 1.1795 @@ -24,3 +24,4 @@ kaboom devel/qgo qgo-1_0_2-1_fc5 devel qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel +adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 6 07:37:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 03:37:30 -0400 Subject: common tobuild,1.1795,1.1796 Message-ID: <200507060737.j667bUpL017204@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17187 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_2_beta4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1795 retrieving revision 1.1796 diff -u -r1.1795 -r1.1796 --- tobuild 6 Jul 2005 06:08:28 -0000 1.1795 +++ tobuild 6 Jul 2005 07:37:28 -0000 1.1796 @@ -25,3 +25,4 @@ qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 +mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel From fedora-extras-commits at redhat.com Wed Jul 6 07:41:48 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 6 Jul 2005 03:41:48 -0400 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 sylpheed-claws.spec, 1.14, 1.15 Message-ID: <200507060741.j667fmMj017257@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-serv17236 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade - add dist tag Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 May 2005 07:17:22 -0000 1.6 +++ .cvsignore 6 Jul 2005 07:41:46 -0000 1.7 @@ -1 +1 @@ -sylpheed-claws-1.9.11.tar.bz2 +sylpheed-claws-1.9.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 May 2005 07:17:22 -0000 1.7 +++ sources 6 Jul 2005 07:41:46 -0000 1.8 @@ -1 +1 @@ -20e5d1796c45ef93520fb3b6defbf857 sylpheed-claws-1.9.11.tar.bz2 +c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sylpheed-claws.spec 29 May 2005 21:35:32 -0000 1.14 +++ sylpheed-claws.spec 6 Jul 2005 07:41:46 -0000 1.15 @@ -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.11 -Release: 1 +Version: 1.9.12 +Release: 1%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.9.11.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.12.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -109,6 +109,10 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Wed Jul 06 2005 Andreas Bierfert +1.9.12-1 +- version upgrade +- add dist tag * Thu May 26 2005 Andreas Bierfert 1.9.11-1 From fedora-extras-commits at redhat.com Wed Jul 6 07:42:44 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 6 Jul 2005 03:42:44 -0400 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 sylpheed-claws.spec, 1.14, 1.15 Message-ID: <200507060742.j667gicw017290@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17269 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - version upgrade - add dist tag Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 29 May 2005 07:17:22 -0000 1.6 +++ .cvsignore 6 Jul 2005 07:42:42 -0000 1.7 @@ -1 +1 @@ -sylpheed-claws-1.9.11.tar.bz2 +sylpheed-claws-1.9.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 May 2005 07:17:22 -0000 1.7 +++ sources 6 Jul 2005 07:42:42 -0000 1.8 @@ -1 +1 @@ -20e5d1796c45ef93520fb3b6defbf857 sylpheed-claws-1.9.11.tar.bz2 +c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sylpheed-claws.spec 29 May 2005 21:35:32 -0000 1.14 +++ sylpheed-claws.spec 6 Jul 2005 07:42:42 -0000 1.15 @@ -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.11 -Release: 1 +Version: 1.9.12 +Release: 1%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.9.11.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.12.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -109,6 +109,10 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Wed Jul 06 2005 Andreas Bierfert +1.9.12-1 +- version upgrade +- add dist tag * Thu May 26 2005 Andreas Bierfert 1.9.11-1 From fedora-extras-commits at redhat.com Wed Jul 6 08:13:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 04:13:39 -0400 Subject: devel/sylpheed sylpheed.spec,1.16,1.17 Message-ID: <200507060813.j668DdvU018954@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18937 Modified Files: sylpheed.spec Log Message: just a test Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sylpheed.spec 5 Jul 2005 17:06:03 -0000 1.16 +++ sylpheed.spec 6 Jul 2005 08:13:37 -0000 1.17 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.2.beta4 +Release: 0.3.beta4 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -42,6 +42,7 @@ %setup -q -n %{name}-2.0.0beta4 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop +rpm --query cairo-devel %build autoconf @@ -83,7 +84,7 @@ %{_mandir}/man1 %changelog -* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.2.beta4 +* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.3.beta4 - Update to 2.0.0beta4. * Tue Jun 28 2005 Michael Schwendt From fedora-extras-commits at redhat.com Wed Jul 6 08:14:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 04:14:12 -0400 Subject: common tobuild,1.1796,1.1797 Message-ID: <200507060814.j668ECtk019015@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18998 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_3_beta4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1796 retrieving revision 1.1797 diff -u -r1.1796 -r1.1797 --- tobuild 6 Jul 2005 07:37:28 -0000 1.1796 +++ tobuild 6 Jul 2005 08:14:10 -0000 1.1797 @@ -26,3 +26,4 @@ steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel +mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel From fedora-extras-commits at redhat.com Wed Jul 6 11:54:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 6 Jul 2005 07:54:44 -0400 Subject: common tobuild,1.1797,1.1798 Message-ID: <200507061154.j66BsiLw022976@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22959 Modified Files: tobuild Log Message: request build of rpms/fish/FC-3 fish-1_11_1-10_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1797 retrieving revision 1.1798 diff -u -r1.1797 -r1.1798 --- tobuild 6 Jul 2005 08:14:10 -0000 1.1797 +++ tobuild 6 Jul 2005 11:54:42 -0000 1.1798 @@ -27,3 +27,4 @@ adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel +oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 6 11:55:29 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 6 Jul 2005 07:55:29 -0400 Subject: common tobuild,1.1798,1.1799 Message-ID: <200507061155.j66BtT3g023038@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23021 Modified Files: tobuild Log Message: request build of rpms/fish/FC-4 fish-1_11_1-10_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1798 retrieving revision 1.1799 diff -u -r1.1798 -r1.1799 --- tobuild 6 Jul 2005 11:54:42 -0000 1.1798 +++ tobuild 6 Jul 2005 11:55:27 -0000 1.1799 @@ -28,3 +28,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 +oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 12:21:25 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:21:25 -0400 Subject: rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc.spec,1.5,1.6 Message-ID: <200507061221.j66CLS8J024208@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/tetex-font-cm-lgc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174/tetex-font-cm-lgc/devel Modified Files: tetex-font-cm-lgc.spec Log Message: Run updmap-sys in %post only when installing, not when updating. Index: tetex-font-cm-lgc.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/devel/tetex-font-cm-lgc.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tetex-font-cm-lgc.spec 17 Jun 2005 02:26:32 -0000 1.5 +++ tetex-font-cm-lgc.spec 6 Jul 2005 12:21:23 -0000 1.6 @@ -4,7 +4,7 @@ Name: tetex-font-cm-lgc Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CM-LGC Type1 fonts for LaTeX Group: Applications/Publishing @@ -64,7 +64,9 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +if [ "$1" = "1" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +fi %postun if [ "$1" = "0" ]; then @@ -88,6 +90,9 @@ %changelog +* Wed Jul 6 2005 Sarantis Paskalis - 0.5-2 +- Run updmap-sys only when installing, not when updating + * Wed Jun 15 2005 Sarantis Paskalis - 0.5-1 - update to 0.5 (#160464) - make the package tetex-3 compliant (use updmap-sys instead of updmap, From fedora-extras-commits at redhat.com Wed Jul 6 12:21:25 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:21:25 -0400 Subject: rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc.spec,1.6,1.7 Message-ID: <200507061221.j66CLS8n024209@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/tetex-font-cm-lgc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24174/tetex-font-cm-lgc/FC-4 Modified Files: tetex-font-cm-lgc.spec Log Message: Run updmap-sys in %post only when installing, not when updating. Index: tetex-font-cm-lgc.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-cm-lgc/FC-4/tetex-font-cm-lgc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tetex-font-cm-lgc.spec 17 Jun 2005 02:25:33 -0000 1.6 +++ tetex-font-cm-lgc.spec 6 Jul 2005 12:21:22 -0000 1.7 @@ -4,7 +4,7 @@ Name: tetex-font-cm-lgc Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CM-LGC Type1 fonts for LaTeX Group: Applications/Publishing @@ -64,7 +64,9 @@ %post /usr/bin/mktexlsr %{texmf} -/usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +if [ "$1" = "1" ]; then + /usr/bin/updmap-sys --quiet --nohash --outputdir %{texmf}/dvips/config --enable Map cm-lgc.map +fi %postun if [ "$1" = "0" ]; then @@ -88,6 +90,9 @@ %changelog +* Wed Jul 6 2005 Sarantis Paskalis - 0.5-2 +- Run updmap-sys only when installing, not when updating + * Wed Jun 15 2005 Sarantis Paskalis - 0.5-1 - update to 0.5 (#160464) - make the package tetex-3 compliant (use updmap-sys instead of updmap, From fedora-extras-commits at redhat.com Wed Jul 6 12:23:14 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:23:14 -0400 Subject: common tobuild,1.1799,1.1800 Message-ID: <200507061223.j66CNEoe024274@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24257 Modified Files: tobuild Log Message: request build of rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1799 retrieving revision 1.1800 diff -u -r1.1799 -r1.1800 --- tobuild 6 Jul 2005 11:55:27 -0000 1.1799 +++ tobuild 6 Jul 2005 12:23:11 -0000 1.1800 @@ -29,3 +29,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 +sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 12:25:08 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Wed, 6 Jul 2005 08:25:08 -0400 Subject: common tobuild,1.1800,1.1801 Message-ID: <200507061225.j66CP8g2024341@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24324 Modified Files: tobuild Log Message: request build of rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1800 retrieving revision 1.1801 diff -u -r1.1800 -r1.1801 --- tobuild 6 Jul 2005 12:23:11 -0000 1.1800 +++ tobuild 6 Jul 2005 12:25:06 -0000 1.1801 @@ -30,3 +30,4 @@ oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 +sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 13:42:18 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 09:42:18 -0400 Subject: devel/sylpheed sylpheed.spec,1.17,1.18 Message-ID: <200507061342.j66DgI4l025603@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25586 Modified Files: sylpheed.spec Log Message: remove the test again and give another build a try -- buildsys should access an up-to-date rawhide tree now according to bug 162551 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed.spec 6 Jul 2005 08:13:37 -0000 1.17 +++ sylpheed.spec 6 Jul 2005 13:42:16 -0000 1.18 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.3.beta4 +Release: 0.4.beta4 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -42,7 +42,6 @@ %setup -q -n %{name}-2.0.0beta4 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop -rpm --query cairo-devel %build autoconf @@ -84,7 +83,7 @@ %{_mandir}/man1 %changelog -* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.3.beta4 +* Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.4.beta4 - Update to 2.0.0beta4. * Tue Jun 28 2005 Michael Schwendt From fedora-extras-commits at redhat.com Wed Jul 6 13:42:51 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 09:42:51 -0400 Subject: common tobuild,1.1801,1.1802 Message-ID: <200507061342.j66DgpTb025662@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25645 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_4_beta4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1801 retrieving revision 1.1802 diff -u -r1.1801 -r1.1802 --- tobuild 6 Jul 2005 12:25:06 -0000 1.1801 +++ tobuild 6 Jul 2005 13:42:49 -0000 1.1802 @@ -31,3 +31,4 @@ oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel +mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel From fedora-extras-commits at redhat.com Wed Jul 6 13:43:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 6 Jul 2005 09:43:28 -0400 Subject: common tobuild,1.1802,1.1803 Message-ID: <200507061343.j66DhSoN025685@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25668 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1802 retrieving revision 1.1803 diff -u -r1.1802 -r1.1803 --- tobuild 6 Jul 2005 13:42:49 -0000 1.1802 +++ tobuild 6 Jul 2005 13:43:26 -0000 1.1803 @@ -1,32 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -gemi rpms/tkcvs/FC-4 tkcvs-7_2_3-1 fc4 -gemi rpms/tkcvs/devel tkcvs-7_2_3-2 devel -gemi rpms/global/FC-4 global-4_8_6-1_fc4 fc4 -gemi rpms/global/devel global-4_8_6-1_fc5 devel -gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_5-1_fc4 fc4 -dragoon rpms/gnome-applet-sensors/FC-4 gnome-applet-sensors-1_0-1_fc4 fc4 -gemi rpms/TeXmacs/devel TeXmacs-1_0_5_5-1_fc5 devel -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-7_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-7_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-7_fc4 fc4 -orion rpms/hdf5/devel hdf5-1_6_4-4_fc5 devel -spot rpms/scrub/FC-4 scrub-1_6-3_fc4 fc4 -dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-1_fc5 devel -awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 -orion rpms/hdf5/FC-3 hdf5-1_6_4-4_fc3 fc3 -orion rpms/hdf5/FC-4 hdf5-1_6_4-4_fc4 fc4 -qspencer rpms/octave/devel octave-2_1_71-12_fc5 devel -dragoon rpms/gnome-applet-sensors/devel gnome-applet-sensors-1_0-2_fc5 devel -ausil rpms/konversation/FC-3 konversation-0_18-4_fc3 fc3 -kaboom devel/qgo qgo-1_0_2-1_fc5 devel -qspencer rpms/octave/FC-4 octave-2_1_71-13_fc4 fc4 -steve rpms/perl-Module-Build/devel perl-Module-Build-0_2611-1_fc5 devel -adrian rpms/most/FC-3 most-4_10_1-1_fc3 fc3 -mschwendt devel/sylpheed sylpheed-2_0_0-0_2_beta4 devel -mschwendt devel/sylpheed sylpheed-2_0_0-0_3_beta4 devel oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 14:33:36 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:36 -0400 Subject: rpms/glabels - New directory Message-ID: <200507061433.j66EXaWf026944@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/glabels Log Message: Directory /cvs/extras/rpms/glabels added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 14:33:37 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:37 -0400 Subject: rpms/glabels/devel - New directory Message-ID: <200507061433.j66EXbkc026949@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26920/glabels/devel Log Message: Directory /cvs/extras/rpms/glabels/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 14:33:56 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:56 -0400 Subject: rpms/glabels Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507061433.j66EXuqW027001@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26967 Added Files: Makefile import.log Log Message: Setup of module glabels --- NEW FILE Makefile --- # Top level Makefile for module glabels all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 6 14:33:56 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:33:56 -0400 Subject: rpms/glabels/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507061434.j66EXupl027006@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26967/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module glabels --- NEW 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 Jul 6 14:35:22 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:35:22 -0400 Subject: rpms/glabels import.log,1.1,1.2 Message-ID: <200507061435.j66EZMsZ027079@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27048 Modified Files: import.log Log Message: auto-import glabels-2.0.3-1 on branch devel from glabels-2.0.3-1.src.rpm Initial import of glabels Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glabels/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Jul 2005 14:33:54 -0000 1.1 +++ import.log 6 Jul 2005 14:35:20 -0000 1.2 @@ -0,0 +1 @@ +glabels-2_0_3-1:HEAD:glabels-2.0.3-1.src.rpm:1120660509 From fedora-extras-commits at redhat.com Wed Jul 6 14:35:22 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 6 Jul 2005 10:35:22 -0400 Subject: rpms/glabels/devel glabels.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507061435.j66EZMpP027086@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27048/devel Modified Files: .cvsignore sources Added Files: glabels.spec Log Message: auto-import glabels-2.0.3-1 on branch devel from glabels-2.0.3-1.src.rpm Initial import of glabels --- NEW FILE glabels.spec --- Name: glabels Version: 2.0.3 Release: 1%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 BuildRequires: libgnomeprintui22-devel BuildRequires: desktop-file-utils, scrollkeeper Requires(post): /sbin/ldconfig Requires(post): scrollkeeper Requires(post): shared-mime-info Requires(post): desktop-file-utils Requires(postun): /sbin/ldconfig Requires(postun): scrollkeeper Requires(postun): shared-mime-info Requires(postun): desktop-file-utils %description gLabels is a lightweight program for creating labels and business cards for the GNOME desktop environment. It is designed to work with various laser/ink-jet peel-off label and business card sheets that you'll find at most office supply stores. %package devel Summary: Development files and documentation for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel This package contains the header files, static libraries and development documentation for %{name}. %prep %setup %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT \ UPDATE_DESKTOP_DATABASE="true" UPDATE_MIME_DATABASE="true" 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} %post scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : /sbin/ldconfig %postun scrollkeeper-update -q || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root, 0755) %doc AUTHORS ChangeLog COPYING NEWS README %doc %{_datadir}/gnome/help/glabels/ %doc %{_mandir}/man1/glabels.1* %{_bindir}/glabels* %{_libdir}/libglabels.so.* %{_datadir}/application-registry/glabels.applications %{_datadir}/applications/fedora-glabels.desktop %{_datadir}/glabels/ %{_datadir}/mime/packages/glabels.xml %{_datadir}/mime-info/glabels.* %{_datadir}/pixmaps/glabels/ %{_datadir}/pixmaps/glabels.png %{_datadir}/pixmaps/glabels-application-x-glabels.png %{_datadir}/omf/glabels/ %files devel %defattr(-, root, root, 0755) %{_includedir}/libglabels/ %{_libdir}/libglabels.a %{_libdir}/libglabels.so %exclude %{_libdir}/libglabels.la %changelog * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Jul 2005 14:33:54 -0000 1.1 +++ .cvsignore 6 Jul 2005 14:35:20 -0000 1.2 @@ -0,0 +1 @@ +glabels-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Jul 2005 14:33:54 -0000 1.1 +++ sources 6 Jul 2005 14:35:20 -0000 1.2 @@ -0,0 +1 @@ +c077afdeac5ba0c685e404eea1d794e8 glabels-2.0.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 14:46:19 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 10:46:19 -0400 Subject: rpms/octave/devel octave.spec,1.11,1.12 Message-ID: <200507061446.j66EkJjB027203@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27186 Modified Files: octave.spec Log Message: Rebuild. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- octave.spec 5 Jul 2005 22:09:22 -0000 1.11 +++ octave.spec 6 Jul 2005 14:46:17 -0000 1.12 @@ -2,7 +2,7 @@ Name: octave Version: 2.1.71 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -128,6 +128,9 @@ %changelog +* Wed Jul 06 2005 Quentin Spencer 2.1.71-13 +- Rebuild + * Tue Jul 05 2005 Quentin Spencer 2.1.71-12 - Require hdf5-devel for build. From fedora-extras-commits at redhat.com Wed Jul 6 14:49:29 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 6 Jul 2005 10:49:29 -0400 Subject: common tobuild,1.1803,1.1804 Message-ID: <200507061449.j66EnTcA027293@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27276 Modified Files: tobuild Log Message: request build of rpms/octave/devel octave-2_1_71-13_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1803 retrieving revision 1.1804 diff -u -r1.1803 -r1.1804 --- tobuild 6 Jul 2005 13:43:26 -0000 1.1803 +++ tobuild 6 Jul 2005 14:49:27 -0000 1.1804 @@ -6,3 +6,4 @@ sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel +qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 14:50:15 2005 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Wed, 6 Jul 2005 10:50:15 -0400 Subject: common tobuild,1.1804,1.1805 Message-ID: <200507061450.j66EoFZi027326@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27309 Modified Files: tobuild Log Message: request build of rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1804 retrieving revision 1.1805 diff -u -r1.1804 -r1.1805 --- tobuild 6 Jul 2005 14:49:27 -0000 1.1804 +++ tobuild 6 Jul 2005 14:50:13 -0000 1.1805 @@ -7,3 +7,4 @@ sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel +caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel From fedora-extras-commits at redhat.com Wed Jul 6 16:45:37 2005 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 6 Jul 2005 12:45:37 -0400 Subject: common tobuild,1.1805,1.1806 Message-ID: <200507061645.j66Gjbpd029781@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29764 Modified Files: tobuild Log Message: request build of rpms/qgo/FC-4 qgo-1_0_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1805 retrieving revision 1.1806 diff -u -r1.1805 -r1.1806 --- tobuild 6 Jul 2005 14:50:13 -0000 1.1805 +++ tobuild 6 Jul 2005 16:45:35 -0000 1.1806 @@ -8,3 +8,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel +kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 From qspencer at ieee.org Wed Jul 6 16:57:22 2005 From: qspencer at ieee.org (Quentin Spencer) Date: Wed, 06 Jul 2005 11:57:22 -0500 Subject: APPROVED: ncview Message-ID: <42CC0D72.1080708@ieee.org> Author: Ed Hill Reviewers: Quentin Spencer, Orion Poplawski Package Summary: Ncview is a visual browser for netCDF format files. Typically you would use ncview to get a quick and easy, push-button look at your netCDF files. You can view simple movies of the data, view along various dimensions, take a look at the actual data values, change color maps, invert the data, etc. From fedora-extras-commits at redhat.com Wed Jul 6 17:06:38 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Wed, 6 Jul 2005 13:06:38 -0400 Subject: web/html/download mirrors.php,1.18,1.19 Message-ID: <200507061707.j66H7J50030892@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30868 Modified Files: mirrors.php Log Message: Added url for new mirror falkor.skane.se Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mirrors.php 5 Jul 2005 20:33:39 -0000 1.18 +++ mirrors.php 6 Jul 2005 17:06:24 -0000 1.19 @@ -414,6 +414,7 @@
  • Sweden
  • Switzerland
      From bugs.michael at gmx.net Wed Jul 6 17:52:34 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Wed, 6 Jul 2005 19:52:34 +0200 Subject: APPROVED: mgopen-fonts Message-ID: <20050706195234.43a98d84.bugs.michael@gmx.net> Package: mgopen-fonts The MgOpen fonts are a font family that includes Latin and Greek glyphs. The fonts have been released under a liberal license, similar to the license covering the Bitstream Vera fonts. Reviewer: Michael Schwendt Maintainer: Sarantis Paskalis -------------- 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 Wed Jul 6 17:56:09 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 6 Jul 2005 13:56:09 -0400 Subject: common tobuild,1.1806,1.1807 Message-ID: <200507061756.j66Hu9bf031073@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31056 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1806 retrieving revision 1.1807 diff -u -r1.1806 -r1.1807 --- tobuild 6 Jul 2005 16:45:35 -0000 1.1806 +++ tobuild 6 Jul 2005 17:56:07 -0000 1.1807 @@ -9,3 +9,4 @@ qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 +skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 19:19:20 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Wed, 6 Jul 2005 15:19:20 -0400 Subject: web/html/download mirrors.php,1.19,1.20 Message-ID: <200507061919.j66JJKOg000974@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv957 Modified Files: mirrors.php Log Message: Added new mirror applios.net Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mirrors.php 6 Jul 2005 17:06:24 -0000 1.19 +++ mirrors.php 6 Jul 2005 19:19:18 -0000 1.20 @@ -119,6 +119,7 @@
    • rsync://mirrors.usc.edu/fedora/
    • ftp://mirror.colorado.edu/pub/fedora/linux/core/
    • ftp://mirrors.csumb.edu/fedora/updates/ (Updates only)
      • +
    • ftp://ftp.applios.net/pub/fedora/linux/core
  • Canada From fedora-extras-commits at redhat.com Wed Jul 6 20:08:07 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:07 -0400 Subject: rpms/perl-Tree-DAG_Node - New directory Message-ID: <200507062008.j66K87ov002242@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2222/perl-Tree-DAG_Node Log Message: Directory /cvs/extras/rpms/perl-Tree-DAG_Node added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 20:08:07 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:07 -0400 Subject: rpms/perl-Tree-DAG_Node/devel - New directory Message-ID: <200507062008.j66K873P002247@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2222/perl-Tree-DAG_Node/devel Log Message: Directory /cvs/extras/rpms/perl-Tree-DAG_Node/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 6 20:08:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:27 -0400 Subject: rpms/perl-Tree-DAG_Node/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507062008.j66K8R4U002299@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2267/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Tree-DAG_Node --- NEW 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 Jul 6 20:08:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:08:27 -0400 Subject: rpms/perl-Tree-DAG_Node Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507062008.j66K8Rkn002294@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2267 Added Files: Makefile import.log Log Message: Setup of module perl-Tree-DAG_Node --- NEW FILE Makefile --- # Top level Makefile for module perl-Tree-DAG_Node all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 6 20:09:00 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:09:00 -0400 Subject: rpms/perl-Tree-DAG_Node import.log,1.1,1.2 Message-ID: <200507062009.j66K9VMw002365@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331 Modified Files: import.log Log Message: auto-import perl-Tree-DAG_Node-1.05-2 on branch devel from perl-Tree-DAG_Node-1.05-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-DAG_Node/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Jul 2005 20:08:24 -0000 1.1 +++ import.log 6 Jul 2005 20:08:58 -0000 1.2 @@ -0,0 +1 @@ +perl-Tree-DAG_Node-1_05-2:HEAD:perl-Tree-DAG_Node-1.05-2.src.rpm:1120680529 From fedora-extras-commits at redhat.com Wed Jul 6 20:09:01 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:09:01 -0400 Subject: rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507062009.j66K9VGm002369@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Tree-DAG_Node/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331/devel Modified Files: .cvsignore sources Added Files: perl-Tree-DAG_Node.spec Log Message: auto-import perl-Tree-DAG_Node-1.05-2 on branch devel from perl-Tree-DAG_Node-1.05-2.src.rpm --- NEW FILE perl-Tree-DAG_Node.spec --- Name: perl-Tree-DAG_Node Version: 1.05 Release: 2%{?dist} Summary: Class for representing nodes in a tree Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Tree-DAG_Node/ Source0: http://www.cpan.org/authors/id/S/SB/SBURKE/Tree-DAG_Node-1.05.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This class encapsulates/makes/manipulates objects that represent nodes in a tree structure. The tree structure is not an object itself, but is emergent from the linkages you create between nodes. This class provides the methods for making linkages that can be used to build up a tree, while preventing you from ever making any kinds of linkages which are not allowed in a tree (such as having a node be its own mother or ancestor, or having a node have two mothers). %prep %setup -q -n Tree-DAG_Node-%{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}/Tree/ %{_mandir}/man3/*.3* %changelog * Fri Jul 1 2005 Jose Pedro Oliveira - 1.05-2 - Dist tag. * Thu Dec 30 2004 Jose Pedro Oliveira - 0:1.05-0.fdr.1 - Update to 1.05. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:1.04-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-DAG_Node/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Jul 2005 20:08:25 -0000 1.1 +++ .cvsignore 6 Jul 2005 20:08:59 -0000 1.2 @@ -0,0 +1 @@ +Tree-DAG_Node-1.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tree-DAG_Node/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Jul 2005 20:08:25 -0000 1.1 +++ sources 6 Jul 2005 20:08:59 -0000 1.2 @@ -0,0 +1 @@ +6956aa477dae75fbb5e7caab83c43d0a Tree-DAG_Node-1.05.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 20:11:31 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 6 Jul 2005 16:11:31 -0400 Subject: common tobuild,1.1807,1.1808 Message-ID: <200507062011.j66KBVpV002475@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2458 Modified Files: tobuild Log Message: request build of rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1807 retrieving revision 1.1808 diff -u -r1.1807 -r1.1808 --- tobuild 6 Jul 2005 17:56:07 -0000 1.1807 +++ tobuild 6 Jul 2005 20:11:28 -0000 1.1808 @@ -10,3 +10,4 @@ caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 +jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 20:38:27 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 6 Jul 2005 16:38:27 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.10,1.11 Message-ID: <200507062038.j66KcR7w002750@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2733 Modified Files: galeon.spec Log Message: 1.3.21-6: fixed buildrequires Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- galeon.spec 4 Jul 2005 12:49:02 -0000 1.10 +++ galeon.spec 6 Jul 2005 20:38:25 -0000 1.11 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -10,11 +10,13 @@ Requires: scrollkeeper Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) BuildRequires: gettext mozilla-nspr-devel desktop-file-utils -BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel BuildRequires: mozilla-devel >= 37:1.7.2 BuildRequires: libxml2-devel >= 2.6.6 BuildRequires: libgnomeui-devel >= 2.5.2 -BuildRequires: autoconf +%ifarch x86_64 +BuildRequires: autoconf automake libtool +%endif %description Galeon is a web browser built around Gecko (Mozilla's rendering @@ -98,6 +100,9 @@ %changelog +* Wed Jul 6 2005 Dams - 1.3.21-6 +- Added missing BuildRequires + * Sat Jul 2 2005 Dams - 1.3.21 - Rebuild From fedora-extras-commits at redhat.com Wed Jul 6 20:39:14 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 6 Jul 2005 16:39:14 -0400 Subject: common tobuild,1.1808,1.1809 Message-ID: <200507062039.j66KdEB5002812@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2795 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-6_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1808 retrieving revision 1.1809 diff -u -r1.1808 -r1.1809 --- tobuild 6 Jul 2005 20:11:28 -0000 1.1808 +++ tobuild 6 Jul 2005 20:39:12 -0000 1.1809 @@ -11,3 +11,4 @@ kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel +anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 21:21:03 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:21:03 -0400 Subject: extras-buildsys/server ArchJob.py, 1.1, 1.2 Builder.py, 1.1, 1.2 CONFIG.py, 1.15, 1.16 Repo.py, 1.5, 1.6 main.py, 1.1, 1.2 Message-ID: <200507062121.j66LL3bL004095@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/server Modified Files: ArchJob.py Builder.py CONFIG.py Repo.py main.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ArchJob.py 5 Jul 2005 21:08:03 -0000 1.1 +++ ArchJob.py 6 Jul 2005 21:21:00 -0000 1.2 @@ -24,7 +24,6 @@ import urllib from plague import FileDownloader from plague import CommonErrors -from M2Crypto import SSL # Load in the config execfile("/etc/plague/server/CONFIG.py") Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Builder.py 5 Jul 2005 21:08:03 -0000 1.1 +++ Builder.py 6 Jul 2005 21:21:00 -0000 1.2 @@ -23,7 +23,6 @@ import threading from plague import XMLRPCServerProxy from plague import CommonErrors -from M2Crypto import SSL import ArchJob # Load in the config @@ -53,7 +52,7 @@ self._arches = [] try: self._arches = self._server.supported_arches() - except (socket.error, SSL.SSLError): + except socket.error: raise RuntimeError self._alive = True self._arches.append('noarch') @@ -86,7 +85,7 @@ self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) - except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): + except (socket.error, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() @@ -105,7 +104,7 @@ self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() - except (socket.error, SSL.SSLError, xmlrpclib.ProtocolError): + except (socket.error, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- CONFIG.py 5 Jul 2005 21:08:03 -0000 1.15 +++ CONFIG.py 6 Jul 2005 21:21:00 -0000 1.16 @@ -16,7 +16,7 @@ config_opts['ssl_frontend'] = True # ssl_buildclients: True = all communication between server & build client # be over an SSL connecction -config_opts['ssl_builders'] = False +config_opts['ssl_builders'] = True SERVER_BASE_DIR = "/etc/plague/server" Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Repo.py 5 Jul 2005 21:08:03 -0000 1.5 +++ Repo.py 6 Jul 2005 21:21:00 -0000 1.6 @@ -31,6 +31,9 @@ def __init__(self, target, builder_manager): self._builder_manager = builder_manager self._target = target + if not os.path.exists(config_opts['repo_dir']): + print "Error: Repository directory '%s' does not exist." % config_opts['repodir'] + os._exit(1) self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): os.makedirs(self._repodir) Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main.py 5 Jul 2005 21:08:03 -0000 1.1 +++ main.py 6 Jul 2005 21:21:01 -0000 1.2 @@ -22,7 +22,6 @@ from plague import lighttpdManager from plague import HTTPServer import SimpleXMLRPCServer -from M2Crypto import threading as m2thread sys.path.append('/usr/share/plague/server') @@ -49,24 +48,12 @@ self.authenticator = User.Authenticator() def auth_cb(self, request, client_address): - """ - Authenticate the user and determine user's privs. - TODO: pull user privs from a DB - """ - peer_cert = request.get_peer_cert() - - # m2crypto 0.9 only supports 'Email' so fall through - # to that if emailAddress doesn't work - try: - email = peer_cert.get_subject().emailAddress - except AttributeError: - email = peer_cert.get_subject().Email - - user = None + peer_cert = request.get_peer_certificate() + email = peer_cert.get_subject().emailAddress try: user = self.authenticator.new_authed_user(email, client_address) except Exception: - pass + user = None return user @@ -80,8 +67,6 @@ hostname = sys.argv[1] - m2thread.init() - builder_manager = BuilderManager.BuilderManager() # Create the BuildMaster thread @@ -119,9 +104,9 @@ srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] srpm_server_certs['ca_cert'] = config_opts['ca_cert'] srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] - srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) + srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) else: - srpm_server = HTTPServer.HTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) + srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) srpm_server.start() print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) @@ -135,7 +120,6 @@ del bm print "Done." - m2thread.cleanup() os._exit(0) From fedora-extras-commits at redhat.com Wed Jul 6 21:20:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:51 -0400 Subject: extras-buildsys ChangeLog,1.43,1.44 plague.spec,1.7,1.8 Message-ID: <200507062121.j66LLLFc004099@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996 Modified Files: ChangeLog plague.spec Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- ChangeLog 5 Jul 2005 21:07:51 -0000 1.43 +++ ChangeLog 6 Jul 2005 21:20:49 -0000 1.44 @@ -1,3 +1,7 @@ +2005-07-06 Dan Williams + + * Convert M2Crypto code to pyOpenSSL so that stuff actually works + 2005-07-05 Dan Williams * Rework a bunch of stuff so the build server doesn't use quite as much CPU, Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plague.spec 1 Jul 2005 11:51:26 -0000 1.7 +++ plague.spec 6 Jul 2005 21:20:49 -0000 1.8 @@ -9,7 +9,7 @@ Source: http://people.redhat.com/dcbw/plague/%{name}-%{version}.tar.bz2 URL: http://people.redhat.com/dcbw/plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: python-sqlite, m2crypto, createrepo +Requires: python-sqlite, pyOpenSSL, createrepo Requires: %{name}-common = %{version}-%{release} Requires: lighttpd @@ -21,7 +21,7 @@ %package common Summary: Common resources for the Plague build system Group: Development/Tools -Requires: m2crypto +Requires: pyOpenSSL %description common This package includes the common Python module that all Plague services require. @@ -32,7 +32,7 @@ Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1 -Requires: mock >= 0.3, m2crypto +Requires: mock >= 0.3, pyOpenSSL %description builder The Plague build client does the actual RPM package building on slave @@ -42,7 +42,7 @@ Summary: Package queueing client for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: m2crypto +Requires: pyOpenSSL Requires: lighttpd %description client @@ -53,7 +53,7 @@ Summary: Utility programs for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires: m2crypto +Requires: pyOpenSSL %description utils This package includes user utilities for the Plague build system, including From fedora-extras-commits at redhat.com Wed Jul 6 21:20:57 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:57 -0400 Subject: extras-buildsys/client client.py,1.6,1.7 Message-ID: <200507062121.j66LLR9x004106@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/client Modified Files: client.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- client.py 5 Jul 2005 21:07:57 -0000 1.6 +++ client.py 6 Jul 2005 21:20:55 -0000 1.7 @@ -19,10 +19,9 @@ import sys, os from plague import XMLRPCServerProxy import ConfigParser -import M2Crypto -import M2Crypto.m2xmlrpclib -import M2Crypto.X509 import socket +import xmlrpclib +import OpenSSL config = ConfigParser.ConfigParser() @@ -101,7 +100,7 @@ if status: args['status'] = status (e, msg, jobs) = server.list_jobs(args) - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -121,7 +120,7 @@ try: (err, msg) = server.kill_job(email, jobid) - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -153,7 +152,7 @@ print_builders("New Builders", builder_list) else: print "No new builders found." - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e @@ -168,7 +167,7 @@ print_builders("Active Builders", builder_list) else: print "No active builders found." - except (M2Crypto.SSL.SSLError, socket.error), e: + except socket.error, e: print "Error connecting to build server: '%s'" % e @@ -194,7 +193,7 @@ if addr.startswith("https:"): raise ServerException("Error: '%s' is an SSL server, but the use_ssl config option set to False. See %s" % (addr, config_file_path)) else: - server = M2Crypto.m2xmlrpclib.ServerProxy(addr) + server = xmlrpclib.ServerProxy(addr) else: raise ServerException("Unrecognized value for config '%s' option use_ssl. See %s" % (use_ssl, config_file_path)) @@ -212,13 +211,11 @@ if not os.access(certfile, os.R_OK): print "%s does not exist or is not readable." % certfile sys.exit(1) - cert = M2Crypto.X509.load_cert(certfile) - # m2crypto 0.9 only has 'Email', so fall through to that - # if 'emailAddress' fails - try: - cert_email = cert.get_subject().emailAddress - except AttributeError: - cert_email = cert.get_subject().Email + f = open(certfile, "r") + buf = f.read(8192) + f.close() + cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, buf) + cert_email = cert.get_subject().emailAddress if cert_email != config_email: print "Error: certificate's email address does not match the email address in the config file." sys.exit(1) From fedora-extras-commits at redhat.com Wed Jul 6 21:20:51 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:51 -0400 Subject: extras-buildsys/builder CONFIG.py,1.4,1.5 builder.py,1.5,1.6 Message-ID: <200507062121.j66LLMmi004103@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CONFIG.py 5 Jul 2005 21:07:52 -0000 1.4 +++ CONFIG.py 6 Jul 2005 21:20:49 -0000 1.5 @@ -18,7 +18,7 @@ config_opts['distro_name'] = "fedora" config_opts['repo_name'] = "core" -config_opts['ssl_buildserver'] = False +config_opts['ssl_buildserver'] = True config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- builder.py 5 Jul 2005 21:07:52 -0000 1.5 +++ builder.py 6 Jul 2005 21:20:49 -0000 1.6 @@ -34,7 +34,6 @@ from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer -from M2Crypto import threading as m2thread # Load in the config @@ -608,8 +607,6 @@ print "%s does not exist or is not readable." % work_dir os._exit(1) - m2thread.init() - # Start up the HTTP server thread which the build server # pulls completed RPMs from port = config_opts['fileserver_port'] @@ -622,24 +619,23 @@ http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.HTTPServer(certs, (g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServer(certs, (g_our_hostname, port), work_dir, certs) else: - http_server = HTTPServer.HTTPServer((g_our_hostname, port), work_dir, None) + http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None) http_server.start() # Stop running as root if drop_privs() == -1: http_server.stop() time.sleep(1) - m2thread.cleanup() os._exit(1) print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) xmlrpc_port = config_opts['xmlrpc_port'] if config_opts['ssl_buildserver']: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), certs) + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port)) + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None) bcs = XMLRPCBuilderServer(localarches) xmlserver.register_instance(bcs) @@ -650,13 +646,6 @@ except KeyboardInterrupt, e: print "Shutting down..." break - except socket.error, e: - if e[0] == 11: # Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break cur_time = time.time() if cur_time >= last_time + 3: @@ -666,5 +655,4 @@ http_server.stop() time.sleep(2) - m2thread.cleanup() os._exit(0) From fedora-extras-commits at redhat.com Wed Jul 6 21:20:57 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 17:20:57 -0400 Subject: extras-buildsys/common SSLConnection.py, NONE, 1.1 AuthedXMLRPCServer.py, 1.1, 1.2 FileDownloader.py, 1.10, 1.11 HTTPSURLopener.py, 1.3, 1.4 HTTPServer.py, 1.1, 1.2 Makefile, 1.4, 1.5 SSLCommon.py, 1.8, 1.9 XMLRPCServerProxy.py, 1.1, 1.2 Message-ID: <200507062121.j66LLRAd004110@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3996/common Modified Files: AuthedXMLRPCServer.py FileDownloader.py HTTPSURLopener.py HTTPServer.py Makefile SSLCommon.py XMLRPCServerProxy.py Added Files: SSLConnection.py Log Message: 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works ***** Error reading new file: [Errno 2] No such file or directory: 'SSLConnection.py' Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AuthedXMLRPCServer.py 5 Jul 2005 21:07:57 -0000 1.1 +++ AuthedXMLRPCServer.py 6 Jul 2005 21:20:55 -0000 1.2 @@ -19,13 +19,18 @@ import socket import time import SocketServer -from M2Crypto import SSL import xmlrpclib import SimpleXMLRPCServer import SSLCommon class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): + + # For some reason, httplib closes the connection right after headers + # have been sent if the connection is _not_ HTTP/1.1, which results in + # a "Bad file descriptor" error when the client tries to read from the socket + protocol_version = "HTTP/1.1" + def do_POST(self): """ See documentation on SimpleXMLRPCRequestHandler. Modifications @@ -88,16 +93,6 @@ return None def verify_request(self, request, client_address): - """ - Allow ourselves a chance to verify the client - """ - if self.authinfo_callback: - authinfo = self.get_authinfo(request, client_address) - if authinfo: - return True - return False - - # Allow all requests if there's no authinfo_callback return True def _marshaled_dispatch(self, data, authinfo): @@ -150,7 +145,6 @@ else: raise Exception('method "%s" is not supported' % method) - # Sigh. Different versions of M2Crypto have this in different places def lcl_resolve_dotted_attribute(self, method): pyver = sys.version_info[:3] if pyver <= (2, 3, 4): @@ -160,34 +154,44 @@ return SimpleXMLRPCServer.resolve_dotted_attribute( self.instance, method, self.allow_dotted_names) - def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break - except socket.error, e: - if e[0] == 11: #Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break - -class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.QuietSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): +class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.PlgBaseSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): """ Extension to allow more fine-tuned SSL handling """ def __init__(self, address, authinfo_callback=None, certs=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) - ctx = SSLCommon.getSSLContext(certs) - SSLCommon.QuietSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, ctx) + SSLCommon.PlgBaseSSLServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler, certs) -class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SocketServer.ThreadingTCPServer, SimpleXMLRPCServer.SimpleXMLRPCServer): +class AuthedXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.PlgBaseServer, SimpleXMLRPCServer.SimpleXMLRPCServer): def __init__(self, address, authinfo_callback=None): BaseAuthedXMLRPCServer.__init__(self, address, authinfo_callback) - SocketServer.ThreadingTCPServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) + SSLCommon.PlgBaseServer.__init__(self, address, AuthedSimpleXMLRPCRequestHandler) + + +########################################################### +# Testing stuff +########################################################### + +class ReqHandler: + def ping(self): + return "pong" + + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python AuthdXMLRPCServer.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + print "Starting the server." + server = AuthedSSLXMLRPCServer(('localhost', 8886), None, certs) + h = ReqHandler() + server.register_instance(h) + server.serve_forever() Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- FileDownloader.py 5 Jul 2005 21:07:57 -0000 1.10 +++ FileDownloader.py 6 Jul 2005 21:20:55 -0000 1.11 @@ -1,4 +1,3 @@ -#!/usr/bin/python -t # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -13,8 +12,7 @@ # 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. -# +# Copyright 2005 Dan Williams and Red Hat, Inc. import threading import urllib @@ -22,7 +20,7 @@ import os import socket import HTTPSURLopener -from M2Crypto import SSL +import OpenSSL import CommonErrors @@ -98,10 +96,10 @@ target_file = os.path.join(self._target_dir, self._filename) try: result = self._opener.retrieve(self._url, target_file) - except SSL.SSLError, e: - # Don't traceback on dropped connections or timeouts - if CommonErrors.canIgnoreSSLError(e): - pass +# except SSL.SSLError, e: +# # Don't traceback on dropped connections or timeouts +# if CommonErrors.canIgnoreSSLError(e): +# pass except socket.error, e: if CommonErrors.canIgnoreSocketError(e): pass @@ -121,7 +119,6 @@ ########################################################### import sys, time -from M2Crypto import threading as m2thread class dlwr: def __init__(self, x, t): @@ -165,7 +162,6 @@ print "Starting..." dlt = dl_tracker() - m2thread.init() x = 0 while x < 100: wr = dlwr(x, dlt) @@ -183,5 +179,4 @@ time.sleep(1) except KeyboardInterrupt: print "Quitting..." - m2thread.cleanup() os._exit(0) Index: HTTPSURLopener.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPSURLopener.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HTTPSURLopener.py 14 Jun 2005 01:16:30 -0000 1.3 +++ HTTPSURLopener.py 6 Jul 2005 21:20:55 -0000 1.4 @@ -15,43 +15,50 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. -import string, sys, urllib -import os, sys -from urllib import * - -from M2Crypto import SSL, httpslib +import string +import urllib +import os +import sys import SSLCommon +from OpenSSL import SSL + class HTTPSURLopener(urllib.URLopener): def __init__(self, certs): - self.ctx = SSLCommon.getSSLContext(certs) + self.ctx = SSLCommon.CreateSSLContext(certs) urllib.URLopener.__init__(self) def open_https(self, url, data=None): """ - Inspired by M2Crypto.m2urllib. The problem here with - M2Crypto.m2urlllib is that there wasn't a way to get an SSL context - into open_https as far as I could tell. - + Need to override this because there was no visible + way to get the SSL Context into open_https() """ - # Attempt to isolate host and request parts from URI host = None if type(url) is type(""): - host, selector = splithost(url) + host, selector = urllib.splithost(url) if host: - user_passwd, host = splituser(host) - host = unquote(host) + user_passwd, host = urllib.splituser(host) + host = urllib.unquote(host) if not host: raise IOError, ('http error', 'no host given') - h = httpslib.HTTPSConnection(host=host, ssl_context=self.ctx) + h = SSLCommon.PlgHTTPS(host=host, ssl_context=self.ctx) h.putrequest('GET', selector) for args in self.addheaders: apply(h.putheader, args) - h.endheaders() - resp = h.getresponse() - fp = resp.fp - return urllib.addinfourl(fp, {}, "https:" + url) + try: + h.endheaders() + except SSL.Error, e: + # Convert the SSL error into an IOError so the call fails + raise IOError, e + + errcode, errmsg, headers = h.getreply() + fp = h.getfile() + if errcode == 200: + return urllib.addinfourl(fp, headers, "https:" + url) + else: + return self.http_error(url, fp, errcode, errmsg, headers) + Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HTTPServer.py 5 Jul 2005 21:07:57 -0000 1.1 +++ HTTPServer.py 6 Jul 2005 21:20:55 -0000 1.2 @@ -17,21 +17,22 @@ # import SimpleHTTPServer -import SocketServer import threading import urllib import posixpath -import os, sys -from SimpleHTTPServer import SimpleHTTPRequestHandler -from M2Crypto import Rand, SSL -from M2Crypto.SSL.SSLServer import ThreadingSSLServer +import os +import sys import SSLCommon -import socket import time -from M2Crypto import threading as m2thread +from OpenSSL import SSL -class HttpRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): +class PlgHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): + + # For some reason, httplib closes the connection right after headers + # have been sent if the connection is _not_ HTTP/1.1, which results in + # a "Bad file descriptor" error when the client tries to read from the socket + protocol_version = "HTTP/1.1" def __init__(self, request, client_address, server): self._server = server @@ -66,84 +67,33 @@ path = os.path.join(path, word) return path - def do_GET(self): - SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) -# try: -# SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) -# except Exception, e: -# # We get an exception if the client drops the transfer -# pass - -class ThreadingHTTPSServer(ThreadingSSLServer): - """ SSL-enabled variant """ - - def __init__(self, server_addr, http_dir, certs): - self.allow_reuse_address = 1 - self.http_dir = http_dir - - self.ctx = SSLCommon.getSSLContext(certs) - ThreadingSSLServer.__init__(self, server_addr, HttpRequestHandler, self.ctx) + def handle(self): + """ Always close the connection when done """ + self.close_connection = 1 - self.server_name = server_addr[0] - self.server_port = server_addr[1] - - # About the last thing we want is a client blocking the server - # because it hung or tracebacked - timeout = SSL.timeout(10) - self.socket.set_socket_read_timeout(timeout) - self.socket.set_socket_write_timeout(timeout) - - def finish(self): - if self.request: - self.request.set_shutdown(SSL.SSL_RECEIVED_SHUTDOWN | SSL.SSL_SENT_SHUTDOWN) - self.request.close() - - def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break - except socket.error, e: - if e[0] == 11: # Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break + try: + self.handle_one_request() + except SSL.Error, e: + print e[0] -class ThreadingHTTPServer(SocketServer.ThreadingTCPServer): - """ Non-SSL variant """ - def __init__(self, certs, server_addr, http_dir): - self.allow_reuse_address = 1 +class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer): + def __init__(self, server_address, http_dir, certs): self.http_dir = http_dir + SSLCommon.PlgBaseSSLServer.__init__(self, server_address, PlgHTTPRequestHandler, certs) - ThreadingTCPServer.__init__(self, server_addr, HttpRequestHandler) - - def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break - except socket.error, e: - if e[0] == 11: # Resource temporarily unavailable - try: - time.sleep(0.1) - except KeyboardInterrupt, e: - print "Shutting down..." - break +class PlgHTTPServer(SSLCommon.PlgBaseServer): + def __init__(self, server_address, http_dir): + self.http_dir = http_dir + SSLCommon.PlgBaseServer.__init__(self, server_address, PlgHTTPRequestHandler) -class HTTPServer(threading.Thread): +class PlgHTTPServer(threading.Thread): def __init__(self, addr, http_dir, certs): if certs and len(certs) > 0: - self._server = ThreadingHTTPSServer(addr, http_dir, certs) + self._server = PlgHTTPSServer(addr, http_dir, certs) else: - self._server = ThreadingHTTPServer(addr, http_dir) + self._server = PlgHTTPServer(addr, http_dir) self._stop = False threading.Thread.__init__(self) @@ -161,7 +111,7 @@ if __name__ == '__main__': if len(sys.argv) < 4: - print "Usage: python SimpleHTTPSServer.py key_and_cert ca_cert peer_ca_cert" + print "Usage: python HTTPServer.py key_and_cert ca_cert peer_ca_cert" sys.exit(1) certs = {} @@ -183,10 +133,8 @@ x = x + 1 f.close() - m2thread.init() - print "Starting the server." - server = SimpleHTTPSServer(certs, ('localhost', 8886), srcdir) + server = PlgHTTPServer(('localhost', 8886), srcdir, certs) server.start() while True: @@ -194,5 +142,4 @@ time.sleep(1) except KeyboardInterrupt: print "Quitting..." - m2thread.cleanup() os._exit(0) Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 5 Jul 2005 21:07:57 -0000 1.4 +++ Makefile 6 Jul 2005 21:20:55 -0000 1.5 @@ -14,6 +14,7 @@ HTTPServer.py \ AuthedXMLRPCServer.py \ SSLCommon.py \ + SSLConnection.py \ XMLRPCServerProxy.py \ lighttpdManager.py \ __init__.py Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SSLCommon.py 5 Jul 2005 21:07:57 -0000 1.8 +++ SSLCommon.py 6 Jul 2005 21:20:55 -0000 1.9 @@ -14,21 +14,23 @@ # # Copyright 2005 Dan Williams and Red Hat, Inc. -from M2Crypto import SSL import os import CommonErrors +from OpenSSL import SSL +import SSLConnection +import httplib +import socket +import SocketServer +def our_verify(connection, x509, errNum, errDepth, preverifyOK): + # print "Verify: errNum = %s, errDepth = %s, preverifyOK = %s" % (errNum, errDepth, preverifyOK) -def quietCallback(self, *args): - """ - This prevents SSL printing out stuff to stderr/stdout. - """ - return + # preverifyOK should tell us whether or not the client's certificate + # correctly authenticates against the CA chain + return preverifyOK -def getSSLContext(certs, session_id='ssl_session'): - """ - Helper method for m2crypto's SSL libraries. - """ + +def CreateSSLContext(certs): key_and_cert = certs['key_and_cert'] ca_cert = certs['ca_cert'] peer_ca_cert = certs['peer_ca_cert'] @@ -37,53 +39,101 @@ print "%s does not exist or is not readable." % f os._exit(1) - ctx = SSL.Context('sslv3') # SSLv3 only - ctx.load_cert(key_and_cert) + ctx = SSL.Context(SSL.SSLv3_METHOD) # SSLv3 only + ctx.use_certificate_file(key_and_cert) + ctx.use_privatekey_file(key_and_cert) ctx.load_client_ca(ca_cert) - ctx.load_verify_info(peer_ca_cert) - ctx.set_allow_unknown_ca(False) - verify = SSL.verify_peer | SSL.verify_fail_if_no_peer_cert - ctx.set_verify(verify, 10) - ctx.set_session_id_ctx(session_id) - ctx.set_info_callback(quietCallback) + ctx.load_verify_locations(peer_ca_cert) + verify = SSL.VERIFY_PEER | SSL.VERIFY_FAIL_IF_NO_PEER_CERT + ctx.set_verify(verify, our_verify) + ctx.set_verify_depth(10) + ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_TLSv1) return ctx - -class QuietSSLServer(SSL.ThreadingSSLServer): - def __init__(self, server_address, RequestHandlerClass, ssl_context): - try: - SSL.SSLServer.__init__(self, server_address, RequestHandlerClass, ssl_context) - except socket.error, e: - if e[0] == 49: # Cannot assign requested address - print "Error: requested address '%s' couldn't be used." % server_address - - # About the last thing we want is a client blocking the server - # because it hung or tracebacked - timeout = SSL.timeout(10) - self.socket.set_socket_read_timeout(timeout) - self.socket.set_socket_write_timeout(timeout) - - def handle_request(self): - request = None - client_address = None - try: - request, client_address = self.get_request() - timeout = SSL.timeout(10) - request.set_socket_read_timeout(timeout) - request.set_socket_write_timeout(timeout) - if self.verify_request(request, client_address): - self.process_request(request, client_address) - except SSL.SSLError, e: - if CommonErrors.canIgnoreSSLError(e): - pass - else: - self.handle_error(request, client_address) - - # Override M2Crypto's SSL.SSLServer handle_error, which - # doesn't accept the same arguments as SocketServer - def handle_error(self, request, client_address): - print '-'*40 - import traceback - traceback.print_exc() - print '-'*40 + + +class PlgBaseServer(SocketServer.ThreadingTCPServer): + allow_reuse_address = 1 + + def __init__(self, server_addr, req_handler): + self.allow_reuse_address = 1 + SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler) + + def serve_forever(self): + while True: + try: + self.handle_request() + except KeyboardInterrupt, e: + print "Shutting down..." + break + + +class PlgBaseSSLServer(PlgBaseServer): + """ SSL-enabled variant """ + + def __init__(self, server_address, req_handler, certs): + + self.ssl_ctx = CreateSSLContext(certs) + + SocketServer.BaseServer.__init__(self, server_address, req_handler) + + sock = socket.socket(self.address_family, self.socket_type) + con = SSL.Connection(self.ssl_ctx, sock) + self.socket = SSLConnection.SSLConnection(con) + self.server_bind() + self.server_activate() + + host, port = self.socket.getsockname()[:2] + self.server_name = socket.getfqdn(host) + self.server_port = port + + +class PlgHTTPSResponse(httplib.HTTPResponse): + def __init__(self, sock, debuglevel=0, strict=0, method=None): + self.fp = socket._fileobject(sock, "rb", 0) + self.debuglevel = debuglevel + self.strict = strict + self._method = method + + self.msg = None + + # from the Status-Line of the response + self.version = httplib._UNKNOWN # HTTP-Version + self.status = httplib._UNKNOWN # Status-Code + self.reason = httplib._UNKNOWN # Reason-Phrase + + self.chunked = httplib._UNKNOWN # is "chunked" being used? + self.chunk_left = httplib._UNKNOWN # bytes left to read in current chunk + self.length = httplib._UNKNOWN # number of bytes left in response + self.will_close = httplib._UNKNOWN # conn will close at end of response + + +class PlgHTTPSConnection(httplib.HTTPConnection): + "This class allows communication via SSL." + + response_class = PlgHTTPSResponse + + def __init__(self, host, port=None, ssl_context=None, strict=None): + httplib.HTTPConnection.__init__(self, host, port, strict) + self.ssl_ctx = ssl_context + + def connect(self): + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + con = SSL.Connection(self.ssl_ctx, sock) + self.sock = SSLConnection.SSLConnection(con) + self.sock.connect((self.host, self.port)) + + +class PlgHTTPS(httplib.HTTP): + """Compatibility with 1.5 httplib interface + + Python 1.5.2 did not have an HTTPS class, but it defined an + interface for sending http requests that is also useful for + https. + """ + + _connection_class = PlgHTTPSConnection + + def __init__(self, host='', port=None, ssl_context=None, strict=None): + self._setup(self._connection_class(host, port, ssl_context, strict)) Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLRPCServerProxy.py 5 Jul 2005 21:07:58 -0000 1.1 +++ XMLRPCServerProxy.py 6 Jul 2005 21:20:55 -0000 1.2 @@ -15,14 +15,84 @@ # Modified by Dan Williams import os, sys -from M2Crypto import SSL -from M2Crypto.m2xmlrpclib import SSL_Transport, ServerProxy import SSLCommon +import urllib +import xmlrpclib -class XMLRPCServerProxy(ServerProxy): +__version__='0.12' + +class SSL_Transport(xmlrpclib.Transport): + + user_agent = "pyOpenSSL_XMLRPC/%s - %s" % (__version__, xmlrpclib.Transport.user_agent) + + def __init__(self, ssl_context): + self.ssl_ctx=ssl_context + + def request(self, host, handler, request_body, verbose=0): + # Handle username and password. + user_passwd, host_port = urllib.splituser(host) + _host, _port = urllib.splitport(host_port) + h = SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) + if verbose: + h.set_debuglevel(1) + + # What follows is as in xmlrpclib.Transport. (Except the authz bit.) + h.putrequest("POST", handler) + + # required by HTTP/1.1 + h.putheader("Host", _host) + + # required by XML-RPC + h.putheader("User-Agent", self.user_agent) + h.putheader("Content-Type", "text/xml") + h.putheader("Content-Length", str(len(request_body))) + + # Authorisation. + if user_passwd is not None: + auth=string.strip(base64.encodestring(user_passwd)) + h.putheader('Authorization', 'Basic %s' % auth) + + h.endheaders() + + if request_body: + h.send(request_body) + + errcode, errmsg, headers = h.getreply() + + if errcode != 200: + raise ProtocolError( + host + handler, + errcode, errmsg, + headers + ) + + self.verbose = verbose + return self.parse_response(h.getfile()) + + +class XMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, uri, certs): if certs and len(certs) > 0: - self.ctx = SSLCommon.getSSLContext(certs) - ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) + self.ctx = SSLCommon.CreateSSLContext(certs) + xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) else: - ServerProxy.__init__(self, uri) + xmlrpclib.ServerProxy.__init__(self, uri) + + + +########################################################### +# Testing stuff +########################################################### + +if __name__ == '__main__': + if len(sys.argv) < 4: + print "Usage: python XMLRPCServerProxy.py key_and_cert ca_cert peer_ca_cert" + sys.exit(1) + + certs = {} + certs['key_and_cert'] = sys.argv[1] + certs['ca_cert'] = sys.argv[2] + certs['peer_ca_cert'] = sys.argv[3] + + s = XMLRPCServerProxy("https://127.0.0.1:8886", certs) + print s.ping() From fedora-extras-commits at redhat.com Wed Jul 6 22:30:35 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:30:35 -0400 Subject: rpms/gramps/devel .cvsignore, 1.8, 1.9 gramps.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200507062230.j66MUZDK005595@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5574 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jul 6 2005 Brian Pepple - 2.0.5-1 - Update to 2.0.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Jul 2005 15:26:39 -0000 1.8 +++ .cvsignore 6 Jul 2005 22:30:33 -0000 1.9 @@ -1 +1 @@ -gramps-2.0.4.tar.gz +gramps-2.0.5.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gramps.spec 1 Jul 2005 15:26:39 -0000 1.8 +++ gramps.spec 6 Jul 2005 22:30:33 -0000 1.9 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jul 6 2005 Brian Pepple - 2.0.5-1 +- Update to 2.0.5. + * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Jul 2005 15:26:39 -0000 1.8 +++ sources 6 Jul 2005 22:30:33 -0000 1.9 @@ -1 +1 @@ -7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz +87e6ad11f18a83dcd91fb12b947b2cc0 gramps-2.0.5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 22:31:48 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:31:48 -0400 Subject: common tobuild,1.1809,1.1810 Message-ID: <200507062231.j66MVm4p005657@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5640 Modified Files: tobuild Log Message: request build of rpms/gramps/devel gramps-2_0_5-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1809 retrieving revision 1.1810 diff -u -r1.1809 -r1.1810 --- tobuild 6 Jul 2005 20:39:12 -0000 1.1809 +++ tobuild 6 Jul 2005 22:31:46 -0000 1.1810 @@ -12,3 +12,4 @@ skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 +bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 6 22:33:02 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:33:02 -0400 Subject: rpms/gramps/FC-4 .cvsignore, 1.8, 1.9 gramps.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200507062233.j66MX2K6005710@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5689 Modified Files: .cvsignore gramps.spec sources Log Message: * Wed Jul 6 2005 Brian Pepple - 2.0.5-1 - Update to 2.0.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Jul 2005 15:29:19 -0000 1.8 +++ .cvsignore 6 Jul 2005 22:33:00 -0000 1.9 @@ -1 +1 @@ -gramps-2.0.4.tar.gz +gramps-2.0.5.tar.gz Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/gramps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gramps.spec 1 Jul 2005 15:29:19 -0000 1.8 +++ gramps.spec 6 Jul 2005 22:33:00 -0000 1.9 @@ -1,5 +1,5 @@ Name: gramps -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?dist} Summary: Genealogical Research and Analysis Management Programming System @@ -111,6 +111,9 @@ %changelog +* Wed Jul 6 2005 Brian Pepple - 2.0.5-1 +- Update to 2.0.5. + * Wed Jun 29 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gramps/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Jul 2005 15:29:19 -0000 1.8 +++ sources 6 Jul 2005 22:33:00 -0000 1.9 @@ -1 +1 @@ -7c26da70434f43f6ee0808a900896c7e gramps-2.0.4.tar.gz +87e6ad11f18a83dcd91fb12b947b2cc0 gramps-2.0.5.tar.gz From fedora-extras-commits at redhat.com Wed Jul 6 22:33:24 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Wed, 6 Jul 2005 18:33:24 -0400 Subject: common tobuild,1.1810,1.1811 Message-ID: <200507062233.j66MXONW005772@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5755 Modified Files: tobuild Log Message: request build of rpms/gramps/FC-4 gramps-2_0_5-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1810 retrieving revision 1.1811 diff -u -r1.1810 -r1.1811 --- tobuild 6 Jul 2005 22:31:46 -0000 1.1810 +++ tobuild 6 Jul 2005 22:33:22 -0000 1.1811 @@ -13,3 +13,4 @@ jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel +bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 6 22:41:33 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 6 Jul 2005 18:41:33 -0400 Subject: rpms/scribus/FC-4 .cvsignore, 1.5, 1.6 scribus.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200507062241.j66MfXfZ005816@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5795/FC-4 Modified Files: .cvsignore scribus.spec sources Log Message: Scribus update for Phil. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jan 2005 19:29:45 -0000 1.5 +++ .cvsignore 6 Jul 2005 22:41:31 -0000 1.6 @@ -1 +1,2 @@ scribus-1.2.1.tar.bz2 +scribus-1.2.2.1.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scribus.spec 22 May 2005 23:16:50 -0000 1.11 +++ scribus.spec 6 Jul 2005 22:41:31 -0000 1.12 @@ -1,15 +1,16 @@ Name: scribus -Version: 1.2.1 -Release: 5 +Version: 1.2.2.1 +Release: 1 Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2 Source1: scribus.xml -Patch0: scribus-x86_64.patch +Source2: scribus.desktop +#Patch0: scribus-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel @@ -22,24 +23,42 @@ BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: openssl-devel -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 2.3 BuildRequires: qt-devel >= 1:3.3 BuildRequires: zlib-devel +BuildRequires: freetype-devel Requires: ghostscript >= 7.07 -Requires: python >= 2.2 +Requires: python >= 2.3 Requires: tkinter Requires(post): shared-mime-info Requires(post): desktop-file-utils Requires(postun): shared-mime-info Requires(postun): desktop-file-utils -Obsoletes: scribus-i18n-en - +Obsoletes: scribus-i18n-en +Obsoletes: scribus-svg +Obsoletes: scribus-scripting +Obsoletes: scribus-short-words +Obsoletes: scribus-vnla +Obsoletes: scribus-i18en +Obsoletes: scribus-i18de +Obsoletes: scribus-i18fr +Obsoletes: scribus-templates + +Provides: scribus-i18n-en +Provides: scribus-svg +Provides: scribus-scripting +Provides: scribus-short-words +Provides: scribus-vnla +Provides: scribus-i18en +Provides: scribus-i18de +Provides: scribus-i18fr +Provides: scribus-templates %description -Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???, -QuarkXPress??? or Adobe?? InDesign???, except that it is published under the -GNU GPL. +Scribus is an desktop open source page layout program with +the aim of producing commercial grade output in PDF and +Postscript, primarily, though not exclusively for Linux. While the goals of the program are for ease of use and simple easy to understand tools, Scribus offers support for professional publishing @@ -58,7 +77,7 @@ %prep %setup -q -%patch -p1 -b .x86_64 +#%patch -p1 -b .x86_64 %build @@ -117,6 +136,20 @@ %changelog +* Tue Jul 5 2005 P Linnell - 1.2.2.1-1 +- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs + +* Sun Jul 3 2005 P Linnell - 1.2.2-0.fc4 +- 1.2.2 final + +* Tue Jun 28 2005 P Linnell - 1.2.2cvs-0 +- test build for 1.2.2cvs +- Add freetype2 explicit build requirement +- Add obsoletes. See PACKAGING in the source tarball +- Change the description per PACKAGING +- Bump required python. 2.2 is no longer supported. + + * Sun May 22 2005 Jeremy Katz - 1.2.1-5 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2005 19:29:45 -0000 1.5 +++ sources 6 Jul 2005 22:41:31 -0000 1.6 @@ -1 +1,2 @@ 002cb629e817722f4123df7a41fc824b scribus-1.2.1.tar.bz2 +8c2eac0a358b04c39252586d9d85ab24 scribus-1.2.2.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 6 23:35:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 6 Jul 2005 19:35:43 -0400 Subject: rpms/scribus/FC-4 scribus.spec,1.12,1.13 Message-ID: <200507062335.j66NZhcn006996@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6974/FC-4 Modified Files: scribus.spec Log Message: Missed a period. Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scribus.spec 6 Jul 2005 22:41:31 -0000 1.12 +++ scribus.spec 6 Jul 2005 23:35:41 -0000 1.13 @@ -67,7 +67,7 @@ %package devel -Summary: Header files for Scribus. +Summary: Header files for Scribus Group: Development/Libraries Requires: %{name} = %{version}-%{release} From fedora-extras-commits at redhat.com Wed Jul 6 23:36:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 6 Jul 2005 19:36:13 -0400 Subject: common tobuild,1.1811,1.1812 Message-ID: <200507062336.j66NaDQx007058@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7041 Modified Files: tobuild Log Message: request build of rpms/scribus/FC-4 scribus-1_2_2_1-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1811 retrieving revision 1.1812 diff -u -r1.1811 -r1.1812 --- tobuild 6 Jul 2005 22:33:22 -0000 1.1811 +++ tobuild 6 Jul 2005 23:36:11 -0000 1.1812 @@ -14,3 +14,4 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 +spot rpms/scribus/FC-4 scribus-1_2_2_1-1 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 03:48:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 6 Jul 2005 23:48:29 -0400 Subject: extras-buildsys/builder builder.py,1.6,1.7 Message-ID: <200507070348.j673mTHV011901@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11884 Modified Files: builder.py Log Message: Fix small error for Python HTTPS Server Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- builder.py 6 Jul 2005 21:20:49 -0000 1.6 +++ builder.py 7 Jul 2005 03:48:26 -0000 1.7 @@ -39,7 +39,7 @@ # Load in the config execfile("/etc/plague/builder/CONFIG.py") -use_lighttpd = True +use_lighttpd = False g_our_hostname = None certs = {} @@ -619,7 +619,7 @@ http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.PlgHTTPServer(certs, (g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, certs) else: http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None) http_server.start() From fedora-extras-commits at redhat.com Thu Jul 7 04:05:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 00:05:49 -0400 Subject: extras-buildsys README,1.5,1.6 Message-ID: <200507070406.j6746Wei013011@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12990 Modified Files: README Log Message: Update it Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README 28 Jun 2005 16:46:11 -0000 1.5 +++ README 7 Jul 2005 04:05:46 -0000 1.6 @@ -18,12 +18,12 @@ Builder Setup: 1) In the CVS checkout directory on the client, execute: make DESTDIR=/ install -2) Create a user for the builder. The builder _cannot_ run as 'root' (since mock cannot run as 'root') +2) Create a user for the builder. The builder drops root privileges before running the build, but must have root to be able to do initial setup 3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs directory 4) Things to modify in the client's CONFIG.py: - Modify the 'distro' and 'repo' options to match the targets you've configured in /etc/mock/. These targets are usually in the form of "distro-target-arch-repo". 'arch' and 'target' are passed by the build system dynamically, but 'distro' and 'repo' are hardcoded in the config file. Examples are "fedora-development-i386-core" and "fedora-development-i386-extras". 5) Configure the mock target files in /etc/mock. You only need one target file for each major arch you support. For example, you don't need separate 'ia32e' or 'amd64' config files, since these just use the normal 'x86_64' config file -6) Start the client, NOT as 'root'. ex: "sudo -u builder /usr/bin/plague-builder 127.0.0.1 i386 i686" +6) Start the client. ex: "/usr/bin/plague-builder 127.0.0.1 i386 i686" On the Server: From fedora-extras-commits at redhat.com Thu Jul 7 04:52:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Thu, 7 Jul 2005 00:52:37 -0400 Subject: rpms/proj import.log,1.5,1.6 Message-ID: <200507070452.j674qbUv013206@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174 Modified Files: import.log Log Message: auto-import proj-4.4.9-0 on branch devel from proj-4.4.9-0.src.rpm Update to fix bugzilla reports 161726 and 150013 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 3 Mar 2005 16:46:54 -0000 1.5 +++ import.log 7 Jul 2005 04:52:35 -0000 1.6 @@ -2,3 +2,4 @@ proj-4_4_8-0_fdr_4_rh90:RHL-9:proj-4.4.8-0.fdr.4.rh90.src.rpm:1109748255 proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681 proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421 +proj-4_4_9-0:HEAD:proj-4.4.9-0.src.rpm:1120711939 From fedora-extras-commits at redhat.com Thu Jul 7 04:52:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Thu, 7 Jul 2005 00:52:37 -0400 Subject: rpms/proj/devel pj_gridinfo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 proj.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507070452.j674qbfH013216@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174/devel Modified Files: .cvsignore proj.spec sources Added Files: pj_gridinfo.patch Log Message: auto-import proj-4.4.9-0 on branch devel from proj-4.4.9-0.src.rpm Update to fix bugzilla reports 161726 and 150013 pj_gridinfo.patch: --- NEW FILE pj_gridinfo.patch --- 493c493 < "failed to find parent %8.8s for %.\n", --- > "failed to find parent %8.8s for %s\n", Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jan 2005 09:45:21 -0000 1.2 +++ .cvsignore 7 Jul 2005 04:52:35 -0000 1.3 @@ -1,2 +1,2 @@ -proj-4.4.8.tar.gz proj-nad27-1.1.tar.gz +proj-4.4.9.tar.gz Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proj.spec 22 May 2005 16:33:49 -0000 1.4 +++ proj.spec 7 Jul 2005 04:52:35 -0000 1.5 @@ -1,16 +1,17 @@ Name: proj -Version: 4.4.8 -Release: 6 +Version: 4.4.9 +Release: 0 Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering License: MIT URL: http://www.remotesensing.org/proj/ -Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz +Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright Patch0: proj.copyright.patch Patch1: proj.test_scripts.patch +Patch2: pj_gridinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel @@ -48,6 +49,10 @@ gzip -dc %{SOURCE1} | tar -xvvf - cd .. +# Patch for Bug 150013 +cp %{PATCH2} ./ +patch src/pj_gridinfo.c pj_gridinfo.patch + %build %configure make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -59,7 +64,7 @@ install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name} %clean -rm -rf $RPM_BUILD_ROOT +#rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:45:21 -0000 1.2 +++ sources 7 Jul 2005 04:52:35 -0000 1.3 @@ -1,2 +1,2 @@ -1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz 66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz +3cc5c2407c213aadfd154c8df80efd6c proj-4.4.9.tar.gz From adrian at lisas.de Thu Jul 7 06:00:13 2005 From: adrian at lisas.de (Adrian Reber) Date: Thu, 7 Jul 2005 08:00:13 +0200 Subject: APPROVED: glabels Message-ID: <20050707060013.GA28468@lisas.de> Package: glabels gLabels is a program for creating labels and business cards for the GNOME desktop environment. It is designed to work with various laser/ink-jet peel-off label and business card sheets that you'll find at most office supply stores. gLabels is free software and is distributed under the terms of the GNU General Public License (GPL). Reviewer: Adrian Reber Maintainer: Jeff Spaleta -------------- 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 Thu Jul 7 06:08:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 02:08:33 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.21,1.22 Message-ID: <200507070608.j6768X8p015682@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15665 Modified Files: bittorrent.spec Log Message: bump and rebuild Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bittorrent.spec 5 Jul 2005 08:51:29 -0000 1.21 +++ bittorrent.spec 7 Jul 2005 06:08:31 -0000 1.22 @@ -5,7 +5,7 @@ Name: bittorrent Version: 4.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -205,6 +205,9 @@ %{_datadir}/pixmaps/bittorrent.png %changelog +* Thu Jul 7 2005 Paul Howarth 4.1.2-4 +- bump and rebuild + * Tue Jul 5 2005 Paul Howarth 4.1.2-3 - obsolete python-khashmir based on version-release, not just version From fedora-extras-commits at redhat.com Thu Jul 7 06:09:10 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 02:09:10 -0400 Subject: common tobuild,1.1812,1.1813 Message-ID: <200507070609.j6769Afu015739@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15722 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1812 retrieving revision 1.1813 diff -u -r1.1812 -r1.1813 --- tobuild 6 Jul 2005 23:36:11 -0000 1.1812 +++ tobuild 7 Jul 2005 06:09:08 -0000 1.1813 @@ -15,3 +15,4 @@ bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 spot rpms/scribus/FC-4 scribus-1_2_2_1-1 fc4 +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-4_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 06:23:20 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 02:23:20 -0400 Subject: common tobuild,1.1813,1.1814 Message-ID: <200507070623.j676NKI4015833@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15816 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1813 retrieving revision 1.1814 diff -u -r1.1813 -r1.1814 --- tobuild 7 Jul 2005 06:09:08 -0000 1.1813 +++ tobuild 7 Jul 2005 06:23:18 -0000 1.1814 @@ -1,18 +1,3 @@ # this is the build control file. the format is # user repo tag target status # -oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 -oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 -sarantis rpms/tetex-font-cm-lgc/FC-4 tetex-font-cm-lgc-0_5-2_fc4 fc4 -sarantis rpms/tetex-font-cm-lgc/devel tetex-font-cm-lgc-0_5-2_fc5 devel -mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta4 devel -qspencer rpms/octave/devel octave-2_1_71-13_fc5 devel -caillon rpms/epiphany-extensions/devel epiphany-extensions-1_7_1-2 devel -kaboom rpms/qgo/FC-4 qgo-1_0_2-1_fc4 fc4 -skvidal rpms/galeon/FC-4 galeon-1_3_21-5_fc4 fc4 -jpo rpms/perl-Tree-DAG_Node/devel perl-Tree-DAG_Node-1_05-2_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-6_fc4 fc4 -bpepple rpms/gramps/devel gramps-2_0_5-1_fc5 devel -bpepple rpms/gramps/FC-4 gramps-2_0_5-1_fc4 fc4 -spot rpms/scribus/FC-4 scribus-1_2_2_1-1 fc4 -pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-4_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 06:41:31 2005 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 7 Jul 2005 02:41:31 -0400 Subject: common tobuild,1.1814,1.1815 Message-ID: <200507070641.j676fV9v015906@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15889 Modified Files: tobuild Log Message: request build of rpms/gnumeric/devel gnumeric-1_4_3-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1814 retrieving revision 1.1815 diff -u -r1.1814 -r1.1815 --- tobuild 7 Jul 2005 06:23:18 -0000 1.1814 +++ tobuild 7 Jul 2005 06:41:29 -0000 1.1815 @@ -1,3 +1,4 @@ # this is the build control file. the format is # user repo tag target status # +jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel From fedora-extras-commits at redhat.com Thu Jul 7 08:51:40 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:51:40 -0400 Subject: rpms/grip/devel grip.1,NONE,1.1 Message-ID: <200507070851.j678peKo018859@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18843 Added Files: grip.1 Log Message: added a man page --- NEW FILE grip.1 --- .TH GRIP "1" "July 2005" "grip 3.2.0" "User Commands" .SH NAME Grip \- Grip is a cd-player and cd-ripper for the Gnome desktop. .SH SYNOPSIS .B grip [\fIoptions\fR] .SH DESCRIPTION Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping capabilities of .BR cd-paranoia (1) builtin, but can also use external rippers (such as .BR cdda2wav (1)). It also provides an automated frontend for audio encoders, letting you take a disc and transform it easily straight into compressed audio files. Internet disc lookups are supported for retrieving track information from disc database servers. .SH OPTIONS .TP \-?, \fB\-\-help\fR Show this help message .TP \fB\-\-usage\fR Display brief usage message .TP \fB\-\-geometry\fR=\fIGEOMETRY\fR Specify the geometry of the main window .TP \fB\-\-config\fR=\fICONFIG\fR Specify the config file to use (in your home dir) .TP \fB\-\-device\fR=\fIDEVICE\fR Specify the cdrom device to use .TP \fB\-\-scsi\-device\fR=\fIDEVICE\fR Specify the generic scsi device to use .TP \fB\-\-small\fR Launch in "small" (cd\-only) mode .TP \fB\-\-local\fR "Local" mode \fB\-\-\fR do not look up disc info on the net .TP \fB\-\-no\-redirect\fR Do not do I/O redirection .TP \fB\-\-verbose\fR Run in verbose (debug) mode .TP \fB\-\-version\fR Show version information .SH "SEE ALSO" .BR cd-paranoia (1) .BR cdda2wav (1) .SH AUTHOR .SS "grip" Mike Oliphant .SS "this manual page" Adrian Reber From fedora-extras-commits at redhat.com Thu Jul 7 08:55:01 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:55:01 -0400 Subject: rpms/grip/devel grip.spec,1.4,1.5 Message-ID: <200507070855.j678t1Xg018892@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18875 Modified Files: grip.spec Log Message: added patch to fix cell renderer problem (BZ #162324) Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- grip.spec 5 Mar 2005 21:10:21 -0000 1.4 +++ grip.spec 7 Jul 2005 08:54:59 -0000 1.5 @@ -1,12 +1,14 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 4 +Release: 5%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia -Source: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source1: grip.1 Patch1: grip-3.2.0-default.patch +Patch2: grip-cell-renderer.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -24,6 +26,7 @@ %prep %setup -q %patch1 -p1 -b .rh-default-encoder +%patch2 -p1 -b .cell-renderer %build %configure @@ -35,6 +38,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install-am +install -p %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1 + cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF StartupWMClass=Grip Encoding=UTF-8 @@ -67,8 +72,13 @@ %{_datadir}/pixmaps/gripicon.png %{_datadir}/gnome/help/grip %{_datadir}/applications/* +%{_mandir}/man1/* %changelog +* Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 +- added patch to fix cell renderer problem (BZ #162324) +- wrote and added a man page + * Wed Mar 02 2005 Adrian Reber - 1:3.2.0-4 - s/Copyright/License/ - s/Serial/Epoch/ From fedora-extras-commits at redhat.com Thu Jul 7 08:55:26 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:55:26 -0400 Subject: rpms/grip/devel grip-cell-renderer.patch,NONE,1.1 Message-ID: <200507070855.j678tQb5018921@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18903 Added Files: grip-cell-renderer.patch Log Message: patch to fix cell renderer problem (BZ #162324) grip-cell-renderer.patch: --- NEW FILE grip-cell-renderer.patch --- --- grip-3.2.0/src/cdplay.c 2004-04-23 18:26:40.000000000 +0200 +++ grip-3.2.0-cell-fix/src/cdplay.c 2005-07-07 08:30:04.000000000 +0200 @@ -294,6 +294,8 @@ GtkRequisition sizereq; GtkWidget *scroll; GtkTreeViewColumn *column; + GtkCellRenderer *track_renderer; + GtkCellRenderer *length_renderer; GtkCellRenderer *renderer; GtkTreeSelection *select; @@ -321,9 +323,9 @@ uinfo->track_list= gtk_tree_view_new_with_model(GTK_TREE_MODEL(uinfo->track_list_store)); - renderer=gtk_cell_renderer_text_new(); + track_renderer=gtk_cell_renderer_text_new(); - column=gtk_tree_view_column_new_with_attributes(_("Track"),renderer, + column=gtk_tree_view_column_new_with_attributes(_("Track"),track_renderer, "text",TRACKLIST_TRACK_COL, NULL); @@ -334,7 +336,8 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(uinfo->track_list),column); - column=gtk_tree_view_column_new_with_attributes(_("Length"),renderer, + length_renderer=gtk_cell_renderer_text_new(); + column=gtk_tree_view_column_new_with_attributes(_("Length"),length_renderer, "text",TRACKLIST_LENGTH_COL, NULL); From fedora-extras-commits at redhat.com Thu Jul 7 08:57:37 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 04:57:37 -0400 Subject: common tobuild,1.1815,1.1816 Message-ID: <200507070857.j678vbHo018983@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18966 Modified Files: tobuild Log Message: request build of rpms/grip/devel grip-3_2_0-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1815 retrieving revision 1.1816 diff -u -r1.1815 -r1.1816 --- tobuild 7 Jul 2005 06:41:29 -0000 1.1815 +++ tobuild 7 Jul 2005 08:57:35 -0000 1.1816 @@ -2,3 +2,4 @@ # user repo tag target status # jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel +adrian rpms/grip/devel grip-3_2_0-5_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 09:36:26 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 05:36:26 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.15,1.16 Message-ID: <200507070936.j679aQsP020203@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-serv20184 Modified Files: sylpheed-claws.spec Log Message: - add missing doc Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sylpheed-claws.spec 6 Jul 2005 07:41:46 -0000 1.15 +++ sylpheed-claws.spec 7 Jul 2005 09:36:24 -0000 1.16 @@ -88,7 +88,7 @@ %files -f sylpheed-claws.lang %defattr(-,root,root,-) -%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING +%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws ChangeLog-gtk2.claws COPYING %doc NEWS README README.claws RELEASE_NOTES.claws %doc TODO %{_bindir}/* From fedora-extras-commits at redhat.com Thu Jul 7 09:40:22 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 05:40:22 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.15,1.16 Message-ID: <200507070940.j679eMZg020260@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20243 Modified Files: sylpheed-claws.spec Log Message: - add missing doc Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sylpheed-claws.spec 6 Jul 2005 07:42:42 -0000 1.15 +++ sylpheed-claws.spec 7 Jul 2005 09:40:20 -0000 1.16 @@ -88,7 +88,7 @@ %files -f sylpheed-claws.lang %defattr(-,root,root,-) -%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING +%doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws ChangeLog-gtk2.claws COPYING %doc NEWS README README.claws RELEASE_NOTES.claws %doc TODO %{_bindir}/* From fedora-extras-commits at redhat.com Thu Jul 7 09:42:59 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:42:59 -0400 Subject: rpms/mgopen-fonts - New directory Message-ID: <200507070942.j679gxEi020350@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20326/mgopen-fonts Log Message: Directory /cvs/extras/rpms/mgopen-fonts added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 09:42:59 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:42:59 -0400 Subject: rpms/mgopen-fonts/devel - New directory Message-ID: <200507070943.j679gx2A020355@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20326/mgopen-fonts/devel Log Message: Directory /cvs/extras/rpms/mgopen-fonts/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 09:43:20 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:43:20 -0400 Subject: rpms/mgopen-fonts Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507070943.j679hKwp020407@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378 Added Files: Makefile import.log Log Message: Setup of module mgopen-fonts --- NEW FILE Makefile --- # Top level Makefile for module mgopen-fonts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Thu Jul 7 09:43:21 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:43:21 -0400 Subject: rpms/mgopen-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507070943.j679hLmN020412@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mgopen-fonts --- NEW 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 Jul 7 09:44:06 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:44:06 -0400 Subject: rpms/mgopen-fonts import.log,1.1,1.2 Message-ID: <200507070944.j679i6tY020481@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20448 Modified Files: import.log Log Message: auto-import mgopen-fonts-0.20050515-1 on branch devel from mgopen-fonts-0.20050515-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 09:43:18 -0000 1.1 +++ import.log 7 Jul 2005 09:44:04 -0000 1.2 @@ -0,0 +1 @@ +mgopen-fonts-0_20050515-1:HEAD:mgopen-fonts-0.20050515-1.src.rpm:1120729433 From fedora-extras-commits at redhat.com Thu Jul 7 09:44:06 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Thu, 7 Jul 2005 05:44:06 -0400 Subject: rpms/mgopen-fonts/devel mgopen-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507070944.j679i6ha020488@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/mgopen-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20448/devel Modified Files: .cvsignore sources Added Files: mgopen-fonts.spec Log Message: auto-import mgopen-fonts-0.20050515-1 on branch devel from mgopen-fonts-0.20050515-1.src.rpm --- NEW FILE mgopen-fonts.spec --- %define archivename MgOpen %define fontdir %{_datadir}/fonts/mgopen %define upstream_date 20050515 Name: mgopen-fonts Version: 0.%{upstream_date} Release: 1 Summary: Truetype greek fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://www.ellak.gr/fonts/mgopen/ Source0: %{archivename}-%{upstream_date}.tar.gz # Upstream tarball is not versioned http://www.ellak.gr/fonts/mgopen/files/%{archivename}.tar.gz Source1: %{archivename}-%{upstream_date}-doc.tar.gz # Tarball of the documentation on the site http://www.ellak.gr/fonts/mgopen/ # The LICENCE file is an excerpt from the html page BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch %description The MgOpen fonts are a font family that includes Latin and Greek glyphs. The fonts have been released under a liberal license, similar to the license covering the Bitstream Vera fonts. %prep %setup -q -c -a1 -n %{archivename}-%{version} %build %install /bin/rm -rf $RPM_BUILD_ROOT #fonts install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} # "touch" all files we've got flagged as %ghost but which are not # present in the RPM_BUILD_ROOT when RPM looks for files /bin/touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 %clean /bin/rm -rf $RPM_BUILD_ROOT %post if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/fonts fi %postun if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then %{_bindir}/fc-cache %{_datadir}/fonts fi fi %files %defattr(0644,root,root,0755) %doc LICENCE mgopen.html _files/ %dir %{fontdir} %{fontdir}/*.ttf %ghost %{fontdir}/fonts.cache-1 %changelog * Thu Jul 6 2005 Sarantis Paskalis 0.20050515-1 - Fix spelling in the description. Import it to Fedora Extras. * Tue Jun 14 2005 Sarantis Paskalis - Use date-versioned sources * Wed May 25 2005 Sarantis Paskalis - Initial package spec (based on bitstream-vera-fonts) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 09:43:19 -0000 1.1 +++ .cvsignore 7 Jul 2005 09:44:04 -0000 1.2 @@ -0,0 +1,2 @@ +MgOpen-20050515-doc.tar.gz +MgOpen-20050515.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mgopen-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 09:43:19 -0000 1.1 +++ sources 7 Jul 2005 09:44:04 -0000 1.2 @@ -0,0 +1,2 @@ +eb667a1458a92bc4d4e9a1f5924f6e61 MgOpen-20050515-doc.tar.gz +9ad4bba3d173e92734320286bfff4c8e MgOpen-20050515.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 09:55:43 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 7 Jul 2005 05:55:43 -0400 Subject: common tobuild,1.1816,1.1817 Message-ID: <200507070955.j679thVQ020635@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1816 retrieving revision 1.1817 diff -u -r1.1816 -r1.1817 --- tobuild 7 Jul 2005 08:57:35 -0000 1.1816 +++ tobuild 7 Jul 2005 09:55:41 -0000 1.1817 @@ -3,3 +3,4 @@ # jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/grip/devel grip-3_2_0-5_fc5 devel +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 09:58:59 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 7 Jul 2005 05:58:59 -0400 Subject: common tobuild,1.1817,1.1818 Message-ID: <200507070958.j679wxOH020703@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20686 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1817 retrieving revision 1.1818 diff -u -r1.1817 -r1.1818 --- tobuild 7 Jul 2005 09:55:41 -0000 1.1817 +++ tobuild 7 Jul 2005 09:58:57 -0000 1.1818 @@ -4,3 +4,4 @@ jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel adrian rpms/grip/devel grip-3_2_0-5_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 10:00:50 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 06:00:50 -0400 Subject: rpms/grip/FC-4 grip-cell-renderer.patch, NONE, 1.1 grip.1, NONE, 1.1 grip.spec, 1.4, 1.5 Message-ID: <200507071000.j67A0o2C020743@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20722 Modified Files: grip.spec Added Files: grip-cell-renderer.patch grip.1 Log Message: * Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 - added patch to fix cell renderer problem (BZ #162324) - wrote and added a man page grip-cell-renderer.patch: --- NEW FILE grip-cell-renderer.patch --- --- grip-3.2.0/src/cdplay.c 2004-04-23 18:26:40.000000000 +0200 +++ grip-3.2.0-cell-fix/src/cdplay.c 2005-07-07 08:30:04.000000000 +0200 @@ -294,6 +294,8 @@ GtkRequisition sizereq; GtkWidget *scroll; GtkTreeViewColumn *column; + GtkCellRenderer *track_renderer; + GtkCellRenderer *length_renderer; GtkCellRenderer *renderer; GtkTreeSelection *select; @@ -321,9 +323,9 @@ uinfo->track_list= gtk_tree_view_new_with_model(GTK_TREE_MODEL(uinfo->track_list_store)); - renderer=gtk_cell_renderer_text_new(); + track_renderer=gtk_cell_renderer_text_new(); - column=gtk_tree_view_column_new_with_attributes(_("Track"),renderer, + column=gtk_tree_view_column_new_with_attributes(_("Track"),track_renderer, "text",TRACKLIST_TRACK_COL, NULL); @@ -334,7 +336,8 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(uinfo->track_list),column); - column=gtk_tree_view_column_new_with_attributes(_("Length"),renderer, + length_renderer=gtk_cell_renderer_text_new(); + column=gtk_tree_view_column_new_with_attributes(_("Length"),length_renderer, "text",TRACKLIST_LENGTH_COL, NULL); --- NEW FILE grip.1 --- .TH GRIP "1" "July 2005" "grip 3.2.0" "User Commands" .SH NAME Grip \- Grip is a cd-player and cd-ripper for the Gnome desktop. .SH SYNOPSIS .B grip [\fIoptions\fR] .SH DESCRIPTION Grip is a cd-player and cd-ripper for the Gnome desktop. It has the ripping capabilities of .BR cd-paranoia (1) builtin, but can also use external rippers (such as .BR cdda2wav (1)). It also provides an automated frontend for audio encoders, letting you take a disc and transform it easily straight into compressed audio files. Internet disc lookups are supported for retrieving track information from disc database servers. .SH OPTIONS .TP \-?, \fB\-\-help\fR Show this help message .TP \fB\-\-usage\fR Display brief usage message .TP \fB\-\-geometry\fR=\fIGEOMETRY\fR Specify the geometry of the main window .TP \fB\-\-config\fR=\fICONFIG\fR Specify the config file to use (in your home dir) .TP \fB\-\-device\fR=\fIDEVICE\fR Specify the cdrom device to use .TP \fB\-\-scsi\-device\fR=\fIDEVICE\fR Specify the generic scsi device to use .TP \fB\-\-small\fR Launch in "small" (cd\-only) mode .TP \fB\-\-local\fR "Local" mode \fB\-\-\fR do not look up disc info on the net .TP \fB\-\-no\-redirect\fR Do not do I/O redirection .TP \fB\-\-verbose\fR Run in verbose (debug) mode .TP \fB\-\-version\fR Show version information .SH "SEE ALSO" .BR cd-paranoia (1) .BR cdda2wav (1) .SH AUTHOR .SS "grip" Mike Oliphant .SS "this manual page" Adrian Reber Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/FC-4/grip.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- grip.spec 5 Mar 2005 21:10:21 -0000 1.4 +++ grip.spec 7 Jul 2005 10:00:48 -0000 1.5 @@ -1,12 +1,14 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 4 +Release: 5%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia -Source: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source0: http://dl.sf.net/grip/grip-%{version}.tar.gz +Source1: grip.1 Patch1: grip-3.2.0-default.patch +Patch2: grip-cell-renderer.patch URL: http://www.nostatic.org/grip/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vorbis-tools @@ -24,6 +26,7 @@ %prep %setup -q %patch1 -p1 -b .rh-default-encoder +%patch2 -p1 -b .cell-renderer %build %configure @@ -35,6 +38,8 @@ make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install-am +install -p %{SOURCE1} -D %{buildroot}%{_mandir}/man1/grip.1 + cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF StartupWMClass=Grip Encoding=UTF-8 @@ -67,8 +72,13 @@ %{_datadir}/pixmaps/gripicon.png %{_datadir}/gnome/help/grip %{_datadir}/applications/* +%{_mandir}/man1/* %changelog +* Thu Jul 07 2005 Adrian Reber - 1:3.2.0-5 +- added patch to fix cell renderer problem (BZ #162324) +- wrote and added a man page + * Wed Mar 02 2005 Adrian Reber - 1:3.2.0-4 - s/Copyright/License/ - s/Serial/Epoch/ From fedora-extras-commits at redhat.com Thu Jul 7 10:03:57 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 06:03:57 -0400 Subject: common tobuild,1.1818,1.1819 Message-ID: <200507071004.j67A4nNS021879@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21862 Modified Files: tobuild Log Message: request build of rpms/grip/FC-4 grip-3_2_0-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1818 retrieving revision 1.1819 diff -u -r1.1818 -r1.1819 --- tobuild 7 Jul 2005 09:58:57 -0000 1.1818 +++ tobuild 7 Jul 2005 10:03:55 -0000 1.1819 @@ -5,3 +5,4 @@ adrian rpms/grip/devel grip-3_2_0-5_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 10:20:37 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:20:37 -0400 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.16,1.17 Message-ID: <200507071020.j67AKbuh021964@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-serv21947 Modified Files: sylpheed-claws.spec Log Message: - modified pixmap stuff Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sylpheed-claws.spec 7 Jul 2005 09:36:24 -0000 1.16 +++ sylpheed-claws.spec 7 Jul 2005 10:20:35 -0000 1.17 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -81,7 +81,12 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png +%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps + +%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png + +%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -97,6 +102,7 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/48x48/apps/sylpheed-claws.png %dir %{_datadir}/sylpheed-claws/ %{_datadir}/sylpheed-claws/* %{_mandir}/man1/* @@ -109,6 +115,11 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Thu Jul 07 2005 Andreas Bierfert +1.9.12-2 +- add some doc +- fix pixmap installation + * Wed Jul 06 2005 Andreas Bierfert 1.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Thu Jul 7 10:21:56 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:21:56 -0400 Subject: common tobuild,1.1819,1.1820 Message-ID: <200507071021.j67ALuvK022027@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22010 Modified Files: tobuild Log Message: request build of rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1819 retrieving revision 1.1820 diff -u -r1.1819 -r1.1820 --- tobuild 7 Jul 2005 10:03:55 -0000 1.1819 +++ tobuild 7 Jul 2005 10:21:54 -0000 1.1820 @@ -6,3 +6,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 +awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 10:22:39 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:22:39 -0400 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.16,1.17 Message-ID: <200507071022.j67AMdGt022052@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22033 Modified Files: sylpheed-claws.spec Log Message: - sync with fc4 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sylpheed-claws.spec 7 Jul 2005 09:40:20 -0000 1.16 +++ sylpheed-claws.spec 7 Jul 2005 10:22:37 -0000 1.17 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 1.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL @@ -81,7 +81,12 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png +%{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps + +%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png + +%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -97,6 +102,7 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/48x48/apps/sylpheed-claws.png %dir %{_datadir}/sylpheed-claws/ %{_datadir}/sylpheed-claws/* %{_mandir}/man1/* @@ -109,6 +115,11 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Thu Jul 07 2005 Andreas Bierfert +1.9.12-2 +- add some doc +- fix pixmap installation + * Wed Jul 06 2005 Andreas Bierfert 1.9.12-1 - version upgrade From fedora-extras-commits at redhat.com Thu Jul 7 10:23:36 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:23:36 -0400 Subject: common tobuild,1.1820,1.1821 Message-ID: <200507071023.j67ANa1c022116@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22099 Modified Files: tobuild Log Message: request build of rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1820 retrieving revision 1.1821 diff -u -r1.1820 -r1.1821 --- tobuild 7 Jul 2005 10:21:54 -0000 1.1820 +++ tobuild 7 Jul 2005 10:23:34 -0000 1.1821 @@ -7,3 +7,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 +awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 10:28:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 06:28:30 -0400 Subject: rpms/anjuta/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 anjuta.spec, 1.9, 1.10 Message-ID: <200507071028.j67ASUY8022168@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22147 Modified Files: .cvsignore sources anjuta.spec Log Message: * Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 - Update to 1.2.3. - Add gettext-devel dependency (Paul Frields). - Add libtool (+automake, +autoconf) dependency. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:02:58 -0000 1.3 +++ .cvsignore 7 Jul 2005 10:28:28 -0000 1.4 @@ -1 +1 @@ -anjuta-1.2.2.tar.gz +anjuta-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:02:58 -0000 1.3 +++ sources 7 Jul 2005 10:28:28 -0000 1.4 @@ -1 +1 @@ -a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz +a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- anjuta.spec 6 Apr 2005 22:11:10 -0000 1.9 +++ anjuta.spec 7 Jul 2005 10:28:28 -0000 1.10 @@ -1,14 +1,13 @@ Name: anjuta -Version: 1.2.2 -Release: 7 - +Version: 1.2.3 +Release: 1 Epoch: 1 Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ -Source0: http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz +Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0.2 @@ -22,7 +21,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils -Requires: pkgconfig +Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -43,7 +42,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description docs -Anjuta documentations. +Anjuta documentation. @@ -123,10 +122,15 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +- Update to 1.2.3. +- Add gettext-devel dependency (Paul Frields). +- Add libtool (+automake, +autoconf) dependency. + +* Thu Apr 7 2005 Michael Schwendt - 1:1.2.2-7 - rebuilt -* Thu Feb 10 2005 Thorsten Leemhuis - 1.2.2-6 +* Thu Feb 10 2005 Thorsten Leemhuis - 1:1.2.2-6 - configure option --enable-final does not work correctly on x86_64; Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt; Fixes x86_64 crash (#147010) @@ -134,7 +138,7 @@ * Thu Dec 16 2004 Michael Schwendt - 1:1.2.2-5 - Add some sed magic in %%build which assumedly fixes x86_64 install. -* Wed Nov 10 2004 Matthias Saou 1.2.2-4 +* Wed Nov 10 2004 Matthias Saou 1:1.2.2-4 - Bump release to provide Extras upgrade path. - Clean up ugly space/tabs mix. From fedora-extras-commits at redhat.com Thu Jul 7 10:32:09 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:32:09 -0400 Subject: rpms/sylpheed-claws/FC-3 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 sylpheed-claws.spec, 1.6, 1.7 Message-ID: <200507071032.j67AW9Tg022234@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22213 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - Version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 May 2005 21:39:38 -0000 1.5 +++ .cvsignore 7 Jul 2005 10:32:07 -0000 1.6 @@ -1 +1 @@ -sylpheed-claws-1.0.4a.tar.bz2 +sylpheed-claws-1.0.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 May 2005 21:39:38 -0000 1.6 +++ sources 7 Jul 2005 10:32:07 -0000 1.7 @@ -1 +1 @@ -5179d65225d443c89538249d70dca1ab sylpheed-claws-1.0.4a.tar.bz2 +ef4a1a7beb407dc7c31b4799bc48f12e sylpheed-claws-1.0.5.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/sylpheed-claws.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sylpheed-claws.spec 26 May 2005 21:39:38 -0000 1.6 +++ sylpheed-claws.spec 7 Jul 2005 10:32:07 -0000 1.7 @@ -1,14 +1,14 @@ %define openssl_pc %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi ) Name: sylpheed-claws -Version: 1.0.4a +Version: 1.0.5 Release: 1 Epoch: 0 Summary: The bleeding edge branch of Sylpheed Group: Applications/Internet License: GPL URL: http://claws.sylpheed.org -Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.4a.tar.bz2 +Source0: http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.5.tar.bz2 Source1: sylpheed.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -108,6 +108,10 @@ %{_libdir}/pkgconfig/sylpheed-claws.pc %changelog +* Thu Jul 07 2005 Andreas Bierfert +0:1.0.5-1 +- Version upgrade + * Thu May 26 2005 Andreas Bierfert 0:1.0.4a-1 - Version upgrade From fedora-extras-commits at redhat.com Thu Jul 7 10:32:55 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 7 Jul 2005 06:32:55 -0400 Subject: common tobuild,1.1821,1.1822 Message-ID: <200507071032.j67AWt33022296@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22279 Modified Files: tobuild Log Message: request build of rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1821 retrieving revision 1.1822 diff -u -r1.1821 -r1.1822 --- tobuild 7 Jul 2005 10:23:34 -0000 1.1821 +++ tobuild 7 Jul 2005 10:32:53 -0000 1.1822 @@ -8,3 +8,4 @@ adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel +awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 10:33:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 06:33:12 -0400 Subject: rpms/anjuta/devel anjuta.spec,1.10,1.11 Message-ID: <200507071033.j67AXCiW022324@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22307 Modified Files: anjuta.spec Log Message: add dist tag Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- anjuta.spec 7 Jul 2005 10:28:28 -0000 1.10 +++ anjuta.spec 7 Jul 2005 10:33:10 -0000 1.11 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.3 -Release: 1 +Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ From fedora-extras-commits at redhat.com Thu Jul 7 10:34:02 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 7 Jul 2005 06:34:02 -0400 Subject: rpms/Coin2/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 Coin2.spec, 1.11, 1.12 Coin-2.4.1-doxygen.diff, 1.1, NONE Message-ID: <200507071034.j67AY211022380@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359 Modified Files: .cvsignore sources Coin2.spec Removed Files: Coin-2.4.1-doxygen.diff Log Message: Update to 2.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 May 2005 07:36:38 -0000 1.5 +++ .cvsignore 7 Jul 2005 10:34:00 -0000 1.6 @@ -1,3 +1,3 @@ -Coin-2.4.1-libtool.diff.bz2 -Coin-2.4.1-simacros.diff.bz2 -Coin-2.4.1.tar.gz +Coin-2.4.3-libtool.diff.bz2 +Coin-2.4.3-simacros.diff.bz2 +Coin-2.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2005 07:36:38 -0000 1.5 +++ sources 7 Jul 2005 10:34:00 -0000 1.6 @@ -1,3 +1,3 @@ -5f4301006d7568e39cdd641695d0c53d Coin-2.4.1-libtool.diff.bz2 -c0e21c3da25204eb5406196acf9d3587 Coin-2.4.1-simacros.diff.bz2 -9a6757dc9fb9fbeaa1c033ea670b31a1 Coin-2.4.1.tar.gz +e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 +4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 +57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Coin2.spec 19 May 2005 06:35:04 -0000 1.11 +++ Coin2.spec 7 Jul 2005 10:34:00 -0000 1.12 @@ -1,15 +1,19 @@ +# +# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# + %define coin_includedir %{_includedir}/Coin2 %define coin_htmldir %{_datadir}/Coin2 -%define srcvers 2.4.1 - %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: %{srcvers} +Version: 2.4.3 Release: 1%{?dist} License: GPL @@ -21,10 +25,9 @@ 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.1-simacros.diff.bz2 -Patch4: Coin-2.4.1-libtool.diff.bz2 +Patch3: Coin-2.4.3-simacros.diff.bz2 +Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff -Patch6: Coin-2.4.1-doxygen.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU @@ -57,7 +60,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ src/glue/freetype.c @@ -112,6 +114,9 @@ %doc %{coin_htmldir} %changelog +* Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 +- Upstream update. + * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. --- Coin-2.4.1-doxygen.diff DELETED --- From fedora-extras-commits at redhat.com Thu Jul 7 10:37:16 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 7 Jul 2005 06:37:16 -0400 Subject: common tobuild,1.1822,1.1823 Message-ID: <200507071037.j67AbGWi022457@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22440 Modified Files: tobuild Log Message: request build of rpms/Coin2/devel Coin2-2_4_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1822 retrieving revision 1.1823 diff -u -r1.1822 -r1.1823 --- tobuild 7 Jul 2005 10:32:53 -0000 1.1822 +++ tobuild 7 Jul 2005 10:37:14 -0000 1.1823 @@ -9,3 +9,4 @@ awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 +corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 12:00:27 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 7 Jul 2005 08:00:27 -0400 Subject: rpms/perl-IO-stringy/devel perl-IO-stringy.spec,1.9,1.10 Message-ID: <200507071200.j67C0RoZ023707@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/perl-IO-stringy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23690 Modified Files: perl-IO-stringy.spec Log Message: Module is dual-licensed according to COPYING file in tarball Index: perl-IO-stringy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-stringy/devel/perl-IO-stringy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-IO-stringy.spec 6 Apr 2005 22:12:46 -0000 1.9 +++ perl-IO-stringy.spec 7 Jul 2005 12:00:25 -0000 1.10 @@ -7,7 +7,7 @@ Version: 2.110 Release: 2 -License: Artistic +License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-stringy/ Source0: http://www.cpan.org/authors/id/D/DS/DSKOLL/%{tarname}-%{version}.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 13:00:11 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 09:00:11 -0400 Subject: common tobuild,1.1823,1.1824 Message-ID: <200507071300.j67D0BVS024878@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24861 Modified Files: tobuild Log Message: request build of rpms/anjuta/devel anjuta-1_2_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1823 retrieving revision 1.1824 diff -u -r1.1823 -r1.1824 --- tobuild 7 Jul 2005 10:37:14 -0000 1.1823 +++ tobuild 7 Jul 2005 13:00:08 -0000 1.1824 @@ -10,3 +10,4 @@ awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel +mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 14:07:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 10:07:35 -0400 Subject: rpms/anjuta/FC-4 .cvsignore, 1.3, 1.4 anjuta.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200507071407.j67E7ZZn027171@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27150 Modified Files: .cvsignore anjuta.spec sources Log Message: 'ERROR: Could not get build-minimal' for devel, so giving a build for FC-4 a try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:02:58 -0000 1.3 +++ .cvsignore 7 Jul 2005 14:07:32 -0000 1.4 @@ -1 +1 @@ -anjuta-1.2.2.tar.gz +anjuta-1.2.3.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- anjuta.spec 6 Apr 2005 22:11:10 -0000 1.9 +++ anjuta.spec 7 Jul 2005 14:07:32 -0000 1.10 @@ -1,14 +1,13 @@ Name: anjuta -Version: 1.2.2 -Release: 7 - +Version: 1.2.3 +Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ -Source0: http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz +Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0.2 @@ -22,7 +21,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils -Requires: pkgconfig +Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -43,7 +42,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description docs -Anjuta documentations. +Anjuta documentation. @@ -123,10 +122,15 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +- Update to 1.2.3. +- Add gettext-devel dependency (Paul Frields). +- Add libtool (+automake, +autoconf) dependency. + +* Thu Apr 7 2005 Michael Schwendt - 1:1.2.2-7 - rebuilt -* Thu Feb 10 2005 Thorsten Leemhuis - 1.2.2-6 +* Thu Feb 10 2005 Thorsten Leemhuis - 1:1.2.2-6 - configure option --enable-final does not work correctly on x86_64; Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt; Fixes x86_64 crash (#147010) @@ -134,7 +138,7 @@ * Thu Dec 16 2004 Michael Schwendt - 1:1.2.2-5 - Add some sed magic in %%build which assumedly fixes x86_64 install. -* Wed Nov 10 2004 Matthias Saou 1.2.2-4 +* Wed Nov 10 2004 Matthias Saou 1:1.2.2-4 - Bump release to provide Extras upgrade path. - Clean up ugly space/tabs mix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:02:58 -0000 1.3 +++ sources 7 Jul 2005 14:07:33 -0000 1.4 @@ -1 +1 @@ -a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz +a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 14:09:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 10:09:32 -0400 Subject: common tobuild,1.1824,1.1825 Message-ID: <200507071409.j67E9WVV027280@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27263 Modified Files: tobuild Log Message: request build of rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1824 retrieving revision 1.1825 diff -u -r1.1824 -r1.1825 --- tobuild 7 Jul 2005 13:00:08 -0000 1.1824 +++ tobuild 7 Jul 2005 14:09:30 -0000 1.1825 @@ -11,3 +11,4 @@ awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel +mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 15:20:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:01 -0400 Subject: rpms/barcode - New directory Message-ID: <200507071520.j67FK1p2028724@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28700/barcode Log Message: Directory /cvs/extras/rpms/barcode added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 15:20:02 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:02 -0400 Subject: rpms/barcode/devel - New directory Message-ID: <200507071520.j67FK2B6028729@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28700/barcode/devel Log Message: Directory /cvs/extras/rpms/barcode/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 15:20:16 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:16 -0400 Subject: rpms/barcode Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507071520.j67FKGGI028772@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28745 Added Files: Makefile import.log Log Message: Setup of module barcode --- NEW FILE Makefile --- # Top level Makefile for module barcode all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 15:20:16 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:20:16 -0400 Subject: rpms/barcode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507071520.j67FKGNi028777@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28745/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module barcode --- NEW 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 Jul 7 15:21:03 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:21:03 -0400 Subject: rpms/barcode import.log,1.1,1.2 Message-ID: <200507071521.j67FLY5S028858@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816 Modified Files: import.log Log Message: auto-import barcode-0.98-5 on branch devel from barcode-0.98-5.src.rpm initial import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/barcode/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 15:20:14 -0000 1.1 +++ import.log 7 Jul 2005 15:21:01 -0000 1.2 @@ -0,0 +1 @@ +barcode-0_98-5:HEAD:barcode-0.98-5.src.rpm:1120749670 From fedora-extras-commits at redhat.com Thu Jul 7 15:21:08 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:21:08 -0400 Subject: rpms/barcode/devel barcode-install-info.patch, NONE, 1.1 barcode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507071521.j67FLcBC028862@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28816/devel Modified Files: .cvsignore sources Added Files: barcode-install-info.patch barcode.spec Log Message: auto-import barcode-0.98-5 on branch devel from barcode-0.98-5.src.rpm initial import barcode-install-info.patch: --- NEW FILE barcode-install-info.patch --- --- barcode-0.98/doc/doc.barcode.orig 2005-07-07 16:27:14.632811312 +0200 +++ barcode-0.98/doc/doc.barcode 2005-07-07 16:31:21.607265488 +0200 @@ -23,6 +23,11 @@ @comment %**start of header @setfilename barcode.info + at dircategory Text creation and manipulation + at dircategory GNU libraries + at direntry +* Barcode: (barcode). Barcode generation from text strings. + at end direntry @settitle Barcode @value{version} @iftex @afourpaper --- NEW FILE barcode.spec --- Summary: generates barcodes from text strings Name: barcode Version: 0.98 Release: 5%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz Patch0: barcode-install-info.patch URL: http://www.gnu.org/software/barcode/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info BuildRequires: tetex, texinfo %description Barcode is meant to solve most needs in barcode creation with a conventional printer. It can create printouts for the conventional product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well as a few other formats. Ouput is generated as either Postscript or Encapsulated Postscript. %package devel Summary: Header files and libraries for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains the header files and libraries needed to develop programs that use the %{name} library. %prep %setup -q %patch0 -p1 -b .categories %build %configure make %{?_smp_mflags} # Regenerate documentation make -C doc barcode.info %install rm -rf %{buildroot} %makeinstall # Fix locations according to FHS mkdir -p %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_infodir} mv %{buildroot}/usr/man/* %{buildroot}%{_mandir} mv %{buildroot}/usr/info/* %{buildroot}%{_infodir} %clean rm -rf %{buildroot} %post /sbin/install-info %{_infodir}/barcode.info.gz %{_infodir}/dir %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/barcode.info.gz %{_infodir}/dir fi %files %defattr(-, root, root) %doc COPYING ChangeLog README TODO %{_bindir}/barcode %{_mandir}/man1/barcode.1.gz %{_infodir}/barcode.info.gz %files devel %defattr(-, root, root) %{_includedir}/*.h %{_libdir}/*.a %{_mandir}/man3/barcode.3.gz %changelog * Thu Jul 07 2005 Andreas Thienemann 0.98-5 - Added install-info support to the texinfo file. - Fixed minor spec errors * Thu Jul 01 2005 Andreas Thienemann 0.98-4 - Added info-install in post and pre stage. * Thu Jul 01 2005 Andreas Thienemann 0.98-3 - Added %%{epoch} tag to the -devel requires. * Thu Jun 30 2005 Andreas Thienemann 0.98-2 - spec cleanup. * Wed Jun 29 2005 Andreas Thienemann 0.98-1 - Initial RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 15:20:14 -0000 1.1 +++ .cvsignore 7 Jul 2005 15:21:02 -0000 1.2 @@ -0,0 +1 @@ +barcode-0.98.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 15:20:14 -0000 1.1 +++ sources 7 Jul 2005 15:21:02 -0000 1.2 @@ -0,0 +1 @@ +7f10c3307b84a19a4ab2fa4b3f2974da barcode-0.98.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 15:23:11 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 11:23:11 -0400 Subject: common tobuild,1.1825,1.1826 Message-ID: <200507071523.j67FNBJF028958@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28944 Modified Files: tobuild Log Message: request build of rpms/barcode/devel barcode-0_98-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1825 retrieving revision 1.1826 diff -u -r1.1825 -r1.1826 --- tobuild 7 Jul 2005 14:09:30 -0000 1.1825 +++ tobuild 7 Jul 2005 15:23:09 -0000 1.1826 @@ -12,3 +12,4 @@ corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 +ixs rpms/barcode/devel barcode-0_98-5_fc5 devel From Christian.Iseli at licr.org Thu Jul 7 15:33:31 2005 From: Christian.Iseli at licr.org (Christian.Iseli at licr.org) Date: Thu, 07 Jul 2005 17:33:31 +0200 Subject: APPROVED: barcode Message-ID: <200507071533.j67FXV4O020011@ludwig-alpha.unil.ch> Name: barcode Summary: generates barcodes from text strings Description: Barcode is meant to solve most needs in barcode creation with a conventional printer. It can create printouts for the conventional product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well as a few other formats. Ouput is generated as either Postscript or Encapsulated Postscript. Reviewer: Christian Iseli Maintainer: Andreas Thienemann From andreas at bawue.net Thu Jul 7 15:37:00 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 7 Jul 2005 17:37:00 +0200 (CEST) Subject: APPROVED barcode Message-ID: Package: barcode Barcode is meant to solve most needs in barcode creation with a conventional printer. It can create printouts for the conventional product tagging standards: UPC-A, UPC-E, EAN-13, EAN-8, ISBN, as well as a few other formats. Ouput is generated as either Postscript or Encapsulated Postscript. Reviewer: Christian Iseli Maintainer: Andreas Thienemann From fedora-extras-commits at redhat.com Thu Jul 7 16:20:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 12:20:59 -0400 Subject: extras-buildsys/server main.py,1.2,1.3 Message-ID: <200507071620.j67GKxCZ030311@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30294/server Modified Files: main.py Log Message: Turn of lighttpd since it's not working with the new SSL stuff yet Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.py 6 Jul 2005 21:21:01 -0000 1.2 +++ main.py 7 Jul 2005 16:20:57 -0000 1.3 @@ -35,7 +35,7 @@ # Load in the config execfile("/etc/plague/server/CONFIG.py") -use_lighttpd = True +use_lighttpd = False class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer): From fedora-extras-commits at redhat.com Thu Jul 7 16:21:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 12:21:14 -0400 Subject: extras-buildsys ChangeLog,1.44,1.45 Message-ID: <200507071621.j67GLi2j030358@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317 Modified Files: ChangeLog Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Use Python exceptions for prep and build errors - Clean up a bunch of stuff - Specify dest file when copying files to the repo * server/Repo.py - Ensure that the destination file is actually the file rather than a path, since shutil.copy() just copies the file over top of the directory in some instances, corrupting the repo Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ChangeLog 6 Jul 2005 21:20:49 -0000 1.44 +++ ChangeLog 7 Jul 2005 16:21:12 -0000 1.45 @@ -1,3 +1,15 @@ +2005-07-07 Dan Williams + + * server/PackageJob.py + - Use Python exceptions for prep and build errors + - Clean up a bunch of stuff + - Specify dest file when copying files to the repo + + * server/Repo.py + - Ensure that the destination file is actually the file rather + than a path, since shutil.copy() just copies the file over top + of the directory in some instances, corrupting the repo + 2005-07-06 Dan Williams * Convert M2Crypto code to pyOpenSSL so that stuff actually works From fedora-extras-commits at redhat.com Thu Jul 7 16:21:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 12:21:14 -0400 Subject: extras-buildsys/server ArchJob.py, 1.2, 1.3 Builder.py, 1.2, 1.3 PackageJob.py, 1.1, 1.2 Repo.py, 1.6, 1.7 Message-ID: <200507071621.j67GLiF4030363@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30317/server Modified Files: ArchJob.py Builder.py PackageJob.py Repo.py Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Use Python exceptions for prep and build errors - Clean up a bunch of stuff - Specify dest file when copying files to the repo * server/Repo.py - Ensure that the destination file is actually the file rather than a path, since shutil.copy() just copies the file over top of the directory in some instances, corrupting the repo Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ArchJob.py 6 Jul 2005 21:21:00 -0000 1.2 +++ ArchJob.py 7 Jul 2005 16:21:12 -0000 1.3 @@ -182,6 +182,7 @@ return self.status def get_files(self): + """ Return a list of base filenames we got from the builder """ files = [] for url in self.downloads.keys(): fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Builder.py 6 Jul 2005 21:21:00 -0000 1.2 +++ Builder.py 7 Jul 2005 16:21:12 -0000 1.3 @@ -23,6 +23,7 @@ import threading from plague import XMLRPCServerProxy from plague import CommonErrors +import OpenSSL import ArchJob # Load in the config @@ -104,7 +105,7 @@ self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() - except (socket.error, xmlrpclib.ProtocolError): + except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): self._unavail_count = self._unavail_count + 1 else: self._unavail_count = 0 Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PackageJob.py 5 Jul 2005 21:08:03 -0000 1.1 +++ PackageJob.py 7 Jul 2005 16:21:12 -0000 1.2 @@ -1,4 +1,4 @@ -# This program is free software; you can redistribute it and/or modify + # 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. @@ -51,18 +51,16 @@ print stuff class PrepError(exceptions.Exception): - def __init__(self, errno=0, args=None): + def __init__(self, args=None): exceptions.Exception.__init__(self) self.args = args - self.errno = errno def __str__(self): return self.args class BuildError(exceptions.Exception): - def __init__(self, errno=0, args=None): + def __init__(self, args=None): exceptions.Exception.__init__(self) self.args = args - self.errno = errno def __str__(self): return self.args @@ -77,7 +75,7 @@ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'cleanup', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] + stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] if stage in stages: return True return False @@ -99,7 +97,6 @@ self.name = None self.target = repo.target() self.repo = repo - self.failed = False self.no_cvs = config_opts['use_srpm_not_cvs'] self.cvs_tag = cvs_tag self.stage_dir = None @@ -252,13 +249,8 @@ debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) # Just in case the 'common' directory didn't come along for the ride, # get it from CVS @@ -270,26 +262,16 @@ s, o = commands.getstatusoutput(cmd) os.chdir(self.checkout_tmpdir) if s != 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) def _make_srpm(self): self._set_cur_stage('make_srpm') self.srpm_path = None srpm_dir = os.path.join(self.checkout_tmpdir, self.package, self.target) if not os.path.exists(srpm_dir): - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) os.chdir(srpm_dir) @@ -297,13 +279,8 @@ debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir)) s, o = commands.getstatusoutput(cmd) if s != 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not make srpm for %s - output was:\n %s" % (self.cvs_tag, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) srpmpath = None for line in o.split("\n"): @@ -313,13 +290,9 @@ srpmpath = path.strip() break if not srpmpath: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) msg = "could not find srpm for %s - output was:\n %s" % (self.cvs_tag, o) - self.email_result(resultstring=msg, subject=subj) - self._set_cur_stage('finished') - self.failed = True - shutil.rmtree(self.checkout_tmpdir, True) - return + raise PrepError(msg) + self.srpm_path = srpmpath def _prep(self): @@ -339,12 +312,8 @@ del ts if len(self.archjobs) == 0: - subj = 'Prep Error: %s on %s' % (self.cvs_tag, self.target) - msg = "could not find any architectures to build for %s - output was:\n" % (self.cvs_tag) - self.email_result(resultstring=msg, subject=subj) - self.failed = True - self._set_cur_stage('finished') - return + msg = "Package %s does not build on any architectures this build system supports.\n" % self.cvs_tag + raise PrepError(msg) self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) for arch in self.archjobs.keys(): @@ -433,79 +402,74 @@ while not self.is_done(): # Advance to next stage based on current stage wait = False - if self.curstage == 'initialize': - self._checkout() - elif self.curstage == 'checkout': - self._make_srpm() - elif self.curstage == 'make_srpm': - self._prep() - elif self.curstage == 'prep' or self.curstage == 'building': - wait = self._monitor() - elif self.curstage == 'finished': - self._cleanup() - elif self.curstage == 'cleanup': - if self.failed: - self._failed() - else: + + try: + if self.curstage == 'initialize': + self._checkout() + elif self.curstage == 'checkout': + self._make_srpm() + elif self.curstage == 'make_srpm': + self._prep() + elif self.curstage == 'prep' or self.curstage == 'building': + wait = self._monitor() + elif self.curstage == 'finished': self._add_to_repo() - elif self.curstage == 'addtorepo': - wait = True - elif self.curstage == 'repodone': - self._succeeded() - - if wait: - while not self._event.isSet(): - self._event.wait() - self._event.clear() + elif self.curstage == 'addtorepo': + wait = True + elif self.curstage == 'repodone': + self._succeeded() + except PrepError, e: + if not self.no_cvs: + shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + self._failed() + except BuildError, e: + subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + # Kill remaining jobs on other arches + self._archjobs_lock.acquire() + for job in self.archjobs.values(): + if job: + job.die() + self._archjobs_lock.release() + self._failed() + else: + # Wait to be woken up when long-running operations complete + if wait: + while not self._event.isSet(): + self._event.wait() + self._event.clear() def _monitor(self): self._set_cur_stage('building') # Count failed and completed jobs completed_jobs = 0 + self._archjobs_lock.acquire() for job in self.archjobs.values(): if not job: continue if job.get_status() is 'done': if job.builder_failed(): - self.failed = True + self._archjobs_lock.release() + msg = "Job failed on arch %s\n" + raise BuildError(msg) else: completed_jobs = completed_jobs + 1 + self._archjobs_lock.release() - # If any jobs have failed, or if all jobs have completed successfully, advance - if self.failed or (completed_jobs == len(self.archjobs)): + if completed_jobs == len(self.archjobs): self._set_cur_stage('finished') return False # Don't want to wait return True - def _cleanup(self): - self._set_cur_stage('cleanup') - if self.failed: - # Kill remaining jobs on other arches - for job in self.archjobs.values(): - if job: - job.die() - def get_stage_dir(self): return self.stage_dir def _failed(self): self._set_cur_stage('failed') - - resultstring = """ - %s (%s): %s on %s failed to complete on one or more archs. -""" % (self.uid, self.package, self.cvs_tag, self.target) - resultstring = resultstring + "\n" - - # Add each arch job and its result: - for job in self.archjobs.values(): - if job and job.builder_status != 'killed': - resultstring = resultstring + " " + "%s - %s: %s" % (job.arch, job.jobid, job.builder_status) + "\n" - - resultstring = resultstring + "\n" - self.email_result(resultstring) - self.bm.notify_job_done(self) def _add_to_repo(self): @@ -516,8 +480,7 @@ for job in self.archjobs.values(): if not job: continue - file_list = job.get_files() - for f in file_list: + for f in job.get_files(): if not f.endswith(".rpm"): continue src_file = os.path.join(self.stage_dir, job.arch, f) @@ -526,7 +489,7 @@ dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, "SRPM") else: dst_path = os.path.join(config_opts['repo_dir'], self.target, self.name, verrel, job.arch) - self.repofiles[src_file] = dst_path + self.repofiles[src_file] = os.path.join(dst_path, f) self._event.clear() Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Repo.py 6 Jul 2005 21:21:00 -0000 1.6 +++ Repo.py 7 Jul 2005 16:21:12 -0000 1.7 @@ -71,13 +71,13 @@ if not os.path.exists(os.path.dirname(dst)): os.makedirs(os.path.dirname(dst)) - # Only copy SRPMs to the repo dir if there's not already one there + file_in_dst = os.path.join(os.path.dirname(dst), os.path.basename(src)) if src.endswith(".src.rpm"): - file_in_dst = os.path.join(os.path.dirname(dst),os.path.basename(src)) + # Only copy SRPMs to the repo dir if there's not already one there if not os.path.exists(file_in_dst): - shutil.copy(src, dst) + shutil.copy(src, file_in_dst) else: - shutil.copy(src, dst) + shutil.copy(src, file_in_dst) # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() From fedora-extras-commits at redhat.com Thu Jul 7 17:01:57 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:01:57 -0400 Subject: rpms/naim - New directory Message-ID: <200507071701.j67H1vdN031665@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/naim Log Message: Directory /cvs/extras/rpms/naim added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 17:02:01 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:02:01 -0400 Subject: rpms/naim/devel - New directory Message-ID: <200507071702.j67H21cW031676@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/naim/devel Log Message: Directory /cvs/extras/rpms/naim/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 17:03:08 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:03:08 -0400 Subject: rpms/naim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507071703.j67H38HV031742@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31728 Added Files: Makefile import.log Log Message: Setup of module naim --- NEW FILE Makefile --- # Top level Makefile for module naim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 17:03:22 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:03:22 -0400 Subject: rpms/naim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507071703.j67H3MD1031755@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31728/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module naim --- NEW 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 Jul 7 17:02:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 13:02:59 -0400 Subject: rpms/anjuta/FC-3 .cvsignore, 1.3, 1.4 anjuta.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507071703.j67H3kXA031769@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/anjuta/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31708 Modified Files: .cvsignore anjuta.spec sources Log Message: sync with FC-4 and devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:02:58 -0000 1.3 +++ .cvsignore 7 Jul 2005 17:02:57 -0000 1.4 @@ -1 +1 @@ -anjuta-1.2.2.tar.gz +anjuta-1.2.3.tar.gz Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-3/anjuta.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- anjuta.spec 10 Feb 2005 20:01:13 -0000 1.6 +++ anjuta.spec 7 Jul 2005 17:02:57 -0000 1.7 @@ -1,35 +1,35 @@ Name: anjuta -Version: 1.2.2 -Release: 6 +Version: 1.2.3 +Release: 1%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ Group: Development/Tools License: GPL URL: http://anjuta.org/ -Source0: http://download.sourceforge.net/anjuta/anjuta-1.2.2.tar.gz +Source0: http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgnomeui-devel >= 0:2.0.2 -BuildRequires: libbonoboui-devel >= 0:2.0.1 +BuildRequires: libgnomeui-devel >= 2.0.2 +BuildRequires: libbonoboui-devel >= 2.0.1 BuildRequires: libgnomeprintui22-devel -BuildRequires: ncurses-devel >= 0:5.0 -BuildRequires: pcre-devel >= 0:3.9 +BuildRequires: ncurses-devel >= 5.0 +BuildRequires: pcre-devel >= 3.9 BuildRequires: vte-devel BuildRequires: scrollkeeper BuildRequires: libtool BuildRequires: gettext BuildRequires: desktop-file-utils -Requires: pkgconfig +Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper Requires(postun): scrollkeeper %description -Anjuta is a versatile Integrated Development Environment (IDE) for C and C++. -It has been written for GTK/GNOME, and features a number of advanced -programming facilities. It is basically a GUI interface for the collection -of command line programming utilities and tools available for the GNU system. +Anjuta is a versatile Integrated Development Environment (IDE) for C and C++. +It has been written for GTK/GNOME, and features a number of advanced +programming facilities. It is basically a GUI interface for the collection +of command line programming utilities and tools available for the GNU system. These are usually run via a text console, and can be unfriendly to use. This package includes anjuta_create_global_tags.sh, which will allow you to @@ -37,12 +37,12 @@ %package docs -Summary: Anjuta documentations package. +Summary: Anjuta documentation Group: Development/Tools -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description docs -Anjuta documentations. +Anjuta documentation. @@ -52,7 +52,7 @@ %build -# configure option --enable-final does not work corretly on x86_64; Use +# configure option --enable-final does not work corretly on x86_64; Use # -DNDEBUG in CFLAGS export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %configure @@ -122,15 +122,23 @@ %changelog -* Thu Feb 10 2005 Thorsten Leemhuis - 1.2.2-6 -- configure option --enable-final does not work correctly on x86_64; +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +- Update to 1.2.3. +- Add gettext-devel dependency (Paul Frields). +- Add libtool (+automake, +autoconf) dependency. + +* Thu Apr 7 2005 Michael Schwendt - 1:1.2.2-7 +- rebuilt + +* Thu Feb 10 2005 Thorsten Leemhuis - 1:1.2.2-6 +- configure option --enable-final does not work correctly on x86_64; Use -DNDEBUG in CFLAGS as suggested my Michael Schwendt; Fixes x86_64 crash (#147010) * Thu Dec 16 2004 Michael Schwendt - 1:1.2.2-5 - Add some sed magic in %%build which assumedly fixes x86_64 install. -* Wed Nov 10 2004 Matthias Saou 1.2.2-4 +* Wed Nov 10 2004 Matthias Saou 1:1.2.2-4 - Bump release to provide Extras upgrade path. - Clean up ugly space/tabs mix. Index: sources =================================================================== RCS file: /cvs/extras/rpms/anjuta/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:02:58 -0000 1.3 +++ sources 7 Jul 2005 17:02:57 -0000 1.4 @@ -1 +1 @@ -a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz +a2fc3873519f566607cf268276db3b90 anjuta-1.2.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 17:05:41 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:05:41 -0400 Subject: rpms/naim import.log,1.1,1.2 Message-ID: <200507071706.j67H6BIs031916@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31876 Modified Files: import.log Log Message: auto-import naim-0.11.7.3.1-1 on branch devel from naim-0.11.7.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/naim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 17:03:06 -0000 1.1 +++ import.log 7 Jul 2005 17:05:38 -0000 1.2 @@ -0,0 +1 @@ +naim-0_11_7_3_1-1:HEAD:naim-0.11.7.3.1-1.src.rpm:1120755922 From fedora-extras-commits at redhat.com Thu Jul 7 17:05:43 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 13:05:43 -0400 Subject: rpms/naim/devel naim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507071706.j67H6DIl031927@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31876/devel Modified Files: .cvsignore sources Added Files: naim.spec Log Message: auto-import naim-0.11.7.3.1-1 on branch devel from naim-0.11.7.3.1-1.src.rpm --- NEW FILE naim.spec --- Name: naim Version: 0.11.7.3.1 Release: 1 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client Group: Applications/Internet License: GPL URL: http://naim.n.ml.org Source0: http://shell.n.ml.org/n/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel Requires: screen %description naim is a console client for AOL Instant Messenger (AIM), AOL I Seek You (ICQ), Internet Relay Chat (IRC), and The lily CMC. %prep %setup -q %build %configure --enable-detach make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/usr/share/doc/naim rm -fr $RPM_BUILD_ROOT/%{_includedir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp %{_bindir}/* %{_mandir}/*/* %changelog * Tue Jul 05 2005 Luke Macken 0.11.7.3.1-1 - Packaged for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 17:03:09 -0000 1.1 +++ .cvsignore 7 Jul 2005 17:05:41 -0000 1.2 @@ -0,0 +1 @@ +naim-0.11.7.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/naim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 17:03:09 -0000 1.1 +++ sources 7 Jul 2005 17:05:41 -0000 1.2 @@ -0,0 +1 @@ +8efe3f267d9c192abc41885865f12734 naim-0.11.7.3.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 7 17:06:14 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 13:06:14 -0400 Subject: common tobuild,1.1826,1.1827 Message-ID: <200507071706.j67H6kX9031971@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31915 Modified Files: tobuild Log Message: request build of rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1826 retrieving revision 1.1827 diff -u -r1.1826 -r1.1827 --- tobuild 7 Jul 2005 15:23:09 -0000 1.1826 +++ tobuild 7 Jul 2005 17:06:12 -0000 1.1827 @@ -13,3 +13,4 @@ mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 ixs rpms/barcode/devel barcode-0_98-5_fc5 devel +mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 17:15:11 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:15:11 -0400 Subject: extras-buildsys/server PackageJob.py,1.2,1.3 Message-ID: <200507071715.j67HFBf5032316@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32299/server Modified Files: PackageJob.py Log Message: Fix error message to include arch the job failed on Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PackageJob.py 7 Jul 2005 16:21:12 -0000 1.2 +++ PackageJob.py 7 Jul 2005 17:15:09 -0000 1.3 @@ -452,8 +452,8 @@ continue if job.get_status() is 'done': if job.builder_failed(): + msg = "Job failed on arch %s\n" % (job.arch) self._archjobs_lock.release() - msg = "Job failed on arch %s\n" raise BuildError(msg) else: completed_jobs = completed_jobs + 1 From fedora-extras-commits at redhat.com Thu Jul 7 17:24:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:24:10 -0400 Subject: extras-buildsys/utils repoconv.py,1.2,1.3 Message-ID: <200507071724.j67HOAIJ032443@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32424/utils Modified Files: repoconv.py Log Message: Make it work with SRPM packages Index: repoconv.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/repoconv.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- repoconv.py 17 Jun 2005 15:52:35 -0000 1.2 +++ repoconv.py 7 Jul 2005 17:24:08 -0000 1.3 @@ -81,12 +81,12 @@ dest_file = os.path.join(destdir, os.path.basename(package)) else: (n,a,e,v,r,srpm) = naevr(package) - t = srpm.split('-') - srpm = t[0] if package.endswith('.src.rpm'): sub_path = os.path.join("%s" % n, "%s-%s" % (v, r)) sub_path = os.path.join(sub_path, "SRPM") else: + t = srpm.split('-') + srpm = t[0] sub_path = os.path.join("%s" % srpm, "%s-%s" % (v, r)) sub_path = os.path.join(sub_path, "%s" % a) dest_file = os.path.join(destdir, sub_path, os.path.basename(package)) From fedora-extras-commits at redhat.com Thu Jul 7 17:45:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:45:10 -0400 Subject: extras-buildsys/server main.py,1.3,1.4 Message-ID: <200507071745.j67HjAdb032587@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540/server Modified Files: main.py Log Message: Fix naming clash Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- main.py 7 Jul 2005 16:20:57 -0000 1.3 +++ main.py 7 Jul 2005 17:45:08 -0000 1.4 @@ -104,9 +104,9 @@ srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert'] srpm_server_certs['ca_cert'] = config_opts['ca_cert'] srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert'] - srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) + srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs) else: - srpm_server = HTTPServer.PlgHTTPServer((hostname, SRPM_SERVER_PORT), http_dir, None) + srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, None) srpm_server.start() print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT) From fedora-extras-commits at redhat.com Thu Jul 7 17:45:04 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:45:04 -0400 Subject: extras-buildsys/builder builder.py,1.7,1.8 Message-ID: <200507071745.j67HjYt7032590@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540/builder Modified Files: builder.py Log Message: Fix naming clash Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- builder.py 7 Jul 2005 03:48:26 -0000 1.7 +++ builder.py 7 Jul 2005 17:45:02 -0000 1.8 @@ -619,9 +619,9 @@ http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, certs) else: - http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None) + http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, None) http_server.start() # Stop running as root From fedora-extras-commits at redhat.com Thu Jul 7 17:45:04 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 13:45:04 -0400 Subject: extras-buildsys/common HTTPServer.py,1.2,1.3 Message-ID: <200507071745.j67HjZ8j032593@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32540/common Modified Files: HTTPServer.py Log Message: Fix naming clash Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- HTTPServer.py 6 Jul 2005 21:20:55 -0000 1.2 +++ HTTPServer.py 7 Jul 2005 17:45:02 -0000 1.3 @@ -88,7 +88,7 @@ SSLCommon.PlgBaseServer.__init__(self, server_address, PlgHTTPRequestHandler) -class PlgHTTPServer(threading.Thread): +class PlgHTTPServerManager(threading.Thread): def __init__(self, addr, http_dir, certs): if certs and len(certs) > 0: self._server = PlgHTTPSServer(addr, http_dir, certs) From tcallawa at redhat.com Thu Jul 7 18:14:33 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Thu, 07 Jul 2005 13:14:33 -0500 Subject: APPROVED: libstatgrab Message-ID: <1120760073.9303.23.camel@localhost.localdomain> Name: libstatgrab Summary: Make system statistics Description: Libstatgrab is a library that provides cross platform access to statistics about the system on which it's run. It's written in C and presents a selection of useful interfaces which can be used to access key system statistics. The current list of statistics includes CPU usage, memory utilisation, disk usage, process counts, network traffic, disk I/O, and more. The current list of platforms is Solaris 2.x, Linux, and FreeBSD 4.x/5.x. The aim is to extend this to include as many operating systems as possible. The package also includes a couple of useful tools. The first, saidar, provides a curses-based interface to viewing the current state of the system. The second, statgrab, gives a sysctl-style interface to the statistics gathered by libstatgrab. This extends the use of libstatgrab to people writing scripts or anything else that can't easily make C function calls. Included with statgrab is a script to generate an MRTG configuration file to use statgrab. Reviewer: Tom "spot" Callaway Maintainer: Oliver Falk ~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 Thu Jul 7 18:17:52 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 14:17:52 -0400 Subject: extras-buildsys ChangeLog,1.45,1.46 Message-ID: <200507071818.j67IINZC001337@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1305 Modified Files: ChangeLog Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Make some prep error emails more informative Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ChangeLog 7 Jul 2005 16:21:12 -0000 1.45 +++ ChangeLog 7 Jul 2005 18:17:50 -0000 1.46 @@ -1,6 +1,11 @@ 2005-07-07 Dan Williams * server/PackageJob.py + - Make some prep error emails more informative + +2005-07-07 Dan Williams + + * server/PackageJob.py - Use Python exceptions for prep and build errors - Clean up a bunch of stuff - Specify dest file when copying files to the repo From fedora-extras-commits at redhat.com Thu Jul 7 18:17:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 14:17:53 -0400 Subject: extras-buildsys/server PackageJob.py,1.3,1.4 Message-ID: <200507071818.j67IINB1001340@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1305/server Modified Files: PackageJob.py Log Message: 2005-07-07 Dan Williams * server/PackageJob.py - Make some prep error emails more informative Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PackageJob.py 7 Jul 2005 17:15:09 -0000 1.3 +++ PackageJob.py 7 Jul 2005 18:17:51 -0000 1.4 @@ -185,46 +185,46 @@ exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] - arches = {} + build_arches = {} if ba == ['noarch']: - arches['noarch'] = None - return arches + build_arches['noarch'] = None + return (build_arches, None, None) # default to building all base arches the 'target' # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target - tmparchs = [] + pkg_arches = [] allowed_arches = [] for arch in buildable_arches: - tmparchs.append(arch) + pkg_arches.append(arch) allowed_arches.append(arch) for arch in addl_arches: - tmparchs.append(arch) + pkg_arches.append(arch) allowed_arches.append(arch) # Optional arches don't get built by default but are "allowed" for arch in opt_arches: allowed_arches.append(arch) if ba: - tmparchs = ba + pkg_arches = ba else: if exclusive: - tmparchs = exclusive + pkg_arches = exclusive if exclude: for arch in exclude: - if arch in tmparchs: - tmparchs.remove(arch) + if arch in pkg_arches: + pkg_arches.remove(arch) # we probably need to check the archs, and make sure they are what # we can build for - for thisarch in tmparchs: + for thisarch in pkg_arches: if thisarch in allowed_arches: - arches[thisarch] = None + build_arches[thisarch] = None - return arches + return (build_arches, pkg_arches, allowed_arches) def _make_stage_dir(self, rootdir): @@ -307,12 +307,15 @@ self.name = hdr['name'] self.ver = hdr['version'] self.release = hdr['release'] - self.archjobs = self.arch_handling(hdr) + (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr) del hdr del ts if len(self.archjobs) == 0: - msg = "Package %s does not build on any architectures this build system supports.\n" % self.cvs_tag + msg = """Package %s does not build on any architectures this build system supports. + Package: %s + Build System: %s +""" % (self.cvs_tag, pkg_arches, allowed_arches) raise PrepError(msg) self.stage_dir = self._make_stage_dir(config_opts['server_work_dir']) From fedora-extras-commits at redhat.com Thu Jul 7 18:43:41 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 7 Jul 2005 14:43:41 -0400 Subject: common tobuild,1.1827,1.1828 Message-ID: <200507071843.j67IhffD001510@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1493 Modified Files: tobuild Log Message: request build of rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1827 retrieving revision 1.1828 diff -u -r1.1827 -r1.1828 --- tobuild 7 Jul 2005 17:06:12 -0000 1.1827 +++ tobuild 7 Jul 2005 18:43:39 -0000 1.1828 @@ -14,3 +14,4 @@ mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 ixs rpms/barcode/devel barcode-0_98-5_fc5 devel mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 +jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 18:44:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 7 Jul 2005 14:44:37 -0400 Subject: common tobuild,1.1828,1.1829 Message-ID: <200507071844.j67Iibjx001577@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1560 Modified Files: tobuild Log Message: request build of rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1828 retrieving revision 1.1829 diff -u -r1.1828 -r1.1829 --- tobuild 7 Jul 2005 18:43:39 -0000 1.1828 +++ tobuild 7 Jul 2005 18:44:35 -0000 1.1829 @@ -15,3 +15,4 @@ ixs rpms/barcode/devel barcode-0_98-5_fc5 devel mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 +jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 19:10:16 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 15:10:16 -0400 Subject: extras-buildsys/common HTTPServer.py,1.3,1.4 Message-ID: <200507071910.j67JAGoc002744@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2727/common Modified Files: HTTPServer.py Log Message: Fix for python 2.2 Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HTTPServer.py 7 Jul 2005 17:45:02 -0000 1.3 +++ HTTPServer.py 7 Jul 2005 19:10:14 -0000 1.4 @@ -67,14 +67,15 @@ path = os.path.join(path, word) return path - def handle(self): - """ Always close the connection when done """ - self.close_connection = 1 - - try: - self.handle_one_request() - except SSL.Error, e: - print e[0] + if sys.version_info[:3] >= (2, 3, 0): + def handle(self): + """ Always close the connection when done """ + self.close_connection = 1 + + try: + self.handle_one_request() + except SSL.Error, e: + print e[0] class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer): From fedora-extras-commits at redhat.com Thu Jul 7 19:17:20 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 15:17:20 -0400 Subject: common tobuild,1.1829,1.1830 Message-ID: <200507071917.j67JHKk0002808@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2791 Modified Files: tobuild Log Message: clean up -- buildsys seems to be stuck at barcode Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1829 retrieving revision 1.1830 diff -u -r1.1829 -r1.1830 --- tobuild 7 Jul 2005 18:44:35 -0000 1.1829 +++ tobuild 7 Jul 2005 19:17:18 -0000 1.1830 @@ -1,17 +1,6 @@ # this is the build control file. the format is # user repo tag target status # -jwrdegoede rpms/gnumeric/devel gnumeric-1_4_3-4 devel -adrian rpms/grip/devel grip-3_2_0-5_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -adrian rpms/grip/FC-4 grip-3_2_0-5_fc4 fc4 -awjb rpms/sylpheed-claws/FC-4 sylpheed-claws-1_9_12-2_fc4 fc4 -awjb rpms/sylpheed-claws/devel sylpheed-claws-1_9_12-2_fc5 devel -awjb rpms/sylpheed-claws/FC-3 sylpheed-claws-1_0_5-1 fc3 -corsepiu rpms/Coin2/devel Coin2-2_4_3-1_fc5 devel -mschwendt rpms/anjuta/devel anjuta-1_2_3-1_fc5 devel -mschwendt rpms/anjuta/FC-4 anjuta-1_2_3-1_fc4 fc4 ixs rpms/barcode/devel barcode-0_98-5_fc5 devel mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 From skvidal at phy.duke.edu Thu Jul 7 19:21:46 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Thu, 07 Jul 2005 15:21:46 -0400 Subject: common tobuild,1.1829,1.1830 In-Reply-To: <200507071917.j67JHKk0002808@cvs-int.fedora.redhat.com> References: <200507071917.j67JHKk0002808@cvs-int.fedora.redhat.com> Message-ID: <1120764106.5121.22.camel@cutter> On Thu, 2005-07-07 at 15:17 -0400, Michael Schwendt wrote: > Author: mschwendt > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2791 > > Modified Files: > tobuild > Log Message: > clean up -- buildsys seems to be stuck at barcode > tex barcode.info seemed to be waiting for input. I killed the tex process. -sv From fedora-extras-commits at redhat.com Thu Jul 7 19:52:07 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:52:07 -0400 Subject: rpms/bazaar/devel bazaar.spec,1.8,1.9 Message-ID: <200507071952.j67Jq70m002941@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2924 Modified Files: bazaar.spec Log Message: Remove /usr/bin/annotate to fix bug #162665 Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/devel/bazaar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bazaar.spec 29 Jun 2005 17:06:54 -0000 1.8 +++ bazaar.spec 7 Jul 2005 19:52:04 -0000 1.9 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -59,6 +59,12 @@ install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check +# The stand alone annotate is meant to debug baz interals, not installation +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then + rm $RPM_BUILD_ROOT%{_bindir}/annotate +fi + %find_lang %{name} # install the documentation @@ -72,11 +78,13 @@ %defattr(-, root, root) %doc COPYING doc/* %{_bindir}/baz -%{_bindir}/annotate %{_bindir}/bazaar-gpg-check %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Shahms E. King 1.4.2-2 +- Remove the standalone "annotate" binary to fix bug #162665 + * Wed Jun 29 2005 Shahms E. King 1.4.2-1 - Update to 1.4.2 - Don't explicitly gzip man pages From fedora-extras-commits at redhat.com Thu Jul 7 19:52:25 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:52:25 -0400 Subject: common tobuild,1.1830,1.1831 Message-ID: <200507071952.j67JqP1L003003@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2986 Modified Files: tobuild Log Message: request build of rpms/bazaar/devel bazaar-1_4_2-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1830 retrieving revision 1.1831 diff -u -r1.1830 -r1.1831 --- tobuild 7 Jul 2005 19:17:18 -0000 1.1830 +++ tobuild 7 Jul 2005 19:52:22 -0000 1.1831 @@ -5,3 +5,4 @@ mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 +shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 19:53:19 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:53:19 -0400 Subject: rpms/bazaar/FC-3 bazaar.spec,1.7,1.8 Message-ID: <200507071953.j67JrJh8003036@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3019 Modified Files: bazaar.spec Log Message: Remove /usr/bin/annotate to fix bug #162665 Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/FC-3/bazaar.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bazaar.spec 29 Jun 2005 17:11:08 -0000 1.7 +++ bazaar.spec 7 Jul 2005 19:53:17 -0000 1.8 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -59,6 +59,12 @@ install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check +# The stand alone annotate is meant to debug baz interals, not installation +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then + rm $RPM_BUILD_ROOT%{_bindir}/annotate +fi + %find_lang %{name} # install the documentation @@ -72,11 +78,13 @@ %defattr(-, root, root) %doc COPYING doc/* %{_bindir}/baz -%{_bindir}/annotate %{_bindir}/bazaar-gpg-check %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Shahms E. King 1.4.2-2 +- Remove the standalone "annotate" binary to fix bug #162665 + * Wed Jun 29 2005 Shahms E. King 1.4.2-1 - Update to 1.4.2 - Don't explicitly gzip man pages From fedora-extras-commits at redhat.com Thu Jul 7 19:53:31 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:53:31 -0400 Subject: common tobuild,1.1831,1.1832 Message-ID: <200507071953.j67JrVcF003099@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3081 Modified Files: tobuild Log Message: request build of rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1831 retrieving revision 1.1832 diff -u -r1.1831 -r1.1832 --- tobuild 7 Jul 2005 19:52:22 -0000 1.1831 +++ tobuild 7 Jul 2005 19:53:28 -0000 1.1832 @@ -6,3 +6,4 @@ jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel +shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 19:53:52 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:53:52 -0400 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 Message-ID: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/bazaar/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3105 Modified Files: bazaar.spec Log Message: Remove /usr/bin/annotate to fix bug #162665 Index: bazaar.spec =================================================================== RCS file: /cvs/extras/rpms/bazaar/FC-4/bazaar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bazaar.spec 29 Jun 2005 17:09:59 -0000 1.8 +++ bazaar.spec 7 Jul 2005 19:53:49 -0000 1.9 @@ -1,7 +1,7 @@ Name: bazaar Version: 1.4.2 Summary: A distributed revision control system -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools Source: http://bazaar.canonical.com/releases/src/%{name}_%{version}.tar.gz @@ -59,6 +59,12 @@ install -D baz.1 $RPM_BUILD_ROOT%{_mandir}/man1/baz.1 install -m755 bazaar-gpg-check $RPM_BUILD_ROOT%{_bindir}/bazaar-gpg-check +# The stand alone annotate is meant to debug baz interals, not installation +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then + rm $RPM_BUILD_ROOT%{_bindir}/annotate +fi + %find_lang %{name} # install the documentation @@ -72,11 +78,13 @@ %defattr(-, root, root) %doc COPYING doc/* %{_bindir}/baz -%{_bindir}/annotate %{_bindir}/bazaar-gpg-check %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Shahms E. King 1.4.2-2 +- Remove the standalone "annotate" binary to fix bug #162665 + * Wed Jun 29 2005 Shahms E. King 1.4.2-1 - Update to 1.4.2 - Don't explicitly gzip man pages From fedora-extras-commits at redhat.com Thu Jul 7 19:54:03 2005 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 7 Jul 2005 15:54:03 -0400 Subject: common tobuild,1.1832,1.1833 Message-ID: <200507071954.j67Js34p003184@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3167 Modified Files: tobuild Log Message: request build of rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1832 retrieving revision 1.1833 diff -u -r1.1832 -r1.1833 --- tobuild 7 Jul 2005 19:53:28 -0000 1.1832 +++ tobuild 7 Jul 2005 19:54:01 -0000 1.1833 @@ -7,3 +7,4 @@ jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 +shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:16:21 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 16:16:21 -0400 Subject: rpms/most/devel most.spec,1.8,1.9 Message-ID: <200507072016.j67KGL8B004360@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4343 Modified Files: most.spec Log Message: * Thu Jul 07 2005 Adrian Reber - 4.10.2-1 - updated to 4.10.2 (fixes search aborting bug) Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- most.spec 4 Jul 2005 08:48:19 -0000 1.8 +++ most.spec 7 Jul 2005 20:16:19 -0000 1.9 @@ -1,11 +1,11 @@ Summary: more, less, most Name: most -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -43,6 +43,9 @@ %changelog +* Thu Jul 07 2005 Adrian Reber - 4.10.2-1 +- updated to 4.10.2 (fixes search aborting bug) + * Fri Jul 01 2005 Adrian Reber - 4.10.1-1 - updated to 4.10.1 From fedora-extras-commits at redhat.com Thu Jul 7 20:22:19 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:22:19 -0400 Subject: rpms/liferea/devel .cvsignore, 1.6, 1.7 liferea.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200507072022.j67KMJ0Y004421@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4400 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu Jul 7 2005 Brian Pepple - 0.9.3-1 - Update to 0.9.3. - Enable dbus. - Add dist tag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 May 2005 17:56:24 -0000 1.6 +++ .cvsignore 7 Jul 2005 20:22:17 -0000 1.7 @@ -1 +1 @@ -liferea-0.9.2.tar.gz +liferea-0.9.3.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liferea.spec 17 May 2005 17:56:24 -0000 1.11 +++ liferea.spec 7 Jul 2005 20:22:17 -0000 1.12 @@ -1,6 +1,8 @@ +%define with_dbus 1 + Name: liferea -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -14,7 +16,11 @@ BuildRequires: GConf2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -Buildrequires: zlib-devel +BuildRequires: zlib-devel + +%if %{with_dbus} +BuildRequires: dbus-devel +%endif Requires(post): GConf2 Requires(preun): GConf2 @@ -33,7 +39,12 @@ %build -%configure --disable-schemas-install --enable-dbus=no +%configure --disable-schemas-install \ +%if %{with_dbus} + --enable-dbus=yes +%else + --enable-dbus=no +%endif make %{?_smp_mflags} @@ -81,6 +92,11 @@ %changelog +* Thu Jul 7 2005 Brian Pepple - 0.9.3-1 +- Update to 0.9.3. +- Enable dbus. +- Add dist tag. + * Thu May 12 2005 Brian Pepple - 0.9.2-1 - Update to 0.9.2 - Don't enable d-bus since old API is used. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 May 2005 17:56:24 -0000 1.7 +++ sources 7 Jul 2005 20:22:17 -0000 1.8 @@ -1 +1 @@ -08a52274b4ef91f7ac9a01cc45fbad13 liferea-0.9.2.tar.gz +8a592a2e73b8d6e1bc78417e91ab82b2 liferea-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:23:45 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:23:45 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.6, 1.7 liferea.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200507072023.j67KNjBD004465@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4444 Modified Files: .cvsignore liferea.spec sources Log Message: * Thu Jul 7 2005 Brian Pepple - 0.9.3-1 - Update to 0.9.3. - Enable dbus. - Add dist tag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 May 2005 17:56:24 -0000 1.6 +++ .cvsignore 7 Jul 2005 20:23:42 -0000 1.7 @@ -1 +1 @@ -liferea-0.9.2.tar.gz +liferea-0.9.3.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- liferea.spec 17 May 2005 17:56:24 -0000 1.11 +++ liferea.spec 7 Jul 2005 20:23:43 -0000 1.12 @@ -1,6 +1,8 @@ +%define with_dbus 1 + Name: liferea -Version: 0.9.2 -Release: 1 +Version: 0.9.3 +Release: 1%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet @@ -14,7 +16,11 @@ BuildRequires: GConf2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -Buildrequires: zlib-devel +BuildRequires: zlib-devel + +%if %{with_dbus} +BuildRequires: dbus-devel +%endif Requires(post): GConf2 Requires(preun): GConf2 @@ -33,7 +39,12 @@ %build -%configure --disable-schemas-install --enable-dbus=no +%configure --disable-schemas-install \ +%if %{with_dbus} + --enable-dbus=yes +%else + --enable-dbus=no +%endif make %{?_smp_mflags} @@ -81,6 +92,11 @@ %changelog +* Thu Jul 7 2005 Brian Pepple - 0.9.3-1 +- Update to 0.9.3. +- Enable dbus. +- Add dist tag. + * Thu May 12 2005 Brian Pepple - 0.9.2-1 - Update to 0.9.2 - Don't enable d-bus since old API is used. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 May 2005 17:56:24 -0000 1.7 +++ sources 7 Jul 2005 20:23:43 -0000 1.8 @@ -1 +1 @@ -08a52274b4ef91f7ac9a01cc45fbad13 liferea-0.9.2.tar.gz +8a592a2e73b8d6e1bc78417e91ab82b2 liferea-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:26:18 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:26:18 -0400 Subject: common tobuild,1.1833,1.1834 Message-ID: <200507072026.j67KQI4l004538@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4521 Modified Files: tobuild Log Message: request build of rpms/liferea/devel liferea-0_9_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1833 retrieving revision 1.1834 diff -u -r1.1833 -r1.1834 --- tobuild 7 Jul 2005 19:54:01 -0000 1.1833 +++ tobuild 7 Jul 2005 20:26:16 -0000 1.1834 @@ -8,3 +8,4 @@ shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 +bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 20:26:54 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 7 Jul 2005 16:26:54 -0400 Subject: common tobuild,1.1834,1.1835 Message-ID: <200507072026.j67KQsux004601@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4584 Modified Files: tobuild Log Message: request build of rpms/liferea/FC-4 liferea-0_9_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1834 retrieving revision 1.1835 diff -u -r1.1834 -r1.1835 --- tobuild 7 Jul 2005 20:26:16 -0000 1.1834 +++ tobuild 7 Jul 2005 20:26:51 -0000 1.1835 @@ -9,3 +9,4 @@ shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel +bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:30:59 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 16:30:59 -0400 Subject: rpms/most/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200507072030.j67KUxP0004646@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627 Modified Files: .cvsignore sources Log Message: updated to 4.10.2 (fixes search aborting bug) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Jul 2005 12:41:26 -0000 1.3 +++ .cvsignore 7 Jul 2005 20:30:57 -0000 1.4 @@ -1 +1 @@ -most-4.10.1.tar.bz2 +most-4.10.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Jul 2005 12:41:26 -0000 1.3 +++ sources 7 Jul 2005 20:30:57 -0000 1.4 @@ -1 +1 @@ -9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 +16f7a67a969e0ce9a941c0e6c1ff0470 most-4.10.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:32:57 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 7 Jul 2005 16:32:57 -0400 Subject: common tobuild,1.1835,1.1836 Message-ID: <200507072032.j67KWvs7004703@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4686 Modified Files: tobuild Log Message: request build of rpms/most/devel most-4_10_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1835 retrieving revision 1.1836 diff -u -r1.1835 -r1.1836 --- tobuild 7 Jul 2005 20:26:51 -0000 1.1835 +++ tobuild 7 Jul 2005 20:32:54 -0000 1.1836 @@ -10,3 +10,4 @@ shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 +adrian rpms/most/devel most-4_10_2-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 7 20:50:12 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 7 Jul 2005 16:50:12 -0400 Subject: rpms/naim/devel naim.spec,1.1,1.2 Message-ID: <200507072050.j67KoC2o004769@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4748 Modified Files: naim.spec Log Message: Remove --enable-detach %configure flag Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- naim.spec 7 Jul 2005 17:05:41 -0000 1.1 +++ naim.spec 7 Jul 2005 20:50:10 -0000 1.2 @@ -1,6 +1,6 @@ Name: naim Version: 0.11.7.3.1 -Release: 1 +Release: 2 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client Group: Applications/Internet @@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel -Requires: screen %description naim is a console client for AOL Instant Messenger (AIM), AOL I Seek You (ICQ), @@ -20,7 +19,7 @@ %setup -q %build -%configure --enable-detach +%configure make %{?_smp_mflags} %install @@ -39,5 +38,9 @@ %{_mandir}/*/* %changelog +* Thu Jul 07 2005 Luke Macken 0.11.7.3.1-2 +- Disable detach-mode, which seems to break the users shell upon detaching. + Run naim in screen manually if you want this functionality. + * Tue Jul 05 2005 Luke Macken 0.11.7.3.1-1 - Packaged for Fedora Extras From fedora-extras-commits at redhat.com Thu Jul 7 20:52:07 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 7 Jul 2005 16:52:07 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.11,1.12 Message-ID: <200507072052.j67Kq7L3004816@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4799 Modified Files: galeon.spec Log Message: galeon: 1.3.21-8. Fixed buildreqs. Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- galeon.spec 6 Jul 2005 20:38:25 -0000 1.11 +++ galeon.spec 7 Jul 2005 20:52:05 -0000 1.12 @@ -1,11 +1,11 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 6%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ -Source0: http://download.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2 +Source0: http://download.sourceforge.net/galeon/galeon-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Requires: scrollkeeper Requires: mozilla = %(rpm -q mozilla-devel --qf='%%{epoch}:%%{version}' 2>/dev/null) @@ -14,8 +14,9 @@ BuildRequires: mozilla-devel >= 37:1.7.2 BuildRequires: libxml2-devel >= 2.6.6 BuildRequires: libgnomeui-devel >= 2.5.2 +BuildRequires: perl(XML::Parser) scrollkeeper %ifarch x86_64 -BuildRequires: autoconf automake libtool +BuildRequires: autoconf automake libtool intltool %endif %description @@ -100,6 +101,10 @@ %changelog +* Thu Jul 7 2005 Dams - 1.3.21 +- Hopefully fixed BuildReq. +- replaced name by galeon in Source0 + * Wed Jul 6 2005 Dams - 1.3.21-6 - Added missing BuildRequires From fedora-extras-commits at redhat.com Thu Jul 7 20:52:54 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 7 Jul 2005 16:52:54 -0400 Subject: common tobuild,1.1836,1.1837 Message-ID: <200507072052.j67Kqsws004878@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4861 Modified Files: tobuild Log Message: request build of rpms/galeon/FC-4 galeon-1_3_21-8_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1836 retrieving revision 1.1837 diff -u -r1.1836 -r1.1837 --- tobuild 7 Jul 2005 20:32:54 -0000 1.1836 +++ tobuild 7 Jul 2005 20:52:51 -0000 1.1837 @@ -11,3 +11,4 @@ bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 adrian rpms/most/devel most-4_10_2-1_fc5 devel +anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:55:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 16:55:03 -0400 Subject: rpms/screem/FC-4 .cvsignore, 1.3, 1.4 screem.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507072055.j67Kt3he004913@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/screem/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4892 Modified Files: .cvsignore screem.spec sources Log Message: * Thu Jul 7 2005 Michael Schwendt - 0.14.1-1 - Update to 0.14.1 (also fixes bug #153224). - BR gnome-menus-devel libcroco-devel - Drop --with-libxml2 --disable-gtkhtml-help --with-included-neon, since they are not evaluated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/screem/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 19:20:27 -0000 1.3 +++ .cvsignore 7 Jul 2005 20:55:01 -0000 1.4 @@ -1 +1 @@ -screem-0.12.1.tar.gz +screem-0.14.1.tar.gz Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/FC-4/screem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- screem.spec 22 May 2005 23:11:22 -0000 1.4 +++ screem.spec 7 Jul 2005 20:55:01 -0000 1.5 @@ -1,13 +1,12 @@ Name: screem -Version: 0.12.1 -Release: 3 - -Summary: A website development enviroment +Version: 0.14.1 +Release: 1%{?dist} +Summary: Website development environment Group: Development/Tools License: GPL URL: http://screem.sourceforge.net/ -Source0: http://download.sourceforge.net/screem/screem-0.12.1.tar.gz +Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -17,7 +16,10 @@ BuildRequires: gtksourceview-devel BuildRequires: libgnomeprintui22-devel BuildRequires: libgnomeui-devel +BuildRequires: gnome-menus-devel +BuildRequires: libcroco-devel BuildRequires: scrollkeeper + Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -42,12 +44,10 @@ %build -%configure --disable-gtkhtml-help \ +%configure \ --disable-schemas-install \ --disable-update-mime \ --disable-update-desktop \ - --with-included-neon \ - --with-libxml2 \ --enable-dbus make %{?_smp_mflags} @@ -100,16 +100,22 @@ %{_datadir}/mime/packages/* %{_datadir}/mime-info %{_datadir}/omf -%{_datadir}/pixmaps +%{_datadir}/pixmaps/* %{_libdir}/%{name} %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Jul 7 2005 Michael Schwendt - 0.14.1-1 +- Update to 0.14.1 (also fixes bug #153224). +- BR gnome-menus-devel libcroco-devel +- Drop --with-libxml2 --disable-gtkhtml-help --with-included-neon, + since they are not evaluated. + * Sun May 22 2005 Jeremy Katz - 0.12.1-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - 0.12.1-2 - rebuilt * Thu Nov 25 2004 Phillip Compton - 0.12.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/screem/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 19:20:27 -0000 1.3 +++ sources 7 Jul 2005 20:55:01 -0000 1.4 @@ -1 +1 @@ -4d1f50deee2888f0ac094cb3df61f1ad screem-0.12.1.tar.gz +b23bf53698df79477f83f3d66b6eab0d screem-0.14.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 20:56:58 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 16:56:58 -0400 Subject: common tobuild,1.1837,1.1838 Message-ID: <200507072056.j67KuwO6004975@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4958 Modified Files: tobuild Log Message: request build of rpms/screem/FC-4 screem-0_14_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1837 retrieving revision 1.1838 diff -u -r1.1837 -r1.1838 --- tobuild 7 Jul 2005 20:52:51 -0000 1.1837 +++ tobuild 7 Jul 2005 20:56:56 -0000 1.1838 @@ -12,3 +12,4 @@ bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 adrian rpms/most/devel most-4_10_2-1_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 +mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 20:57:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 16:57:36 -0400 Subject: rpms/screem/devel .cvsignore, 1.3, 1.4 screem.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507072057.j67KvaY2005002@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/screem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4981 Modified Files: .cvsignore screem.spec sources Log Message: sync with FC-4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/screem/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 19:20:27 -0000 1.3 +++ .cvsignore 7 Jul 2005 20:57:33 -0000 1.4 @@ -1 +1 @@ -screem-0.12.1.tar.gz +screem-0.14.1.tar.gz Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/devel/screem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- screem.spec 22 May 2005 23:11:22 -0000 1.4 +++ screem.spec 7 Jul 2005 20:57:33 -0000 1.5 @@ -1,13 +1,12 @@ Name: screem -Version: 0.12.1 -Release: 3 - -Summary: A website development enviroment +Version: 0.14.1 +Release: 1%{?dist} +Summary: Website development environment Group: Development/Tools License: GPL URL: http://screem.sourceforge.net/ -Source0: http://download.sourceforge.net/screem/screem-0.12.1.tar.gz +Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -17,7 +16,10 @@ BuildRequires: gtksourceview-devel BuildRequires: libgnomeprintui22-devel BuildRequires: libgnomeui-devel +BuildRequires: gnome-menus-devel +BuildRequires: libcroco-devel BuildRequires: scrollkeeper + Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -42,12 +44,10 @@ %build -%configure --disable-gtkhtml-help \ +%configure \ --disable-schemas-install \ --disable-update-mime \ --disable-update-desktop \ - --with-included-neon \ - --with-libxml2 \ --enable-dbus make %{?_smp_mflags} @@ -100,16 +100,22 @@ %{_datadir}/mime/packages/* %{_datadir}/mime-info %{_datadir}/omf -%{_datadir}/pixmaps +%{_datadir}/pixmaps/* %{_libdir}/%{name} %{_sysconfdir}/gconf/schemas/* %changelog +* Thu Jul 7 2005 Michael Schwendt - 0.14.1-1 +- Update to 0.14.1 (also fixes bug #153224). +- BR gnome-menus-devel libcroco-devel +- Drop --with-libxml2 --disable-gtkhtml-help --with-included-neon, + since they are not evaluated. + * Sun May 22 2005 Jeremy Katz - 0.12.1-3 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt +* Thu Apr 7 2005 Michael Schwendt - 0.12.1-2 - rebuilt * Thu Nov 25 2004 Phillip Compton - 0.12.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/screem/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 19:20:27 -0000 1.3 +++ sources 7 Jul 2005 20:57:33 -0000 1.4 @@ -1 +1 @@ -4d1f50deee2888f0ac094cb3df61f1ad screem-0.12.1.tar.gz +b23bf53698df79477f83f3d66b6eab0d screem-0.14.1.tar.gz From tcallawa at redhat.com Thu Jul 7 21:00:10 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Thu, 07 Jul 2005 16:00:10 -0500 Subject: APPROVAL: libifp Message-ID: <1120770010.9303.52.camel@localhost.localdomain> libifp is a general-purpose library-driver for iRiver's iFP (flash-based) portable audio players. The source code is pure C and is fairly portable. Also included is a console app that uses the library. Reviewer: Tom "spot" Callaway Maintainer: Ignacio Vazquez-Abrams ~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 Thu Jul 7 21:12:48 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:12:48 -0400 Subject: rpms/libifp - New directory Message-ID: <200507072112.j67LCmIR006242@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6222/libifp Log Message: Directory /cvs/extras/rpms/libifp added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 21:12:48 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:12:48 -0400 Subject: rpms/libifp/devel - New directory Message-ID: <200507072112.j67LCmps006247@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6222/libifp/devel Log Message: Directory /cvs/extras/rpms/libifp/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 21:13:02 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:02 -0400 Subject: rpms/libifp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507072113.j67LD2LE006294@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6267 Added Files: Makefile import.log Log Message: Setup of module libifp --- NEW FILE Makefile --- # Top level Makefile for module libifp all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 21:13:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:03 -0400 Subject: rpms/libifp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507072113.j67LD3O3006299@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6267/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libifp --- NEW 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 Jul 7 21:13:49 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:49 -0400 Subject: rpms/libifp import.log,1.1,1.2 Message-ID: <200507072113.j67LDndC006362@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6331 Modified Files: import.log Log Message: auto-import libifp-1.0.0.1-1 on branch devel from libifp-1.0.0.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libifp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 21:13:00 -0000 1.1 +++ import.log 7 Jul 2005 21:13:47 -0000 1.2 @@ -0,0 +1 @@ +libifp-1_0_0_1-1:HEAD:libifp-1.0.0.1-1.src.rpm:1120770934 From fedora-extras-commits at redhat.com Thu Jul 7 21:13:49 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:13:49 -0400 Subject: rpms/libifp/devel libifp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507072113.j67LDnjx006369@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6331/devel Modified Files: .cvsignore sources Added Files: libifp.spec Log Message: auto-import libifp-1.0.0.1-1 on branch devel from libifp-1.0.0.1-1.src.rpm --- NEW FILE libifp.spec --- Name: libifp Version: 1.0.0.1 Release: 1 Summary: A general-purpose library-driver for iRiver's iFP portable audio players Group: System Environment/Base License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen %description libifp is a general-purpose library-driver for iRiver's iFP (flash-based) portable audio players. The source code is pure C and is fairly portable. Also included is a console app that uses the library. %package devel Summary: Headers and libraries for developing with libifp Group: Development/Libraries Requires: %{name}=%{version}-%{release} %description devel This package contains headers and libraries for developing apps that use libifp. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.so %{_mandir}/man3/* %changelog * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 21:13:01 -0000 1.1 +++ .cvsignore 7 Jul 2005 21:13:47 -0000 1.2 @@ -0,0 +1 @@ +libifp-1.0.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 21:13:01 -0000 1.1 +++ sources 7 Jul 2005 21:13:47 -0000 1.2 @@ -0,0 +1 @@ +3b692cc224391b5714f5a8fbb8abf85b libifp-1.0.0.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 21:17:47 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 17:17:47 -0400 Subject: rpms/libifp/devel libifp.spec,1.1,1.2 Message-ID: <200507072117.j67LHl1c006458@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441/devel Modified Files: libifp.spec Log Message: Fix spacing, add disttag Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libifp.spec 7 Jul 2005 21:13:47 -0000 1.1 +++ libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: libifp Version: 1.0.0.1 -Release: 1 +Release: 1%{?dist} Summary: A general-purpose library-driver for iRiver's iFP portable audio players Group: System Environment/Base @@ -20,7 +20,7 @@ %package devel Summary: Headers and libraries for developing with libifp Group: Development/Libraries -Requires: %{name}=%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel This package contains headers and libraries for developing apps that use From Christian.Iseli at licr.org Thu Jul 7 21:32:28 2005 From: Christian.Iseli at licr.org (Christian.Iseli at licr.org) Date: Thu, 07 Jul 2005 23:32:28 +0200 Subject: common tobuild,1.1829,1.1830 In-Reply-To: Your message of "Thu, 07 Jul 2005 15:21:46 EDT." <1120764106.5121.22.camel@cutter> Message-ID: <200507072132.j67LWaBJ030263@mx1.redhat.com> skvidal at phy.duke.edu said: > On Thu, 2005-07-07 at 15:17 -0400, Michael Schwendt wrote: >> clean up -- buildsys seems to be stuck at barcode > I killed the tex process. Looks like some BuildRequires are missing in barcode.spec: -BuildRequires: tetex, texinfo +BuildRequires: tetex, texinfo, tetex-dvips, ghostscript Sorry it escaped me in the review. With this patch, I got it to compile in mock... It's strange that it'd get stuck in the tex process, though. Another oddity is in my mock's root.log file: Install: libxml2.i386 0:2.6.19-1 -ls: readlink:: No such file or directory ls: file: No such file or directory ls: expected: No such file or directory core Christian From fedora-extras-commits at redhat.com Thu Jul 7 21:38:28 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 17:38:28 -0400 Subject: rpms/screem/FC-3 .cvsignore, 1.3, 1.4 screem.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507072138.j67LcS0Z006595@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/screem/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6574 Modified Files: .cvsignore screem.spec sources Log Message: * Thu Jul 7 2005 Michael Schwendt - 0.12.2-1 - Update to 0.12.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/screem/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Nov 2004 19:20:27 -0000 1.3 +++ .cvsignore 7 Jul 2005 21:38:26 -0000 1.4 @@ -1 +1 @@ -screem-0.12.1.tar.gz +screem-0.12.2.tar.gz Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/FC-3/screem.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- screem.spec 25 Nov 2004 19:20:27 -0000 1.2 +++ screem.spec 7 Jul 2005 21:38:26 -0000 1.3 @@ -1,12 +1,12 @@ Name: screem -Version: 0.12.1 +Version: 0.12.2 Release: 1 -Summary: A website development enviroment +Summary: Website development environment Group: Development/Tools License: GPL URL: http://screem.sourceforge.net/ -Source0: http://download.sourceforge.net/screem/screem-0.12.1.tar.gz +Source0: http://download.sourceforge.net/screem/screem-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel @@ -105,6 +105,9 @@ %changelog +* Thu Jul 7 2005 Michael Schwendt - 0.12.2-1 +- Update to 0.12.2. + * Thu Nov 25 2004 Phillip Compton - 0.12.1-1 - 0.12.1. Index: sources =================================================================== RCS file: /cvs/extras/rpms/screem/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Nov 2004 19:20:27 -0000 1.3 +++ sources 7 Jul 2005 21:38:26 -0000 1.4 @@ -1 +1 @@ -4d1f50deee2888f0ac094cb3df61f1ad screem-0.12.1.tar.gz +34368e70de44a3f7fc1687e39dc5156e screem-0.12.2.tar.gz From andreas at bawue.net Thu Jul 7 21:42:14 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 7 Jul 2005 23:42:14 +0200 (CEST) Subject: common tobuild,1.1829,1.1830 In-Reply-To: <200507072132.j67LWaBJ030263@mx1.redhat.com> References: <200507072132.j67LWaBJ030263@mx1.redhat.com> Message-ID: On Thu, 7 Jul 2005 Christian.Iseli at licr.org wrote: > Looks like some BuildRequires are missing in barcode.spec: > > -BuildRequires: tetex, texinfo > +BuildRequires: tetex, texinfo, tetex-dvips, ghostscript > > Sorry it escaped me in the review. With this patch, I got it to compile in > mock... This has been already added to the cvs as release 6. However, it's a bit strange as why it suddenly wants to completely rebuild the docs. > It's strange that it'd get stuck in the tex process, though. Yes. Definitly. Especially as this didn't happen on two different machines. bye, andreas From fedora-extras-commits at redhat.com Thu Jul 7 21:42:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 7 Jul 2005 17:42:48 -0400 Subject: common tobuild,1.1838,1.1839 Message-ID: <200507072142.j67LgmSo006706@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6687 Modified Files: tobuild Log Message: request build of rpms/screem/FC-3 screem-0_12_2-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1838 retrieving revision 1.1839 diff -u -r1.1838 -r1.1839 --- tobuild 7 Jul 2005 20:56:56 -0000 1.1838 +++ tobuild 7 Jul 2005 21:42:46 -0000 1.1839 @@ -13,3 +13,4 @@ adrian rpms/most/devel most-4_10_2-1_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 +mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 21:44:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 17:44:01 -0400 Subject: rpms/barcode/devel barcode-configure.patch, NONE, 1.1 barcode.spec, 1.1, 1.2 Message-ID: <200507072144.j67Li12q006740@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6720 Modified Files: barcode.spec Added Files: barcode-configure.patch Log Message: Fixed missing BuildRequire and a buildproblem on x86_64 barcode-configure.patch: --- NEW FILE barcode-configure.patch --- --- barcode-0.98/Makefile.in.orig 2005-07-07 23:07:48.513990181 +0200 +++ barcode-0.98/Makefile.in 2005-07-07 23:08:53.716905115 +0200 @@ -11,12 +11,12 @@ LDFLAGS = -L. -l$(TARGET) @LIBPAPER@ prefix = @prefix@ -BINDIR = $(prefix)/bin -LIBDIR = $(prefix)/lib -INCDIR = $(prefix)/include -MAN1DIR = $(prefix)/man/man1 -MAN3DIR = $(prefix)/man/man3 -INFODIR = $(prefix)/info +BINDIR = $(bindir) +LIBDIR = $(libdir) +INCDIR = $(includedir) +MAN1DIR = $(mandir)/man1 +MAN3DIR = $(mandir)/man3 +INFODIR = $(infodir) # getopt may be installed or not, if not take our copy GETOPT_O = @GETOPT_O@ Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- barcode.spec 7 Jul 2005 15:21:02 -0000 1.1 +++ barcode.spec 7 Jul 2005 21:43:59 -0000 1.2 @@ -1,16 +1,17 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz -Patch0: barcode-install-info.patch +Patch0: barcode-configure.patch +Patch1: barcode-install-info.patch URL: http://www.gnu.org/software/barcode/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info -BuildRequires: tetex, texinfo +BuildRequires: tetex, tetex-dvips, texinfo, ghostscript %description Barcode is meant to solve most needs in barcode creation with a @@ -30,25 +31,17 @@ %prep %setup -q -%patch0 -p1 -b .categories +%patch0 -p1 -b .directories +%patch1 -p1 -b .categories %build %configure make %{?_smp_mflags} -# Regenerate documentation -make -C doc barcode.info - %install rm -rf %{buildroot} %makeinstall -# Fix locations according to FHS -mkdir -p %{buildroot}%{_mandir} -mkdir -p %{buildroot}%{_infodir} -mv %{buildroot}/usr/man/* %{buildroot}%{_mandir} -mv %{buildroot}/usr/info/* %{buildroot}%{_infodir} - %clean rm -rf %{buildroot} @@ -74,6 +67,9 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 07 2005 Andreas Thienemann 0.98-6 +- Added configure patch to pick up correct libdir for x86_64 + * Thu Jul 07 2005 Andreas Thienemann 0.98-5 - Added install-info support to the texinfo file. - Fixed minor spec errors From fedora-extras-commits at redhat.com Thu Jul 7 21:46:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 7 Jul 2005 17:46:00 -0400 Subject: rpms/barcode/devel barcode.spec,1.2,1.3 Message-ID: <200507072146.j67Lk0Sh006772@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6753 Modified Files: barcode.spec Log Message: updated changelog Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- barcode.spec 7 Jul 2005 21:43:59 -0000 1.2 +++ barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 @@ -69,6 +69,7 @@ %changelog * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 +- Added missing BuildRequires for ghostscript and tetex-dvips * Thu Jul 07 2005 Andreas Thienemann 0.98-5 - Added install-info support to the texinfo file. From Christian.Iseli at licr.org Thu Jul 7 21:47:33 2005 From: Christian.Iseli at licr.org (Christian.Iseli at licr.org) Date: Thu, 07 Jul 2005 23:47:33 +0200 Subject: common tobuild,1.1829,1.1830 In-Reply-To: Your message of "Thu, 07 Jul 2005 23:42:14 +0200." Message-ID: <200507072147.j67LldsD015682@mx3.redhat.com> andreas at bawue.net said: > However, it's a bit strange as why it suddenly wants to completely rebuild > the docs. That's because you patch the doc.barcode file... From fedora-extras-commits at redhat.com Thu Jul 7 22:29:46 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:29:46 -0400 Subject: rpms/ncview - New directory Message-ID: <200507072229.j67MTklb008734@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8714/ncview Log Message: Directory /cvs/extras/rpms/ncview added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 22:29:47 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:29:47 -0400 Subject: rpms/ncview/devel - New directory Message-ID: <200507072229.j67MTlMR008739@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8714/ncview/devel Log Message: Directory /cvs/extras/rpms/ncview/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 7 22:30:05 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:05 -0400 Subject: rpms/ncview Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507072230.j67MU59M008786@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8759 Added Files: Makefile import.log Log Message: Setup of module ncview --- NEW FILE Makefile --- # Top level Makefile for module ncview all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 7 22:30:05 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:05 -0400 Subject: rpms/ncview/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507072230.j67MU5dt008791@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8759/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ncview --- NEW 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 Jul 7 22:30:55 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:55 -0400 Subject: rpms/ncview import.log,1.1,1.2 Message-ID: <200507072231.j67MVPiI008885@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8838 Modified Files: import.log Log Message: auto-import ncview-1.92e-4 on branch devel from ncview-1.92e-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ncview/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Jul 2005 22:30:03 -0000 1.1 +++ import.log 7 Jul 2005 22:30:53 -0000 1.2 @@ -0,0 +1 @@ +ncview-1_92e-4:HEAD:ncview-1.92e-4.src.rpm:1120775451 From fedora-extras-commits at redhat.com Thu Jul 7 22:30:55 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Thu, 7 Jul 2005 18:30:55 -0400 Subject: rpms/ncview/devel ncview-1.92e-Makefile.in.patch, NONE, 1.1 ncview-1.92e-do_print.c.patch, NONE, 1.1 ncview-1.92e-netpbm.patch, NONE, 1.1 ncview.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507072230.j67MUtKV008877@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8838/devel Modified Files: .cvsignore sources Added Files: ncview-1.92e-Makefile.in.patch ncview-1.92e-do_print.c.patch ncview-1.92e-netpbm.patch ncview.spec Log Message: auto-import ncview-1.92e-4 on branch devel from ncview-1.92e-4.src.rpm ncview-1.92e-Makefile.in.patch: --- NEW FILE ncview-1.92e-Makefile.in.patch --- --- ncview-1.92e/Makefile.in.orig 2004-10-12 15:54:42.795409115 -0400 +++ ncview-1.92e/Makefile.in 2004-10-12 15:55:14.503542390 -0400 @@ -43,7 +43,7 @@ ## files will be kept and installed. Comment this line out if ## no such directory will be specified. ##################################################################### -NCVIEW_LIB_DIR = @prefix@/lib/ncview +NCVIEW_LIB_DIR = @datadir@ ###################################################################### ## If needed, *add* here the names of any additional include or library @@ -123,7 +123,7 @@ ncview: $(OBJS) @CC@ $(MYCFLAGS) -o ncview $(OBJS) $(LDOPTIONS) $(OTHERLIBDIRS) \ @X_LIBS@ $(NETCDFLIB) $(UDUNITSLIB) $(XAWLIB) $(XMULIB) \ - $(PPMLIB) \ + $(PPMLIBDIR) $(PPMLIB) \ @X_PRE_LIBS@ $(XTOOLLIB) $(XEXTLIB) $(XLIB) @X_EXTRA_LIBS@ -lm ncview.1: ncview.1.sed ncview-1.92e-do_print.c.patch: --- NEW FILE ncview-1.92e-do_print.c.patch --- --- ncview-1.92e/do_print.c.orig 2005-07-06 13:33:37.000000000 -0400 +++ ncview-1.92e/do_print.c 2005-07-06 14:00:56.000000000 -0400 @@ -75,6 +75,7 @@ size_t x_size, y_size, top_of_image, bot_of_image, center_x, center_y, left_of_image, right_of_image; char outfname[1024], tstr[1500]; + int outfid; FILE *outf; float output_scale; int r, g, b, n_print; @@ -86,20 +87,34 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; - - if( printopts.output_device == DEVICE_PRINTER ) - strcpy( printopts.out_file_name, tmpnam(NULL) ); - if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) + if( printopts.output_device == DEVICE_PRINTER ) { + strcpy( printopts.out_file_name, "/tmp/ncview.XXXXXX" ); + outfid = mkstemp( printopts.out_file_name ); + if (outfid == -1) { + sprintf( tstr, "Error opening temporary file for output!\n" ); + in_error( tstr ); return; - - if( (outf = fopen(printopts.out_file_name, "w" )) == NULL ) { + } + if( (outf = fopen(printopts.out_file_name, "a" )) == NULL ) { sprintf( tstr, "Error opening file %s for output!\n", - outfname ); + printopts.out_file_name ); in_error( tstr ); return; - } - + } + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) + return; + + if( (outf = fopen(printopts.out_file_name, "w" )) == NULL ) { + sprintf( tstr, "Error opening file %s for output!\n", + outfname ); + in_error( tstr ); + return; + } + } + in_set_cursor_busy(); calc_scale( &output_scale, x_size, y_size ); ncview-1.92e-netpbm.patch: --- NEW FILE ncview-1.92e-netpbm.patch --- --- ncview-1.92e/configure.BAD 2005-07-05 16:07:32.000000000 -0500 +++ ncview-1.92e/configure 2005-07-05 16:07:53.000000000 -0500 @@ -2835,7 +2835,7 @@ fi fi -PPM_LIBNAME=libppm.so +PPM_LIBNAME=libnetpbm.so # Check whether --with-ppm_libdir or --without-ppm_libdir was given. if test "${with_ppm_libdir+set}" = set; then withval="$with_ppm_libdir" --- NEW FILE ncview.spec --- Name: ncview Version: 1.92e Release: 4 Summary: A visual browser for netCDF format files Group: Applications/Engineering License: GPL URL: http://meteora.ucsd.edu/~pierce/ncview_home_page.html Source0: ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.92e.tar.gz Patch0: ncview-1.92e-Makefile.in.patch Patch1: ncview-1.92e-netpbm.patch Patch2: ncview-1.92e-do_print.c.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel netcdf-devel udunits-devel netpbm-devel Requires: xorg-x11 udunits %description Ncview is a visual browser for netCDF format files. Typically you would use ncview to get a quick and easy, push-button look at your netCDF files. You can view simple movies of the data, view along various dimensions, take a look at the actual data values, change color maps, invert the data, etc. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build %configure --with-netcdf_incdir=%{_includedir}/netcdf-3 \ --with-netcdf_libdir=%{_libdir}/netcdf-3 --with-ppm_libdir=%{_libdir} \ --prefix=/usr --datadir=%{_datadir}/ncview # WARNING! # The parallel build was tested and it does NOT work. # make %{?_smp_mflags} make %install rm -rf $RPM_BUILD_ROOT export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults" mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults" %makeinstall NCVIEW_LIB_DIR=${RPM_BUILD_ROOT}%{_datadir}/ncview BINDIR=${RPM_BUILD_ROOT}%{_bindir} MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man1 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/* chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/* %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/* %{_datadir}/ncview %{_libdir}/X11/app-defaults/* %{_mandir}/man1/* %changelog * Wed Jul 6 2005 Ed Hill - 1.92e-4 - mkstemp() security fix and more cleanups * Wed Jul 6 2005 Ed Hill - 1.92e-3 - move the data files to %{_datadir} and add COPYING - added xorg-x11 Requires and BuildRequires * Tue Jul 5 2005 Ed Hill - 1.92e-2 - fix permissions, remove fortran dependency, and small cleanups * Tue Jul 5 2005 Tom "spot" Callaway - 1.92e-1 - Fedora Extras cleanups * Sun Dec 5 2004 Ed Hill - 0:1.92e-0.fdr.0 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Jul 2005 22:30:03 -0000 1.1 +++ .cvsignore 7 Jul 2005 22:30:53 -0000 1.2 @@ -0,0 +1 @@ +ncview-1.92e.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Jul 2005 22:30:03 -0000 1.1 +++ sources 7 Jul 2005 22:30:53 -0000 1.2 @@ -0,0 +1 @@ +37b9566e6ece132c9e578e69db0cdf7d ncview-1.92e.tar.gz From fedora-extras-commits at redhat.com Thu Jul 7 22:36:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:36:09 -0400 Subject: rpms/scribus/FC-4 scribus.spec,1.13,1.14 Message-ID: <200507072236.j67Ma9Nd008970@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-4 Modified Files: scribus.spec Log Message: Bumping release for FC-3 build Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scribus.spec 6 Jul 2005 23:35:41 -0000 1.13 +++ scribus.spec 7 Jul 2005 22:36:07 -0000 1.14 @@ -1,6 +1,6 @@ Name: scribus Version: 1.2.2.1 -Release: 1 +Release: 2%{?dist} Summary: DeskTop Publishing application written in Qt @@ -136,6 +136,9 @@ %changelog +* Thu Jul 7 2005 Tom "spot" Callaway 1.2.2.1-2 +- use dist tag for sanity between branches + * Tue Jul 5 2005 P Linnell - 1.2.2.1-1 - 1.2.2.1 released to fix crash on open with certain 1.2.1 docs From fedora-extras-commits at redhat.com Thu Jul 7 22:36:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:36:09 -0400 Subject: rpms/scribus/FC-3 scribus.spec,1.8,1.9 Message-ID: <200507072236.j67Ma948008964@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935/FC-3 Modified Files: scribus.spec Log Message: Bumping release for FC-3 build Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-3/scribus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scribus.spec 9 Feb 2005 01:54:43 -0000 1.8 +++ scribus.spec 7 Jul 2005 22:36:07 -0000 1.9 @@ -1,14 +1,15 @@ Name: scribus -Version: 1.2.1 -Release: 3 +Version: 1.2.2.1 +Release: 2%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2 Source1: scribus.xml -Patch0: scribus-x86_64.patch +Source2: scribus.desktop +#Patch0: scribus-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cups-devel @@ -21,24 +22,42 @@ BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: openssl-devel -BuildRequires: python-devel >= 2.2 +BuildRequires: python-devel >= 2.3 BuildRequires: qt-devel >= 1:3.3 BuildRequires: zlib-devel +BuildRequires: freetype-devel Requires: ghostscript >= 7.07 -Requires: python >= 2.2 +Requires: python >= 2.3 Requires: tkinter Requires(post): shared-mime-info Requires(post): desktop-file-utils Requires(postun): shared-mime-info Requires(postun): desktop-file-utils -Obsoletes: scribus-i18n-en - +Obsoletes: scribus-i18n-en +Obsoletes: scribus-svg +Obsoletes: scribus-scripting +Obsoletes: scribus-short-words +Obsoletes: scribus-vnla +Obsoletes: scribus-i18en +Obsoletes: scribus-i18de +Obsoletes: scribus-i18fr +Obsoletes: scribus-templates + +Provides: scribus-i18n-en +Provides: scribus-svg +Provides: scribus-scripting +Provides: scribus-short-words +Provides: scribus-vnla +Provides: scribus-i18en +Provides: scribus-i18de +Provides: scribus-i18fr +Provides: scribus-templates %description -Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???, -QuarkXPress??? or Adobe?? InDesign???, except that it is published under the -GNU GPL. +Scribus is an desktop open source page layout program with +the aim of producing commercial grade output in PDF and +Postscript, primarily, though not exclusively for Linux. While the goals of the program are for ease of use and simple easy to understand tools, Scribus offers support for professional publishing @@ -47,17 +66,17 @@ %package devel -Summary: Header files for Scribus. +Summary: Header files for Scribus Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Header files for Scribus. +Header files for Scribus %prep %setup -q -%patch -p1 -b .x86_64 +#%patch -p1 -b .x86_64 %build @@ -116,6 +135,22 @@ %changelog +* Thu Jul 7 2005 Tom "spot" Callaway 1.2.2.1-2 +- use dist tag for sanity between branches + +* Tue Jul 5 2005 P Linnell - 1.2.2.1-1 +- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs + +* Sun Jul 3 2005 P Linnell - 1.2.2-0.fc4 +- 1.2.2 final + +* Tue Jun 28 2005 P Linnell - 1.2.2cvs-0 +- test build for 1.2.2cvs +- Add freetype2 explicit build requirement +- Add obsoletes. See PACKAGING in the source tarball +- Change the description per PACKAGING +- Bump required python. 2.2 is no longer supported. + * Sun Feb 06 2005 Phillip Compton - 1.2.1-3 - Bumped BR on qt-devel to 3.3. From fedora-extras-commits at redhat.com Thu Jul 7 22:36:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:36:51 -0400 Subject: rpms/scribus/FC-3 sources,1.5,1.6 Message-ID: <200507072236.j67MapZT008997@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scribus/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8976/FC-3 Modified Files: sources Log Message: New sources. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2005 19:29:45 -0000 1.5 +++ sources 7 Jul 2005 22:36:49 -0000 1.6 @@ -1 +1,2 @@ 002cb629e817722f4123df7a41fc824b scribus-1.2.1.tar.bz2 +8c2eac0a358b04c39252586d9d85ab24 scribus-1.2.2.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 7 22:37:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:37:16 -0400 Subject: common tobuild,1.1839,1.1840 Message-ID: <200507072237.j67MbGXx009059@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9042 Modified Files: tobuild Log Message: request build of rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1839 retrieving revision 1.1840 diff -u -r1.1839 -r1.1840 --- tobuild 7 Jul 2005 21:42:46 -0000 1.1839 +++ tobuild 7 Jul 2005 22:37:14 -0000 1.1840 @@ -14,3 +14,4 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 +spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 7 22:37:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 7 Jul 2005 18:37:36 -0400 Subject: common tobuild,1.1840,1.1841 Message-ID: <200507072237.j67Mbamu009121@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9104 Modified Files: tobuild Log Message: request build of rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1840 retrieving revision 1.1841 diff -u -r1.1840 -r1.1841 --- tobuild 7 Jul 2005 22:37:14 -0000 1.1840 +++ tobuild 7 Jul 2005 22:37:34 -0000 1.1841 @@ -15,3 +15,4 @@ mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 +spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 7 23:02:43 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 19:02:43 -0400 Subject: rpms/libifp/devel libifp.hotplug, NONE, 1.1 libifp.usermap, NONE, 1.1 libifp.spec, 1.2, 1.3 Message-ID: <200507072302.j67N2hBN010513@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/devel Modified Files: libifp.spec Added Files: libifp.hotplug libifp.usermap Log Message: Added Per Bjornsson's hotplug files --- NEW FILE libifp.hotplug --- #!/bin/bash # # /etc/hotplug/usb/libifp # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, # but it's ugly to depend on a camera driver in order to talk # to an audio player... # # Sets up newly plugged-in iRiver iFP device so that the user who owns # the console according to pam_console can access it from user space # # Note that for this script to work, you'll need all of the following: # a) a line in the file /etc/hotplug/usb/libifp.usermap that corresponds # to the iFP device you are using. # b) a setup using pam_console creates the respective lock files # containing the name of the respective user. You can check for that # by executing "echo `cat /var/{run,lock}/console.lock`" and # verifying the appropriate user is mentioned somewhere there. # c) a Linux kernel supporting hotplug and usbdevfs # d) the hotplug package (http://linux-hotplug.sourceforge.net/) # # All of the above are expected to be true on recent Red Hat and Fedora # distributions in the default install. # # In the usermap file, the first field "usb module" should be named # "libifp" like this script. # if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # New code, using lock files instead of copying /dev/console permissions # This also works with non-gdm logins (e.g. on a virtual terminal) # Idea and code from Nalin Dahyabhai if [ -f /var/run/console/console.lock ] then CONSOLEOWNER=`cat /var/run/console/console.lock` elif [ -f /var/lock/console.lock ] then CONSOLEOWNER=`cat /var/lock/console.lock` else CONSOLEOWNER= fi if [ -n "$CONSOLEOWNER" ] then chmod 0000 "${DEVICE}" chown "$CONSOLEOWNER" "${DEVICE}" chmod 0600 "${DEVICE}" fi fi --- NEW FILE libifp.usermap --- # This file is shipped with libifp (based on a similar file in # the libsane package as shipped by Red Hat). # # The entries below are used to detect an iRiver iFP portable music # player when it is plugged in and then run the libifp hotplug script to # change the ownership and permissions on the "device node" used by # libusb. # # The 0x0003 match flag means the device is matched by its vendor and # product IDs. # # Sample entry (replace 0xVVVV and 0xPPPP with vendor ID and product ID respectively) : # libifp 0x0003 0xVVVV 0xPPPP 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # # usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info # # # The following list already contains the known iRiver iFP devices, with the # product IDs copied from the header file for libifp. # If it doesn't work for yours, try adding an appropriate entry. # iRiver iFP-1XX libifp 0x0003 0x4102 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-3XX libifp 0x0003 0x4102 0x1003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-5XX libifp 0x0003 0x4102 0x1005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-7XX libifp 0x0003 0x4102 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-8XX libifp 0x0003 0x4102 0x1008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-9XX libifp 0x0003 0x4102 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-10XX libifp 0x0003 0x4102 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver N10 libifp 0x0003 0x4102 0x1011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 +++ libifp.spec 7 Jul 2005 23:02:41 -0000 1.3 @@ -7,6 +7,8 @@ License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz +Source1: libifp.hotplug +Source2: libifp.usermap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -37,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +53,7 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* +%{_sysconfdir}/hotplug/usb/* %files devel %defattr(-,root,root,-) @@ -58,5 +63,8 @@ %{_mandir}/man3/* %changelog +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release From fedora-extras-commits at redhat.com Thu Jul 7 23:02:36 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 19:02:36 -0400 Subject: rpms/libifp/FC-3 libifp.hotplug, NONE, 1.1 libifp.usermap, NONE, 1.1 libifp.spec, 1.2, 1.3 Message-ID: <200507072302.j67N2aE6010478@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/FC-3 Modified Files: libifp.spec Added Files: libifp.hotplug libifp.usermap Log Message: Added Per Bjornsson's hotplug files --- NEW FILE libifp.hotplug --- #!/bin/bash # # /etc/hotplug/usb/libifp # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, # but it's ugly to depend on a camera driver in order to talk # to an audio player... # # Sets up newly plugged-in iRiver iFP device so that the user who owns # the console according to pam_console can access it from user space # # Note that for this script to work, you'll need all of the following: # a) a line in the file /etc/hotplug/usb/libifp.usermap that corresponds # to the iFP device you are using. # b) a setup using pam_console creates the respective lock files # containing the name of the respective user. You can check for that # by executing "echo `cat /var/{run,lock}/console.lock`" and # verifying the appropriate user is mentioned somewhere there. # c) a Linux kernel supporting hotplug and usbdevfs # d) the hotplug package (http://linux-hotplug.sourceforge.net/) # # All of the above are expected to be true on recent Red Hat and Fedora # distributions in the default install. # # In the usermap file, the first field "usb module" should be named # "libifp" like this script. # if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # New code, using lock files instead of copying /dev/console permissions # This also works with non-gdm logins (e.g. on a virtual terminal) # Idea and code from Nalin Dahyabhai if [ -f /var/run/console/console.lock ] then CONSOLEOWNER=`cat /var/run/console/console.lock` elif [ -f /var/lock/console.lock ] then CONSOLEOWNER=`cat /var/lock/console.lock` else CONSOLEOWNER= fi if [ -n "$CONSOLEOWNER" ] then chmod 0000 "${DEVICE}" chown "$CONSOLEOWNER" "${DEVICE}" chmod 0600 "${DEVICE}" fi fi --- NEW FILE libifp.usermap --- # This file is shipped with libifp (based on a similar file in # the libsane package as shipped by Red Hat). # # The entries below are used to detect an iRiver iFP portable music # player when it is plugged in and then run the libifp hotplug script to # change the ownership and permissions on the "device node" used by # libusb. # # The 0x0003 match flag means the device is matched by its vendor and # product IDs. # # Sample entry (replace 0xVVVV and 0xPPPP with vendor ID and product ID respectively) : # libifp 0x0003 0xVVVV 0xPPPP 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # # usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info # # # The following list already contains the known iRiver iFP devices, with the # product IDs copied from the header file for libifp. # If it doesn't work for yours, try adding an appropriate entry. # iRiver iFP-1XX libifp 0x0003 0x4102 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-3XX libifp 0x0003 0x4102 0x1003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-5XX libifp 0x0003 0x4102 0x1005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-7XX libifp 0x0003 0x4102 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-8XX libifp 0x0003 0x4102 0x1008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-9XX libifp 0x0003 0x4102 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-10XX libifp 0x0003 0x4102 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver N10 libifp 0x0003 0x4102 0x1011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/FC-3/libifp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 +++ libifp.spec 7 Jul 2005 23:02:34 -0000 1.3 @@ -7,6 +7,8 @@ License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz +Source1: libifp.hotplug +Source2: libifp.usermap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -37,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +53,7 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* +%{_sysconfdir}/hotplug/usb/* %files devel %defattr(-,root,root,-) @@ -58,5 +63,8 @@ %{_mandir}/man3/* %changelog +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release From fedora-extras-commits at redhat.com Thu Jul 7 23:02:41 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 7 Jul 2005 19:02:41 -0400 Subject: rpms/libifp/FC-4 libifp.hotplug, NONE, 1.1 libifp.usermap, NONE, 1.1 libifp.spec, 1.2, 1.3 Message-ID: <200507072303.j67N2fTa010505@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10461/FC-4 Modified Files: libifp.spec Added Files: libifp.hotplug libifp.usermap Log Message: Added Per Bjornsson's hotplug files --- NEW FILE libifp.hotplug --- #!/bin/bash # # /etc/hotplug/usb/libifp # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, # but it's ugly to depend on a camera driver in order to talk # to an audio player... # # Sets up newly plugged-in iRiver iFP device so that the user who owns # the console according to pam_console can access it from user space # # Note that for this script to work, you'll need all of the following: # a) a line in the file /etc/hotplug/usb/libifp.usermap that corresponds # to the iFP device you are using. # b) a setup using pam_console creates the respective lock files # containing the name of the respective user. You can check for that # by executing "echo `cat /var/{run,lock}/console.lock`" and # verifying the appropriate user is mentioned somewhere there. # c) a Linux kernel supporting hotplug and usbdevfs # d) the hotplug package (http://linux-hotplug.sourceforge.net/) # # All of the above are expected to be true on recent Red Hat and Fedora # distributions in the default install. # # In the usermap file, the first field "usb module" should be named # "libifp" like this script. # if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then # New code, using lock files instead of copying /dev/console permissions # This also works with non-gdm logins (e.g. on a virtual terminal) # Idea and code from Nalin Dahyabhai if [ -f /var/run/console/console.lock ] then CONSOLEOWNER=`cat /var/run/console/console.lock` elif [ -f /var/lock/console.lock ] then CONSOLEOWNER=`cat /var/lock/console.lock` else CONSOLEOWNER= fi if [ -n "$CONSOLEOWNER" ] then chmod 0000 "${DEVICE}" chown "$CONSOLEOWNER" "${DEVICE}" chmod 0600 "${DEVICE}" fi fi --- NEW FILE libifp.usermap --- # This file is shipped with libifp (based on a similar file in # the libsane package as shipped by Red Hat). # # The entries below are used to detect an iRiver iFP portable music # player when it is plugged in and then run the libifp hotplug script to # change the ownership and permissions on the "device node" used by # libusb. # # The 0x0003 match flag means the device is matched by its vendor and # product IDs. # # Sample entry (replace 0xVVVV and 0xPPPP with vendor ID and product ID respectively) : # libifp 0x0003 0xVVVV 0xPPPP 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # # usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info # # # The following list already contains the known iRiver iFP devices, with the # product IDs copied from the header file for libifp. # If it doesn't work for yours, try adding an appropriate entry. # iRiver iFP-1XX libifp 0x0003 0x4102 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-3XX libifp 0x0003 0x4102 0x1003 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-5XX libifp 0x0003 0x4102 0x1005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-7XX libifp 0x0003 0x4102 0x1007 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-8XX libifp 0x0003 0x4102 0x1008 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-9XX libifp 0x0003 0x4102 0x1009 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver iFP-10XX libifp 0x0003 0x4102 0x1010 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 #iRiver N10 libifp 0x0003 0x4102 0x1011 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/FC-4/libifp.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libifp.spec 7 Jul 2005 21:17:45 -0000 1.2 +++ libifp.spec 7 Jul 2005 23:02:39 -0000 1.3 @@ -7,6 +7,8 @@ License: GPL URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz +Source1: libifp.hotplug +Source2: libifp.usermap BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -37,6 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +53,7 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* +%{_sysconfdir}/hotplug/usb/* %files devel %defattr(-,root,root,-) @@ -58,5 +63,8 @@ %{_mandir}/man3/* %changelog +* Thu Jul 7 2005 Ignacio Vazquez-Abrams +- Added Per Bjornsson's hotplug files + * Wed Jun 29 2005 Ignacio Vazquez-Abrams 1.0.0.1-1 - Initial RPM release From ed at eh3.com Fri Jul 8 01:40:12 2005 From: ed at eh3.com (Ed Hill) Date: Thu, 07 Jul 2005 21:40:12 -0400 Subject: APPROVED: opendap Message-ID: <1120786813.18460.76.camel@ernie> OPeNDAP is suite of client and server tools and libs generally used for distributing scientific data sets such as satellite observations. Description : OPeNDAP provides software which makes local data accessible to remote locations regardless of local storage format. OPeNDAP also provides tools for transforming existing applications into OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data). OPeNDAP software is freely available. Maintainer: Tom 'Spot' Callaway Reviewers: Ed Hill, Michael Schwendt [1] [1] https://www.redhat.com/archives/fedora-extras-list/2005- April/msg00690.html -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Fri Jul 8 01:50:31 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 7 Jul 2005 21:50:31 -0400 Subject: rpms/mlmmj/devel mlmmj.spec,1.12,1.13 Message-ID: <200507080150.j681oVY8013153@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mlmmj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13136 Modified Files: mlmmj.spec Log Message: - Bump Index: mlmmj.spec =================================================================== RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mlmmj.spec 21 Jun 2005 01:18:32 -0000 1.12 +++ mlmmj.spec 8 Jul 2005 01:50:29 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Mailserver-independent ezmlm-like mailing list manager Name: mlmmj Version: 1.2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/Internet Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2 @@ -48,6 +48,9 @@ %{_mandir}/man1/mlmmj-* %changelog +* Fri Jul 8 2005 Michael Fleming 1.2.8-2 +- Bump & rebuild + * Tue Jun 21 2005 Michael Fleming 1.2.8-1 - New upstream release From fedora-extras-commits at redhat.com Fri Jul 8 01:51:13 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 7 Jul 2005 21:51:13 -0400 Subject: common tobuild,1.1841,1.1842 Message-ID: <200507080151.j681pDhd013217@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13200 Modified Files: tobuild Log Message: request build of rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1841 retrieving revision 1.1842 diff -u -r1.1841 -r1.1842 --- tobuild 7 Jul 2005 22:37:34 -0000 1.1841 +++ tobuild 8 Jul 2005 01:51:09 -0000 1.1842 @@ -16,3 +16,4 @@ mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 +mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 03:28:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 7 Jul 2005 23:28:21 -0400 Subject: extras-buildsys Makefile,1.5,1.6 Message-ID: <200507080328.j683SLJ8015616@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15599 Modified Files: Makefile Log Message: >From ignacio vazquez: Add distclean and rpm targets Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 28 Jun 2005 01:41:21 -0000 1.5 +++ Makefile 8 Jul 2005 03:28:19 -0000 1.6 @@ -11,6 +11,10 @@ clean: for d in $(SUBDIRS); do make -C $$d clean ; done +distclean: clean + rm -rf dist build + rm -f *.tar.bz2 + subdirs: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1 ; done @@ -36,3 +40,7 @@ @rm -rf /tmp/${PKGNAME}-$(VERSION) @echo "The archive is in ${PKGNAME}-$(VERSION).tar.bz2" +rpm: archive + rm -rf build dist + mkdir build dist + rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba $(PKGNAME).spec From fedora-extras-commits at redhat.com Fri Jul 8 04:13:34 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:13:34 -0400 Subject: rpms/glabels/devel glabels.spec,1.1,1.2 Message-ID: <200507080413.j684DYcx016804@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16787 Modified Files: glabels.spec Log Message: small spec file change Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/devel/glabels.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glabels.spec 6 Jul 2005 14:35:20 -0000 1.1 +++ glabels.spec 8 Jul 2005 04:13:32 -0000 1.2 @@ -1,12 +1,12 @@ Name: glabels Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net -Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz +Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 @@ -99,5 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 +- use Source0 + * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build + From fedora-extras-commits at redhat.com Fri Jul 8 04:16:34 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:16:34 -0400 Subject: rpms/glabels/FC-4 glabels.spec,1.1,1.2 Message-ID: <200507080416.j684GYRt016830@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16813 Modified Files: glabels.spec Log Message: small spec file change Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/FC-4/glabels.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glabels.spec 6 Jul 2005 14:35:20 -0000 1.1 +++ glabels.spec 8 Jul 2005 04:16:32 -0000 1.2 @@ -1,12 +1,12 @@ Name: glabels Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net -Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz +Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 @@ -99,5 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 +- use Source0 + * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build + From fedora-extras-commits at redhat.com Fri Jul 8 04:17:26 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:17:26 -0400 Subject: rpms/glabels/FC-3 glabels.spec,1.1,1.2 Message-ID: <200507080417.j684HQ4S016858@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/glabels/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16841 Modified Files: glabels.spec Log Message: small spec file change Index: glabels.spec =================================================================== RCS file: /cvs/extras/rpms/glabels/FC-3/glabels.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glabels.spec 6 Jul 2005 14:35:20 -0000 1.1 +++ glabels.spec 8 Jul 2005 04:17:24 -0000 1.2 @@ -1,12 +1,12 @@ Name: glabels Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A program for creating labels and business cards for GNOME Group: Applications/Publishing License: GPL URL: http://glabels.sf.net -Source: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz +Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1 @@ -99,5 +99,9 @@ %exclude %{_libdir}/libglabels.la %changelog +* Thu Jul 7 2005 Jef Spaleta - 2.0.3-2 +- use Source0 + * Mon Jul 5 2005 Jef Spaleta - 2.0.3-1 - Initial fedora extras build + From fedora-extras-commits at redhat.com Fri Jul 8 04:20:43 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 00:20:43 -0400 Subject: common tobuild,1.1842,1.1843 Message-ID: <200507080420.j684KhkK016933@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16916 Modified Files: tobuild Log Message: request build of rpms/glabels/devel glabels-2_0_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1842 retrieving revision 1.1843 diff -u -r1.1842 -r1.1843 --- tobuild 8 Jul 2005 01:51:09 -0000 1.1842 +++ tobuild 8 Jul 2005 04:20:40 -0000 1.1843 @@ -17,3 +17,4 @@ spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel +jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel From rc040203 at freenet.de Fri Jul 8 04:33:11 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 08 Jul 2005 06:33:11 +0200 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 In-Reply-To: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> References: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> Message-ID: <1120797191.30532.313.camel@mccallum.corsepiu.local> On Thu, 2005-07-07 at 15:53 -0400, Shahms King wrote: > Author: shahms > Index: bazaar.spec > +# The stand alone annotate is meant to debug baz interals, not installation > +# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html > +if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then > + rm $RPM_BUILD_ROOT%{_bindir}/annotate > +fi Why so clumsy? rm -f $RPM_BUILD_ROOT%{_bindir}/annotate Ralf From fedora-extras-commits at redhat.com Fri Jul 8 04:41:15 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 00:41:15 -0400 Subject: extras-buildsys plague.spec,1.8,1.9 Message-ID: <200507080441.j684fFbY017000@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16983 Modified Files: plague.spec Log Message: Make it noarch Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- plague.spec 6 Jul 2005 21:20:49 -0000 1.8 +++ plague.spec 8 Jul 2005 04:41:13 -0000 1.9 @@ -1,5 +1,7 @@ %define pythonver 2.4 +BuildArch: noarch + Summary: Distributed build system for RPMs Name: plague Version: 0.1 From fedora-extras-commits at redhat.com Fri Jul 8 05:01:31 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 01:01:31 -0400 Subject: common tobuild,1.1843,1.1844 Message-ID: <200507080502.j6852Hkd018150@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18133 Modified Files: tobuild Log Message: request build of rpms/glabels/FC-4 glabels-2_0_3-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1843 retrieving revision 1.1844 diff -u -r1.1843 -r1.1844 --- tobuild 8 Jul 2005 04:20:40 -0000 1.1843 +++ tobuild 8 Jul 2005 05:01:29 -0000 1.1844 @@ -18,3 +18,4 @@ spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel +jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 From rc040203 at freenet.de Fri Jul 8 05:05:41 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 08 Jul 2005 07:05:41 +0200 Subject: APPROVED: perl-Period Message-ID: <1120799142.30532.328.camel@mccallum.corsepiu.local> %description perl-Period provides the Time::Period Perl module. This module can be used to work with periods of time. Maintainer: Chris Ricker Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Fri Jul 8 05:23:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Fri, 8 Jul 2005 01:23:37 -0400 Subject: rpms/proj import.log,1.6,1.7 Message-ID: <200507080524.j685O754018281@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18246 Modified Files: import.log Log Message: auto-import proj-4.4.9-1 on branch devel from proj-4.4.9-1.src.rpm Update to address review comments in bug 150013 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 7 Jul 2005 04:52:35 -0000 1.6 +++ import.log 8 Jul 2005 05:23:35 -0000 1.7 @@ -3,3 +3,4 @@ proj-4_4_8-0_fdr_4_1:FC-1:proj-4.4.8-0.fdr.4.1.src.rpm:1109867681 proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421 proj-4_4_9-0:HEAD:proj-4.4.9-0.src.rpm:1120711939 +proj-4_4_9-1:HEAD:proj-4.4.9-1.src.rpm:1120800198 From fedora-extras-commits at redhat.com Fri Jul 8 05:23:37 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Fri, 8 Jul 2005 01:23:37 -0400 Subject: rpms/proj/devel .cvsignore, 1.3, 1.4 pj_gridinfo.patch, 1.1, 1.2 proj.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507080524.j685O7Wb018290@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18246/devel Modified Files: .cvsignore pj_gridinfo.patch proj.spec sources Log Message: auto-import proj-4.4.9-1 on branch devel from proj-4.4.9-1.src.rpm Update to address review comments in bug 150013 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Jul 2005 04:52:35 -0000 1.3 +++ .cvsignore 8 Jul 2005 05:23:35 -0000 1.4 @@ -1,2 +1,2 @@ -proj-nad27-1.1.tar.gz proj-4.4.9.tar.gz +proj-nad27-1.1.tar.gz pj_gridinfo.patch: Index: pj_gridinfo.patch =================================================================== RCS file: /cvs/extras/rpms/proj/devel/pj_gridinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pj_gridinfo.patch 7 Jul 2005 04:52:35 -0000 1.1 +++ pj_gridinfo.patch 8 Jul 2005 05:23:35 -0000 1.2 @@ -1,4 +1,19 @@ -493c493 -< "failed to find parent %8.8s for %.\n", ---- -> "failed to find parent %8.8s for %s\n", +*** src/pj_gridinfo.c 2004-10-29 21:03:03.000000000 -0700 +--- src/pj_gridinfo.c.new 2005-07-07 21:48:25.000000000 -0700 +*************** +*** 490,496 **** + { + if( getenv("PROJ_DEBUG") != NULL ) + fprintf( stderr, "pj_gridinfo_init_ntv2(): " +! "failed to find parent %8.8s for %.\n", + (const char *) header+24, gi->ct->id ); + + for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} +--- 490,496 ---- + { + if( getenv("PROJ_DEBUG") != NULL ) + fprintf( stderr, "pj_gridinfo_init_ntv2(): " +! "failed to find parent %8.8s for %s\n", + (const char *) header+24, gi->ct->id ); + + for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- proj.spec 7 Jul 2005 04:52:35 -0000 1.5 +++ proj.spec 8 Jul 2005 05:23:35 -0000 1.6 @@ -1,6 +1,6 @@ Name: proj Version: 4.4.9 -Release: 0 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -51,7 +51,7 @@ # Patch for Bug 150013 cp %{PATCH2} ./ -patch src/pj_gridinfo.c pj_gridinfo.patch +%patch2 -p0 -b .buildroot %build %configure @@ -64,7 +64,7 @@ install -p -m 0755 nad/test27 nad/test83 nad/testvarious $RPM_BUILD_ROOT%{_datadir}/%{name} %clean -#rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -93,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Thu Jul 7 2005 Shawn McCann - 4.4.9-1 +- Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source. + * Sun May 22 2005 Michael Schwendt - 4.4.8-6 - rebuilt @@ -125,4 +128,3 @@ - to comply with both Fedora and RedHat 9 packaging guidelines. - Split files into proj, proj-devel, and proj-nad (additional grids) - and adjusted the EXE path in the test scripts. - Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Jul 2005 04:52:35 -0000 1.3 +++ sources 8 Jul 2005 05:23:35 -0000 1.4 @@ -1,2 +1,2 @@ -66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz 3cc5c2407c213aadfd154c8df80efd6c proj-4.4.9.tar.gz +66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 05:49:54 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 8 Jul 2005 01:49:54 -0400 Subject: mock mock.py,1.20,1.21 Message-ID: <200507080549.j685nsr6018385@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18368 Modified Files: mock.py Log Message: remove references to mach-helper to fix 161828 Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mock.py 25 Jun 2005 19:00:52 -0000 1.20 +++ mock.py 8 Jul 2005 05:49:52 -0000 1.21 @@ -619,13 +619,13 @@ # defaults config_opts = {} - config_opts['basedir'] = '/var/lib/mach/roots/' # root name is automatically added to this - config_opts['chroot'] = '/usr/sbin/mach-helper chroot' - config_opts['mount'] = '/usr/sbin/mach-helper mount' - config_opts['umount'] = '/usr/sbin/mach-helper umount' - config_opts['rm'] = '/usr/sbin/mach-helper rm' - config_opts['mknod'] = '/usr/sbin/mach-helper mknod' - config_opts['yum'] = '/usr/sbin/mach-helper yum' + config_opts['basedir'] = '/var/lib/mock/' # root name is automatically added to this + config_opts['chroot'] = '/usr/sbin/mock-helper chroot' + config_opts['mount'] = '/usr/sbin/mock-helper mount' + config_opts['umount'] = '/usr/sbin/mock-helper umount' + config_opts['rm'] = '/usr/sbin/mock-helper rm' + config_opts['mknod'] = '/usr/sbin/mock-helper mknod' + config_opts['yum'] = '/usr/sbin/mock-helper yum' config_opts['runuser'] = '/sbin/runuser' config_opts['buildgroup'] = 'build' config_opts['chrootuser'] = 'mockbuild' From fedora-extras-commits at redhat.com Fri Jul 8 06:39:23 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 8 Jul 2005 02:39:23 -0400 Subject: common tobuild,1.1844,1.1845 Message-ID: <200507080639.j686dN8O020502@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20484 Modified Files: tobuild Log Message: request build of rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1844 retrieving revision 1.1845 diff -u -r1.1844 -r1.1845 --- tobuild 8 Jul 2005 05:01:29 -0000 1.1844 +++ tobuild 8 Jul 2005 06:39:21 -0000 1.1845 @@ -19,3 +19,4 @@ mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 +sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel From fedora-extras-commits at redhat.com Fri Jul 8 06:39:50 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 8 Jul 2005 02:39:50 -0400 Subject: common tobuild,1.1845,1.1846 Message-ID: <200507080639.j686dobw020537@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20520 Modified Files: tobuild Log Message: request build of rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1845 retrieving revision 1.1846 diff -u -r1.1845 -r1.1846 --- tobuild 8 Jul 2005 06:39:21 -0000 1.1845 +++ tobuild 8 Jul 2005 06:39:48 -0000 1.1846 @@ -20,3 +20,4 @@ jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel +sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 06:40:14 2005 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 8 Jul 2005 02:40:14 -0400 Subject: common tobuild,1.1846,1.1847 Message-ID: <200507080640.j686eEra020570@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20553 Modified Files: tobuild Log Message: request build of rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1846 retrieving revision 1.1847 diff -u -r1.1846 -r1.1847 --- tobuild 8 Jul 2005 06:39:48 -0000 1.1846 +++ tobuild 8 Jul 2005 06:40:12 -0000 1.1847 @@ -21,3 +21,4 @@ jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 +sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 From oliver at linux-kernel.at Fri Jul 8 07:01:02 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 09:01:02 +0200 Subject: APPROVED: icmpdn Message-ID: <42CE24AE.7000903@linux-kernel.at> icmpdn: ICMP host name utilities icmpdn is an implementation of the RFC 1788 ICMP domain name facilities for Linux. It includes icmpdnd, a daemon which responds to ICMP domain name requests from other hosts, idnlookup, which requests the domain name of another host, and nss_icmp, which is a nameswitch module for doing reverse hostname lookups via idnlookup. Maintainer: Fredrik Tolf Reviewer: Oliver Falk From fedora-extras-commits at redhat.com Fri Jul 8 07:21:56 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:21:56 -0400 Subject: rpms/libstatgrab - New directory Message-ID: <200507080721.j687Lu5M021859@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835/libstatgrab Log Message: Directory /cvs/extras/rpms/libstatgrab added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 07:21:57 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:21:57 -0400 Subject: rpms/libstatgrab/devel - New directory Message-ID: <200507080721.j687Lvol021864@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21835/libstatgrab/devel Log Message: Directory /cvs/extras/rpms/libstatgrab/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 07:22:10 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:10 -0400 Subject: rpms/libstatgrab Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507080722.j687MAnX021911@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21880 Added Files: Makefile import.log Log Message: Setup of module libstatgrab --- NEW FILE Makefile --- # Top level Makefile for module libstatgrab all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 07:22:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:11 -0400 Subject: rpms/libstatgrab/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507080722.j687MBWa021916@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21880/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libstatgrab --- NEW 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 Jul 8 07:22:43 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:43 -0400 Subject: rpms/libstatgrab import.log,1.1,1.2 Message-ID: <200507080722.j687MhFI021986@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21949 Modified Files: import.log Log Message: auto-import libstatgrab-0.11.1-3 on branch devel from libstatgrab-0.11.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 07:22:08 -0000 1.1 +++ import.log 8 Jul 2005 07:22:41 -0000 1.2 @@ -0,0 +1 @@ +libstatgrab-0_11_1-3:HEAD:libstatgrab-0.11.1-3.src.rpm:1120807354 From fedora-extras-commits at redhat.com Fri Jul 8 07:22:44 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:22:44 -0400 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libstatgrab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21949/devel Modified Files: .cvsignore sources Added Files: libstatgrab.nochmod.patch libstatgrab.spec Log Message: auto-import libstatgrab-0.11.1-3 on branch devel from libstatgrab-0.11.1-3.src.rpm libstatgrab.nochmod.patch: --- NEW FILE libstatgrab.nochmod.patch --- --- src/statgrab/Makefile.am.old 2005-02-04 19:45:16.384407326 +0100 +++ src/statgrab/Makefile.am 2005-02-04 19:45:23.292225787 +0100 @@ -19,12 +19,12 @@ if STATGRAB if SETGIDBINS # Some operating systems need the binary to be setgid kmem - chgrp kmem $(DESTDIR)@bindir@/statgrab - chmod g+s $(DESTDIR)@bindir@/statgrab + chgrp kmem $(DESTDIR)@bindir@/statgrab || true + chmod g+s $(DESTDIR)@bindir@/statgrab || true endif if SETUIDBINS # Some operating systems need the binary to be setuid root - chown root $(DESTDIR)@bindir@/statgrab + chown root $(DESTDIR)@bindir@/statgrab || true chmod u+s $(DESTDIR)@bindir@/statgrab endif endif --- src/statgrab/Makefile.in.old 2005-02-04 19:56:55.352716673 +0100 +++ src/statgrab/Makefile.in 2005-02-04 19:57:31.010601483 +0100 @@ -507,10 +507,10 @@ install-exec-local: # Some operating systems need the binary to be setgid kmem - at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab - at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab + at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chgrp kmem $(DESTDIR)@bindir@/statgrab || true + at SETGIDBINS_TRUE@@STATGRAB_TRUE@ chmod g+s $(DESTDIR)@bindir@/statgrab || true # Some operating systems need the binary to be setuid root - at SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab + at SETUIDBINS_TRUE@@STATGRAB_TRUE@ chown root $(DESTDIR)@bindir@/statgrab || true @SETUIDBINS_TRUE@@STATGRAB_TRUE@ chmod u+s $(DESTDIR)@bindir@/statgrab # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- src/saidar/Makefile.in.old 2005-02-04 20:34:08.108193091 +0100 +++ src/saidar/Makefile.in 2005-02-04 20:34:34.550848428 +0100 @@ -474,11 +474,11 @@ install-exec-local: # Some operating systems need the binary to be setgid kmem - at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar - at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar + at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chgrp kmem $(DESTDIR)@bindir@/saidar || true + at SAIDAR_TRUE@@SETGIDBINS_TRUE@ chmod g+s $(DESTDIR)@bindir@/saidar || true # Some operating systems need the binary to be setuid root - at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar - at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar + at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chown root $(DESTDIR)@bindir@/saidar || true + at SAIDAR_TRUE@@SETUIDBINS_TRUE@ chmod u+s $(DESTDIR)@bindir@/saidar || true # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- NEW FILE libstatgrab.spec --- %define shortname statgrab Summary: Make system statistics Name: libstatgrab Version: 0.11.1 Release: 3%{?dist} Source0: ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}.nochmod.patch License: LGPL Group: System Environment/Libraries URL: http://www.i-scream.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool ncurses-devel %description Libstatgrab is a library that provides cross platform access to statistics about the system on which it's run. It's written in C and presents a selection of useful interfaces which can be used to access key system statistics. The current list of statistics includes CPU usage, memory utilisation, disk usage, process counts, network traffic, disk I/O, and more. The current list of platforms is Solaris 2.x, Linux, and FreeBSD 4.x/5.x. The aim is to extend this to include as many operating systems as possible. The package also includes a couple of useful tools. The first, saidar, provides a curses-based interface to viewing the current state of the system. The second, statgrab, gives a sysctl-style interface to the statistics gathered by libstatgrab. This extends the use of libstatgrab to people writing scripts or anything else that can't easily make C function calls. Included with statgrab is a script to generate an MRTG configuration file to use statgrab. %package -n %{shortname}-tools Summary: Tools from %{name} to monitoring the system Group: Applications/System %description -n %{shortname}-tools This package contains a few tools shiped with libstatgrab. Eg. A tool called saidar, which shows various system information like top, but - of course - OTHER informations. %package devel Summary: The development files from %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel This package contains header files and man pages for those use to develop libstatgrab based applications. %package examples Summary: The example files from %{name} Group: Development/Tools Requires: %{name} = %{version}-%{release} %description examples This package contains various examples used to show how to develop libstatgrab based applications. %prep %setup -q %patch0 -p0 %build %configure --with-ncurses make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT cd examples/.libs install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \ network_traffic os_info page_stats process_snapshot \ process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir} chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -n %shortname-tools %defattr(-,root,root) %doc COPYING %{_bindir}/saidar %{_bindir}/statgrab %{_bindir}/statgrab-make-mrtg-config %{_bindir}/statgrab-make-mrtg-index %{_mandir}/*/statgrab* %files %defattr(-,root,root) %doc AUTHORS INSTALL README ChangeLog NEWS COPYING.LGPL examples/*.c %{_libdir}/*.so.* %files devel %defattr(-,root,root) %{_libdir}/*.so %{_libdir}/*.a %{_libdir}/*.la %{_includedir}/*.h %{_libdir}/pkgconfig/%name.pc %{_mandir}/*/sg_* %files examples %defattr(-,root,root) %{_bindir}/cpu_usage %{_bindir}/disk_traffic %{_bindir}/load_stats %{_bindir}/network_iface_stats %{_bindir}/network_traffic %{_bindir}/os_info %{_bindir}/page_stats %{_bindir}/process_snapshot %{_bindir}/process_stats %{_bindir}/user_list %{_bindir}/vm_stats %changelog * Fri Jul 08 2005 Oliver Falk - 0.11.1-3 - Included examples/*.c in doc * Wed Jul 6 2005 Tom "spot" Callaway 0.11.1-2 - a lot of fixes for Fedora Extras * Thu May 19 2005 Oliver Falk - 0.11.1-1.1 - Specfile cleanup * Sun Apr 03 2005 Oliver Falk - 0.11.1-1 - Update * Fri Mar 25 2005 Oliver Falk - 0.11-2.1 - Fix rpmlint warnings * Tue Feb 15 2005 Oliver Falk - 0.11-2 - Don't require coreutils. They are normally installed on Fedora, but not available on RH 8, where the tools are usually also installed. Yes, rebuilding with nodeps would also do it, but it's not fine... * Tue Feb 15 2005 Oliver Falk - 0.11-1 - Initial build for Fedora Core Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 07:22:08 -0000 1.1 +++ .cvsignore 8 Jul 2005 07:22:42 -0000 1.2 @@ -0,0 +1 @@ +libstatgrab-0.11.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libstatgrab/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 07:22:08 -0000 1.1 +++ sources 8 Jul 2005 07:22:42 -0000 1.2 @@ -0,0 +1 @@ +6d1e6980c39e505082e1c98c9fe81950 libstatgrab-0.11.1.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 07:24:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 8 Jul 2005 03:24:11 -0400 Subject: common tobuild,1.1847,1.1848 Message-ID: <200507080724.j687OBVF022088@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22071 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1847 retrieving revision 1.1848 diff -u -r1.1847 -r1.1848 --- tobuild 8 Jul 2005 06:40:12 -0000 1.1847 +++ tobuild 8 Jul 2005 07:24:09 -0000 1.1848 @@ -22,3 +22,4 @@ sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 +oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel From rc040203 at freenet.de Fri Jul 8 07:42:30 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 08 Jul 2005 09:42:30 +0200 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> References: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> Message-ID: <1120808550.30532.348.camel@mccallum.corsepiu.local> On Fri, 2005-07-08 at 03:22 -0400, Oliver Falk wrote: > Author: oliver > cd examples/.libs > install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \ > network_traffic os_info page_stats process_snapshot \ > process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir} > chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config > chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar > chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab > %files examples > %defattr(-,root,root) > %{_bindir}/cpu_usage > %{_bindir}/disk_traffic > %{_bindir}/load_stats > %{_bindir}/network_iface_stats > %{_bindir}/network_traffic > %{_bindir}/os_info > %{_bindir}/page_stats > %{_bindir}/process_snapshot > %{_bindir}/process_stats > %{_bindir}/user_list > %{_bindir}/vm_stats I am not going veto against this package, but please c.f. https://www.redhat.com/archives/fedora-packaging/2005-July/msg00088.html Ralf From fedora-extras-commits at redhat.com Fri Jul 8 07:59:01 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 03:59:01 -0400 Subject: rpms/most/FC-4 .cvsignore, 1.3, 1.4 most.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507080759.j687x1OL022202@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22181 Modified Files: .cvsignore most.spec sources Log Message: * Thu Jul 07 2005 Adrian Reber - 4.10.2-1 - updated to 4.10.2 (fixes search aborting bug) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jul 2005 15:42:03 -0000 1.3 +++ .cvsignore 8 Jul 2005 07:58:59 -0000 1.4 @@ -1 +1 @@ -most-4.10.1.tar.bz2 +most-4.10.2.tar.gz Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/most.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- most.spec 5 Jul 2005 15:42:03 -0000 1.7 +++ most.spec 8 Jul 2005 07:58:59 -0000 1.8 @@ -1,11 +1,11 @@ Summary: more, less, most Name: most -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -43,6 +43,9 @@ %changelog +* Thu Jul 07 2005 Adrian Reber - 4.10.2-1 +- updated to 4.10.2 (fixes search aborting bug) + * Fri Jul 01 2005 Adrian Reber - 4.10.1-1 - updated to 4.10.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jul 2005 15:42:03 -0000 1.3 +++ sources 8 Jul 2005 07:58:59 -0000 1.4 @@ -1 +1 @@ -9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 +16f7a67a969e0ce9a941c0e6c1ff0470 most-4.10.2.tar.gz From oliver at linux-kernel.at Fri Jul 8 08:08:39 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 10:08:39 +0200 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1120808550.30532.348.camel@mccallum.corsepiu.local> References: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> <1120808550.30532.348.camel@mccallum.corsepiu.local> Message-ID: <42CE3487.4030601@linux-kernel.at> On 07/08/2005 09:42 AM, Ralf Corsepius wrote: > On Fri, 2005-07-08 at 03:22 -0400, Oliver Falk wrote: > >>Author: oliver > > >>cd examples/.libs >>install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \ >> network_traffic os_info page_stats process_snapshot \ >> process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir} >>chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config >>chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar >>chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab > > >>%files examples >>%defattr(-,root,root) >>%{_bindir}/cpu_usage >>%{_bindir}/disk_traffic >>%{_bindir}/load_stats >>%{_bindir}/network_iface_stats >>%{_bindir}/network_traffic >>%{_bindir}/os_info >>%{_bindir}/page_stats >>%{_bindir}/process_snapshot >>%{_bindir}/process_stats >>%{_bindir}/user_list >>%{_bindir}/vm_stats > > > I am not going veto against this package, but please c.f. > https://www.redhat.com/archives/fedora-packaging/2005-July/msg00088.html Spot allready move them into the %doc section... Best, Oliver From oliver at linux-kernel.at Fri Jul 8 08:11:01 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 10:11:01 +0200 Subject: rpms/libstatgrab/devel libstatgrab.nochmod.patch, NONE, 1.1 libstatgrab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <42CE3487.4030601@linux-kernel.at> References: <200507080722.j687MieJ021995@cvs-int.fedora.redhat.com> <1120808550.30532.348.camel@mccallum.corsepiu.local> <42CE3487.4030601@linux-kernel.at> Message-ID: <42CE3515.2010508@linux-kernel.at> On 07/08/2005 10:08 AM, Oliver Falk wrote: > On 07/08/2005 09:42 AM, Ralf Corsepius wrote: >> On Fri, 2005-07-08 at 03:22 -0400, Oliver Falk wrote: [ ... ] >> I am not going veto against this package, but please c.f. >> https://www.redhat.com/archives/fedora-packaging/2005-July/msg00088.html > > Spot allready move them into the %doc section... Oops, sorry, my mistake. He didn't. But actually the examples-package is a subpackage, that the user can uninstall if he doesn't need it, so it should be OK - I believe. If you have better ideas, feel free to patch it. :-) Best, Oliver From fedora-extras-commits at redhat.com Fri Jul 8 08:16:40 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 04:16:40 -0400 Subject: common tobuild,1.1848,1.1849 Message-ID: <200507080816.j688Gepn023930@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23910 Modified Files: tobuild Log Message: request build of rpms/most/FC-4 most-4_10_2-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1848 retrieving revision 1.1849 diff -u -r1.1848 -r1.1849 --- tobuild 8 Jul 2005 07:24:09 -0000 1.1848 +++ tobuild 8 Jul 2005 08:16:38 -0000 1.1849 @@ -23,3 +23,4 @@ sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel +adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 08:44:07 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 04:44:07 -0400 Subject: rpms/most/FC-3 .cvsignore, 1.3, 1.4 most.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507080844.j688i7io023994@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23973 Modified Files: .cvsignore most.spec sources Log Message: * Thu Jul 07 2005 Adrian Reber - 4.10.2-1 - updated to 4.10.2 (fixes search aborting bug) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Jul 2005 06:08:02 -0000 1.3 +++ .cvsignore 8 Jul 2005 08:44:05 -0000 1.4 @@ -1 +1 @@ -most-4.10.1.tar.bz2 +most-4.10.2.tar.gz Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/most.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- most.spec 6 Jul 2005 06:08:02 -0000 1.5 +++ most.spec 8 Jul 2005 08:44:05 -0000 1.6 @@ -1,11 +1,11 @@ Summary: more, less, most Name: most -Version: 4.10.1 +Version: 4.10.2 Release: 1%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text -Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.bz2 +Source: ftp://space.mit.edu/pub/davis/most/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: slang-devel @@ -43,6 +43,9 @@ %changelog +* Thu Jul 07 2005 Adrian Reber - 4.10.2-1 +- updated to 4.10.2 (fixes search aborting bug) + * Fri Jul 01 2005 Adrian Reber - 4.10.1-1 - updated to 4.10.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/most/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Jul 2005 06:08:02 -0000 1.3 +++ sources 8 Jul 2005 08:44:05 -0000 1.4 @@ -1 +1 @@ -9f12a81536b8a8a59e61b6df09cd5dfd most-4.10.1.tar.bz2 +16f7a67a969e0ce9a941c0e6c1ff0470 most-4.10.2.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 08:44:40 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 04:44:40 -0400 Subject: common tobuild,1.1849,1.1850 Message-ID: <200507080844.j688ievT024056@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24038 Modified Files: tobuild Log Message: request build of rpms/most/FC-3 most-4_10_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1849 retrieving revision 1.1850 diff -u -r1.1849 -r1.1850 --- tobuild 8 Jul 2005 08:16:38 -0000 1.1849 +++ tobuild 8 Jul 2005 08:44:38 -0000 1.1850 @@ -24,3 +24,4 @@ sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 +adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 10:07:52 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:07:52 -0400 Subject: devel/wesnoth .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wesnoth.spec, 1.11, 1.12 Message-ID: <200507081008.j68A8MmH026436@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/wesnoth In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/wesnoth/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Jun 2005 01:17:19 -0000 1.4 +++ .cvsignore 8 Jul 2005 10:07:50 -0000 1.5 @@ -1 +1 @@ -wesnoth-0.9.2.tar.gz +wesnoth-0.9.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/devel/wesnoth/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Jun 2005 01:17:19 -0000 1.4 +++ sources 8 Jul 2005 10:07:50 -0000 1.5 @@ -1 +1 @@ -0158b7733373b1a25ed1da6bf1d32899 wesnoth-0.9.2.tar.gz +833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/devel/wesnoth/wesnoth.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- wesnoth.spec 27 Jun 2005 22:24:48 -0000 1.11 +++ wesnoth.spec 8 Jul 2005 10:07:50 -0000 1.12 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -50,8 +50,6 @@ %prep %setup -q cp %{SOURCE3} . -# in 0.9.2: the translations are not built -find po -name stamp-po | xargs rm -f %build @@ -146,6 +144,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 +- update to 0.9.3 + * Mon Jun 13 2005 Michael Schwendt - 0.9.2-1 - update to 0.9.2 - BR libpng-devel is needed From fedora-extras-commits at redhat.com Fri Jul 8 10:13:22 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:13:22 -0400 Subject: common tobuild,1.1850,1.1851 Message-ID: <200507081013.j68ADM6w026517@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26500 Modified Files: tobuild Log Message: request build of devel/wesnoth wesnoth-0_9_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1850 retrieving revision 1.1851 diff -u -r1.1850 -r1.1851 --- tobuild 8 Jul 2005 08:44:38 -0000 1.1850 +++ tobuild 8 Jul 2005 10:13:20 -0000 1.1851 @@ -25,3 +25,4 @@ oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 +mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 10:13:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:13:59 -0400 Subject: common tobuild,1.1851,1.1852 Message-ID: <200507081013.j68ADxdY026550@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26533 Modified Files: tobuild Log Message: request build of devel/screem screem-0_14_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1851 retrieving revision 1.1852 diff -u -r1.1851 -r1.1852 --- tobuild 8 Jul 2005 10:13:20 -0000 1.1851 +++ tobuild 8 Jul 2005 10:13:57 -0000 1.1852 @@ -26,3 +26,4 @@ adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel +mschwendt devel/screem screem-0_14_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 10:15:06 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:15:06 -0400 Subject: devel/anjuta anjuta.spec,1.11,1.12 Message-ID: <200507081015.j68AF637026580@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26563 Modified Files: anjuta.spec Log Message: another build attempt Index: anjuta.spec =================================================================== RCS file: /cvs/extras/devel/anjuta/anjuta.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- anjuta.spec 7 Jul 2005 10:33:10 -0000 1.11 +++ anjuta.spec 8 Jul 2005 10:15:04 -0000 1.12 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GNOME IDE for C and C++ @@ -122,7 +122,7 @@ %changelog -* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-1 +* Thu Jul 7 2005 Michael Schwendt - 1:1.2.3-2 - Update to 1.2.3. - Add gettext-devel dependency (Paul Frields). - Add libtool (+automake, +autoconf) dependency. From fedora-extras-commits at redhat.com Fri Jul 8 10:15:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 06:15:33 -0400 Subject: common tobuild,1.1852,1.1853 Message-ID: <200507081015.j68AFXTI026649@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26628 Modified Files: tobuild Log Message: request build of devel/anjuta anjuta-1_2_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1852 retrieving revision 1.1853 diff -u -r1.1852 -r1.1853 --- tobuild 8 Jul 2005 10:13:57 -0000 1.1852 +++ tobuild 8 Jul 2005 10:15:30 -0000 1.1853 @@ -27,3 +27,4 @@ adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel mschwendt devel/screem screem-0_14_1-1_fc5 devel +mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 10:41:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 06:41:41 -0400 Subject: rpms/blender/FC-4 blender.spec,1.12,1.13 Message-ID: <200507081041.j68Affub026772@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blender/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725/FC-4 Modified Files: blender.spec Log Message: Invisible changes :-) (fix trailing spaces and tab vs. spaces). Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blender.spec 6 Jun 2005 03:47:41 -0000 1.12 +++ blender.spec 8 Jul 2005 10:41:39 -0000 1.13 @@ -13,7 +13,7 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch +Patch0: blender-2.37-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -95,17 +95,17 @@ %changelog * Sun Jun 5 2005 Toshio Kuratomi 2.37-2 - Patch to fix compilation errors on x86_64. - + * Sun Jun 5 2005 Toshio Kuratomi 2.37-1 - Update to 2.37. - Drop gcc4 patch. - + * Mon May 16 2005 Toshio Kuratomi 2.36-3 - Bump and rebuild now that scons is available on all platforms. - + * Sat May 14 2005 Toshio Kuratomi 2.36-2 - Fix a gcc4 error. - + * Fri May 13 2005 Toshio Kuratomi 2.36-1 - Update to 2.36. - Rebuild with new gcc4. From fedora-extras-commits at redhat.com Fri Jul 8 10:41:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 06:41:41 -0400 Subject: rpms/blender/FC-3 blender.spec,1.6,1.7 Message-ID: <200507081041.j68AffDI026766@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blender/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725/FC-3 Modified Files: blender.spec Log Message: Invisible changes :-) (fix trailing spaces and tab vs. spaces). Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/FC-3/blender.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blender.spec 7 Jun 2005 00:19:49 -0000 1.6 +++ blender.spec 8 Jul 2005 10:41:38 -0000 1.7 @@ -13,7 +13,7 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch +Patch0: blender-2.37-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils From fedora-extras-commits at redhat.com Fri Jul 8 10:41:41 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 06:41:41 -0400 Subject: rpms/blender/devel blender.spec,1.12,1.13 Message-ID: <200507081041.j68AffpP026778@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26725/devel Modified Files: blender.spec Log Message: Invisible changes :-) (fix trailing spaces and tab vs. spaces). Index: blender.spec =================================================================== RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blender.spec 7 Jun 2005 00:22:58 -0000 1.12 +++ blender.spec 8 Jul 2005 10:41:39 -0000 1.13 @@ -13,7 +13,7 @@ Source3: blender.png Source4: blender.desktop Source5: blender.xml -Patch0: blender-2.37-x86_64.patch +Patch0: blender-2.37-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -95,20 +95,20 @@ %changelog * Mon Jun 6 2005 Toshio Kuratomi 2.37-3 - Bump release for development. - + * Sun Jun 5 2005 Toshio Kuratomi 2.37-2 - Patch to fix compilation errors on x86_64. - + * Sun Jun 5 2005 Toshio Kuratomi 2.37-1 - Update to 2.37. - Drop gcc4 patch. - + * Mon May 16 2005 Toshio Kuratomi 2.36-3 - Bump and rebuild now that scons is available on all platforms. - + * Sat May 14 2005 Toshio Kuratomi 2.36-2 - Fix a gcc4 error. - + * Fri May 13 2005 Toshio Kuratomi 2.36-1 - Update to 2.36. - Rebuild with new gcc4. From oliver at linux-kernel.at Fri Jul 8 12:51:24 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 14:51:24 +0200 Subject: Request for review: libdnet Message-ID: <42CE76CC.4040500@linux-kernel.at> Summary: Simple portable interface to lowlevel networking routines Description: libdnet provides a simplified, portable interface to several low-level networking routines, including network address manipulation, kernel arp(4) cache and route(4) table lookup and manipulation, network firewalling (IP filter, ipfw, ipchains, pf, ...), network interface lookup and manipulation, raw IP packet and Ethernet frame, and data transmission. SRPM & SPEC: http://filelister.linux-kernel.at/mod_perl?current=/packages/FC_EXTRAS_APPROVAL/libdnet I'd like to include libdnet as a prerequisite for scanssh. scanssh also uses libevent, but this is allready in FE. Please review/approve. Merci, Oliver From fedora-extras-commits at redhat.com Fri Jul 8 14:20:42 2005 From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing)) Date: Fri, 8 Jul 2005 10:20:42 -0400 Subject: common tobuild,1.1853,1.1854 Message-ID: <200507081420.j68EKgMh031678@cvs-int.fedora.redhat.com> Author: ertzing Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31661 Modified Files: tobuild Log Message: request build of rpms/libevent/devel libevent-1_1a-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1853 retrieving revision 1.1854 diff -u -r1.1853 -r1.1854 --- tobuild 8 Jul 2005 10:15:30 -0000 1.1853 +++ tobuild 8 Jul 2005 14:20:40 -0000 1.1854 @@ -28,3 +28,4 @@ mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel mschwendt devel/screem screem-0_14_1-1_fc5 devel mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel +ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel From shahms at shahms.com Fri Jul 8 14:25:55 2005 From: shahms at shahms.com (Shahms King) Date: Fri, 08 Jul 2005 07:25:55 -0700 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 In-Reply-To: <1120797191.30532.313.camel@mccallum.corsepiu.local> References: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> <1120797191.30532.313.camel@mccallum.corsepiu.local> Message-ID: <42CE8CF3.4050904@shahms.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Ralf Corsepius wrote: | On Thu, 2005-07-07 at 15:53 -0400, Shahms King wrote: | |>Author: shahms | | |>Index: bazaar.spec | | |>+# The stand alone annotate is meant to debug baz interals, not installation |>+# see: http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html |>+if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then |>+ rm $RPM_BUILD_ROOT%{_bindir}/annotate |>+fi | | | Why so clumsy? | rm -f $RPM_BUILD_ROOT%{_bindir}/annotate | | Ralf I don't find checking before removing clumsy, myself and I try to avoid "rm -f" where possible simply on principle. - -- Shahms E. King Multnomah ESD Public Key: http://shahms.mesd.k12.or.us/~sking/shahms.asc Fingerprint: 1612 054B CE92 8770 F1EA AB1B FEAB 3636 45B2 D75B -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iD8DBQFCzozz/qs2NkWy11sRAkp0AJ4lkKILuVnVwd15Qqwy0MSUg4FEagCgj328 Sba++FuXgILRJMAMVgdQyFI= =zCk2 -----END PGP SIGNATURE----- From oliver at linux-kernel.at Fri Jul 8 14:25:53 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 08 Jul 2005 16:25:53 +0200 Subject: libevent (WAS: Re: common tobuild,1.1853,1.1854) In-Reply-To: <200507081420.j68EKgMh031678@cvs-int.fedora.redhat.com> References: <200507081420.j68EKgMh031678@cvs-int.fedora.redhat.com> Message-ID: <42CE8CF1.4000604@linux-kernel.at> On 07/08/2005 04:20 PM, Ralf Ertzinger (ertzing) wrote: > Author: ertzing > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31661 > > Modified Files: > tobuild > Log Message: > request build of rpms/libevent/devel libevent-1_1a-2_fc5 for devel > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.1853 > retrieving revision 1.1854 > diff -u -r1.1853 -r1.1854 > --- tobuild 8 Jul 2005 10:15:30 -0000 1.1853 > +++ tobuild 8 Jul 2005 14:20:40 -0000 1.1854 > @@ -28,3 +28,4 @@ > mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel > mschwendt devel/screem screem-0_14_1-1_fc5 devel > mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel > +ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel Ah, here we go... :-) -of From fedora-extras-commits at redhat.com Fri Jul 8 15:12:46 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Fri, 8 Jul 2005 11:12:46 -0400 Subject: common tobuild,1.1854,1.1855 Message-ID: <200507081512.j68FCkRq000481@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv464 Modified Files: tobuild Log Message: request build of rpms/glabels/FC-3 glabels-2_0_3-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1854 retrieving revision 1.1855 diff -u -r1.1854 -r1.1855 --- tobuild 8 Jul 2005 14:20:40 -0000 1.1854 +++ tobuild 8 Jul 2005 15:12:44 -0000 1.1855 @@ -29,3 +29,4 @@ mschwendt devel/screem screem-0_14_1-1_fc5 devel mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel +jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 15:51:39 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 8 Jul 2005 11:51:39 -0400 Subject: common tobuild,1.1855,1.1856 Message-ID: <200507081551.j68FpdcN000632@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv615 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1855 retrieving revision 1.1856 diff -u -r1.1855 -r1.1856 --- tobuild 8 Jul 2005 15:12:44 -0000 1.1855 +++ tobuild 8 Jul 2005 15:51:37 -0000 1.1856 @@ -1,32 +1,5 @@ # this is the build control file. the format is # user repo tag target status # -ixs rpms/barcode/devel barcode-0_98-5_fc5 devel -mschwendt rpms/anjuta/FC-3 anjuta-1_2_3-1_fc3 fc3 -jpo rpms/perl-Tree-DAG_Node/FC-4 perl-Tree-DAG_Node-1_05-2_fc4 fc4 -jpo rpms/perl-Tree-DAG_Node/FC-3 perl-Tree-DAG_Node-1_05-2_fc3 fc3 -shahms rpms/bazaar/devel bazaar-1_4_2-2_fc5 devel -shahms rpms/bazaar/FC-3 bazaar-1_4_2-2_fc3 fc3 -shahms rpms/bazaar/FC-4 bazaar-1_4_2-2_fc4 fc4 -bpepple rpms/liferea/devel liferea-0_9_3-1_fc5 devel -bpepple rpms/liferea/FC-4 liferea-0_9_3-1_fc4 fc4 -adrian rpms/most/devel most-4_10_2-1_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-8_fc4 fc4 -mschwendt rpms/screem/FC-4 screem-0_14_1-1_fc4 fc4 -mschwendt rpms/screem/FC-3 screem-0_12_2-1 fc3 -spot rpms/scribus/FC-3 scribus-1_2_2_1-2_fc3 fc3 -spot rpms/scribus/FC-4 scribus-1_2_2_1-2_fc4 fc4 -mfleming rpms/mlmmj/devel mlmmj-1_2_8-2_fc5 devel -jspaleta rpms/glabels/devel glabels-2_0_3-2_fc5 devel -jspaleta rpms/glabels/FC-4 glabels-2_0_3-2_fc4 fc4 -sarantis rpms/mgopen-fonts/devel mgopen-fonts-0_20050515-1 devel -sarantis rpms/mgopen-fonts/FC-4 mgopen-fonts-0_20050515-1 fc4 -sarantis rpms/mgopen-fonts/FC-3 mgopen-fonts-0_20050515-1 fc3 -oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel -adrian rpms/most/FC-4 most-4_10_2-1_fc4 fc4 -adrian rpms/most/FC-3 most-4_10_2-1_fc3 fc3 -mschwendt devel/wesnoth wesnoth-0_9_3-1_fc5 devel -mschwendt devel/screem screem-0_14_1-1_fc5 devel -mschwendt devel/anjuta anjuta-1_2_3-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 16:17:37 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:17:37 -0400 Subject: common tobuild,1.1856,1.1857 Message-ID: <200507081617.j68GHbds001894@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1877 Modified Files: tobuild Log Message: request build of rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1856 retrieving revision 1.1857 diff -u -r1.1856 -r1.1857 --- tobuild 8 Jul 2005 15:51:37 -0000 1.1856 +++ tobuild 8 Jul 2005 16:17:35 -0000 1.1857 @@ -3,3 +3,4 @@ # ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 +ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 16:18:04 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:18:04 -0400 Subject: common tobuild,1.1857,1.1858 Message-ID: <200507081618.j68GI4Go001961@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1944 Modified Files: tobuild Log Message: request build of rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1857 retrieving revision 1.1858 diff -u -r1.1857 -r1.1858 --- tobuild 8 Jul 2005 16:17:35 -0000 1.1857 +++ tobuild 8 Jul 2005 16:18:02 -0000 1.1858 @@ -4,3 +4,4 @@ ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 +ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 16:18:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:18:29 -0400 Subject: common tobuild,1.1858,1.1859 Message-ID: <200507081619.j68GJ0rG002042@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2015 Modified Files: tobuild Log Message: request build of rpms/libifp/devel libifp-1_0_0_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1858 retrieving revision 1.1859 diff -u -r1.1858 -r1.1859 --- tobuild 8 Jul 2005 16:18:02 -0000 1.1858 +++ tobuild 8 Jul 2005 16:18:27 -0000 1.1859 @@ -5,3 +5,4 @@ jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 +ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 16:44:09 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:44:09 -0400 Subject: rpms/fyre/devel fyre-cluster.init,1.1,1.2 fyre.spec,1.8,1.9 Message-ID: <200507081644.j68Gi9UR002178@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2127/devel Modified Files: fyre-cluster.init fyre.spec Log Message: Added restart definition to initscript (#161008) Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre-cluster.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fyre-cluster.init 18 May 2005 22:41:20 -0000 1.1 +++ fyre-cluster.init 8 Jul 2005 16:44:06 -0000 1.2 @@ -9,11 +9,6 @@ # processname: fyre # config: /etc/sysconfig/fyre # pidfile: /var/run/fyre.pid -# # Source function library. . /etc/init.d/functions @@ -46,6 +41,11 @@ return 0 } +restart() { + stop + start +} + case "$1" in start) start Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fyre.spec 19 May 2005 07:36:23 -0000 1.8 +++ fyre.spec 8 Jul 2005 16:44:06 -0000 1.9 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,13 +75,16 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog -* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8.fc4 +* Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 +- Added restart definition to initscript (#161008) + +* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8 - Marked config file -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7.fc4 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7 - Added initscript for clustering -* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6.fc4 +* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6 - Re-enabled OpenEXR and GNet * Thu Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Fri Jul 8 16:44:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:44:03 -0400 Subject: rpms/fyre/FC-3 fyre-cluster.init,1.1,1.2 fyre.spec,1.7,1.8 Message-ID: <200507081644.j68GiYb6002187@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2127/FC-3 Modified Files: fyre-cluster.init fyre.spec Log Message: Added restart definition to initscript (#161008) Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-3/fyre-cluster.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fyre-cluster.init 18 May 2005 22:41:20 -0000 1.1 +++ fyre-cluster.init 8 Jul 2005 16:44:01 -0000 1.2 @@ -9,11 +9,6 @@ # processname: fyre # config: /etc/sysconfig/fyre # pidfile: /var/run/fyre.pid -# # Source function library. . /etc/init.d/functions @@ -46,6 +41,11 @@ return 0 } +restart() { + stop + start +} + case "$1" in start) start Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-3/fyre.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fyre.spec 19 May 2005 07:36:23 -0000 1.7 +++ fyre.spec 8 Jul 2005 16:44:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 7%{?dist} +Release: 9%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,15 +75,21 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog -* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-7.fc3 +* Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 +- Added restart definition to initscript (#161008) + +* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8 - Marked config file -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-6.fc3 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7 - Added initscript for clustering -* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-5.fc3 +* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6 - Re-enabled OpenEXR and GNet +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Mar 30 2005 Ignacio Vazquez-Abrams 1.0.0-4 - Disabled OpenEXR and GNet in %%configure - Removed gtk2-devel from BuildRequires From fedora-extras-commits at redhat.com Fri Jul 8 16:44:03 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:44:03 -0400 Subject: rpms/fyre/FC-4 fyre-cluster.init,1.1,1.2 fyre.spec,1.8,1.9 Message-ID: <200507081644.j68GiYHA002188@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/fyre/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2127/FC-4 Modified Files: fyre-cluster.init fyre.spec Log Message: Added restart definition to initscript (#161008) Index: fyre-cluster.init =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-4/fyre-cluster.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fyre-cluster.init 18 May 2005 22:41:20 -0000 1.1 +++ fyre-cluster.init 8 Jul 2005 16:44:01 -0000 1.2 @@ -9,11 +9,6 @@ # processname: fyre # config: /etc/sysconfig/fyre # pidfile: /var/run/fyre.pid -# # Source function library. . /etc/init.d/functions @@ -46,6 +41,11 @@ return 0 } +restart() { + stop + start +} + case "$1" in start) start Index: fyre.spec =================================================================== RCS file: /cvs/extras/rpms/fyre/FC-4/fyre.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fyre.spec 19 May 2005 07:36:23 -0000 1.8 +++ fyre.spec 8 Jul 2005 16:44:01 -0000 1.9 @@ -1,6 +1,6 @@ Name: fyre Version: 1.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A tool for creating artwork from chaotic functions Group: Amusements/Graphics @@ -75,13 +75,16 @@ %config(noreplace) %{_sysconfdir}/sysconfig/fyre %changelog -* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8.fc4 +* Fri Jul 8 2005 Ignacio Vazquez-Abrams 1.0.0-9 +- Added restart definition to initscript (#161008) + +* Thu May 19 2005 Ignacio Vazquez-Abrams 1.0.0-8 - Marked config file -* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7.fc4 +* Wed May 18 2005 Ignacio Vazquez-Abrams 1.0.0-7 - Added initscript for clustering -* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6.fc4 +* Tue May 10 2005 Ignacio Vazquez-Abrams 1.0.0-6 - Re-enabled OpenEXR and GNet * Thu Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Fri Jul 8 16:46:30 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:46:30 -0400 Subject: common tobuild,1.1859,1.1860 Message-ID: <200507081646.j68GkUDm002259@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2242 Modified Files: tobuild Log Message: request build of rpms/fyre/FC-3 fyre-1_0_0-9_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1859 retrieving revision 1.1860 diff -u -r1.1859 -r1.1860 --- tobuild 8 Jul 2005 16:18:27 -0000 1.1859 +++ tobuild 8 Jul 2005 16:46:27 -0000 1.1860 @@ -6,3 +6,4 @@ ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel +ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 16:47:02 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:47:02 -0400 Subject: common tobuild,1.1860,1.1861 Message-ID: <200507081647.j68Gl2cY002321@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304 Modified Files: tobuild Log Message: request build of rpms/fyre/FC-4 fyre-1_0_0-9_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1860 retrieving revision 1.1861 diff -u -r1.1860 -r1.1861 --- tobuild 8 Jul 2005 16:46:27 -0000 1.1860 +++ tobuild 8 Jul 2005 16:47:00 -0000 1.1861 @@ -7,3 +7,4 @@ ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 +ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 16:47:29 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 8 Jul 2005 12:47:29 -0400 Subject: common tobuild,1.1861,1.1862 Message-ID: <200507081647.j68GlTXB002383@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2366 Modified Files: tobuild Log Message: request build of rpms/fyre/devel fyre-1_0_0-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1861 retrieving revision 1.1862 diff -u -r1.1861 -r1.1862 --- tobuild 8 Jul 2005 16:47:00 -0000 1.1861 +++ tobuild 8 Jul 2005 16:47:27 -0000 1.1862 @@ -8,3 +8,4 @@ ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 +ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 17:23:46 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 13:23:46 -0400 Subject: extras-buildsys ChangeLog,1.46,1.47 Message-ID: <200507081723.j68HNkUr003675@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3608 Modified Files: ChangeLog Log Message: 2005-07-07 Dan Williams * builder/builder.py - Clean up the buildroot no matter what * Make archjobs write their status to the database too Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 7 Jul 2005 18:17:50 -0000 1.46 +++ ChangeLog 8 Jul 2005 17:23:44 -0000 1.47 @@ -1,5 +1,12 @@ 2005-07-07 Dan Williams + * builder/builder.py + - Clean up the buildroot no matter what + + * Make archjobs write their status to the database too + +2005-07-07 Dan Williams + * server/PackageJob.py - Make some prep error emails more informative From fedora-extras-commits at redhat.com Fri Jul 8 17:23:46 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 13:23:46 -0400 Subject: extras-buildsys/builder builder.py,1.8,1.9 Message-ID: <200507081723.j68HNkwI003681@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3608/builder Modified Files: builder.py Log Message: 2005-07-07 Dan Williams * builder/builder.py - Clean up the buildroot no matter what * Make archjobs write their status to the database too Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- builder.py 7 Jul 2005 17:45:02 -0000 1.8 +++ builder.py 8 Jul 2005 17:23:44 -0000 1.9 @@ -79,6 +79,7 @@ self._srpm_url = srpm_url self._log_fd = None self._mock_config = None + self._done_status = '' self._result_dir = os.path.join(config_opts['builder_work_dir'], self._uniqid, "result") if not os.path.exists(self._result_dir): @@ -115,7 +116,8 @@ self.log("Couldn't kill process %d: %s\n" % (self._pobj.pid, e)) self.log("Killed.\n"); - self._status = 'killed' + self._done_status = 'killed' + self._cleanup() return True def log(self, string): @@ -179,8 +181,8 @@ self._status = 'failed' break - # Kill mock after 5s if it didn't dump the status file - if time.time() - start_time > 5: + # Kill mock after 7s if it didn't dump the status file + if time.time() - start_time > 7: self.log("Timed out waiting for the mock status file! %s\n" % mockstatusfile) try: self.log("Killing mock...\n") @@ -294,7 +296,7 @@ elif self._status == 'failed': if self._pobj: exit_status = self._pobj.poll() - self.log("Job failed due to mock errors! mock exit status: %d\n" % exit_status) + 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") @@ -329,17 +331,29 @@ # mock completed successfully if self._status != 'building': self.log("Bad job end status %s encountered!" % self._status) + self._done_status = 'done' self._cleanup() elif exit_status > 0: # mock exited with an error - self._status = 'failed' + self._done_status = 'failed' + self._cleanup() + else: + # mock still running + pass elif self._status == 'cleanup': exit_status = self._pobj.poll() if exit_status >= 0: + print "mock clean done" # We ignore mock errors when cleaning the buildroot - self._status = 'done' - if self._mock_config.has_key('rootdir'): + self._status = self._done_status + # FIXME: remove the last dir off the end of 'rootdir' here to get + # the real basedir and kill it. At least what's here removes the + # buildroot which is where most of the space is used + if self._mock_config and self._mock_config.has_key('rootdir'): shutil.rmtree(self._mock_config['rootdir'], ignore_errors=True) + else: + # mock still running + pass self._grab_mock_output() if self.is_done_status(): From fedora-extras-commits at redhat.com Fri Jul 8 17:23:47 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 13:23:47 -0400 Subject: extras-buildsys/server ArchJob.py,1.3,1.4 BuildMaster.py,1.10,1.11 Message-ID: <200507081723.j68HNlhw003688@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3608/server Modified Files: ArchJob.py BuildMaster.py Log Message: 2005-07-07 Dan Williams * builder/builder.py - Clean up the buildroot no matter what * Make archjobs write their status to the database too Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ArchJob.py 7 Jul 2005 16:21:12 -0000 1.3 +++ ArchJob.py 8 Jul 2005 17:23:45 -0000 1.4 @@ -53,7 +53,7 @@ self.starttime = time.time() def _builder_finished(self): - if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed': + if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned': return True return False @@ -67,12 +67,44 @@ return True return False + def _to_dict(self): + attrdict = {} + attrdict['jobid'] = self.jobid + attrdict['parent_uid'] = self.par_job.uid + attrdict['arch'] = self.arch + addr = self.builder.address() + # for some reason, splithost doesn't like the protocol + # method, you have to give it a string starting with "//" + if addr.startswith("http"): + idx = addr.find('//') + addr = addr[idx:] + host_port, path = urllib.splithost(addr) + host, port = urllib.splitport(host_port) + attrdict['builder_addr'] = host + attrdict['status'] = self.status + attrdict['builder_status'] = self.builder_status + return attrdict + def set_builder_status(self, status): if status != 'idle': - self.builder_status = status + oldstatus = self.builder_status + self.builder_status = status + if oldstatus != self.builder_status: + attrdict = self._to_dict() + self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) + del attrdict + if status == 'killed' or status == 'failed': self.par_job.wake() + def _set_status(self, status): + oldstatus = self.status + self.status = status + if oldstatus != self.status: + attrdict = self._to_dict() + self.par_job.bm.queue_archjob_status_update(self.jobid, attrdict) + del attrdict + def _send_repo_unlocked(self): try: self._server.repo_unlocked(self.jobid) @@ -108,7 +140,7 @@ # if the builder is done, grab list of files to download if self._builder_finished(): - self.status = 'downloading' + self._set_status('downloading') for f in self._dl_files(): uf = urllib.unquote(f) self.downloads[uf] = 0 @@ -153,7 +185,7 @@ # All done downloading? if not undownloaded: self._print_downloaded_files() - self.status = 'done' + self._set_status('done') self.par_job.wake() def _print_downloaded_files(self): @@ -196,11 +228,13 @@ def builder_gone(self): if self.status != 'done': - self._par_job.remove_arch_job(self) + self.builder_status = 'orphaned' + self._set_status('done') + self.par_job.remove_arch_job(self) def die(self): if self.status == 'initialize' or self.status == 'running': self._server.die(self.jobid) - self.status = 'done' + self._set_status('done') Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BuildMaster.py 5 Jul 2005 21:08:03 -0000 1.10 +++ BuildMaster.py 8 Jul 2005 17:23:45 -0000 1.11 @@ -68,6 +68,28 @@ 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): def __init__(self, hostname, builder_manager): @@ -86,6 +108,8 @@ self._new_queue_lock = threading.Lock() self._status_updates = {} self._status_updates_lock = threading.Lock() + self._archjob_status_updates = {} + self._archjob_status_updates_lock = threading.Lock() self._query_queue = [] self._query_queue_lock = threading.Lock() @@ -147,6 +171,13 @@ self._status_updates[lcl_uid] = lcl_status self._status_updates_lock.release() + def queue_archjob_status_update(self, jobid, attrdict): + self._archjob_status_updates_lock.acquire() + lcl_jobid = copy.copy(jobid) + lcl_attrdict = copy.deepcopy(attrdict) + self._archjob_status_updates[lcl_jobid] = lcl_attrdict + self._archjob_status_updates_lock.release() + def notify_job_done(self, job): self._done_queue_lock.acquire() self._done_queue.append(job) @@ -157,7 +188,7 @@ for job in self._done_queue: curstage = job.get_cur_stage() - self._write_status_to_db(job.get_uid(), curstage) + self._write_job_status_to_db(job.get_uid(), curstage) print "%s (%s): Job finished." % (job.get_uid(), job.package) self._building_jobs_lock.acquire() self._building_jobs.remove(job) @@ -166,7 +197,7 @@ self._done_queue = [] self._done_queue_lock.release() - def _write_status_to_db(self, uid, status): + def _write_job_status_to_db(self, uid, status): try: self.curs.execute('UPDATE jobs SET status="%s" WHERE uid=%d' \ % (status, uid)) @@ -175,16 +206,41 @@ self.dbcx.commit() + def _write_archjob_status_to_db(self, jobid, attrdict): + self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % jobid) + self.dbcx.commit() + if len(self.curs.fetchall()) == 0: + try: + self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, arch, builder_addr, status, builder_status) ' \ + 'VALUES ("%s", %d, %d, "%s", "%s", "%s", "%s")' % (jobid, attrdict['parent_uid'], time.time(), attrdict['arch'], \ + attrdict['builder_addr'], attrdict['status'], attrdict['builder_status'])) + except sqlite.OperationalError, 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" ' \ + 'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], attrdict['builder_status'], jobid, attrdict['parent_uid'])) + except sqlite.OperationalError, e: + print "DB Error: could not access jobs database. Reason: '%s'" % e + + self.dbcx.commit() + def _save_job_status(self): # Write new job status to the database self._status_updates_lock.acquire() for uid in self._status_updates.keys(): - self._write_status_to_db(uid, self._status_updates[uid]) + self._write_job_status_to_db(uid, self._status_updates[uid]) self._status_updates = {} self._status_updates_lock.release() + self._archjob_status_updates_lock.acquire() + for jobid in self._archjob_status_updates.keys(): + self._write_archjob_status_to_db(jobid, self._archjob_status_updates[jobid]) + self._archjob_status_updates = {} + self._archjob_status_updates_lock.release() + def _start_new_jobs(self): self._new_queue_lock.acquire() @@ -277,6 +333,13 @@ if have_work: return True + self._archjob_status_updates_lock.acquire() + if len(self._archjob_status_updates) > 0: + have_work = True + self._archjob_status_updates_lock.release() + if have_work: + return True + if self.builder_manager.have_work(): return True From fedora-extras-commits at redhat.com Fri Jul 8 17:30:07 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 13:30:07 -0400 Subject: rpms/jhead/devel .cvsignore, 1.4, 1.5 jhead.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200507081730.j68HU7E1003939@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3918 Modified Files: .cvsignore jhead.spec sources Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-1 - updated to 2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2005 11:16:18 -0000 1.4 +++ .cvsignore 8 Jul 2005 17:30:05 -0000 1.5 @@ -1 +1 @@ -jhead-2.3.tar.gz +jhead-2.4.tar.gz Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- jhead.spec 6 Apr 2005 22:12:02 -0000 1.9 +++ jhead.spec 8 Jul 2005 17:30:05 -0000 1.10 @@ -1,12 +1,11 @@ Name: jhead -Version: 2.3 -Release: 2 - +Version: 2.4 +Release: 1%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain URL: http://www.sentex.net/~mwandel/jhead/ -Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.3.tar.gz +Source0: http://www.sentex.net/~mwandel/jhead/jhead-2.4.tar.gz Patch0: jhead-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,6 +37,9 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-1 +- updated to 2.4 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 11:16:18 -0000 1.4 +++ sources 8 Jul 2005 17:30:05 -0000 1.5 @@ -1 +1 @@ -b27c37f1edd25e5f416914ed46ba11fb jhead-2.3.tar.gz +410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 17:33:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:33:22 -0400 Subject: rpms/fedora-rpmdevtools/FC-3 .cvsignore, 1.7, 1.8 fedora-rpmdevtools.spec, 1.7, 1.8 sources, 1.7, 1.8 Message-ID: <200507081733.j68HXMnB004027@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3978/FC-3 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: 1.1: more perl spectemplate cleanup, gcc-gfortran is devel, drop fedora.us key. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2005 16:45:41 -0000 1.7 +++ .cvsignore 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.0.tar.bz2 +fedora-rpmdevtools-1.1.tar.bz2 spectool-1.0.4.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/fedora-rpmdevtools.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fedora-rpmdevtools.spec 24 Mar 2005 16:45:41 -0000 1.7 +++ fedora-rpmdevtools.spec 8 Jul 2005 17:33:20 -0000 1.8 @@ -3,8 +3,8 @@ %define spectool_version 1.0.4 Name: fedora-rpmdevtools -Version: 1.0 -Release: 1 +Version: 1.1 +Release: 1%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -27,8 +27,8 @@ %description This package contains scripts and (X)Emacs support files to aid in -development of Fedora RPM packages. These tools are designed for Red -Hat Linux 8.0 and higher. +development of Fedora RPM packages. These tools are designed for Fedora +Core 2 and later. fedora-buildrpmtree Create RPM build tree within user's home directory fedora-installdevkeys Install GPG keys in alternate RPM keyring fedora-kmodhelper Helper script for building kernel module RPMs @@ -126,6 +126,11 @@ %changelog +* Fri Jul 8 2005 Ville Skytt?? - 1.1-1 +- Drop more pre-FC2 compat stuff from Perl spec template. +- Treat gcc-gfortran as a devel package in rmdevelrpms. +- Drop fedora.us GPG key. + * Thu Mar 24 2005 Ville Skytt?? - 1.0-1 - Make fedora-diffarchive work better with archives containing dirs without read/execute permissions. Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2005 16:45:41 -0000 1.7 +++ sources 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -2f20b353cb5795cf01742f8ca08e8d29 fedora-rpmdevtools-1.0.tar.bz2 +5855a4312c1d2ab5bc8f2d574866e59e fedora-rpmdevtools-1.1.tar.bz2 f88484ff2a2d83f0cc1d37bc71300f7a spectool-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 17:33:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:33:22 -0400 Subject: rpms/fedora-rpmdevtools/FC-4 .cvsignore, 1.7, 1.8 fedora-rpmdevtools.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200507081733.j68HXM7P004035@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3978/FC-4 Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: 1.1: more perl spectemplate cleanup, gcc-gfortran is devel, drop fedora.us key. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2005 16:45:41 -0000 1.7 +++ .cvsignore 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.0.tar.bz2 +fedora-rpmdevtools-1.1.tar.bz2 spectool-1.0.4.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/fedora-rpmdevtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fedora-rpmdevtools.spec 6 Apr 2005 22:11:37 -0000 1.10 +++ fedora-rpmdevtools.spec 8 Jul 2005 17:33:20 -0000 1.11 @@ -3,9 +3,8 @@ %define spectool_version 1.0.4 Name: fedora-rpmdevtools -Version: 1.0 -Release: 2 - +Version: 1.1 +Release: 1%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -28,8 +27,8 @@ %description This package contains scripts and (X)Emacs support files to aid in -development of Fedora RPM packages. These tools are designed for Red -Hat Linux 8.0 and higher. +development of Fedora RPM packages. These tools are designed for Fedora +Core 2 and later. fedora-buildrpmtree Create RPM build tree within user's home directory fedora-installdevkeys Install GPG keys in alternate RPM keyring fedora-kmodhelper Helper script for building kernel module RPMs @@ -127,7 +126,12 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 8 2005 Ville Skytt?? - 1.1-1 +- Drop more pre-FC2 compat stuff from Perl spec template. +- Treat gcc-gfortran as a devel package in rmdevelrpms. +- Drop fedora.us GPG key. + +* Fri Apr 7 2005 Michael Schwendt - 1.0-2 - rebuilt * Thu Mar 24 2005 Ville Skytt?? - 1.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2005 16:45:41 -0000 1.7 +++ sources 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -2f20b353cb5795cf01742f8ca08e8d29 fedora-rpmdevtools-1.0.tar.bz2 +5855a4312c1d2ab5bc8f2d574866e59e fedora-rpmdevtools-1.1.tar.bz2 f88484ff2a2d83f0cc1d37bc71300f7a spectool-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 17:33:23 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:33:23 -0400 Subject: rpms/fedora-rpmdevtools/devel .cvsignore, 1.7, 1.8 fedora-rpmdevtools.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200507081733.j68HXNC3004043@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/fedora-rpmdevtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3978/devel Modified Files: .cvsignore fedora-rpmdevtools.spec sources Log Message: 1.1: more perl spectemplate cleanup, gcc-gfortran is devel, drop fedora.us key. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Mar 2005 16:45:41 -0000 1.7 +++ .cvsignore 8 Jul 2005 17:33:20 -0000 1.8 @@ -1,2 +1,2 @@ -fedora-rpmdevtools-1.0.tar.bz2 +fedora-rpmdevtools-1.1.tar.bz2 spectool-1.0.4.tar.bz2 Index: fedora-rpmdevtools.spec =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/fedora-rpmdevtools.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fedora-rpmdevtools.spec 6 Apr 2005 22:11:37 -0000 1.10 +++ fedora-rpmdevtools.spec 8 Jul 2005 17:33:20 -0000 1.11 @@ -3,9 +3,8 @@ %define spectool_version 1.0.4 Name: fedora-rpmdevtools -Version: 1.0 -Release: 2 - +Version: 1.1 +Release: 1%{?dist} Summary: Fedora RPM Development Tools Group: Development/Tools @@ -28,8 +27,8 @@ %description This package contains scripts and (X)Emacs support files to aid in -development of Fedora RPM packages. These tools are designed for Red -Hat Linux 8.0 and higher. +development of Fedora RPM packages. These tools are designed for Fedora +Core 2 and later. fedora-buildrpmtree Create RPM build tree within user's home directory fedora-installdevkeys Install GPG keys in alternate RPM keyring fedora-kmodhelper Helper script for building kernel module RPMs @@ -127,7 +126,12 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 8 2005 Ville Skytt?? - 1.1-1 +- Drop more pre-FC2 compat stuff from Perl spec template. +- Treat gcc-gfortran as a devel package in rmdevelrpms. +- Drop fedora.us GPG key. + +* Fri Apr 7 2005 Michael Schwendt - 1.0-2 - rebuilt * Thu Mar 24 2005 Ville Skytt?? - 1.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fedora-rpmdevtools/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Mar 2005 16:45:41 -0000 1.7 +++ sources 8 Jul 2005 17:33:21 -0000 1.8 @@ -1,2 +1,2 @@ -2f20b353cb5795cf01742f8ca08e8d29 fedora-rpmdevtools-1.0.tar.bz2 +5855a4312c1d2ab5bc8f2d574866e59e fedora-rpmdevtools-1.1.tar.bz2 f88484ff2a2d83f0cc1d37bc71300f7a spectool-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 17:35:30 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:35:30 -0400 Subject: common tobuild,1.1862,1.1863 Message-ID: <200507081735.j68HZU2R004107@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4090 Modified Files: tobuild Log Message: request build of rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1862 retrieving revision 1.1863 diff -u -r1.1862 -r1.1863 --- tobuild 8 Jul 2005 16:47:27 -0000 1.1862 +++ tobuild 8 Jul 2005 17:35:27 -0000 1.1863 @@ -9,3 +9,4 @@ ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel +scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 17:36:12 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:36:12 -0400 Subject: common tobuild,1.1863,1.1864 Message-ID: <200507081736.j68HaChp004178@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4161 Modified Files: tobuild Log Message: request build of rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1863 retrieving revision 1.1864 diff -u -r1.1863 -r1.1864 --- tobuild 8 Jul 2005 17:35:27 -0000 1.1863 +++ tobuild 8 Jul 2005 17:36:10 -0000 1.1864 @@ -10,3 +10,4 @@ ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 +scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 17:36:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 8 Jul 2005 13:36:46 -0400 Subject: common tobuild,1.1864,1.1865 Message-ID: <200507081736.j68Hakku004240@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4223 Modified Files: tobuild Log Message: request build of rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1864 retrieving revision 1.1865 diff -u -r1.1864 -r1.1865 --- tobuild 8 Jul 2005 17:36:10 -0000 1.1864 +++ tobuild 8 Jul 2005 17:36:44 -0000 1.1865 @@ -11,3 +11,4 @@ ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 +scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 17:51:34 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 13:51:34 -0400 Subject: common tobuild,1.1865,1.1866 Message-ID: <200507081751.j68HpYbS004377@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4360 Modified Files: tobuild Log Message: request build of rpms/jhead/devel jhead-2_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1865 retrieving revision 1.1866 diff -u -r1.1865 -r1.1866 --- tobuild 8 Jul 2005 17:36:44 -0000 1.1865 +++ tobuild 8 Jul 2005 17:51:32 -0000 1.1866 @@ -12,3 +12,4 @@ scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel +adrian rpms/jhead/devel jhead-2_4-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 18:12:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:12:33 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.11, 1.12 UserInterface.py, 1.15, 1.16 Message-ID: <200507081812.j68ICXBS005531@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5482/server Modified Files: BuildMaster.py UserInterface.py Log Message: 2005-07-08 Dan Williams * Pass archjob information along to the client, and move query into UserInterface's thread Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- BuildMaster.py 8 Jul 2005 17:23:45 -0000 1.11 +++ BuildMaster.py 8 Jul 2005 18:12:31 -0000 1.12 @@ -211,8 +211,8 @@ self.dbcx.commit() if len(self.curs.fetchall()) == 0: try: - self.curs.execute('INSERT INTO archjobs (jobid, parent_uid, starttime, arch, builder_addr, status, builder_status) ' \ - 'VALUES ("%s", %d, %d, "%s", "%s", "%s", "%s")' % (jobid, attrdict['parent_uid'], time.time(), attrdict['arch'], \ + 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")' % (jobid, attrdict['parent_uid'], time.time(), 0, attrdict['arch'], \ attrdict['builder_addr'], attrdict['status'], attrdict['builder_status'])) except sqlite.OperationalError, e: print "DB Error: could not access jobs database. Reason: '%s'" % e Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- UserInterface.py 5 Jul 2005 21:08:03 -0000 1.15 +++ UserInterface.py 8 Jul 2005 18:12:31 -0000 1.16 @@ -26,7 +26,8 @@ import PackageJob # Load in the config -execfile("/etc/plague/server/CONFIG.py") +CONFIG_LOCATION = "/etc/plague/server/" +execfile(CONFIG_LOCATION + "CONFIG.py") def email_result(email, cvs_tag, resultstring, subject=None): @@ -44,6 +45,12 @@ s.close() +def get_dbcx(): + dbcx = None + dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3) + curs = dbcx.cursor() + return (dbcx, curs) + class UserInterface: """ @@ -145,29 +152,47 @@ search = search + " AND " search = search + 'status = "%s"' % status else: - return (-1, "Error: Invalid query.", []) + return (-1, "Error: Invalid query.", [], []) if len(search): sql = sql + search if not len(sql): - return (-1, "Error: Invalid query.", []) + return (-1, "Error: Invalid query.", [], []) + + try: + dbcx, curs = get_dbcx() + except sqlite.DatabaseError, e: + return (-1, "Unable to access job database.", [], []) + curs.execute(sql) + data = curs.fetchall() + results = [] + for row in data: + tempX = [ item for item in row ] + results.append(tempX) + jobs = copy.deepcopy(results) + + uids = '' + for result in jobs: + if len(uids) == 0: + uids = uids + "parent_uid=%d" % result[0] + else: + uids = uids + " OR parent_uid=%d" % result[0] + + archjobs = [] + if len(uids) > 0: + sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids + curs.execute(sql) + data = curs.fetchall() + aj_results = [] + for row in data: + tempX = [ item for item in row ] + aj_results.append(tempX) + archjobs = copy.deepcopy(aj_results) + + del curs + del dbcx - job_list = [] - query = BuildMaster.JobsQuery(sql) - self._bm.queue_query(query) - start_time = time.time() - - # Wait for query to return from BuildMaster - ret = -1 - msg = "Error: The query timed out, please try again." - while time.time() <= start_time + 5: - if query.done: - job_list = copy.deepcopy(query.result) - del query - ret = 0 - msg = "Success." - break - return (ret, msg, job_list) + return (0, "Success.", jobs, archjobs) def update_builders(self): From fedora-extras-commits at redhat.com Fri Jul 8 18:12:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:12:27 -0400 Subject: extras-buildsys ChangeLog,1.47,1.48 Message-ID: <200507081812.j68ICvxu005534@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5482 Modified Files: ChangeLog Log Message: 2005-07-08 Dan Williams * Pass archjob information along to the client, and move query into UserInterface's thread Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 8 Jul 2005 17:23:44 -0000 1.47 +++ ChangeLog 8 Jul 2005 18:12:25 -0000 1.48 @@ -1,3 +1,8 @@ +2005-07-08 Dan Williams + + * Pass archjob information along to the client, + and move query into UserInterface's thread + 2005-07-07 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Fri Jul 8 18:12:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:12:27 -0400 Subject: extras-buildsys/client client.py,1.7,1.8 Message-ID: <200507081813.j68ICwTY005537@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5482/client Modified Files: client.py Log Message: 2005-07-08 Dan Williams * Pass archjob information along to the client, and move query into UserInterface's thread Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- client.py 6 Jul 2005 21:20:55 -0000 1.7 +++ client.py 8 Jul 2005 18:12:25 -0000 1.8 @@ -99,7 +99,7 @@ args['email'] = email if status: args['status'] = status - (e, msg, jobs) = server.list_jobs(args) + (e, msg, jobs, archjobs) = server.list_jobs(args) except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -111,6 +111,9 @@ else: for job in jobs: print job + for archjob in archjobs: + if archjob[1] == job[0]: + print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) def kill(server, email, jobid): From fedora-extras-commits at redhat.com Fri Jul 8 18:16:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 8 Jul 2005 14:16:24 -0400 Subject: extras-buildsys/common CommonErrors.py,1.6,1.7 Message-ID: <200507081816.j68IGO8L005567@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5550/common Modified Files: CommonErrors.py Log Message: Don't import m2crypto any more Index: CommonErrors.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/CommonErrors.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CommonErrors.py 24 Jun 2005 17:13:26 -0000 1.6 +++ CommonErrors.py 8 Jul 2005 18:16:22 -0000 1.7 @@ -14,7 +14,6 @@ # # Copyright 2005 Dan Williams and Red Hat, Inc. -from M2Crypto import SSL import socket From fedora-extras-commits at redhat.com Fri Jul 8 18:23:06 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:23:06 -0400 Subject: rpms/inadyn/FC-4 inadyn.spec,1.10,1.11 Message-ID: <200507081823.j68INbjQ005629@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/inadyn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597/inadyn/FC-4 Modified Files: inadyn.spec Log Message: Fix dist being mandatory in FC-4 branch, and devel being older without. Index: inadyn.spec =================================================================== RCS file: /cvs/extras/rpms/inadyn/FC-4/inadyn.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- inadyn.spec 6 Jun 2005 15:08:51 -0000 1.10 +++ inadyn.spec 8 Jul 2005 18:23:04 -0000 1.11 @@ -1,6 +1,6 @@ Name: inadyn Version: 1.90 -Release: 11%{dist} +Release: 11%{?dist} Summary: Dynamic DNS Client @@ -54,7 +54,7 @@ s|/etc/([^ir])|%{_sysconfdir}/$1|g ; \ s|/etc/rc\.d/init\.d/|%{_initrddir}/|g' \ <%{SOURCE2} >$RPM_BUILD_ROOT%{_initrddir}/inadyn - + %clean rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Fri Jul 8 18:23:07 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:23:07 -0400 Subject: rpms/inadyn/devel inadyn.spec,1.9,1.10 Message-ID: <200507081823.j68INbca005630@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/inadyn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5597/inadyn/devel Modified Files: inadyn.spec Log Message: Fix dist being mandatory in FC-4 branch, and devel being older without. Index: inadyn.spec =================================================================== RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- inadyn.spec 3 May 2005 19:54:39 -0000 1.9 +++ inadyn.spec 8 Jul 2005 18:23:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: inadyn Version: 1.90 -Release: 11 +Release: 11%{?dist} Summary: Dynamic DNS Client @@ -54,7 +54,7 @@ s|/etc/([^ir])|%{_sysconfdir}/$1|g ; \ s|/etc/rc\.d/init\.d/|%{_initrddir}/|g' \ <%{SOURCE2} >$RPM_BUILD_ROOT%{_initrddir}/inadyn - + %clean rm -rf $RPM_BUILD_ROOT From fedora-extras-commits at redhat.com Fri Jul 8 18:27:00 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 8 Jul 2005 14:27:00 -0400 Subject: rpms/naim/devel naim.spec,1.2,1.3 Message-ID: <200507081827.j68IR0ip005696@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5679 Modified Files: naim.spec Log Message: Add %{?dist} tag to Release Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- naim.spec 7 Jul 2005 20:50:10 -0000 1.2 +++ naim.spec 8 Jul 2005 18:26:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: naim Version: 0.11.7.3.1 -Release: 2 +Release: 2%{?dist} Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client Group: Applications/Internet From fedora-extras-commits at redhat.com Fri Jul 8 18:29:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:29:53 -0400 Subject: rpms/kyum/FC-4 kyum.spec,1.3,1.4 Message-ID: <200507081830.j68IUNSJ005751@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kyum/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5719/kyum/FC-4 Modified Files: kyum.spec Log Message: Change dist to not be mandatory in FC-4 branch, and remove trailing spaces. Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/kyum.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kyum.spec 16 Jun 2005 15:38:16 -0000 1.3 +++ kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 @@ -1,16 +1,16 @@ Name: kyum Version: 0.7.1 -Release: 2%{dist} +Release: 2%{?dist} Summary: Graphical User Frontend (GUI) for yum License: GPL Group: Applications/System URL: http://kde-apps.org/content/show.php?content=22185 -Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz +Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum >= 2.2.0 Requires: kdebase >= 6:3.3 @@ -31,15 +31,15 @@ %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh - + make -f Makefile.cvs -%configure --disable-rpath +%configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ @@ -50,7 +50,7 @@ --add-category Application \ --add-category SystemSetup \ $RPM_BUILD_ROOT%{_datadir}/app*/*/%{name}.desktop - + %clean rm -rf $RPM_BUILD_ROOT @@ -113,7 +113,7 @@ - release version 0.5.3 - Fix: "Remove" operation was accidently disabled in the source. - + - Added support for the yum command "generate-rss" (although this yum command is probably rather useful in a nightly batch mode). @@ -122,7 +122,7 @@ - release version 0.5.2 - When an old-format yum.conf, that contains repository definitions, is loaded, kyum offers to move them to a *.repo file (kyum.repo). - + - The "Import GPG Key" dialog now uses the value "gpgkey" from the repository definition, if present. @@ -139,7 +139,7 @@ - Replaced QFileDialog with KFileDialog. - Output window now uses monospaced font (Courier). - + - When an item is focused in the package list, all columns are selected. * Sat Apr 09 2005 Roland Wolters @@ -147,17 +147,17 @@ - release version 0.4.2: - Fix: Repos loaded from profiles where always put in kyum.repo instead of restoring the *.repo they were originally defined in. - + * Sat Apr 09 2005 Steffen Offermann - release version 0.4.1: - - Added profile support: Different sets of repository/yum.conf configurations - can be saved to and loaded from profiles. - - Reordered tabs in main window. - - Search dialog: Added option "Find and Install". - - Added option "Import GPG Key" to the repository context menu. - - Running actions can now be aborted. - - Support for yum's "clean" command added. + - Added profile support: Different sets of repository/yum.conf configurations + can be saved to and loaded from profiles. + - Reordered tabs in main window. + - Search dialog: Added option "Find and Install". + - Added option "Import GPG Key" to the repository context menu. + - Running actions can now be aborted. + - Support for yum's "clean" command added. * Thu Mar 31 2005 Steffen Offermann From fedora-extras-commits at redhat.com Fri Jul 8 18:29:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 8 Jul 2005 14:29:53 -0400 Subject: rpms/kyum/devel kyum.spec,1.3,1.4 Message-ID: <200507081830.j68IUNXH005754@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5719/kyum/devel Modified Files: kyum.spec Log Message: Change dist to not be mandatory in FC-4 branch, and remove trailing spaces. Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kyum.spec 21 Jun 2005 20:20:46 -0000 1.3 +++ kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 @@ -7,10 +7,10 @@ License: GPL Group: Applications/System URL: http://kde-apps.org/content/show.php?content=22185 -Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz +Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum >= 2.2.0 Requires: kdebase >= 6:3.3 @@ -31,15 +31,15 @@ %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh - + make -f Makefile.cvs -%configure --disable-rpath +%configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ @@ -50,7 +50,7 @@ --add-category Application \ --add-category SystemSetup \ $RPM_BUILD_ROOT%{_datadir}/app*/*/%{name}.desktop - + %clean rm -rf $RPM_BUILD_ROOT @@ -116,7 +116,7 @@ - release version 0.5.3 - Fix: "Remove" operation was accidently disabled in the source. - + - Added support for the yum command "generate-rss" (although this yum command is probably rather useful in a nightly batch mode). @@ -125,7 +125,7 @@ - release version 0.5.2 - When an old-format yum.conf, that contains repository definitions, is loaded, kyum offers to move them to a *.repo file (kyum.repo). - + - The "Import GPG Key" dialog now uses the value "gpgkey" from the repository definition, if present. @@ -142,7 +142,7 @@ - Replaced QFileDialog with KFileDialog. - Output window now uses monospaced font (Courier). - + - When an item is focused in the package list, all columns are selected. * Sat Apr 09 2005 Roland Wolters @@ -150,17 +150,17 @@ - release version 0.4.2: - Fix: Repos loaded from profiles where always put in kyum.repo instead of restoring the *.repo they were originally defined in. - + * Sat Apr 09 2005 Steffen Offermann - release version 0.4.1: - - Added profile support: Different sets of repository/yum.conf configurations - can be saved to and loaded from profiles. - - Reordered tabs in main window. - - Search dialog: Added option "Find and Install". - - Added option "Import GPG Key" to the repository context menu. - - Running actions can now be aborted. - - Support for yum's "clean" command added. + - Added profile support: Different sets of repository/yum.conf configurations + can be saved to and loaded from profiles. + - Reordered tabs in main window. + - Search dialog: Added option "Find and Install". + - Added option "Import GPG Key" to the repository context menu. + - Running actions can now be aborted. + - Support for yum's "clean" command added. * Thu Mar 31 2005 Steffen Offermann From tcallawa at redhat.com Fri Jul 8 18:35:01 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Fri, 08 Jul 2005 13:35:01 -0500 Subject: APPROVED: libapreq2 Message-ID: <1120847701.9303.129.camel@localhost.localdomain> Name: libapreq2 Summary: Generic Apache Request Library Reviewer: Tom "spot" Callaway Maintainer: Ville Skytt? ~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 Jul 8 18:35:21 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:21 -0400 Subject: rpms/tcllib - New directory Message-ID: <200507081835.j68IZL2v005838@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5818/tcllib Log Message: Directory /cvs/extras/rpms/tcllib added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:35:21 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:21 -0400 Subject: rpms/tcllib/devel - New directory Message-ID: <200507081835.j68IZLVK005843@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5818/tcllib/devel Log Message: Directory /cvs/extras/rpms/tcllib/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:35:44 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:44 -0400 Subject: rpms/tcllib Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507081835.j68IZiBd005900@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873 Added Files: Makefile import.log Log Message: Setup of module tcllib --- NEW FILE Makefile --- # Top level Makefile for module tcllib all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 18:35:44 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:35:44 -0400 Subject: rpms/tcllib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507081835.j68IZiTm005905@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5873/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module tcllib --- NEW 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 Jul 8 18:38:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:39 -0400 Subject: rpms/perl-ExtUtils-XSBuilder - New directory Message-ID: <200507081838.j68IcdWr006083@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/perl-ExtUtils-XSBuilder Log Message: Directory /cvs/extras/rpms/perl-ExtUtils-XSBuilder added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:38:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:39 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel - New directory Message-ID: <200507081838.j68Icdc1006088@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/perl-ExtUtils-XSBuilder/devel Log Message: Directory /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:38:15 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:38:15 -0400 Subject: rpms/tcllib import.log,1.1,1.2 Message-ID: <200507081838.j68IcjIx006099@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988 Modified Files: import.log Log Message: auto-import tcllib-1.7-2 on branch devel from tcllib-1.7-2.src.rpm Initial import of tcllib Index: import.log =================================================================== RCS file: /cvs/extras/rpms/tcllib/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 18:35:42 -0000 1.1 +++ import.log 8 Jul 2005 18:38:13 -0000 1.2 @@ -0,0 +1 @@ +tcllib-1_7-2:HEAD:tcllib-1.7-2.src.rpm:1120847884 From fedora-extras-commits at redhat.com Fri Jul 8 18:38:15 2005 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 8 Jul 2005 14:38:15 -0400 Subject: rpms/tcllib/devel tcllib.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507081838.j68Ick1C006104@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/tcllib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988/devel Modified Files: .cvsignore sources Added Files: tcllib.spec Log Message: auto-import tcllib-1.7-2 on branch devel from tcllib-1.7-2.src.rpm Initial import of tcllib --- NEW FILE tcllib.spec --- Summary: The standard Tcl library Name: tcllib Version: 1.7 Release: 2%{?dist} Epoch: 0 License: BSD-like Group: Development/Libraries Source: http://download.sourceforge.net/tcllib/tcllib-1.7.tar.bz2 URL: http://tcllib.sourceforge.net/ BuildArchitectures: noarch Requires: tcl >= 0:8.3.1 BuildRequires: tcl >= 0:8.3.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Tcllib, the Tcl Standard Library is a collection of Tcl packages that provide utility functions useful to a large collection of Tcl programmers. The home web site for this code is http://tcllib.sourceforge.net/. At this web site, you will find mailing lists, web forums, databases for bug reports and feature requests, the CVS repository (browsable on the web, or read-only accessible via CVS ), and more. Note: also grab source tarball for more documentation, examples, ... %prep %setup -q %install rm -rf $RPM_BUILD_ROOT files #echo 'not available' > modules/calendar/calendar.n # excluded in distribution echo 'not available' > modules/imap4/imap4.n %_bindir/tclsh installer.tcl -no-gui -no-wait -no-html -no-examples -no-apps\ -pkg-path $RPM_BUILD_ROOT/$(echo 'puts $tcl_library' | %_bindir/tclsh)/%name-%version\ -nroff-path $RPM_BUILD_ROOT%_mandir/mann # install HTML documentation into specific modules sub-directories: cd modules mkdir ../ftp; mv ftp/docs/*.html ../ftp/ for module in exif mime snit stooop struct textutil; do mkdir ../$module && mv $module/*.html ../$module/; done cd .. # generate list of files in the package (man pages are compressed): find $RPM_BUILD_ROOT ! -type d |\ sed -e "s,^$RPM_BUILD_ROOT,,;" -e 's,\.n$,\.n\.gz,;' > files %clean rm -rf $RPM_BUILD_ROOT %files -f files %defattr(-,root,root) %doc PACKAGES README README-1.7.txt ChangeLog license.terms %doc exif/ ftp/ mime/ snit/ stooop/ struct/ textutil/ %changelog * Mon Jul 4 2005 0:1.7-2 - Minor spec file changes in an attempt to conform to Fedora Extras packaging guidelines. * Thu Oct 14 2004 Jean-Luc Fontaine 0:1.7-1 - 1.7 version - new modules: asn, bee, grammar_fa, http, ident, jpeg, ldap, png, rc4, ripemd, tar, tie, treeql, uuid - modules removed: struct1 * Thu Feb 19 2004 Jean-Luc Fontaine 0:1.6-1 - 1.6 version - leaner and cleaner spec file based on Fedora standards - install under tcl_library, not hard-coded /usr/lib Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tcllib/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 18:35:42 -0000 1.1 +++ .cvsignore 8 Jul 2005 18:38:13 -0000 1.2 @@ -0,0 +1 @@ +tcllib-1.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tcllib/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 18:35:42 -0000 1.1 +++ sources 8 Jul 2005 18:38:13 -0000 1.2 @@ -0,0 +1 @@ +db8de0205d0a65b88a4a3e235da6ae10 tcllib-1.7.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 8 18:38:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:54 -0400 Subject: rpms/perl-ExtUtils-XSBuilder Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507081838.j68Icskc006148@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117 Added Files: Makefile import.log Log Message: Setup of module perl-ExtUtils-XSBuilder --- NEW FILE Makefile --- # Top level Makefile for module perl-ExtUtils-XSBuilder all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 18:38:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:38:54 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507081838.j68IcssU006153@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6117/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-ExtUtils-XSBuilder --- NEW 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 Jul 8 18:39:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:39:19 -0400 Subject: rpms/perl-ExtUtils-XSBuilder import.log,1.1,1.2 Message-ID: <200507081839.j68IdnvW006239@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6181 Modified Files: import.log Log Message: auto-import perl-ExtUtils-XSBuilder-0.27-2 on branch devel from perl-ExtUtils-XSBuilder-0.27-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 18:38:52 -0000 1.1 +++ import.log 8 Jul 2005 18:39:16 -0000 1.2 @@ -0,0 +1 @@ +perl-ExtUtils-XSBuilder-0_27-2:HEAD:perl-ExtUtils-XSBuilder-0.27-2.src.rpm:1120848014 From fedora-extras-commits at redhat.com Fri Jul 8 18:39:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:39:19 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507081839.j68IdnBr006243@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6181/devel Modified Files: .cvsignore sources Added Files: perl-ExtUtils-XSBuilder.spec Log Message: auto-import perl-ExtUtils-XSBuilder-0.27-2 on branch devel from perl-ExtUtils-XSBuilder-0.27-2.src.rpm --- NEW FILE perl-ExtUtils-XSBuilder.spec --- %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Name: perl-ExtUtils-XSBuilder Version: 0.27 Release: 2%{?dist} Summary: Modules that parse C header files and create XS glue code Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/ExtUtils-XSBuilder/ Source0: http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Tie::IxHash) Requires: perl(Tie::IxHash) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description ExtUtils::XSBuilder is a set of modules to parse C header files and create XS glue code and documentation out of it. Ideally this allows one to "write" an interface to a C library without coding a line. Since no C-API is ideal, some adjuments are necessary most of the time. So to use this module you must still be familiar with C and XS programming, but it removes a lot of stupid work and copy&paste from you. Also when the C API changes, most of the time you only have to rerun XSBuilder to get your new Perl API. %prep %setup -q -n ExtUtils-XSBuilder-%{version} find . -type f | xargs chmod -x %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/ExtUtils %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 0.27-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.27-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 18:38:52 -0000 1.1 +++ .cvsignore 8 Jul 2005 18:39:17 -0000 1.2 @@ -0,0 +1 @@ +ExtUtils-XSBuilder-0.27.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 18:38:52 -0000 1.1 +++ sources 8 Jul 2005 18:39:17 -0000 1.2 @@ -0,0 +1 @@ +6e1f1c8207b598166dc7a06d633db308 ExtUtils-XSBuilder-0.27.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 18:43:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:43:56 -0400 Subject: rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder.spec, 1.1, 1.2 Message-ID: <200507081843.j68Ihu9O006340@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6323/devel Modified Files: perl-ExtUtils-XSBuilder.spec Log Message: Nuke perl_vendorlib define Index: perl-ExtUtils-XSBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/perl-ExtUtils-XSBuilder.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-ExtUtils-XSBuilder.spec 8 Jul 2005 18:39:17 -0000 1.1 +++ perl-ExtUtils-XSBuilder.spec 8 Jul 2005 18:43:53 -0000 1.2 @@ -1,5 +1,3 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-ExtUtils-XSBuilder Version: 0.27 Release: 2%{?dist} From fedora-extras-commits at redhat.com Fri Jul 8 18:45:11 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:11 -0400 Subject: rpms/perl-Tie-DBI - New directory Message-ID: <200507081845.j68IjBtg006452@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432/perl-Tie-DBI Log Message: Directory /cvs/extras/rpms/perl-Tie-DBI added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:45:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:12 -0400 Subject: rpms/perl-Tie-DBI/devel - New directory Message-ID: <200507081845.j68IjCAX006457@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6432/perl-Tie-DBI/devel Log Message: Directory /cvs/extras/rpms/perl-Tie-DBI/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 18:45:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:28 -0400 Subject: rpms/perl-Tie-DBI Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507081845.j68IjS25006509@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6477 Added Files: Makefile import.log Log Message: Setup of module perl-Tie-DBI --- NEW FILE Makefile --- # Top level Makefile for module perl-Tie-DBI all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 8 18:45:29 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:29 -0400 Subject: rpms/perl-Tie-DBI/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507081845.j68IjTJB006514@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6477/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Tie-DBI --- NEW 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 Jul 8 18:45:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:55 -0400 Subject: rpms/perl-Tie-DBI import.log,1.1,1.2 Message-ID: <200507081845.j68IjtYD006578@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547 Modified Files: import.log Log Message: auto-import perl-Tie-DBI-1.01-2 on branch devel from perl-Tie-DBI-1.01-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Tie-DBI/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 18:45:26 -0000 1.1 +++ import.log 8 Jul 2005 18:45:53 -0000 1.2 @@ -0,0 +1 @@ +perl-Tie-DBI-1_01-2:HEAD:perl-Tie-DBI-1.01-2.src.rpm:1120848409 From fedora-extras-commits at redhat.com Fri Jul 8 18:45:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 14:45:55 -0400 Subject: rpms/perl-Tie-DBI/devel perl-Tie-DBI.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507081845.j68IjtQw006585@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Tie-DBI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6547/devel Modified Files: .cvsignore sources Added Files: perl-Tie-DBI.spec Log Message: auto-import perl-Tie-DBI-1.01-2 on branch devel from perl-Tie-DBI-1.01-2.src.rpm --- NEW FILE perl-Tie-DBI.spec --- Name: perl-Tie-DBI Version: 1.01 Release: 2%{?dist} Summary: Tie hashes to DBI relational databases Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Tie-DBI/ Source0: http://search.cpan.org/CPAN/authors/id/L/LD/LDS/Tie-DBI-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This distribution contains Tie::DBI and Tie::RDBM, two modules that allow you to tie associative arrays to relational databases using the DBI library. The hash is tied to a table in a local or networked database. Reading from the hash retrieves values from the datavbase. Storing into the hash updates the database (if you have sufficient privileges). %prep %setup -q -n Tie-DBI-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check # needs a running mysql server #make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Tie %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 1.01-2 - cleanups, new description * Wed Jul 6 2005 Tom "spot" Callaway 1.01-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Tie-DBI/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 18:45:26 -0000 1.1 +++ .cvsignore 8 Jul 2005 18:45:53 -0000 1.2 @@ -0,0 +1 @@ +Tie-DBI-1.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Tie-DBI/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 18:45:26 -0000 1.1 +++ sources 8 Jul 2005 18:45:53 -0000 1.2 @@ -0,0 +1 @@ +acdf6ea3c01dc46af8f0c847f8cf40ea Tie-DBI-1.01.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 18:52:24 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Fri, 8 Jul 2005 14:52:24 -0400 Subject: common tobuild,1.1866,1.1867 Message-ID: <200507081852.j68IqOkI006716@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6699 Modified Files: tobuild Log Message: request build of rpms/naim/devel naim-0_11_7_3_1-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1866 retrieving revision 1.1867 diff -u -r1.1866 -r1.1867 --- tobuild 8 Jul 2005 17:51:32 -0000 1.1866 +++ tobuild 8 Jul 2005 18:52:22 -0000 1.1867 @@ -13,3 +13,4 @@ scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel adrian rpms/jhead/devel jhead-2_4-1_fc5 devel +lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 19:37:16 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 15:37:16 -0400 Subject: rpms/jhead/devel jhead-compiler-warnings.patch, NONE, 1.1 jhead.spec, 1.10, 1.11 Message-ID: <200507081937.j68JbGho007916@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7896 Modified Files: jhead.spec Added Files: jhead-compiler-warnings.patch Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy jhead-compiler-warnings.patch: --- NEW FILE jhead-compiler-warnings.patch --- diff -ur jhead-2.4/exif.c jhead-2.4.new/exif.c --- jhead-2.4/exif.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/exif.c 2005-07-08 19:37:52.000000000 +0200 @@ -395,7 +395,7 @@ unsigned char * ValuePtr; int ByteCount; char * DirEntry; - DirEntry = DIR_ENTRY_ADDR(DirStart, de); + DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); Tag = Get16u(DirEntry); Format = Get16u(DirEntry+2); @@ -421,7 +421,7 @@ ValuePtr = OffsetBase+OffsetVal; }else{ // 4 bytes or less and value is in the dir entry itself - ValuePtr = DirEntry+8; + ValuePtr = (unsigned char *)DirEntry+8; } if (LastExifRefd < ValuePtr+ByteCount){ @@ -493,17 +493,17 @@ switch(Tag){ case TAG_MAKE: - strncpy(ImageInfo.CameraMake, ValuePtr, 31); + strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31); break; case TAG_MODEL: - strncpy(ImageInfo.CameraModel, ValuePtr, 39); + strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39); break; case TAG_DATETIME_ORIGINAL: // If we get a DATETIME_ORIGINAL, we use that one. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); // Fallthru... case TAG_DATETIME_DIGITIZED: @@ -511,14 +511,14 @@ if (!isdigit(ImageInfo.DateTime[0])){ // If we don't already have a DATETIME_ORIGINAL, use whatever // time fields we may have. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); } if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){ ErrNonfatal("More than %d date fields! This is nuts", MAX_DATE_COPIES, 0); break; } - ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr; + ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr; break; @@ -540,13 +540,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - strncpy(ImageInfo.Comments, a+ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199); break; } } }else{ - strncpy(ImageInfo.Comments, ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)ValuePtr, 199); } break; @@ -927,7 +927,7 @@ for (de=0;de - 2.4-2 +- added patch to make compiler happy + * Fri Jul 08 2005 Adrian Reber - 2.4-1 - updated to 2.4 From fedora-extras-commits at redhat.com Fri Jul 8 20:18:35 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 8 Jul 2005 16:18:35 -0400 Subject: rpms/aiksaurus/devel aiksaurus.spec,1.5,1.6 Message-ID: <200507082018.j68KIZZ0009176@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/aiksaurus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9159 Modified Files: aiksaurus.spec Log Message: Add URL Index: aiksaurus.spec =================================================================== RCS file: /cvs/extras/rpms/aiksaurus/devel/aiksaurus.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- aiksaurus.spec 25 Jun 2005 14:04:23 -0000 1.5 +++ aiksaurus.spec 8 Jul 2005 20:18:33 -0000 1.6 @@ -1,7 +1,7 @@ Summary: An English-language thesaurus library. Name: aiksaurus Version: 1.2.1 -Release: 8 +Release: 9 Epoch: 1 Group: System Environment/Libraries License: GPL @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel, desktop-file-utils >= 0.9 PreReq: desktop-file-utils >= 0.9 +URL: http://aiksaurus.sourceforge.net/ Patch0: aiksaurus-1.2.1-desktop.patch @@ -104,6 +105,9 @@ %{_libdir}/pkgconfig/gaiksaurus-1.0.pc %changelog +* Fri Jul 8 2005 Marc Maurer 1:1.2.1-9 +- Add URL + * Sat Jun 25 2005 Colin Charles 1:1.2.1-8 - Fix download URL From fedora-extras-commits at redhat.com Fri Jul 8 20:19:15 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 8 Jul 2005 16:19:15 -0400 Subject: common tobuild,1.1867,1.1868 Message-ID: <200507082019.j68KJFE2009237@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9220 Modified Files: tobuild Log Message: request build of rpms/aiksaurus/devel aiksaurus-1_2_1-9 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1867 retrieving revision 1.1868 diff -u -r1.1867 -r1.1868 --- tobuild 8 Jul 2005 18:52:22 -0000 1.1867 +++ tobuild 8 Jul 2005 20:19:13 -0000 1.1868 @@ -14,3 +14,4 @@ scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel adrian rpms/jhead/devel jhead-2_4-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel +uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel From fedora-extras-commits at redhat.com Fri Jul 8 21:07:54 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:07:54 -0400 Subject: common tobuild,1.1868,1.1869 Message-ID: <200507082107.j68L7sXE010606@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10589 Modified Files: tobuild Log Message: request build of rpms/jhead/devel jhead-2_4-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1868 retrieving revision 1.1869 diff -u -r1.1868 -r1.1869 --- tobuild 8 Jul 2005 20:19:13 -0000 1.1868 +++ tobuild 8 Jul 2005 21:07:52 -0000 1.1869 @@ -15,3 +15,4 @@ adrian rpms/jhead/devel jhead-2_4-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel +adrian rpms/jhead/devel jhead-2_4-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 8 21:26:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:26:42 -0400 Subject: rpms/nexuiz-data - New directory Message-ID: <200507082126.j68LQglH010701@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10677/nexuiz-data Log Message: Directory /cvs/extras/rpms/nexuiz-data added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 21:26:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:26:42 -0400 Subject: rpms/nexuiz-data/devel - New directory Message-ID: <200507082126.j68LQgoW010706@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10677/nexuiz-data/devel Log Message: Directory /cvs/extras/rpms/nexuiz-data/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 8 21:27:08 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:27:08 -0400 Subject: rpms/nexuiz-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507082127.j68LR8XO010751@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10722 Added Files: Makefile import.log Log Message: Setup of module nexuiz-data --- NEW FILE Makefile --- # Top level Makefile for module nexuiz-data all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Fri Jul 8 21:27:08 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:27:08 -0400 Subject: rpms/nexuiz-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507082127.j68LR811010756@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10722/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nexuiz-data --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Fri Jul 8 21:38:03 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:38:03 -0400 Subject: rpms/jhead/FC-4 jhead-compiler-warnings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jhead.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200507082138.j68Lc3AB010821@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10794 Modified Files: .cvsignore jhead.spec sources Added Files: jhead-compiler-warnings.patch Log Message: - added patch to make compiler happy - updated to 2.4 jhead-compiler-warnings.patch: --- NEW FILE jhead-compiler-warnings.patch --- diff -ur jhead-2.4/exif.c jhead-2.4.new/exif.c --- jhead-2.4/exif.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/exif.c 2005-07-08 19:37:52.000000000 +0200 @@ -395,7 +395,7 @@ unsigned char * ValuePtr; int ByteCount; char * DirEntry; - DirEntry = DIR_ENTRY_ADDR(DirStart, de); + DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); Tag = Get16u(DirEntry); Format = Get16u(DirEntry+2); @@ -421,7 +421,7 @@ ValuePtr = OffsetBase+OffsetVal; }else{ // 4 bytes or less and value is in the dir entry itself - ValuePtr = DirEntry+8; + ValuePtr = (unsigned char *)DirEntry+8; } if (LastExifRefd < ValuePtr+ByteCount){ @@ -493,17 +493,17 @@ switch(Tag){ case TAG_MAKE: - strncpy(ImageInfo.CameraMake, ValuePtr, 31); + strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31); break; case TAG_MODEL: - strncpy(ImageInfo.CameraModel, ValuePtr, 39); + strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39); break; case TAG_DATETIME_ORIGINAL: // If we get a DATETIME_ORIGINAL, we use that one. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); // Fallthru... case TAG_DATETIME_DIGITIZED: @@ -511,14 +511,14 @@ if (!isdigit(ImageInfo.DateTime[0])){ // If we don't already have a DATETIME_ORIGINAL, use whatever // time fields we may have. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); } if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){ ErrNonfatal("More than %d date fields! This is nuts", MAX_DATE_COPIES, 0); break; } - ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr; + ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr; break; @@ -540,13 +540,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - strncpy(ImageInfo.Comments, a+ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199); break; } } }else{ - strncpy(ImageInfo.Comments, ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)ValuePtr, 199); } break; @@ -927,7 +927,7 @@ for (de=0;de - 2.4-2 +- added patch to make compiler happy + +* Fri Jul 08 2005 Adrian Reber - 2.4-1 +- updated to 2.4 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 11:16:18 -0000 1.4 +++ sources 8 Jul 2005 21:38:01 -0000 1.5 @@ -1 +1 @@ -b27c37f1edd25e5f416914ed46ba11fb jhead-2.3.tar.gz +410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 21:38:34 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:38:34 -0400 Subject: common tobuild,1.1869,1.1870 Message-ID: <200507082138.j68LcYQq010880@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10863 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-4 jhead-2_4-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1869 retrieving revision 1.1870 diff -u -r1.1869 -r1.1870 --- tobuild 8 Jul 2005 21:07:52 -0000 1.1869 +++ tobuild 8 Jul 2005 21:38:32 -0000 1.1870 @@ -16,3 +16,4 @@ lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel adrian rpms/jhead/devel jhead-2_4-2_fc5 devel +adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 21:57:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:57:06 -0400 Subject: rpms/nexuiz-data import.log,1.1,1.2 Message-ID: <200507082157.j68LvbDR010958@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10924 Modified Files: import.log Log Message: auto-import nexuiz-data-1.1-1 on branch devel from nexuiz-data-1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Jul 2005 21:27:06 -0000 1.1 +++ import.log 8 Jul 2005 21:57:04 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-data-1_1-1:HEAD:nexuiz-data-1.1-1.src.rpm:1120859808 From fedora-extras-commits at redhat.com Fri Jul 8 21:57:07 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 17:57:07 -0400 Subject: rpms/nexuiz-data/devel nexuiz-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507082157.j68LvbbJ010962@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10924/devel Modified Files: .cvsignore sources Added Files: nexuiz-data.spec Log Message: auto-import nexuiz-data-1.1-1 on branch devel from nexuiz-data-1.1-1.src.rpm --- NEW FILE nexuiz-data.spec --- %define datadate 20050703 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data Version: 1.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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, 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 %build %install %{__rm} -rf %{buildroot} %{__install} -D -p data/data%{datadate}.pk3 \ %{buildroot}%{_datadir}/nexuiz/data/data%{datadate}.pk3 %clean %{__rm} -rf %{buildroot} %files %defattr(0644, root, root, 0755) %doc Readme.htm COPYING %{_datadir}/nexuiz/ %changelog * 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 shipping the source full of the already provided binary builds. - Don't gz/bzip2 the source as it saves 252kB of 152MB at best and wastes time (the data is already a huge compressed .pk3). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Jul 2005 21:27:06 -0000 1.1 +++ .cvsignore 8 Jul 2005 21:57:05 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-data-1.1.tar Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Jul 2005 21:27:06 -0000 1.1 +++ sources 8 Jul 2005 21:57:05 -0000 1.2 @@ -0,0 +1 @@ +c177cce8cf6ac9134d1d9b8a08dc3272 nexuiz-data-1.1.tar From bugs.michael at gmx.net Fri Jul 8 22:00:40 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Sat, 9 Jul 2005 00:00:40 +0200 Subject: rpms/jhead/FC-4 jhead-compiler-warnings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jhead.spec, 1.9, 1.10 sources, 1.4, 1.5 In-Reply-To: <200507082138.j68Lc3AB010821@cvs-int.fedora.redhat.com> References: <200507082138.j68Lc3AB010821@cvs-int.fedora.redhat.com> Message-ID: <20050709000040.7902e52c.bugs.michael@gmx.net> On Fri, 8 Jul 2005 17:38:03 -0400, Adrian Reber wrote: > Author: adrian > diff -ur jhead-2.4/makefile jhead-2.4.new/makefile > --- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 > +++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 > @@ -9,7 +9,7 @@ > objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o > > $(OBJ)/%.o:$(SRC)/%.c > - ${CC} ${CFLAGS} -Wall -c $< -o $@ > + ${CC} -O3 -Wall -c $< -o $@ > > jhead: $(objs) jhead.h > ${CC} -o jhead $(objs) -lm This one looks reversed. From fedora-extras-commits at redhat.com Fri Jul 8 22:00:20 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:00:20 -0400 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 jhead.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507082200.j68M0Kat011057@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11034 Modified Files: .cvsignore jhead.spec sources Added Files: jhead-compiler-warnings.patch Log Message: - added patch to make compiler happy - updated to 2.4 jhead-compiler-warnings.patch: --- NEW FILE jhead-compiler-warnings.patch --- diff -ur jhead-2.4/exif.c jhead-2.4.new/exif.c --- jhead-2.4/exif.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/exif.c 2005-07-08 19:37:52.000000000 +0200 @@ -395,7 +395,7 @@ unsigned char * ValuePtr; int ByteCount; char * DirEntry; - DirEntry = DIR_ENTRY_ADDR(DirStart, de); + DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de); Tag = Get16u(DirEntry); Format = Get16u(DirEntry+2); @@ -421,7 +421,7 @@ ValuePtr = OffsetBase+OffsetVal; }else{ // 4 bytes or less and value is in the dir entry itself - ValuePtr = DirEntry+8; + ValuePtr = (unsigned char *)DirEntry+8; } if (LastExifRefd < ValuePtr+ByteCount){ @@ -493,17 +493,17 @@ switch(Tag){ case TAG_MAKE: - strncpy(ImageInfo.CameraMake, ValuePtr, 31); + strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31); break; case TAG_MODEL: - strncpy(ImageInfo.CameraModel, ValuePtr, 39); + strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39); break; case TAG_DATETIME_ORIGINAL: // If we get a DATETIME_ORIGINAL, we use that one. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); // Fallthru... case TAG_DATETIME_DIGITIZED: @@ -511,14 +511,14 @@ if (!isdigit(ImageInfo.DateTime[0])){ // If we don't already have a DATETIME_ORIGINAL, use whatever // time fields we may have. - strncpy(ImageInfo.DateTime, ValuePtr, 19); + strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19); } if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){ ErrNonfatal("More than %d date fields! This is nuts", MAX_DATE_COPIES, 0); break; } - ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr; + ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr; break; @@ -540,13 +540,13 @@ int c; c = (ValuePtr)[a]; if (c != '\0' && c != ' '){ - strncpy(ImageInfo.Comments, a+ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199); break; } } }else{ - strncpy(ImageInfo.Comments, ValuePtr, 199); + strncpy(ImageInfo.Comments, (char *)ValuePtr, 199); } break; @@ -927,7 +927,7 @@ for (de=0;de - 2.4-2 +- added patch to make compiler happy + +* Fri Jul 08 2005 Adrian Reber - 2.4-1 +- updated to 2.4 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sat Feb 12 2005 Adrian Reber 2.3-1 - updated to 2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 11:16:18 -0000 1.4 +++ sources 8 Jul 2005 22:00:18 -0000 1.5 @@ -1 +1 @@ -b27c37f1edd25e5f416914ed46ba11fb jhead-2.3.tar.gz +410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 8 22:00:51 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:00:51 -0400 Subject: common tobuild,1.1870,1.1871 Message-ID: <200507082200.j68M0pQK011120@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11103 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-3 jhead-2_4-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1870 retrieving revision 1.1871 diff -u -r1.1870 -r1.1871 --- tobuild 8 Jul 2005 21:38:32 -0000 1.1870 +++ tobuild 8 Jul 2005 22:00:49 -0000 1.1871 @@ -17,3 +17,4 @@ uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel adrian rpms/jhead/devel jhead-2_4-2_fc5 devel adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 +adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 22:03:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:03:28 -0400 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch,1.1,1.2 Message-ID: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12182 Modified Files: jhead-compiler-warnings.patch Log Message: don't reverse the other patch jhead-compiler-warnings.patch: Index: jhead-compiler-warnings.patch =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-3/jhead-compiler-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jhead-compiler-warnings.patch 8 Jul 2005 22:00:18 -0000 1.1 +++ jhead-compiler-warnings.patch 8 Jul 2005 22:03:26 -0000 1.2 @@ -115,18 +115,6 @@ }else{ // Discard this section. free(Sections[--SectionsRead].Data); -diff -ur jhead-2.4/makefile jhead-2.4.new/makefile ---- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 -@@ -9,7 +9,7 @@ - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} ${CFLAGS} -Wall -c $< -o $@ -+ ${CC} -O3 -Wall -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm diff -ur jhead-2.4/makernote.c jhead-2.4.new/makernote.c --- jhead-2.4/makernote.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/makernote.c 2005-07-08 19:41:00.000000000 +0200 From fedora-extras-commits at redhat.com Fri Jul 8 22:08:35 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:08:35 -0400 Subject: rpms/jhead/FC-3 jhead.spec,1.8,1.9 Message-ID: <200507082208.j68M8Z4w012263@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12245 Modified Files: jhead.spec Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-3 - undo parts of the compiler warning patch because it disabled the correct optflags Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-3/jhead.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jhead.spec 8 Jul 2005 22:00:18 -0000 1.8 +++ jhead.spec 8 Jul 2005 22:08:33 -0000 1.9 @@ -1,6 +1,6 @@ Name: jhead Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain @@ -39,6 +39,10 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-3 +- undo parts of the compiler warning patch because it + disabled the correct optflags + * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy From fedora-extras-commits at redhat.com Fri Jul 8 22:09:55 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:09:55 -0400 Subject: rpms/jhead/FC-4 jhead-compiler-warnings.patch, 1.1, 1.2 jhead.spec, 1.10, 1.11 Message-ID: <200507082209.j68M9t3W012351@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329 Modified Files: jhead-compiler-warnings.patch jhead.spec Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-3 - undo parts of the compiler warning patch because it disabled the correct optflags jhead-compiler-warnings.patch: Index: jhead-compiler-warnings.patch =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-4/jhead-compiler-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jhead-compiler-warnings.patch 8 Jul 2005 21:38:01 -0000 1.1 +++ jhead-compiler-warnings.patch 8 Jul 2005 22:09:53 -0000 1.2 @@ -115,18 +115,6 @@ }else{ // Discard this section. free(Sections[--SectionsRead].Data); -diff -ur jhead-2.4/makefile jhead-2.4.new/makefile ---- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 -@@ -9,7 +9,7 @@ - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} ${CFLAGS} -Wall -c $< -o $@ -+ ${CC} -O3 -Wall -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm diff -ur jhead-2.4/makernote.c jhead-2.4.new/makernote.c --- jhead-2.4/makernote.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/makernote.c 2005-07-08 19:41:00.000000000 +0200 Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/FC-4/jhead.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jhead.spec 8 Jul 2005 21:38:01 -0000 1.10 +++ jhead.spec 8 Jul 2005 22:09:53 -0000 1.11 @@ -1,6 +1,6 @@ Name: jhead Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain @@ -39,6 +39,10 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-3 +- undo parts of the compiler warning patch because it + disabled the correct optflags + * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy From fedora-extras-commits at redhat.com Fri Jul 8 22:11:04 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:11:04 -0400 Subject: rpms/jhead/devel jhead-compiler-warnings.patch, 1.1, 1.2 jhead.spec, 1.11, 1.12 Message-ID: <200507082211.j68MB4Mn012414@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/jhead/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12392 Modified Files: jhead-compiler-warnings.patch jhead.spec Log Message: * Fri Jul 08 2005 Adrian Reber - 2.4-3 - undo parts of the compiler warning patch because it disabled the correct optflags jhead-compiler-warnings.patch: Index: jhead-compiler-warnings.patch =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead-compiler-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jhead-compiler-warnings.patch 8 Jul 2005 19:37:14 -0000 1.1 +++ jhead-compiler-warnings.patch 8 Jul 2005 22:11:02 -0000 1.2 @@ -115,18 +115,6 @@ }else{ // Discard this section. free(Sections[--SectionsRead].Data); -diff -ur jhead-2.4/makefile jhead-2.4.new/makefile ---- jhead-2.4/makefile 2005-07-08 19:49:51.000000000 +0200 -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 -@@ -9,7 +9,7 @@ - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o - - $(OBJ)/%.o:$(SRC)/%.c -- ${CC} ${CFLAGS} -Wall -c $< -o $@ -+ ${CC} -O3 -Wall -c $< -o $@ - - jhead: $(objs) jhead.h - ${CC} -o jhead $(objs) -lm diff -ur jhead-2.4/makernote.c jhead-2.4.new/makernote.c --- jhead-2.4/makernote.c 2005-06-10 15:39:56.000000000 +0200 +++ jhead-2.4.new/makernote.c 2005-07-08 19:41:00.000000000 +0200 Index: jhead.spec =================================================================== RCS file: /cvs/extras/rpms/jhead/devel/jhead.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jhead.spec 8 Jul 2005 19:37:14 -0000 1.11 +++ jhead.spec 8 Jul 2005 22:11:02 -0000 1.12 @@ -1,6 +1,6 @@ Name: jhead Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for displaying EXIF data embedded in JPEG images Group: Applications/Multimedia License: Public Domain @@ -39,6 +39,10 @@ %{_mandir}/man?/* %changelog +* Fri Jul 08 2005 Adrian Reber - 2.4-3 +- undo parts of the compiler warning patch because it + disabled the correct optflags + * Fri Jul 08 2005 Adrian Reber - 2.4-2 - added patch to make compiler happy From fedora-extras-commits at redhat.com Fri Jul 8 22:13:53 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:13:53 -0400 Subject: common tobuild,1.1871,1.1872 Message-ID: <200507082213.j68MDrm9012483@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12463 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-3 jhead-2_4-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1871 retrieving revision 1.1872 diff -u -r1.1871 -r1.1872 --- tobuild 8 Jul 2005 22:00:49 -0000 1.1871 +++ tobuild 8 Jul 2005 22:13:51 -0000 1.1872 @@ -18,3 +18,4 @@ adrian rpms/jhead/devel jhead-2_4-2_fc5 devel adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 +adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 8 22:14:35 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:14:35 -0400 Subject: common tobuild,1.1872,1.1873 Message-ID: <200507082214.j68MEZBo012535@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12518 Modified Files: tobuild Log Message: request build of rpms/jhead/FC-4 jhead-2_4-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1872 retrieving revision 1.1873 diff -u -r1.1872 -r1.1873 --- tobuild 8 Jul 2005 22:13:51 -0000 1.1872 +++ tobuild 8 Jul 2005 22:14:33 -0000 1.1873 @@ -19,3 +19,4 @@ adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 +adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 8 22:15:58 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 8 Jul 2005 18:15:58 -0400 Subject: common tobuild,1.1873,1.1874 Message-ID: <200507082215.j68MFwGB012573@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12556 Modified Files: tobuild Log Message: request build of rpms/jhead/devel jhead-2_4-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1873 retrieving revision 1.1874 diff -u -r1.1873 -r1.1874 --- tobuild 8 Jul 2005 22:14:33 -0000 1.1873 +++ tobuild 8 Jul 2005 22:15:56 -0000 1.1874 @@ -20,3 +20,4 @@ adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 +adrian rpms/jhead/devel jhead-2_4-3_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 00:11:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:11:57 -0400 Subject: rpms/opendap - New directory Message-ID: <200507090011.j690BvXI015173@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15153/opendap Log Message: Directory /cvs/extras/rpms/opendap added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 00:11:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:11:57 -0400 Subject: rpms/opendap/devel - New directory Message-ID: <200507090012.j690Bv8e015178@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15153/opendap/devel Log Message: Directory /cvs/extras/rpms/opendap/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 00:12:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:12:13 -0400 Subject: rpms/opendap Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507090012.j690CDPS015229@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15198 Added Files: Makefile import.log Log Message: Setup of module opendap --- NEW FILE Makefile --- # Top level Makefile for module opendap all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 9 00:12:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:12:13 -0400 Subject: rpms/opendap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507090012.j690CDaN015234@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15198/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module opendap --- NEW 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 Jul 9 00:14:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:14:59 -0400 Subject: rpms/opendap import.log,1.1,1.2 Message-ID: <200507090015.j690FTkF015376@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15318 Modified Files: import.log Log Message: auto-import opendap-3.4.4-5 on branch devel from opendap-3.4.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/opendap/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jul 2005 00:12:10 -0000 1.1 +++ import.log 9 Jul 2005 00:14:57 -0000 1.2 @@ -0,0 +1 @@ +opendap-3_4_4-5:HEAD:opendap-3.4.4-5.src.rpm:1120868152 From fedora-extras-commits at redhat.com Sat Jul 9 00:14:59 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 8 Jul 2005 20:14:59 -0400 Subject: rpms/opendap/devel opendap-3.4.4-dap-gcc4.patch, NONE, 1.1 opendap-3.4.4-gcc4.patch, NONE, 1.1 opendap-3.4.4-includedir.patch, NONE, 1.1 opendap-3.4.4-nc3-dods-f95.patch, NONE, 1.1 opendap-3.4.4-rpmoptflags.patch, NONE, 1.1 opendap-3.4.4-shared.patch, NONE, 1.1 opendap-3.4.4-systemlibs.patch, NONE, 1.1 opendap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507090014.j690ExBf015360@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/opendap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15318/devel Modified Files: .cvsignore sources Added Files: opendap-3.4.4-dap-gcc4.patch opendap-3.4.4-gcc4.patch opendap-3.4.4-includedir.patch opendap-3.4.4-nc3-dods-f95.patch opendap-3.4.4-rpmoptflags.patch opendap-3.4.4-shared.patch opendap-3.4.4-systemlibs.patch opendap.spec Log Message: auto-import opendap-3.4.4-5 on branch devel from opendap-3.4.4-5.src.rpm opendap-3.4.4-dap-gcc4.patch: --- NEW FILE opendap-3.4.4-dap-gcc4.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/RValue.cc.BAD 2005-04-22 13:43:25.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/RValue.cc 2005-04-22 13:43:33.000000000 -0500 @@ -110,7 +110,7 @@ #ifdef WIN32 BaseType **argv = (new (BaseType*)) + argc + 1; #else - BaseType **argv = new (BaseType*)[argc + 1]; + BaseType **argv = new BaseType* [argc + 1]; #endif int index = 0; --- opendap-3.4.4/DODS/src/dap-3.4.8/Operators.h.BAD 2005-04-22 13:39:30.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/Operators.h 2005-04-22 13:39:45.000000000 -0500 @@ -36,8 +36,12 @@ #ifndef _operators_h #define _operators_h +#include #include // GNU Regex class used for string =~ op. +using std::cerr; +using std::endl; + static unsigned dods_max(int i1, int i2) { opendap-3.4.4-gcc4.patch: --- NEW FILE opendap-3.4.4-gcc4.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-22 13:15:04.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-22 13:15:38.000000000 -0500 @@ -3303,6 +3303,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-22 13:13:54.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-22 13:14:33.000000000 -0500 @@ -4531,6 +4531,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; --- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure.BAD 2005-04-22 13:58:22.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure 2005-04-22 13:58:31.000000000 -0500 @@ -3081,6 +3081,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; --- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure.BAD 2005-04-22 13:58:46.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure 2005-04-22 13:58:56.000000000 -0500 @@ -3199,6 +3199,8 @@ echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; 3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; + 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5 +echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;; *) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5 echo "$as_me: error: must be at least version 2.7.x" >&2;} { (exit 1); exit 1; }; } ;; opendap-3.4.4-includedir.patch: --- NEW FILE opendap-3.4.4-includedir.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/opendap-config.in.BAD 2005-07-05 14:39:45.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/opendap-config.in 2005-07-05 14:40:18.000000000 -0500 @@ -2,10 +2,10 @@ # # Borrowed the idea for this script (and some code) from libcurl. # -prefix=@dods_root@ +prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${prefix}/include +includedir=${prefix}/include/opendap usage() { opendap-3.4.4-nc3-dods-f95.patch: --- NEW FILE opendap-3.4.4-nc3-dods-f95.patch --- --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-22 14:00:37.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-22 14:00:57.000000000 -0500 @@ -3159,7 +3159,7 @@ forts='f77 g77 fort77' ;; Linux*) - forts="f77 fort77 g77" + forts="f77 fort77 g77 f95" ;; OSF1*) # The use of f90(1) results in the following for opendap-3.4.4-rpmoptflags.patch: --- NEW FILE opendap-3.4.4-rpmoptflags.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/regex-0.12/Makefile.in.BAD 2005-07-05 16:51:18.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/regex-0.12/Makefile.in 2005-07-05 16:51:51.000000000 -0500 @@ -26,7 +26,7 @@ # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to # the corresponding C procedures). If not -DDEBUG, the macros # are used. -CPPFLAGS = +CPPFLAGS = $(RPM_OPT_FLAGS) -fPIC # Likewise, you can override CFLAGS to optimize, use -Wall, etc. CFLAGS = -g opendap-3.4.4-shared.patch: --- NEW FILE opendap-3.4.4-shared.patch --- --- opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in.BAD 2005-07-05 14:46:00.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in 2005-07-05 14:53:01.000000000 -0500 @@ -13,7 +13,7 @@ # a url. In addition it can read and process DAS and DDS objects, displaying # the print representation on the screen. -PROG = libdap++.a geturl usage deflate +PROG = libdap++.a libdap++.so.0.0.0 geturl usage deflate # dods_relative ends in a slash. 5/14/2001 jhrg DODS_ROOT = @dods_relative@ @@ -181,55 +181,59 @@ $(AR) cru $@ $? $(RANLIB) $@ +libdap++.so.0.0.0: $(DASOBJS) $(DDSOBJS) $(TYPEOBJS) $(GNUOBJS) $(ERROROBJS) \ + $(EXPROBJS) $(UTILOBJS) $(CLIENTOBJS) $(AISOBJS) + $(CC) $(CPPFLAGS) -shared -Wl,-soname,libdap++.so.0 -o $@ $? + deflate: deflate.o $(CC) $(LDFLAGS) -o deflate deflate.o -lz # geturl is really a test driver, but it is so useful in other contexts that # I have decided to build it as part of the `all' target. jhrg 7/11/96 -geturl: libdap++.a geturl.o +geturl: libdap++.so.0.0.0 geturl.o $(CXX) $(LDFLAGS) -o geturl geturl.o -ldap++ $(LIBS) # The program named usage is the filter that is run by the CGI dispatch # script as the `usage server'. This filter is the same for all different # server types so it does not need to be specialized for each API. -usage: libdap++.a usage.o - $(CXX) $(LDFLAGS) -o usage usage.o libdap++.a $(LIBS) +usage: libdap++.so.0.0.0 usage.o + $(CXX) $(LDFLAGS) -o usage usage.o -ldap++ $(LIBS) # Build the test drivers -das-test: libdap++.a das-test.o das.tab.h - $(CXX) $(LDFLAGS) -o das-test das-test.o libdap++.a $(LIBS) +das-test: libdap++.so.0.0.0 das-test.o das.tab.h + $(CXX) $(LDFLAGS) -o das-test das-test.o -ldap++ $(LIBS) -dds-test: libdap++.a dds-test.o dds.tab.h - $(CXX) $(LDFLAGS) -o dds-test dds-test.o libdap++.a $(LIBS) +dds-test: libdap++.so.0.0.0 dds-test.o dds.tab.h + $(CXX) $(LDFLAGS) -o dds-test dds-test.o -ldap++ $(LIBS) -gse-test: libdap++.a lex.gse.o gse-test.o \ +gse-test: libdap++.so.0.0.0 lex.gse.o gse-test.o \ gse.tab.o $(CXX) $(LDFLAGS) -o gse-test lex.gse.o gse-test.o gse.tab.o \ - libdap++.a $(LIBS) + -ldap++ $(LIBS) -expr-test: libdap++.a $(TESTOBJS) expr-test.o expr.tab.h +expr-test: libdap++.so.0.0.0 $(TESTOBJS) expr-test.o expr.tab.h $(CXX) $(LDFLAGS) -o expr-test expr-test.o lex.expr.o \ - $(TESTOBJS) libdap++.a $(LIBS) + $(TESTOBJS) -ldap++ $(LIBS) error-test: error-test.o Error.tab.h $(ERROROBJS) $(CXX) $(LDFLAGS) -o error-test error-test.o $(ERROROBJS) \ - libdap++.a $(LIBS) + -ldap++ $(LIBS) # Build a summary test for Dods running in a Multi-threaded mode ThreadTest: ThreadTest.o - $(CXX) $(LDFLAGS) -o ThreadTest ThreadTest.o libdap++.a $(LIBS) + $(CXX) $(LDFLAGS) -o ThreadTest ThreadTest.o -ldap++ $(LIBS) -server_handler: server_handler.o $(TESTOBJS) libdap++.a - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) +server_handler: server_handler.o $(TESTOBJS) + $(CXX) $(LDFLAGS) -o $@ $^ -ldap++ $(LIBS) # *** Remove this when we're done hacking the idl client Pix code. 04/14/03 # *** jhrg -tryme: tryme.o LongIterAdapter.o libdap++.a - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) +tryme: tryme.o LongIterAdapter.o + $(CXX) $(LDFLAGS) -o $@ $^ -ldap++ $(LIBS) # The grammar targets. @@ -320,6 +324,7 @@ install: all install-headers install-geturl install-opendap-config install-usage install-deflate -mkdir -p $(libdir) $(INSTALL_DATA) libdap++.a $(libdir) + $(INSTALL_DATA) libdap++.so* $(libdir) $(RANLIB) $(libdir)/libdap++.a install-headers: @@ -360,7 +365,7 @@ ./configure; \ fi -check: libdap++.a das-check dds-check expr-check +check: libdap++.so.0.0.0 das-check dds-check expr-check test-coverage: clean $(MAKE) $(MFLAGS) CXXFLAGS="$(CXXFLAGS) $(TEST_COV_FLAGS)" check @@ -428,52 +433,52 @@ # Build the unit tests. Requires CppUnit be installed. -RCReaderTest: RCReaderTest.o libdap++.a +RCReaderTest: RCReaderTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -SignalHandlerTest: SignalHandlerTest.o libdap++.a +SignalHandlerTest: SignalHandlerTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -DODSFilterTest: DODSFilterTest.o libdap++.a +DODSFilterTest: DODSFilterTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AISMergeTest: AISMergeTest.o libdap++.a +AISMergeTest: AISMergeTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AISDatabaseParserTest: AISDatabaseParserTest.o libdap++.a +AISDatabaseParserTest: AISDatabaseParserTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AISResourcesTest: AISResourcesTest.o libdap++.a +AISResourcesTest: AISResourcesTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -parserUtilTest: parserUtilTest.o libdap++.a +parserUtilTest: parserUtilTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -generalUtilTest: generalUtilTest.o libdap++.a +generalUtilTest: generalUtilTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -DASTest: DASTest.o libdap++.a +DASTest: DASTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -ByteTest: ByteTest.o libdap++.a +ByteTest: ByteTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -SequenceTest: SequenceTest.o libdap++.a +SequenceTest: SequenceTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -AttrTableTest: AttrTableTest.o libdap++.a +AttrTableTest: AttrTableTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -DDSTest: DDSTest.o libdap++.a +DDSTest: DDSTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -cgiUtilTest: cgiUtilTest.o libdap++.a +cgiUtilTest: cgiUtilTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -HTTPCacheTest: HTTPCacheTest.o libdap++.a +HTTPCacheTest: HTTPCacheTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) -HTTPConnectTest: HTTPConnectTest.o libdap++.a +HTTPConnectTest: HTTPConnectTest.o $(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS) unit-check: $(UNIT_TEST_PROGS) --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in.BAD 2005-07-05 14:53:39.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in 2005-07-05 14:59:57.000000000 -0500 @@ -7,7 +7,7 @@ # DEFS gets the `-D' defines that describe what a particular system has # or doesn't have. -PROG = libnc-dods.a nc_das nc_dds nc_dods +PROG = libnc-dods.a libnc-doda.so.0.0.0 nc_das nc_dds nc_dods DODS_ROOT = @dods_relative@ INCS = -I./lnetcdf @INCS@ @@ -25,7 +25,7 @@ LDFLAGS = -L. -L./lnetcdf @LDFLAGS@ LFLAGS=-8 YFLAGS=-d -NCDODS = -lnc-dods -ldap++ -lnc-dods -ldap++ +NCDODS = -lnc-dods -ldap++ LIBS = @LIBS@ # Set the instalation directories; prefix can be set on the command line @@ -107,15 +107,15 @@ fortran/fort-geninq.o fortran/fort-var1io.o # Matlab client can be suppressed by a switch to configure. -all: libnc-dods.a nc_das nc_dds nc_dods ncdump +all: libnc-dods.a libnc-dods.so.0.0.0 nc_das nc_dds nc_dods ncdump -nc_das: $(DASOBJS) libnc-dods.a +nc_das: $(DASOBJS) libnc-dods.so.0.0.0 $(CXX) $(LDFLAGS) -o nc_das $(DASOBJS) $(NCDODS) $(LIBS) -nc_dds: $(DDSOBJS) libnc-dods.a +nc_dds: $(DDSOBJS) libnc-dods.so.0.0.0 $(CXX) $(LDFLAGS) -o nc_dds $(DDSOBJS) $(NCDODS) $(LIBS) -nc_dods: $(SRVOBJS) libnc-dods.a +nc_dods: $(SRVOBJS) libnc-dods.so.0.0.0 $(CXX) $(LDFLAGS) -o nc_dods $(SRVOBJS) $(NCDODS) $(LIBS) libnc-dods.a: $(LIBOBJS) $(NCOBJS) @@ -123,6 +123,9 @@ $(AR) -cru $@ $(LIBOBJS) $(NCOBJS) $(RANLIB) $@ +libnc-dods.so.0.0.0: $(LIBOBJS) $(NCOBJS) + $(CC) -shared -Wl,-soname,libnc-dods.so.0 -o $@ $? + .PHONY: fortran fortran: -(cd fortran && $(MAKE) $(MFLAGS) all) @@ -163,8 +166,9 @@ gcov -l -o ../ $$f >> $$cov_dat; \ done) -install: libnc-dods.a nc_das nc_dds nc_dods +install: libnc-dods.a libnc-dods.so.0.0.0 nc_das nc_dds nc_dods $(INSTALL_DATA) libnc-dods.a $(libdir) + $(INSTALL_DATA) libnc-dods.so.0.0.0 $(libdir) $(RANLIB) $(libdir)/libnc-dods.a $(INSTALL_DATA) lnetcdf/netcdf.h $(includedir) $(INSTALL_DATA) fortran/netcdf.inc $(includedir) @@ -179,14 +183,14 @@ clean: -rm -f *.o *.sum *.log *~ core - -rm -f $(PROG) libnc-dods.a + -rm -f $(PROG) libnc-dods.a libnc-dods.so.0.0.0 -(cd ncdump && $(MAKE) $(MFLAGS) clean) -(cd fortran && $(MAKE) $(MFLAGS) clean) -(cd nc_test && $(MAKE) $(MFLAGS) clean) distclean: -rm -f *.o *.sum *.log *~ core - -rm -f $(PROG) libnc-dods.a + -rm -f $(PROG) libnc-dods.a libnc-dods.so.0.0.0 -rm -f config.status config.log config.cache -rm -f site.exp config_nc.h lnetcdf/ncconfig.h -(cd ncdump && $(MAKE) $(MFLAGS) distclean) opendap-3.4.4-systemlibs.patch: --- NEW FILE opendap-3.4.4-systemlibs.patch --- --- opendap-3.4.4/DODS/src/ff-dods-3.4.3/configure.BAD 2005-04-23 16:30:59.000000000 -0500 +++ opendap-3.4.4/DODS/src/ff-dods-3.4.3/configure 2005-04-23 16:31:53.000000000 -0500 @@ -6521,19 +6521,6 @@ - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -6551,13 +6538,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-23 16:22:48.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-23 16:28:34.000000000 -0500 @@ -6597,13 +6597,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -6680,13 +6677,13 @@ echo $ECHO_N "checking for libxml2 and its headers... $ECHO_C" >&6 # 2003/06/13 ERD - chaged to handle libxml2 distrib w/ DODS # libxml2 NOT part of DODS distribution - #if test -n "`which xml2-config`" + if test -n "`which xml2-config`" # libxml2 IS part of DODS distribution - if test -x $dods_root/bin/xml2-config + #if test -x $dods_root/bin/xml2-config then # libxml2 NOT part of DODS distribution - #INCS="`xml2-config --cflags` $INCS" - #LIBS="`xml2-config --libs` $LIBS" + INCS="`xml2-config --cflags` $INCS" + LIBS="`xml2-config --libs` $LIBS" # libxml2 IS part of DODS distribution # INCS="`$dods_root/bin/xml2-config --cflags` $INCS" # @@ -6694,8 +6691,8 @@ # which makes its way into the Makefile. This, in turn, puts an # absolute path in the dependencies (why I don't really know, -MM # should not make dependencies for <> includes). 07/25/03 jhrg - INCS="-I../../include/libxml2 $INCS" - LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" + #INCS="-I../../include/libxml2 $INCS" + #LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-23 16:25:20.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-23 16:28:00.000000000 -0500 @@ -8140,19 +8140,6 @@ - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -8170,13 +8157,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -8253,13 +8237,13 @@ echo $ECHO_N "checking for libxml2 and its headers... $ECHO_C" >&6 # 2003/06/13 ERD - chaged to handle libxml2 distrib w/ DODS # libxml2 NOT part of DODS distribution - #if test -n "`which xml2-config`" + if test -n "`which xml2-config`" # libxml2 IS part of DODS distribution - if test -x $dods_root/bin/xml2-config + #if test -x $dods_root/bin/xml2-config then # libxml2 NOT part of DODS distribution - #INCS="`xml2-config --cflags` $INCS" - #LIBS="`xml2-config --libs` $LIBS" + INCS="`xml2-config --cflags` $INCS" + LIBS="`xml2-config --libs` $LIBS" # libxml2 IS part of DODS distribution # INCS="`$dods_root/bin/xml2-config --cflags` $INCS" # @@ -8267,8 +8251,8 @@ # which makes its way into the Makefile. This, in turn, puts an # absolute path in the dependencies (why I don't really know, -MM # should not make dependencies for <> includes). 07/25/03 jhrg - INCS="-I../../include/libxml2 $INCS" - LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" + #INCS="-I../../include/libxml2 $INCS" + #LIBS="`$dods_root/bin/xml2-config --libs` $LIBS" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure.BAD 2005-04-23 16:35:27.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure 2005-04-23 16:36:03.000000000 -0500 @@ -6343,19 +6343,6 @@ _ACEOF - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -6436,13 +6423,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure.BAD 2005-04-23 16:34:22.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure 2005-04-23 16:35:17.000000000 -0500 @@ -6404,19 +6404,6 @@ _ACEOF - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -6497,13 +6484,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/src/jg-dods-3.4.3/configure.BAD 2005-04-23 16:29:06.000000000 -0500 +++ opendap-3.4.4/DODS/src/jg-dods-3.4.3/configure 2005-04-23 16:30:15.000000000 -0500 @@ -7212,19 +7212,6 @@ _ACEOF - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg @@ -7305,13 +7292,10 @@ echo "$as_me:$LINENO: checking for libcurl and its headers" >&5 echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6 - if test -x $dods_root/bin/curl-config + if test -n "`which curl-config`" then - # We don't need to add libcurl's --cflgas stuff until we start using - # the native OS's version of the library. 09/20/02 jhrg - # INCS="`$dods_root/bin/curl-config --cflags` $INCS" - # AC_SUBST(INCS) # 09/20/02 jhrg - LIBS="`$dods_root/bin/curl-config --libs` $LIBS" + INCS="`curl-config --cflags` $INCS" + LIBS="`curl-config --libs` $LIBS" # 2003/06/13 ERD - added result message echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 --- opendap-3.4.4/DODS/Makefile.in.BAD 2005-04-23 16:18:57.000000000 -0500 +++ opendap-3.4.4/DODS/Makefile.in 2005-04-23 16:19:43.000000000 -0500 @@ -53,9 +53,11 @@ CLIENTS = src/clients/ncview* src/clients/ml-cmdln* \ src/clients/ml-structs* -PACKAGES = src/packages* +# Use system packages +# PACKAGES = src/packages* +PACKAGES = -World: packages configure all +World: configure all # I'm not sure just how to handle the packages yet. For now, users/builders # must cd to DODS_ROOT/packages and build there first. It is as if there are --- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-23 16:40:37.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-23 16:41:15.000000000 -0500 @@ -1332,19 +1332,6 @@ - echo "$as_me:$LINENO: checking for the packages directory" >&5 -echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6 - # Where does DODS live? - - DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null` - if test -z "$DODS_PACKAGES_DIR" - then - { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5 -echo "$as_me: error: Could not find the third-party packages!" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5 -echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6 LDFLAGS="$LDFLAGS -L${dods_relative}lib" INCS="$INCS -I${dods_relative}include" # 09/20/02 jhrg --- opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in.BAD 2005-04-23 16:43:49.000000000 -0500 +++ opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in 2005-04-23 16:47:16.000000000 -0500 @@ -661,9 +661,7 @@ util.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h \ Str.h dods-limits.h Url.h Array.h Vector.h List.h Structure.h \ Constructor.h Sequence.h Grid.h DataDDS.h HTTPConnect.h \ - ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h ObjectType.h HTTPCache.h \ + RCReader.h ObjectType.h HTTPCache.h \ ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \ SignalHandlerRegisteredErr.h HTTPResponse.h Response.h RCReader.o: RCReader.cc config_dap.h debug.h RCReader.h Error.h util.h \ @@ -676,16 +674,13 @@ Clause.h expr.h RValue.h Connect.h DAS.h AttrTable.h util.h Byte.h \ Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \ dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \ - Sequence.h Grid.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + Sequence.h Grid.h HTTPConnect.h \ + RCReader.h \ ObjectType.h HTTPCache.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h escaping.h HTTPConnect.o: HTTPConnect.cc config_dap.h debug.h GNU/Regex.h \ - HTTPConnect.h ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h Error.h util.h BaseType.h \ + HTTPConnect.h RCReader.h Error.h util.h BaseType.h \ InternalErr.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \ Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \ GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \ @@ -886,41 +881,9 @@ ResponseTooBigErr.h Error.h AISResources.o: AISResources.cc config_dap.h AISResources.h GNU/Regex.h \ Resource.h Error.h AISExceptions.h AISDatabaseParser.h \ - ../../include/libxml2/libxml/parserInternals.h \ - ../../include/libxml2/libxml/parser.h \ - ../../include/libxml2/libxml/tree.h \ - ../../include/libxml2/libxml/xmlversion.h \ - ../../include/libxml2/libxml/xmlregexp.h \ - ../../include/libxml2/libxml/valid.h \ - ../../include/libxml2/libxml/list.h \ - ../../include/libxml2/libxml/xmlautomata.h \ - ../../include/libxml2/libxml/entities.h \ - ../../include/libxml2/libxml/encoding.h \ - ../../include/libxml2/libxml/xmlIO.h \ - ../../include/libxml2/libxml/globals.h \ - ../../include/libxml2/libxml/xmlerror.h \ - ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \ - ../../include/libxml2/libxml/xmlmemory.h \ - ../../include/libxml2/libxml/threads.h \ - ../../include/libxml2/libxml/HTMLparser.h InternalErr.h + InternalErr.h AISDatabaseParser.o: AISDatabaseParser.cc config_dap.h \ - AISDatabaseParser.h ../../include/libxml2/libxml/parserInternals.h \ - ../../include/libxml2/libxml/parser.h \ - ../../include/libxml2/libxml/tree.h \ - ../../include/libxml2/libxml/xmlversion.h \ - ../../include/libxml2/libxml/xmlregexp.h \ - ../../include/libxml2/libxml/valid.h \ - ../../include/libxml2/libxml/list.h \ - ../../include/libxml2/libxml/xmlautomata.h \ - ../../include/libxml2/libxml/entities.h \ - ../../include/libxml2/libxml/encoding.h \ - ../../include/libxml2/libxml/xmlIO.h \ - ../../include/libxml2/libxml/globals.h \ - ../../include/libxml2/libxml/xmlerror.h \ - ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \ - ../../include/libxml2/libxml/xmlmemory.h \ - ../../include/libxml2/libxml/threads.h \ - ../../include/libxml2/libxml/HTMLparser.h InternalErr.h Error.h \ + AISDatabaseParser.h InternalErr.h Error.h \ AISExceptions.h AISResources.h GNU/Regex.h Resource.h util.h BaseType.h \ dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h \ Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h GNU/Pix.h \ @@ -928,9 +891,7 @@ Constructor.h Sequence.h Grid.h debug.h AISMerge.o: AISMerge.cc config_dap.h AISMerge.h DAS.h GNU/Pix.h \ IteratorAdapter.h AttrTable.h Error.h HTTPConnect.h \ - ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h util.h BaseType.h InternalErr.h \ + RCReader.h util.h BaseType.h InternalErr.h \ dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h \ Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h Clause.h \ expr.h RValue.h List.h Structure.h Constructor.h Sequence.h Grid.h \ @@ -943,9 +904,7 @@ InternalErr.h dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h \ Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \ dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \ - Sequence.h Grid.h DataDDS.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + Sequence.h Grid.h DataDDS.h HTTPConnect.h RCReader.h \ ObjectType.h HTTPCache.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \ @@ -1005,9 +964,7 @@ InternalErr.h dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h \ Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \ dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \ - Sequence.h Grid.h DataDDS.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + Sequence.h Grid.h DataDDS.h HTTPConnect.h RCReader.h \ ObjectType.h HTTPCache.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \ @@ -1017,9 +974,7 @@ Clause.h expr.h RValue.h util.h Byte.h Int16.h UInt16.h Int32.h \ UInt32.h Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h \ List.h Structure.h Constructor.h Sequence.h Grid.h DataDDS.h \ - HTTPConnect.h ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h ObjectType.h HTTPCache.h \ + HTTPConnect.h RCReader.h ObjectType.h HTTPCache.h \ config_dap.h ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \ SignalHandlerRegisteredErr.h HTTPResponse.h Response.h debug.h server_handler.o: server_handler.cc config_dap.h DODSFilter.h DAS.h \ @@ -1048,18 +1003,14 @@ List.h Structure.h Constructor.h Sequence.h Grid.h HTTPCacheTest.o: HTTPCacheTest.cc HTTPCache.h config_dap.h Error.h \ InternalErr.h ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \ - SignalHandlerRegisteredErr.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h util.h \ + SignalHandlerRegisteredErr.h HTTPConnect.h RCReader.h util.h \ BaseType.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \ Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \ GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \ Constructor.h Sequence.h Grid.h ObjectType.h HTTPResponse.h Response.h \ debug.h SignalHandler.h EventHandler.h cgi_util.h EncodingType.h HTTPConnectTest.o: HTTPConnectTest.cc GNU/Regex.h HTTPConnect.h \ - ../../include/curl/curl.h ../../include/curl/curlver.h \ - ../../include/curl/easy.h ../../include/curl/multi.h \ - ../../include/curl/types.h RCReader.h Error.h util.h BaseType.h \ + RCReader.h Error.h util.h BaseType.h \ InternalErr.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \ Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \ GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \ @@ -1090,23 +1041,7 @@ Vector.h DDS.h GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h \ Grid.h Constructor.h AISDatabaseParserTest.o: AISDatabaseParserTest.cc AISDatabaseParser.h \ - ../../include/libxml2/libxml/parserInternals.h \ - ../../include/libxml2/libxml/parser.h \ - ../../include/libxml2/libxml/tree.h \ - ../../include/libxml2/libxml/xmlversion.h \ - ../../include/libxml2/libxml/xmlregexp.h \ - ../../include/libxml2/libxml/valid.h \ - ../../include/libxml2/libxml/list.h \ - ../../include/libxml2/libxml/xmlautomata.h \ - ../../include/libxml2/libxml/entities.h \ - ../../include/libxml2/libxml/encoding.h \ - ../../include/libxml2/libxml/xmlIO.h \ - ../../include/libxml2/libxml/globals.h \ - ../../include/libxml2/libxml/xmlerror.h \ - ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \ - ../../include/libxml2/libxml/xmlmemory.h \ - ../../include/libxml2/libxml/threads.h \ - ../../include/libxml2/libxml/HTMLparser.h InternalErr.h Error.h \ + InternalErr.h Error.h \ AISExceptions.h AISResources.h GNU/Regex.h Resource.h debug.h AISResourcesTest.o: AISResourcesTest.cc AISResources.h GNU/Regex.h \ Resource.h Error.h AISExceptions.h debug.h @@ -1115,9 +1050,7 @@ dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h Int16.h \ UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h dods-limits.h Url.h \ Array.h Vector.h List.h Structure.h Constructor.h Sequence.h Grid.h \ - DataDDS.h HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \ + DataDDS.h HTTPConnect.h RCReader.h \ ObjectType.h HTTPCache.h config_dap.h ResponseTooBigErr.h \ HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \ Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \ --- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in.BAD 2005-04-23 16:49:47.000000000 -0500 +++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in 2005-04-23 16:51:49.000000000 -0500 @@ -293,9 +293,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/HTTPCache.h \ ../../include/config_dap.h ../../include/ResponseTooBigErr.h \ ../../include/HTTPCacheDisconnectedMode.h \ @@ -326,9 +324,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -363,9 +359,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -387,9 +381,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -414,9 +406,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -440,9 +430,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -466,9 +454,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -504,9 +490,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -530,9 +514,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -568,9 +550,7 @@ ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -604,9 +584,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -630,9 +608,7 @@ ../../include/Vector.h ../../include/List.h ../../include/Structure.h \ ../../include/Constructor.h ../../include/Sequence.h \ ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ @@ -656,9 +632,7 @@ ../../include/Array.h ../../include/Vector.h ../../include/List.h \ ../../include/Structure.h ../../include/Constructor.h \ ../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \ - ../../include/HTTPConnect.h ../../include/curl/curl.h \ - ../../include/curl/curlver.h ../../include/curl/easy.h \ - ../../include/curl/multi.h ../../include/curl/types.h \ + ../../include/HTTPConnect.h \ ../../include/RCReader.h ../../include/ObjectType.h \ ../../include/HTTPCache.h ../../include/config_dap.h \ ../../include/ResponseTooBigErr.h \ --- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/Makefile.in.BAD 2005-04-23 16:49:18.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/Makefile.in 2005-04-23 16:49:30.000000000 -0500 @@ -337,9 +337,7 @@ ../../../include/List.h ../../../include/Structure.h \ ../../../include/Constructor.h ../../../include/Sequence.h \ ../../../include/Grid.h ../../../include/DataDDS.h \ - ../../../include/HTTPConnect.h ../../../include/curl/curl.h \ - ../../../include/curl/curlver.h ../../../include/curl/easy.h \ - ../../../include/curl/multi.h ../../../include/curl/types.h \ + ../../../include/HTTPConnect.h \ ../../../include/RCReader.h ../../../include/ObjectType.h \ ../../../include/HTTPCache.h ../../../include/config_dap.h \ ../../../include/ResponseTooBigErr.h \ --- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/Makefile.in.BAD 2005-04-23 16:48:57.000000000 -0500 +++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/Makefile.in 2005-04-23 16:49:09.000000000 -0500 @@ -314,9 +314,7 @@ ../../../include/List.h ../../../include/Structure.h \ ../../../include/Constructor.h ../../../include/Sequence.h \ ../../../include/Grid.h ../../../include/DataDDS.h \ - ../../../include/HTTPConnect.h ../../../include/curl/curl.h \ - ../../../include/curl/curlver.h ../../../include/curl/easy.h \ - ../../../include/curl/multi.h ../../../include/curl/types.h \ + ../../../include/HTTPConnect.h \ ../../../include/RCReader.h ../../../include/ObjectType.h \ ../../../include/HTTPCache.h ../../../include/config_dap.h \ ../../../include/ResponseTooBigErr.h \ --- NEW FILE opendap.spec --- Name: opendap Version: 3.4.4 Release: 5%{?dist} Summary: Open-source Project for a Network Data Access Protocol Group: Applications/Engineering License: LGPL URL: http://www.opendap.org/ Source0: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-dap-3.4.8.tar.gz Source1: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-nc3-dods-3.4.7.tar.gz Source2: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-jg-dods-3.4.3.tar.gz Source3: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-ff-dods-3.4.3.tar.gz # This thing is really broken. #Source4: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-ncview-3.4.3.tar.gz Source5: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-asciival-3.4.3.tar.gz Source6: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-www-interface-3.4.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: opendap-3.4.4-gcc4.patch Patch1: opendap-3.4.4-dap-gcc4.patch Patch2: opendap-3.4.4-nc3-dods-f95.patch Patch3: opendap-3.4.4-systemlibs.patch Patch4: opendap-3.4.4-includedir.patch Patch5: opendap-3.4.4-shared.patch Patch6: opendap-3.4.4-rpmoptflags.patch BuildRequires: openssl-devel, pkgconfig BuildRequires: curl-devel, krb5-libs, netcdf-devel BuildRequires: libxml2-devel %package devel Summary: Development files for opendap Group: Development/Libraries Requires: %{name} = %{version}-%{release} %package server Summary: Server components for opendap Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: perl-HTML-Parser %description OPeNDAP provides software which makes local data accessible to remote locations regardless of local storage format. OPeNDAP also provides tools for transforming existing applications into OPeNDAP clients (i.e., enabling them to remotely access OPeNDAP served data). OPeNDAP software is freely available. %description devel This package contains the OPeNDAP header files and libraries. %description server This package contains the OPeNDAP server components. %prep %setup -c -n %{name}-%{version} -q -a 1 -a 2 -a 3 -a 5 -a 6 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build cd DODS/ export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3 export CPPFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make unset NETCDF_INC NETCDF_LIB %install rm -rf ${RPM_BUILD_ROOT} cd DODS/ rm -rf include/netcdf.h include/netcdf.inc include/builtin.h share/ mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_includedir}/opendap install -m644 etc/*.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/ install -m644 etc/jgofs_objects_readme $RPM_BUILD_ROOT/%{_datadir}/%{name} install -m755 bin/* $RPM_BUILD_ROOT/%{_bindir} for i in ff_das ff_dds ff_dods jg_das jg_dds jg_dods nc_das nc_dds nc_dods usage-jg \ usage def www_int nph-dods installServers deflate asciival; do install -m755 etc/$i $RPM_BUILD_ROOT/%{_bindir} done install -m755 lib/*.a $RPM_BUILD_ROOT/%{_libdir} install -m755 lib/libdap++.so* $RPM_BUILD_ROOT/%{_libdir} install -m755 lib/libnc-dods.so* $RPM_BUILD_ROOT/%{_libdir} install -m644 include/* $RPM_BUILD_ROOT/%{_includedir}/opendap cd $RPM_BUILD_ROOT/%{_libdir} chmod +x libdap++.so.0.0.0 libnc-dods.so.0.0.0 ln -s libdap++.so.0.0.0 libdap++.so.0 ln -s libdap++.so.0.0.0 libdap++.so ln -s libnc-dods.so.0.0.0 libnc-dods.so.0 ln -s libnc-dods.so.0.0.0 libnc-dods.so %clean rm -rf ${RPM_BUILD_ROOT} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc DODS/etc/INSTALL-clients DODS/README DODS/etc/INSTALL-matlab-client DODS/etc/COPYING %{_bindir}/geturl %{_bindir}/dncdump %{_bindir}/checkvar %{_libdir}/libdap++.so.* %{_libdir}/libnc-dods.so.* %files devel %defattr(-,root,root,-) %doc DODS/ChangeLog DODS/INSTALL DODS/NEWS DODS/VERSION DODS/etc/COPYRIGHT_URI %{_bindir}/opendap-config %{_libdir}/libdap++.a %{_libdir}/libdap++.so %{_libdir}/libnc-dods.a %{_libdir}/libnc-dods.so %{_includedir}/opendap %files server %defattr(-,root,root,-) %doc DODS/etc/INSTALL-servers DODS/etc/README-security DODS/etc/EXAMPLE_DODS_STATISTICS %{_bindir}/installServers %{_bindir}/nph-dods %{_bindir}/asciival %{_bindir}/www_int %{_bindir}/def %{_bindir}/jg_* %{_bindir}/ff_* %{_bindir}/nc_* %{_bindir}/usage-jg %{_bindir}/chkform %{_bindir}/newform %{_bindir}/bufform %{_bindir}/readfile %{_bindir}/deflate %{_bindir}/usage %dir %{_datadir}/%{name} %{_datadir}/%{name}/jgofs_objects_readme %{perl_vendorlib}/*.pm %changelog * Tue Jul 5 2005 Tom "spot" Callaway 3.4.4-4 - Remove broken client bits * Tue Jul 5 2005 Tom "spot" Callaway 3.4.4-3 - put headers in %{_includedir}/opendap - make shared libraries - fix opendap-config * Sat Apr 23 2005 Tom "spot" Callaway 3.4.4-2 - Use system packages instead of included older versions * Fri Apr 22 2005 Tom "spot" Callaway 3.4.4-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opendap/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2005 00:12:11 -0000 1.1 +++ .cvsignore 9 Jul 2005 00:14:57 -0000 1.2 @@ -0,0 +1,6 @@ +DODS-asciival-3.4.3.tar.gz +DODS-dap-3.4.8.tar.gz +DODS-ff-dods-3.4.3.tar.gz +DODS-jg-dods-3.4.3.tar.gz +DODS-nc3-dods-3.4.7.tar.gz +DODS-www-interface-3.4.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opendap/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2005 00:12:11 -0000 1.1 +++ sources 9 Jul 2005 00:14:57 -0000 1.2 @@ -0,0 +1,6 @@ +4fb5b5b1af1e962b7d35302d129071dc DODS-asciival-3.4.3.tar.gz +3a1c6000d8713ded765d987c8d216462 DODS-dap-3.4.8.tar.gz +e341d6ba8ac0ea8ef11679e330a0655c DODS-ff-dods-3.4.3.tar.gz +38a2ef12916f1414d3dbe26d8913e2ae DODS-jg-dods-3.4.3.tar.gz +dfeb77f1eace3b3c64884d21afc8a422 DODS-nc3-dods-3.4.7.tar.gz +3c0f9dc00bba72fec8049ad7352fc5af DODS-www-interface-3.4.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 00:41:25 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 8 Jul 2005 20:41:25 -0400 Subject: rpms/mod_security/devel mod_security.conf, 1.1, 1.2 mod_security.spec, 1.2, 1.3 Message-ID: <200507090041.j690fP4U015480@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15461 Modified Files: mod_security.conf mod_security.spec Log Message: - Spec cleanup (from Oliver Falk) - Updated config with some safe-but-useful rulesets Index: mod_security.conf =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_security.conf 19 May 2005 01:39:17 -0000 1.1 +++ mod_security.conf 9 Jul 2005 00:41:23 -0000 1.2 @@ -1,5 +1,4 @@ # Example configuration file for the mod_security Apache module -# This is a minimal setup. You should add some extra entries here. LoadModule security_module modules/mod_security.so @@ -69,4 +68,40 @@ # (and you don't need it anyway) SecFilterSelective HTTP_Transfer-Encoding "!^$" - + # Some common application-related rules from + # http://modsecrules.monkeydev.org/rules.php?safety=safe + + #Nuke Bookmarks XSS + SecFilterSelective THE_REQUEST "/modules\.php\?name=Bookmarks\&file=(del_cat\&catname|del_mark\&markname|edit_cat\&catname|edit_cat\&catcomment|marks\&catname|uploadbookmarks\&category)=(<[[:space:]]*script|(http|https|ftp)\:/)" + + #Nuke Bookmarks Marks.php SQL Injection Vulnerability + SecFilterSelective THE_REQUEST "modules\.php\?name=Bookmarks\&file=marks\&catname=.*\&category=.*/\*\*/(union|select|delete|insert)" + + #PHPNuke general XSS attempt + #/modules.php?name=News&file=article&sid=1&optionbox= + SecFilterSelective THE_REQUEST "/modules\.php\?*name=<[[:space:]]*script" + + # PHPNuke SQL injection attempt + SecFilterSelective THE_REQUEST "/modules\.php\?*name=Search*instory=" + + #phpnuke sql insertion + SecFilterSelective THE_REQUEST "/modules\.php*name=Forums.*file=viewtopic*/forum=.*\'/" + + # WEB-PHP phpbb quick-reply.php arbitrary command attempt + + SecFilterSelective THE_REQUEST "/quick-reply\.php" chain + SecFilter "phpbb_root_path=" + + #Topic Calendar Mod for phpBB Cross-Site Scripting Attack + SecFilterSelective THE_REQUEST "/calendar_scheduler\.php\?start=(<[[:space:]]*script|(http|https|ftp)\:/)" + + # phpMyAdmin: Safe + + #phpMyAdmin Export.PHP File Disclosure Vulnerability + SecFilterSelective SCRIPT_FILENAME "export\.php$" chain + SecFilterSelective ARG_what "\.\." + + #phpMyAdmin path vln + SecFilterSelective REQUEST_URI "/css/phpmyadmin\.css\.php\?GLOBALS\[cfg\]\[ThemePath\]=/etc" + + Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_security.spec 19 May 2005 06:42:01 -0000 1.2 +++ mod_security.spec 9 Jul 2005 00:41:23 -0000 1.3 @@ -1,20 +1,20 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 1.8.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons -Source: http://www.modsecurity.org/download/modsecurity-1.8.7.tar.gz +Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz Source1: mod_security.conf -BuildRoot: %{_tmppath}/%{name}-root/ -Requires: httpd >= 2.0.38 -BuildRequires: httpd-devel >= 2.0.38 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: httpd +BuildRequires: httpd-devel %description -ModSecurity is an open source intrusion detection and prevention engine for web -applications. It operates embedded into the web server, acting as a powerful -umbrella - shielding web applications from attacks. +ModSecurity is an open source intrusion detection and prevention engine +for web applications. It operates embedded into the web server, acting +as a powerful umbrella - shielding web applications from attacks. %prep @@ -40,6 +40,10 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Sat Jul 9 2005 Michael Fleming 1.8.7-3 +- Correct Buildroot +- Some sensible and safe rules for common apps in mod_security.conf + * Thu May 19 2005 Michael Fleming 1.8.7-2 - Don't strip the module (so we can get a useful debuginfo package) From fedora-extras-commits at redhat.com Sat Jul 9 03:26:53 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:26:53 -0400 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.3, 1.4 scim-anthy.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507090326.j693Qr4o019117@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19096 Modified Files: .cvsignore scim-anthy.spec sources Log Message: 0.5.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2005 13:15:35 -0000 1.3 +++ .cvsignore 9 Jul 2005 03:26:51 -0000 1.4 @@ -1 +1 @@ -scim-anthy-0.5.0.tar.gz +scim-anthy-0.5.1.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-anthy.spec 30 Jun 2005 13:15:35 -0000 1.4 +++ scim-anthy.spec 9 Jul 2005 03:26:51 -0000 1.5 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input @@ -45,6 +45,9 @@ %changelog +* Sat Jul 9 2005 Jens Petersen - 0.5.1 +- update to 0.5.1 release + * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 - update to 0.5.0 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2005 13:15:35 -0000 1.3 +++ sources 9 Jul 2005 03:26:51 -0000 1.4 @@ -1 +1 @@ -1e220a07404668f876d727b6e23a9ae0 scim-anthy-0.5.0.tar.gz +155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:27:21 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:27:21 -0400 Subject: common tobuild,1.1874,1.1875 Message-ID: <200507090327.j693RL9C019179@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19162 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1874 retrieving revision 1.1875 diff -u -r1.1874 -r1.1875 --- tobuild 8 Jul 2005 22:15:56 -0000 1.1874 +++ tobuild 9 Jul 2005 03:27:18 -0000 1.1875 @@ -21,3 +21,4 @@ adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 adrian rpms/jhead/devel jhead-2_4-3_fc5 devel +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 03:29:33 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:29:33 -0400 Subject: rpms/scim-anthy/devel .cvsignore, 1.3, 1.4 scim-anthy.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507090329.j693TX3b019226@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19205 Modified Files: .cvsignore scim-anthy.spec sources Log Message: 0.5.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2005 13:15:35 -0000 1.3 +++ .cvsignore 9 Jul 2005 03:29:30 -0000 1.4 @@ -1 +1 @@ -scim-anthy-0.5.0.tar.gz +scim-anthy-0.5.1.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-anthy.spec 30 Jun 2005 13:15:35 -0000 1.4 +++ scim-anthy.spec 9 Jul 2005 03:29:30 -0000 1.5 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.5.0 +Version: 0.5.1 Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input @@ -45,6 +45,9 @@ %changelog +* Sat Jul 9 2005 Jens Petersen - 0.5.1-1 +- update to 0.5.1 release + * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 - update to 0.5.0 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2005 13:15:35 -0000 1.3 +++ sources 9 Jul 2005 03:29:30 -0000 1.4 @@ -1 +1 @@ -1e220a07404668f876d727b6e23a9ae0 scim-anthy-0.5.0.tar.gz +155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:38:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:38:18 -0400 Subject: rpms/scim/devel .cvsignore, 1.4, 1.5 scim.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200507090338.j693cIdd019295@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19274 Modified Files: .cvsignore scim.spec sources Log Message: - update to 1.3.3 release - disable linking with version-scripts for now since they cause some problems - disable building of static libs Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jul 2005 00:45:47 -0000 1.4 +++ .cvsignore 9 Jul 2005 03:38:16 -0000 1.5 @@ -1 +1 @@ -scim-1.3.2.tar.gz +scim-1.3.3.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim.spec 5 Jul 2005 00:45:47 -0000 1.5 +++ scim.spec 9 Jul 2005 03:38:16 -0000 1.6 @@ -1,5 +1,5 @@ Name: scim -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Smart Common Input Method platform @@ -36,7 +36,7 @@ %build -%configure +%configure --disable-static --disable-ld-version-script make %{?_smp_mflags} @@ -45,8 +45,8 @@ make DESTDIR=${RPM_BUILD_ROOT} install mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} -# Kill all .a and .la -find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f +# remove .la files +find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel desktop-file-install \ @@ -134,6 +134,11 @@ %changelog +* Sat Jul 9 2005 Jens Petersen - 1.3.3-1 +- update to 1.3.3 release + - disable linking with version-scripts for now since they cause some problems +- disable building of static libs + * Tue Jul 5 2005 Jens Petersen - 1.3.2-1 - update to 1.3.2 test release - don't set xinput.d script executable Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jul 2005 00:45:47 -0000 1.4 +++ sources 9 Jul 2005 03:38:16 -0000 1.5 @@ -1 +1 @@ -94a808c6a2d952d7842a4e9bfe71a7bc scim-1.3.2.tar.gz +6644e6ff3a5c01fbb06ea5809c9396f8 scim-1.3.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:51:02 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:51:02 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200507090351.j693p2wo019409@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19383 Modified Files: scim-anthy.spec sources Log Message: fix the incomplete tarball Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-anthy.spec 9 Jul 2005 03:26:51 -0000 1.5 +++ scim-anthy.spec 9 Jul 2005 03:51:00 -0000 1.6 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,7 +45,7 @@ %changelog -* Sat Jul 9 2005 Jens Petersen - 0.5.1 +* Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2005 03:26:51 -0000 1.4 +++ sources 9 Jul 2005 03:51:00 -0000 1.5 @@ -1 +1 @@ -155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz +53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 03:53:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 8 Jul 2005 23:53:18 -0400 Subject: rpms/scim-anthy/devel scim-anthy.spec,1.5,1.6 sources,1.4,1.5 Message-ID: <200507090353.j693rIsS019478@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19459 Modified Files: scim-anthy.spec sources Log Message: use the new tarball Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-anthy.spec 9 Jul 2005 03:29:30 -0000 1.5 +++ scim-anthy.spec 9 Jul 2005 03:53:16 -0000 1.6 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,7 +45,7 @@ %changelog -* Sat Jul 9 2005 Jens Petersen - 0.5.1-1 +* Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jul 2005 03:29:30 -0000 1.4 +++ sources 9 Jul 2005 03:53:16 -0000 1.5 @@ -1 +1 @@ -155a6830005c65da25f3cd1fbefa3d54 scim-anthy-0.5.1.tar.gz +53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 04:12:38 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sat, 9 Jul 2005 00:12:38 -0400 Subject: common tobuild,1.1875,1.1876 Message-ID: <200507090412.j694Cc5n020649@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20632 Modified Files: tobuild Log Message: request build of rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1875 retrieving revision 1.1876 diff -u -r1.1875 -r1.1876 --- tobuild 9 Jul 2005 03:27:18 -0000 1.1875 +++ tobuild 9 Jul 2005 04:12:36 -0000 1.1876 @@ -22,3 +22,4 @@ adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 adrian rpms/jhead/devel jhead-2_4-3_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 04:14:22 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sat, 9 Jul 2005 00:14:22 -0400 Subject: common tobuild,1.1876,1.1877 Message-ID: <200507090414.j694EMbW020693@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20676 Modified Files: tobuild Log Message: request build of rpms/scim/devel scim-1_3_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1876 retrieving revision 1.1877 diff -u -r1.1876 -r1.1877 --- tobuild 9 Jul 2005 04:12:36 -0000 1.1876 +++ tobuild 9 Jul 2005 04:14:20 -0000 1.1877 @@ -23,3 +23,4 @@ adrian rpms/jhead/devel jhead-2_4-3_fc5 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 +petersen rpms/scim/devel scim-1_3_3-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 08:31:50 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:31:50 -0400 Subject: rpms/ip-sentinel/devel ip-sentinel-0.12-pidfile.patch, NONE, 1.1 ip-sentinel.spec, 1.7, 1.8 Message-ID: <200507090831.j698Vov1025906@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25886 Modified Files: ip-sentinel.spec Added Files: ip-sentinel-0.12-pidfile.patch Log Message: fixed named of pidfile (reported by Razvan Sandu) ip-sentinel-0.12-pidfile.patch: --- NEW FILE ip-sentinel-0.12-pidfile.patch --- Index: src/arguments.c =================================================================== --- src/arguments.c (revision 487) +++ src/arguments.c (working copy) @@ -34,7 +34,7 @@ #endif #ifndef DEFAULT_PIDFILE -# define DEFAULT_PIDFILE "/var/run/ip-sentinel.run" +# define DEFAULT_PIDFILE "/var/run/ip-sentinel.pid" #endif #ifndef DEFAULT_LOGFILE Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/devel/ip-sentinel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ip-sentinel.spec 8 Jun 2005 20:07:23 -0000 1.7 +++ ip-sentinel.spec 9 Jul 2005 08:31:48 -0000 1.8 @@ -54,12 +54,13 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 Source1: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig +Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) BuildRequires: which @@ -121,7 +122,7 @@ %prep %setup -q - +%patch0 -p0 -b .pidfile %build %configure --enable-release \ @@ -199,6 +200,9 @@ %changelog +* Fri Jul 8 2005 Enrico Scholz - 0.12-5 +- fixed named of pidfile (reported by Razvan Sandu) + * Wed Jun 8 2005 Enrico Scholz - 0.12-4 - rebuilt From fedora-extras-commits at redhat.com Sat Jul 9 08:35:27 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:35:27 -0400 Subject: rpms/ip-sentinel/FC-3 ip-sentinel-0.12-pidfile.patch, NONE, 1.1 ip-sentinel.spec, 1.4, 1.5 Message-ID: <200507090835.j698ZRvU026012@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25979/FC-3 Modified Files: ip-sentinel.spec Added Files: ip-sentinel-0.12-pidfile.patch Log Message: synced with devel/ ip-sentinel-0.12-pidfile.patch: --- NEW FILE ip-sentinel-0.12-pidfile.patch --- Index: src/arguments.c =================================================================== --- src/arguments.c (revision 487) +++ src/arguments.c (working copy) @@ -34,7 +34,7 @@ #endif #ifndef DEFAULT_PIDFILE -# define DEFAULT_PIDFILE "/var/run/ip-sentinel.run" +# define DEFAULT_PIDFILE "/var/run/ip-sentinel.pid" #endif #ifndef DEFAULT_LOGFILE Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/FC-3/ip-sentinel.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ip-sentinel.spec 8 Jun 2005 20:07:22 -0000 1.4 +++ ip-sentinel.spec 9 Jul 2005 08:35:25 -0000 1.5 @@ -54,12 +54,13 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 Source1: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig +Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) BuildRequires: which @@ -121,6 +122,7 @@ %prep %setup -q +%patch0 -p0 -b .pidfile %build @@ -199,6 +201,9 @@ %changelog +* Fri Jul 8 2005 Enrico Scholz - 0.12-5 +- fixed named of pidfile (reported by Razvan Sandu) + * Wed Jun 8 2005 Enrico Scholz - 0.12-4 - rebuilt From fedora-extras-commits at redhat.com Sat Jul 9 08:35:27 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:35:27 -0400 Subject: rpms/ip-sentinel/FC-4 ip-sentinel-0.12-pidfile.patch, NONE, 1.1 ip-sentinel.spec, 1.7, 1.8 Message-ID: <200507090835.j698ZRqD026020@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/ip-sentinel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25979/FC-4 Modified Files: ip-sentinel.spec Added Files: ip-sentinel-0.12-pidfile.patch Log Message: synced with devel/ ip-sentinel-0.12-pidfile.patch: --- NEW FILE ip-sentinel-0.12-pidfile.patch --- Index: src/arguments.c =================================================================== --- src/arguments.c (revision 487) +++ src/arguments.c (working copy) @@ -34,7 +34,7 @@ #endif #ifndef DEFAULT_PIDFILE -# define DEFAULT_PIDFILE "/var/run/ip-sentinel.run" +# define DEFAULT_PIDFILE "/var/run/ip-sentinel.pid" #endif #ifndef DEFAULT_LOGFILE Index: ip-sentinel.spec =================================================================== RCS file: /cvs/extras/rpms/ip-sentinel/FC-4/ip-sentinel.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ip-sentinel.spec 8 Jun 2005 20:07:23 -0000 1.7 +++ ip-sentinel.spec 9 Jul 2005 08:35:25 -0000 1.8 @@ -54,12 +54,13 @@ Summary: Tool to prevent unauthorized usage of IP addresses Name: ip-sentinel Version: 0.12 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: System Environment/Daemons URL: http://www.nongnu.org/ip-sentinel/ Source0: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2 Source1: http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig +Patch0: ip-sentinel-0.12-pidfile.patch BuildRoot: %_tmppath/%name-%version-%release-buildroot Requires: init(ip-sentinel) BuildRequires: which @@ -121,6 +122,7 @@ %prep %setup -q +%patch0 -p0 -b .pidfile %build @@ -199,6 +201,9 @@ %changelog +* Fri Jul 8 2005 Enrico Scholz - 0.12-5 +- fixed named of pidfile (reported by Razvan Sandu) + * Wed Jun 8 2005 Enrico Scholz - 0.12-4 - rebuilt From fedora-extras-commits at redhat.com Sat Jul 9 08:36:47 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:36:47 -0400 Subject: common tobuild,1.1877,1.1878 Message-ID: <200507090836.j698al1P026109@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26087 Modified Files: tobuild Log Message: request build of rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1877 retrieving revision 1.1878 diff -u -r1.1877 -r1.1878 --- tobuild 9 Jul 2005 04:14:20 -0000 1.1877 +++ tobuild 9 Jul 2005 08:36:45 -0000 1.1878 @@ -24,3 +24,4 @@ petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 petersen rpms/scim/devel scim-1_3_3-1_fc5 devel +ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 9 08:36:53 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 04:36:53 -0400 Subject: common tobuild,1.1878,1.1879 Message-ID: <200507090836.j698aros026134@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26115 Modified Files: tobuild Log Message: request build of rpms/barcode/devel barcode-0_98-6_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1878 retrieving revision 1.1879 diff -u -r1.1878 -r1.1879 --- tobuild 9 Jul 2005 08:36:45 -0000 1.1878 +++ tobuild 9 Jul 2005 08:36:51 -0000 1.1879 @@ -25,3 +25,4 @@ petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 petersen rpms/scim/devel scim-1_3_3-1_fc5 devel ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 +ixs rpms/barcode/devel barcode-0_98-6_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 08:37:13 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:37:13 -0400 Subject: common tobuild,1.1879,1.1880 Message-ID: <200507090837.j698bDGP026192@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26175 Modified Files: tobuild Log Message: request build of rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1879 retrieving revision 1.1880 diff -u -r1.1879 -r1.1880 --- tobuild 9 Jul 2005 08:36:51 -0000 1.1879 +++ tobuild 9 Jul 2005 08:37:11 -0000 1.1880 @@ -26,3 +26,4 @@ petersen rpms/scim/devel scim-1_3_3-1_fc5 devel ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-6_fc5 devel +ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 08:37:39 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 9 Jul 2005 04:37:39 -0400 Subject: common tobuild,1.1880,1.1881 Message-ID: <200507090837.j698bdFF026254@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26237 Modified Files: tobuild Log Message: request build of rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1880 retrieving revision 1.1881 diff -u -r1.1880 -r1.1881 --- tobuild 9 Jul 2005 08:37:11 -0000 1.1880 +++ tobuild 9 Jul 2005 08:37:37 -0000 1.1881 @@ -27,3 +27,4 @@ ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-6_fc5 devel ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 +ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel From ville.skytta at iki.fi Sat Jul 9 11:14:51 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Sat, 09 Jul 2005 14:14:51 +0300 Subject: APPROVED: perl-Tie-DBI Message-ID: <1120907691.2892.80.camel@localhost.localdomain> perl-Tie-DBI contains modules for tying hashes to relational databases. Reviewer: Ville Skytt? Maintainer: Tom Callaway From ville.skytta at iki.fi Sat Jul 9 11:18:38 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Sat, 09 Jul 2005 14:18:38 +0300 Subject: APPROVED: perl-ExtUtils-XSBuilder Message-ID: <1120907918.2892.82.camel@localhost.localdomain> ExtUtils::XSBuilder is a set modules to parse C header files and create XS glue code and documentation out of it. Ideally this allows to "write" an interface to a C library without coding a line. Since no C-API is ideal, some adjuments are necessary most of the time. So to use this module you must still be familar with C and XS programming, but it removes a lot of stupid work and copy&paste burden. Also when the C API changes, most of the time you only have to rerun XSBuilder to get your new Perl API. Reviewer: Ville Skytt? Maintainer: Tom Callaway From fedora-extras-commits at redhat.com Sat Jul 9 11:40:51 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 9 Jul 2005 07:40:51 -0400 Subject: rpms/kernel-module-thinkpad/devel kernel-module-thinkpad.spec, 1.12, 1.13 Message-ID: <200507091140.j69Bepta029834@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/kernel-module-thinkpad/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29817/devel Modified Files: kernel-module-thinkpad.spec Log Message: Install modules into extra/thinkpad. Index: kernel-module-thinkpad.spec =================================================================== RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kernel-module-thinkpad.spec 5 Jul 2005 19:33:06 -0000 1.12 +++ kernel-module-thinkpad.spec 9 Jul 2005 11:40:49 -0000 1.13 @@ -1,11 +1,11 @@ %{!?kver: %define kver 2.6.11-1.1369_FC4} %define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu} -%define moddir /lib/modules/%{kver}/updates +%define moddir /lib/modules/%{kver}/extra Name: kernel-module-thinkpad Version: 5.8 -Release: 2.%(echo %{kver} | tr - _) +Release: 3.%(echo %{kver} | tr - _) Summary: Supplemental kernel modules for ThinkPad?? laptop computers License: GPL @@ -82,6 +82,9 @@ %changelog +* Sat Jul 9 2005 Ville Skytt?? - 5.8-3 +- Install modules into extra/thinkpad. + * Sun Jul 3 2005 Ville Skytt?? - 5.8-2 - Change towards new (in-progress) kernel module packaging guidelines. - Automatically load modules at boot time. From fedora-extras-commits at redhat.com Sat Jul 9 11:43:08 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:43:08 -0400 Subject: rpms/mod_suphp/devel mod_suphp.spec,1.4,1.5 Message-ID: <200507091143.j69Bh8Ud029892@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29845/devel Modified Files: mod_suphp.spec Log Message: Added specific httpd-mmn dependency Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/devel/mod_suphp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_suphp.spec 5 Jul 2005 18:07:37 -0000 1.4 +++ mod_suphp.spec 9 Jul 2005 11:43:06 -0000 1.5 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -16,6 +16,7 @@ URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel >= 2.0 %description @@ -66,6 +67,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 +- Added a dependency on a specific httpd-mmn + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 - Bumped up the releasever From fedora-extras-commits at redhat.com Sat Jul 9 11:43:02 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:43:02 -0400 Subject: rpms/mod_suphp/FC-3 mod_suphp.spec,1.3,1.4 Message-ID: <200507091143.j69BhW2b029895@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29845/FC-3 Modified Files: mod_suphp.spec Log Message: Added specific httpd-mmn dependency Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-3/mod_suphp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 +++ mod_suphp.spec 9 Jul 2005 11:43:00 -0000 1.4 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -16,6 +16,7 @@ URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel >= 2.0 %description @@ -66,6 +67,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 +- Added a dependency on a specific httpd-mmn + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 - Bumped up the releasever From fedora-extras-commits at redhat.com Sat Jul 9 11:43:03 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:43:03 -0400 Subject: rpms/mod_suphp/FC-4 mod_suphp.spec,1.3,1.4 Message-ID: <200507091143.j69BhXxs029898@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mod_suphp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29845/FC-4 Modified Files: mod_suphp.spec Log Message: Added specific httpd-mmn dependency Index: mod_suphp.spec =================================================================== RCS file: /cvs/extras/rpms/mod_suphp/FC-4/mod_suphp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_suphp.spec 5 Jul 2005 18:07:31 -0000 1.3 +++ mod_suphp.spec 9 Jul 2005 11:43:00 -0000 1.4 @@ -8,7 +8,7 @@ Summary: An apache2 module for executing PHP scripts with the permissions of their owners Name: mod_suphp Version: 0.5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: System Environment/Daemons Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz @@ -16,6 +16,7 @@ URL: http://www.suphp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.0, php +Requires: httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel >= 2.0 %description @@ -66,6 +67,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Tue Jul 09 2005 Andreas Thienemann 0.5.2-8 +- Added a dependency on a specific httpd-mmn + * Tue Jul 05 2005 Andreas Thienemann 0.5.2-7 - Bumped up the releasever From fedora-extras-commits at redhat.com Sat Jul 9 11:45:31 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:45:31 -0400 Subject: common tobuild,1.1881,1.1882 Message-ID: <200507091145.j69BjVRf030030@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30013 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1881 retrieving revision 1.1882 diff -u -r1.1881 -r1.1882 --- tobuild 9 Jul 2005 08:37:37 -0000 1.1881 +++ tobuild 9 Jul 2005 11:45:28 -0000 1.1882 @@ -28,3 +28,4 @@ ixs rpms/barcode/devel barcode-0_98-6_fc5 devel ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 9 11:45:50 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:45:50 -0400 Subject: common tobuild,1.1882,1.1883 Message-ID: <200507091145.j69BjoB3030063@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30046 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1882 retrieving revision 1.1883 diff -u -r1.1882 -r1.1883 --- tobuild 9 Jul 2005 11:45:28 -0000 1.1882 +++ tobuild 9 Jul 2005 11:45:47 -0000 1.1883 @@ -29,3 +29,4 @@ ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 9 11:46:11 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sat, 9 Jul 2005 07:46:11 -0400 Subject: common tobuild,1.1883,1.1884 Message-ID: <200507091146.j69BkBuJ030096@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30079 Modified Files: tobuild Log Message: request build of rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1883 retrieving revision 1.1884 diff -u -r1.1883 -r1.1884 --- tobuild 9 Jul 2005 11:45:47 -0000 1.1883 +++ tobuild 9 Jul 2005 11:46:08 -0000 1.1884 @@ -30,3 +30,4 @@ ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 9 11:57:41 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:57:41 -0400 Subject: rpms/nexuiz - New directory Message-ID: <200507091157.j69BvfYA030181@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30157/nexuiz Log Message: Directory /cvs/extras/rpms/nexuiz added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 11:57:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:57:42 -0400 Subject: rpms/nexuiz/devel - New directory Message-ID: <200507091157.j69BvgMw030186@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30157/nexuiz/devel Log Message: Directory /cvs/extras/rpms/nexuiz/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 11:58:00 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:58:00 -0400 Subject: rpms/nexuiz Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507091158.j69Bw0Mj030235@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202 Added Files: Makefile import.log Log Message: Setup of module nexuiz --- NEW FILE Makefile --- # Top level Makefile for module nexuiz all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 9 11:58:00 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:58:00 -0400 Subject: rpms/nexuiz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507091158.j69Bw06n030240@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nexuiz --- NEW 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 Jul 9 11:58:46 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 9 Jul 2005 07:58:46 -0400 Subject: rpms/mod_security/devel mod_security.conf, 1.2, 1.3 mod_security.spec, 1.3, 1.4 Message-ID: <200507091158.j69Bwk3v030283@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30155 Modified Files: mod_security.conf mod_security.spec Log Message: - Ruleset improvements - Requires httpd-mmn so we only install w/appropriate httpd versions. Index: mod_security.conf =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_security.conf 9 Jul 2005 00:41:23 -0000 1.2 +++ mod_security.conf 9 Jul 2005 11:58:44 -0000 1.3 @@ -37,18 +37,18 @@ # SecFilter 111 # Prevent path traversal (..) attacks - SecFilter "\.\./" + # SecFilter "\.\./" # Weaker XSS protection but allows common HTML tags - SecFilter "<( |\n)*script" + # SecFilter "<( |\n)*script" # Prevent XSS atacks (HTML/Javascript injection) - SecFilter "<(.|\n)+>" + # SecFilter "<(.|\n)+>" # Very crude filters to prevent SQL injection attacks - SecFilter "delete[[:space:]]+from" - SecFilter "insert[[:space:]]+into" - SecFilter "select.+from" + # SecFilter "delete[[:space:]]+from" + # SecFilter "insert[[:space:]]+into" + # SecFilter "select.+from" # Require HTTP_USER_AGENT and HTTP_HOST headers SecFilterSelective "HTTP_USER_AGENT|HTTP_HOST" "^$" Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_security.spec 9 Jul 2005 00:41:23 -0000 1.3 +++ mod_security.spec 9 Jul 2005 11:58:44 -0000 1.4 @@ -1,14 +1,15 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 1.8.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz Source1: mod_security.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: httpd +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat +%{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel %description @@ -40,6 +41,11 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Sat Jul 9 2005 Michael Fleming 1.8.7-4 +- Add Requires: httpd-mmn to get the appropriate "module magic" version + (thanks Ville Skytt?) +- Disabled an overly-agressive rule or two.. + * Sat Jul 9 2005 Michael Fleming 1.8.7-3 - Correct Buildroot - Some sensible and safe rules for common apps in mod_security.conf From fedora-extras-commits at redhat.com Sat Jul 9 11:59:34 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:59:34 -0400 Subject: rpms/nexuiz import.log,1.1,1.2 Message-ID: <200507091200.j69C04k0030341@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30299 Modified Files: import.log Log Message: auto-import nexuiz-1.1-1 on branch devel from nexuiz-1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nexuiz/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jul 2005 11:57:58 -0000 1.1 +++ import.log 9 Jul 2005 11:59:32 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-1_1-1:HEAD:nexuiz-1.1-1.src.rpm:1120910361 From fedora-extras-commits at redhat.com Sat Jul 9 11:59:35 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 9 Jul 2005 07:59:35 -0400 Subject: rpms/nexuiz/devel nexuiz-1.0-basedir.patch, NONE, 1.1 nexuiz-1.1-nostrip.patch, NONE, 1.1 nexuiz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507091159.j69BxZCg030335@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30299/devel Modified Files: .cvsignore sources Added Files: nexuiz-1.0-basedir.patch nexuiz-1.1-nostrip.patch nexuiz.spec Log Message: auto-import nexuiz-1.1-1 on branch devel from nexuiz-1.1-1.src.rpm nexuiz-1.0-basedir.patch: --- NEW FILE nexuiz-1.0-basedir.patch --- --- fs.c.orig 2005-07-08 13:00:47.000000000 +0200 +++ fs.c 2005-07-08 13:01:06.000000000 +0200 @@ -902,7 +902,7 @@ void FS_Init (void) fs_mempool = Mem_AllocPool("file management", 0, NULL); - strcpy(fs_basedir, "."); + strcpy(fs_basedir, "/usr/share/nexuiz"); strcpy(fs_gamedir, ""); #ifdef MACOSX nexuiz-1.1-nostrip.patch: --- NEW FILE nexuiz-1.1-nostrip.patch --- --- makefile.inc.orig 2005-06-20 18:35:34.000000000 +0200 +++ makefile.inc 2005-07-08 15:32:57.000000000 +0200 @@ -342,7 +342,6 @@ bin-release : DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\ LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)" - strip $(EXE) vid_glx.o: vid_glx.c $(DO_CC) -I/usr/X11R6/include --- NEW FILE nexuiz.spec --- Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.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-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 Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # For the .ico extraction BuildRequires: ImageMagick, file BuildRequires: xorg-x11-devel, alsa-lib-devel, desktop-file-utils # 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 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 Requires: desktop-file-utils >= 0.9 Requires: nexuiz-data Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, focused on providing basic, old style deathmatches. %package server Group: Amusements/Games Summary: Dedicated server for the Nexuiz first person shooter Requires: nexuiz-data # 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 %description server Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, focused on providing basic, old style deathmatches. This is the nexuiz dedicated server required to host network games. %prep %setup -q %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip %{__sed} -i 's/\r//' Readme.htm %build %{__make} %{?_smp_mflags} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert nexuiz.ico nexuiz.png %install %{__rm} -rf %{buildroot} # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -m 0755 nexuiz-{glx,dedicated} \ %{buildroot}%{_bindir}/ # Create the desktop file %{__cat} > %{name}.desktop << EOF [Desktop Entry] Name=Nexuiz Comment=Multiplayer, deathmatch oriented first person shooter Encoding=UTF-8 Icon=nexuiz Exec=nexuiz-glx Terminal=false Type=Application EOF # Install the desktop file %{__mkdir_p} %{buildroot}%{_datadir}/applications desktop-file-install \ --vendor=fedora \ --dir %{buildroot}%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Game \ %{name}.desktop # Install all png files previously extracted from the .ico file for file in nexuiz*.png; do res="`file ${file} | tr -d ' ' | cut -d ',' -f 2`" %{__install} -D -m 0644 ${file} \ %{buildroot}%{_datadir}/icons/hicolor/${res}/apps/nexuiz.png done %post update-desktop-database %{_datadir}/applications 2>/dev/null || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %postun update-desktop-database %{_datadir}/applications 2>/dev/null || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %doc Readme.htm COPYING %{_bindir}/nexuiz-glx %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop %files server %defattr(-,root,root,-) %doc Readme.htm COPYING %{_bindir}/nexuiz-dedicated %changelog * Sat Jul 09 2005 Adrian Reber - 1.1-1 - added gtk-update-icon-cache to %%post and %%postun - added desktop-file-utils as Requires({post,postun}) * Fri Jul 8 2005 Matthias Saou 1.1-0 - Update to 1.1. - Split off the huge data, unfortunately requires using custom sources. - Major spec file changes. * Thu Jun 09 2005 Adrian Reber - 1.0-2 - comments concerning the requires added - better(???) descriptions * Thu Jun 09 2005 Adrian Reber - 1.0-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2005 11:57:58 -0000 1.1 +++ .cvsignore 9 Jul 2005 11:59:33 -0000 1.2 @@ -0,0 +1 @@ +nexuiz-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2005 11:57:58 -0000 1.1 +++ sources 9 Jul 2005 11:59:33 -0000 1.2 @@ -0,0 +1 @@ +a2177339360d4ad19816c66a7dfd0353 nexuiz-1.1.tar.bz2 From ville.skytta at iki.fi Sat Jul 9 12:17:19 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Sat, 09 Jul 2005 15:17:19 +0300 Subject: rpms/mod_security/devel mod_security.conf, 1.2, 1.3 mod_security.spec, 1.3, 1.4 In-Reply-To: <200507091158.j69Bwk3v030283@cvs-int.fedora.redhat.com> References: <200507091158.j69Bwk3v030283@cvs-int.fedora.redhat.com> Message-ID: <1120911439.2892.99.camel@localhost.localdomain> On Sat, 2005-07-09 at 07:58 -0400, Michael G. Fleming wrote: > -Requires: httpd > +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat > +%{_includedir}/httpd/.mmn || echo missing) That won't work at least on FC4 and earlier; the %(...) construct cannot contain linebreaks. In this case, the build will hang, waiting for input to "cat". Also, httpd-mmn is provided by httpd, see attached suggested patch. -------------- next part -------------- A non-text attachment was scrubbed... Name: ms.patch Type: text/x-patch Size: 777 bytes Desc: not available URL: From fedora-extras-commits at redhat.com Sat Jul 9 12:34:12 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 9 Jul 2005 08:34:12 -0400 Subject: rpms/mod_security/devel mod_security.spec,1.4,1.5 Message-ID: <200507091234.j69CYCkV031582@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31565 Modified Files: mod_security.spec Log Message: Convert spec to UTF-8 Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_security.spec 9 Jul 2005 11:58:44 -0000 1.4 +++ mod_security.spec 9 Jul 2005 12:34:10 -0000 1.5 @@ -43,7 +43,7 @@ %changelog * Sat Jul 9 2005 Michael Fleming 1.8.7-4 - Add Requires: httpd-mmn to get the appropriate "module magic" version - (thanks Ville Skytt?) + (thanks Ville Skytt??) - Disabled an overly-agressive rule or two.. * Sat Jul 9 2005 Michael Fleming 1.8.7-3 From fedora-extras-commits at redhat.com Sat Jul 9 12:57:52 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 9 Jul 2005 08:57:52 -0400 Subject: rpms/mod_security/devel mod_security.spec,1.5,1.6 Message-ID: <200507091257.j69CvqPJ031635@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31618 Modified Files: mod_security.spec Log Message: Join busted Requires line. Sorry. Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mod_security.spec 9 Jul 2005 12:34:10 -0000 1.5 +++ mod_security.spec 9 Jul 2005 12:57:50 -0000 1.6 @@ -8,8 +8,7 @@ Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz Source1: mod_security.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat -%{_includedir}/httpd/.mmn || echo missing) +Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) BuildRequires: httpd-devel %description @@ -43,7 +42,7 @@ %changelog * Sat Jul 9 2005 Michael Fleming 1.8.7-4 - Add Requires: httpd-mmn to get the appropriate "module magic" version - (thanks Ville Skytt??) + (thanks Ville Skytt?) - Disabled an overly-agressive rule or two.. * Sat Jul 9 2005 Michael Fleming 1.8.7-3 From fedora-extras-commits at redhat.com Sat Jul 9 21:15:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:15:54 -0400 Subject: rpms/icmpdn - New directory Message-ID: <200507092115.j69LFsDJ011788@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11764/icmpdn Log Message: Directory /cvs/extras/rpms/icmpdn added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 21:15:54 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:15:54 -0400 Subject: rpms/icmpdn/devel - New directory Message-ID: <200507092115.j69LFsr6011793@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11764/icmpdn/devel Log Message: Directory /cvs/extras/rpms/icmpdn/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 9 21:16:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:13 -0400 Subject: rpms/icmpdn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507092116.j69LGD02011855@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11824 Added Files: Makefile import.log Log Message: Setup of module icmpdn --- NEW FILE Makefile --- # Top level Makefile for module icmpdn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 9 21:16:13 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:13 -0400 Subject: rpms/icmpdn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507092116.j69LGDYB011860@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11824/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module icmpdn --- NEW 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 Jul 9 21:16:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:45 -0400 Subject: rpms/icmpdn import.log,1.1,1.2 Message-ID: <200507092117.j69LHFRu011929@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11890 Modified Files: import.log Log Message: auto-import icmpdn-0.3-2 on branch devel from icmpdn-0.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/icmpdn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Jul 2005 21:16:11 -0000 1.1 +++ import.log 9 Jul 2005 21:16:43 -0000 1.2 @@ -0,0 +1 @@ +icmpdn-0_3-2:HEAD:icmpdn-0.3-2.src.rpm:1120943796 From fedora-extras-commits at redhat.com Sat Jul 9 21:16:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:16:45 -0400 Subject: rpms/icmpdn/devel icmpdn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507092117.j69LHGEw011933@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/icmpdn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11890/devel Modified Files: .cvsignore sources Added Files: icmpdn.spec Log Message: auto-import icmpdn-0.3-2 on branch devel from icmpdn-0.3-2.src.rpm --- NEW FILE icmpdn.spec --- Name: icmpdn Version: 0.3 Release: 2 License: LGPL for library, GPL for utilities Group: System Environment/Libraries Summary: ICMP host name utilities Source0: http://www.dolda2000.com/~fredrik/icmp-dn/%name-%version.tar.gz URL: http://www.dolda2000.com/~fredrik/icmp-dn/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description icmpdn is an implementation of the RFC 1788 ICMP domain name facilities for Linux. It includes icmpdnd, a daemon which responds to ICMP domain name requests from other hosts, idnlookup, which requests the domain name of another host, and nss_icmp, which is a nameswitch module for doing reverse hostname lookups via idnlookup. %prep %setup %build %configure --libdir=/%{_lib} make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" mkdir $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{_initrddir} install -m755 admin/icmpdnd "$RPM_BUILD_ROOT%{_initrddir}" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) /%{_lib}/libnss_icmp.so /%{_lib}/libnss_icmp.la /%{_lib}/libnss_icmp.so.2.0.0 /%{_lib}/libnss_icmp.so.2 %config %{_sysconfdir}/nss-icmp.conf %attr(4755,root,root) %{_bindir}/idnlookup %config %{_initrddir}/icmpdnd %{_sbindir}/icmpdnd %doc AUTHORS ChangeLog COPYING COPYING.LIB README %changelog * Thu Jul 07 2005 Fredrik Tolf - Compressed the description. - Added COPYING.LIB, which contains the LGPL. * Thu Jun 30 2005 Fredrik Tolf - Fixed more things as from fedora-extras-list: - Replaced /lib with /%{_lib} - Run ldconfig in %post and %postun. - Install init script in %{_initrdddir} instead of %_{sysconfdir}. * Tue Jun 28 2005 Fredrik Tolf - Fixed a lot of things after a discussion on fedora-extras-list, among other things: - Removed Vendor tag - Fixed Source tag - Replaced en-dashes with ASCII hyphens - Added SMP flags to make - Removed INSTALL and NEWS from %doc - Added this ChangeLog section. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icmpdn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Jul 2005 21:16:11 -0000 1.1 +++ .cvsignore 9 Jul 2005 21:16:43 -0000 1.2 @@ -0,0 +1 @@ +icmpdn-0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/icmpdn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Jul 2005 21:16:11 -0000 1.1 +++ sources 9 Jul 2005 21:16:43 -0000 1.2 @@ -0,0 +1 @@ +1a9e9ce3e229c64be63a1cfba55fa576 icmpdn-0.3.tar.gz From fedora-extras-commits at redhat.com Sat Jul 9 21:18:21 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 9 Jul 2005 17:18:21 -0400 Subject: common tobuild,1.1884,1.1885 Message-ID: <200507092118.j69LILPd012027@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12010 Modified Files: tobuild Log Message: request build of rpms/icmpdn/devel icmpdn-0_3-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1884 retrieving revision 1.1885 diff -u -r1.1884 -r1.1885 --- tobuild 9 Jul 2005 11:46:08 -0000 1.1884 +++ tobuild 9 Jul 2005 21:18:19 -0000 1.1885 @@ -31,3 +31,4 @@ ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 +oliver rpms/icmpdn/devel icmpdn-0_3-2 devel From fedora-extras-commits at redhat.com Sat Jul 9 21:39:05 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 17:39:05 -0400 Subject: rpms/udunits/devel udunits.spec,1.6,1.7 Message-ID: <200507092139.j69Ld5HF012116@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/udunits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12069/devel Modified Files: udunits.spec Log Message: use -fPIC for all arches and remove redundant man3f entry Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/devel/udunits.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udunits.spec 9 May 2005 19:58:21 -0000 1.6 +++ udunits.spec 9 Jul 2005 21:39:03 -0000 1.7 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -59,10 +59,8 @@ %endif %build -%ifarch x86_64 export CFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC" -%endif cd src/ export LD_MATH=-lm %configure @@ -74,6 +72,7 @@ sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install cp -p COPYRIGHT README RELEASE_NOTES VERSION ../ +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -106,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Sat Jul 9 2005 Ed Hill 1.12.4-9 +- use -fPIC for all arches and remove redundant man3f entry + * Mon May 9 2005 Tom "spot" Callaway 1.12.4-8 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Sat Jul 9 21:38:59 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 17:38:59 -0400 Subject: rpms/udunits/FC-3 udunits.spec,1.6,1.7 Message-ID: <200507092139.j69LdTjE012119@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/udunits/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12069/FC-3 Modified Files: udunits.spec Log Message: use -fPIC for all arches and remove redundant man3f entry Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-3/udunits.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udunits.spec 9 May 2005 19:58:20 -0000 1.6 +++ udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -59,10 +59,8 @@ %endif %build -%ifarch x86_64 export CFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC" -%endif cd src/ export LD_MATH=-lm %configure @@ -74,6 +72,7 @@ sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install cp -p COPYRIGHT README RELEASE_NOTES VERSION ../ +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -106,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Sat Jul 9 2005 Ed Hill 1.12.4-9 +- use -fPIC for all arches and remove redundant man3f entry + * Mon May 9 2005 Tom "spot" Callaway 1.12.4-8 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Sat Jul 9 21:38:59 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 17:38:59 -0400 Subject: rpms/udunits/FC-4 udunits.spec,1.6,1.7 Message-ID: <200507092139.j69LdUGK012122@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/udunits/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12069/FC-4 Modified Files: udunits.spec Log Message: use -fPIC for all arches and remove redundant man3f entry Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-4/udunits.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udunits.spec 9 May 2005 19:58:21 -0000 1.6 +++ udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -59,10 +59,8 @@ %endif %build -%ifarch x86_64 export CFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC" -%endif cd src/ export LD_MATH=-lm %configure @@ -74,6 +72,7 @@ sed "s?/usr?${RPM_BUILD_ROOT}/usr?" Makefile > Makefile.install make PREFIX=${RPM_BUILD_ROOT}/usr datadir=${RPM_BUILD_ROOT}/etc sysconfigdir=${RPM_BUILD_ROOT}/etc -f Makefile.install install cp -p COPYRIGHT README RELEASE_NOTES VERSION ../ +rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -106,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Sat Jul 9 2005 Ed Hill 1.12.4-9 +- use -fPIC for all arches and remove redundant man3f entry + * Mon May 9 2005 Tom "spot" Callaway 1.12.4-8 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Sat Jul 9 21:44:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:44:25 -0400 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.2,1.3 Message-ID: <200507092144.j69LiPUA012154@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12137/common Modified Files: XMLRPCServerProxy.py Log Message: Simplify our SSL_Transport class Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XMLRPCServerProxy.py 6 Jul 2005 21:20:55 -0000 1.2 +++ XMLRPCServerProxy.py 9 Jul 2005 21:44:23 -0000 1.3 @@ -21,60 +21,25 @@ __version__='0.12' -class SSL_Transport(xmlrpclib.Transport): +class PlgSSL_Transport(xmlrpclib.Transport): user_agent = "pyOpenSSL_XMLRPC/%s - %s" % (__version__, xmlrpclib.Transport.user_agent) def __init__(self, ssl_context): self.ssl_ctx=ssl_context - def request(self, host, handler, request_body, verbose=0): + def make_connection(self, host): # Handle username and password. - user_passwd, host_port = urllib.splituser(host) - _host, _port = urllib.splitport(host_port) - h = SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) - if verbose: - h.set_debuglevel(1) + host, extra_headers, x509 = self.get_host_info(host) + _host, _port = urllib.splitport(host) + return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) - # What follows is as in xmlrpclib.Transport. (Except the authz bit.) - h.putrequest("POST", handler) - # required by HTTP/1.1 - h.putheader("Host", _host) - - # required by XML-RPC - h.putheader("User-Agent", self.user_agent) - h.putheader("Content-Type", "text/xml") - h.putheader("Content-Length", str(len(request_body))) - - # Authorisation. - if user_passwd is not None: - auth=string.strip(base64.encodestring(user_passwd)) - h.putheader('Authorization', 'Basic %s' % auth) - - h.endheaders() - - if request_body: - h.send(request_body) - - errcode, errmsg, headers = h.getreply() - - if errcode != 200: - raise ProtocolError( - host + handler, - errcode, errmsg, - headers - ) - - self.verbose = verbose - return self.parse_response(h.getfile()) - - -class XMLRPCServerProxy(xmlrpclib.ServerProxy): +class PlgXMLRPCServerProxy(xmlrpclib.ServerProxy): def __init__(self, uri, certs): if certs and len(certs) > 0: self.ctx = SSLCommon.CreateSSLContext(certs) - xmlrpclib.ServerProxy.__init__(self, uri, SSL_Transport(ssl_context=self.ctx)) + xmlrpclib.ServerProxy.__init__(self, uri, PlgSSL_Transport(ssl_context=self.ctx)) else: xmlrpclib.ServerProxy.__init__(self, uri) From fedora-extras-commits at redhat.com Sat Jul 9 21:53:42 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:53:42 -0400 Subject: extras-buildsys/utils repoconv.py,1.3,1.4 Message-ID: <200507092153.j69LrgTL012185@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12168/utils Modified Files: repoconv.py Log Message: Fix indents Index: repoconv.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/repoconv.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- repoconv.py 7 Jul 2005 17:24:08 -0000 1.3 +++ repoconv.py 9 Jul 2005 21:53:40 -0000 1.4 @@ -96,8 +96,8 @@ os.unlink(dest_file) debugprint('Copying %s to %s' % (os.path.basename(package), dest_file)) - if not os.path.exists(os.path.dirname(dest_file)): - os.makedirs(os.path.dirname(dest_file)) + if not os.path.exists(os.path.dirname(dest_file)): + os.makedirs(os.path.dirname(dest_file)) shutil.copy(package, dest_file) # Create repo metadata From fedora-extras-commits at redhat.com Sat Jul 9 21:54:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:54:10 -0400 Subject: extras-buildsys/server Repo.py,1.7,1.8 Message-ID: <200507092154.j69LsAqr012208@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12191/server Modified Files: Repo.py Log Message: Fix traceback when repo_dir doesn't exist Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Repo.py 7 Jul 2005 16:21:12 -0000 1.7 +++ Repo.py 9 Jul 2005 21:54:08 -0000 1.8 @@ -32,7 +32,7 @@ self._builder_manager = builder_manager self._target = target if not os.path.exists(config_opts['repo_dir']): - print "Error: Repository directory '%s' does not exist." % config_opts['repodir'] + print "Error: Repository directory '%s' does not exist." % config_opts['repo_dir'] os._exit(1) self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): From fedora-extras-commits at redhat.com Sat Jul 9 21:54:36 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 17:54:36 -0400 Subject: extras-buildsys/client client.py,1.8,1.9 Message-ID: <200507092154.j69Lsacl012231@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12214/client Modified Files: client.py Log Message: Add space after each job Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- client.py 8 Jul 2005 18:12:25 -0000 1.8 +++ client.py 9 Jul 2005 21:54:34 -0000 1.9 @@ -114,6 +114,7 @@ for archjob in archjobs: if archjob[1] == job[0]: print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) + print '' def kill(server, email, jobid): From fedora-extras-commits at redhat.com Sun Jul 10 01:49:48 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 21:49:48 -0400 Subject: rpms/ncview/devel ncview-1.92e-do_print.c.patch,1.1,1.2 Message-ID: <200507100149.j6A1nmBt017002@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946/devel Modified Files: ncview-1.92e-do_print.c.patch Log Message: remember to close the file descriptor from mkstemp() ncview-1.92e-do_print.c.patch: Index: ncview-1.92e-do_print.c.patch =================================================================== RCS file: /cvs/extras/rpms/ncview/devel/ncview-1.92e-do_print.c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview-1.92e-do_print.c.patch 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview-1.92e-do_print.c.patch 10 Jul 2005 01:49:46 -0000 1.2 @@ -8,7 +8,7 @@ FILE *outf; float output_scale; int r, g, b, n_print; -@@ -86,20 +87,34 @@ +@@ -86,20 +87,35 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; @@ -36,6 +36,7 @@ - } - + } ++ close(outfid); + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) From fedora-extras-commits at redhat.com Sun Jul 10 01:49:41 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 21:49:41 -0400 Subject: rpms/ncview/FC-3 ncview-1.92e-do_print.c.patch,1.1,1.2 Message-ID: <200507100150.j6A1oCF3017005@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946/FC-3 Modified Files: ncview-1.92e-do_print.c.patch Log Message: remember to close the file descriptor from mkstemp() ncview-1.92e-do_print.c.patch: Index: ncview-1.92e-do_print.c.patch =================================================================== RCS file: /cvs/extras/rpms/ncview/FC-3/ncview-1.92e-do_print.c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview-1.92e-do_print.c.patch 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview-1.92e-do_print.c.patch 10 Jul 2005 01:49:39 -0000 1.2 @@ -8,7 +8,7 @@ FILE *outf; float output_scale; int r, g, b, n_print; -@@ -86,20 +87,34 @@ +@@ -86,20 +87,35 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; @@ -36,6 +36,7 @@ - } - + } ++ close(outfid); + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) From fedora-extras-commits at redhat.com Sun Jul 10 01:49:42 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Sat, 9 Jul 2005 21:49:42 -0400 Subject: rpms/ncview/FC-4 ncview-1.92e-do_print.c.patch,1.1,1.2 Message-ID: <200507100150.j6A1oDsv017008@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/rpms/ncview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16946/FC-4 Modified Files: ncview-1.92e-do_print.c.patch Log Message: remember to close the file descriptor from mkstemp() ncview-1.92e-do_print.c.patch: Index: ncview-1.92e-do_print.c.patch =================================================================== RCS file: /cvs/extras/rpms/ncview/FC-4/ncview-1.92e-do_print.c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncview-1.92e-do_print.c.patch 7 Jul 2005 22:30:53 -0000 1.1 +++ ncview-1.92e-do_print.c.patch 10 Jul 2005 01:49:40 -0000 1.2 @@ -8,7 +8,7 @@ FILE *outf; float output_scale; int r, g, b, n_print; -@@ -86,20 +87,34 @@ +@@ -86,20 +87,35 @@ sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); if( printer_options( &printopts ) == MESSAGE_CANCEL ) return; @@ -36,6 +36,7 @@ - } - + } ++ close(outfid); + } + else { + if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) From fedora-extras-commits at redhat.com Sun Jul 10 03:44:37 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:37 -0400 Subject: extras-buildsys/builder builder.py,1.9,1.10 Message-ID: <200507100344.j6A3ibtu019411@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/builder Modified Files: builder.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- builder.py 8 Jul 2005 17:23:44 -0000 1.9 +++ builder.py 10 Jul 2005 03:44:35 -0000 1.10 @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# copyright 2005 Duke University -# written by Seth Vidal +# +# Copyright 2005 Dan Williams and Red Hat, Inc. import SimpleXMLRPCServer From fedora-extras-commits at redhat.com Sun Jul 10 03:44:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:38 -0400 Subject: extras-buildsys/client client.py,1.9,1.10 Message-ID: <200507100344.j6A3icCe019420@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/client Modified Files: client.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- client.py 9 Jul 2005 21:54:34 -0000 1.9 +++ client.py 10 Jul 2005 03:44:36 -0000 1.10 @@ -192,7 +192,7 @@ certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert')) certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert')) certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert')) - server = XMLRPCServerProxy.XMLRPCServerProxy(addr, certs) + server = XMLRPCServerProxy.PlgXMLRPCServerProxy(addr, certs) elif use_ssl == 'false': if addr.startswith("https:"): raise ServerException("Error: '%s' is an SSL server, but the use_ssl config option set to False. See %s" % (addr, config_file_path)) From fedora-extras-commits at redhat.com Sun Jul 10 03:44:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:39 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.2, 1.3 XMLRPCServerProxy.py, 1.3, 1.4 Message-ID: <200507100344.j6A3idA9019427@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/common Modified Files: AuthedXMLRPCServer.py XMLRPCServerProxy.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AuthedXMLRPCServer.py 6 Jul 2005 21:20:55 -0000 1.2 +++ AuthedXMLRPCServer.py 10 Jul 2005 03:44:36 -0000 1.3 @@ -12,8 +12,8 @@ # 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 Konstantin Ryabitsev -# Modified by Dan Williams +# Copyright 2005 Dan Williams and Red Hat, Inc. + import os, sys import socket @@ -22,6 +22,44 @@ import xmlrpclib import SimpleXMLRPCServer import SSLCommon +import threading + + + +""" +So we need a way of getting data from the RequestHandler instance, which +is unique to each request, into the actual handler instance that we've registered. + +To do this without overriding a bunch of member functions, we have a global +dict of data that maps authorization info to a particular thread, since each +request is handled in its own thread. Therefore, the handler instance can +access the data that our request handler has set. + +""" + +__authinfos_lock = threading.Lock() +__authinfos = {} + + +def _add_authinfo(authinfo): + __authinfos_lock.acquire() + __authinfos[threading.currentThread()] = authinfo + __authinfos_lock.release() + +def get_authinfo(): + i = None + __authinfos_lock.acquire() + try: + i = __authinfos[threading.currentThread()] + except KeyError: + pass + __authinfos_lock.release() + return i + +def _del_authinfo(): + __authinfos_lock.acquire() + del __authinfos[threading.currentThread()] + __authinfos_lock.release() class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): @@ -32,50 +70,10 @@ protocol_version = "HTTP/1.1" def do_POST(self): - """ - See documentation on SimpleXMLRPCRequestHandler. Modifications - include the ability to pass through local request-specific data, - and removal of code to deal with historical _dispatch methods. - """ - - if 0: - # ONLY FOR DEBUGGING, so we can see exceptions on the console - # get arguments - data = self.rfile.read(int(self.headers["content-length"])) - authinfo = self.server.get_authinfo(self.request, self.client_address) - response = self.server._marshaled_dispatch(data, authinfo) - - # got a valid XML RPC response - self.send_response(200) - self.send_header("Content-type", "text/xml") - self.send_header("Content-length", str(len(response))) - self.end_headers() - self.wfile.write(response) - - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) - else: - try: - # get arguments - data = self.rfile.read(int(self.headers["content-length"])) - authinfo = self.server.get_authinfo(self.request, self.client_address) - response = self.server._marshaled_dispatch(data, authinfo) - except: # This should only happen if the module is buggy - # internal error, report as HTTP server error - self.send_response(500) - self.end_headers() - else: - # got a valid XML RPC response - self.send_response(200) - self.send_header("Content-type", "text/xml") - self.send_header("Content-length", str(len(response))) - self.end_headers() - self.wfile.write(response) - - # shut down the connection - self.wfile.flush() - self.connection.shutdown(1) + authinfo = self.server.get_authinfo(self.request, self.client_address) + _add_authinfo(authinfo) + SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.do_POST(self) + _del_authinfo() class BaseAuthedXMLRPCServer: @@ -92,68 +90,6 @@ return self.authinfo_callback(request, client_address) return None - def verify_request(self, request, client_address): - return True - - def _marshaled_dispatch(self, data, authinfo): - """ - Allow the ability to pass request-dependent objects into - the handler instance. - """ - params, method = xmlrpclib.loads(data) - - # generate response - try: - response = self._dispatch(authinfo, method, params) - # wrap response in a singleton tuple - response = (response,) - response = xmlrpclib.dumps(response, methodresponse=1) - except xmlrpclib.Fault, fault: - response = xmlrpclib.dumps(fault) - except: - # report exception back to server - response = xmlrpclib.dumps( - xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)) - ) - - return response - - def _dispatch(self, authinfo, method, params): - """ - Allow the ability to pass request-dependent objects into - the handler instance. - """ - func = None - try: - # check to see if a matching function has been registered - func = self.funcs[method] - except KeyError: - if self.instance is not None: - # call instance method directly - try: - func = self.lcl_resolve_dotted_attribute(method) - except AttributeError: - pass - - if func is not None: - # Only pass authinfo into Instance if we have are set - # up to get authinfo - if self.authinfo_callback is not None: - return func(authinfo, *params) - else: - return func(*params) - else: - raise Exception('method "%s" is not supported' % method) - - def lcl_resolve_dotted_attribute(self, method): - pyver = sys.version_info[:3] - if pyver <= (2, 3, 4): - return SimpleXMLRPCServer.resolve_dotted_attribute( - self.instance, method) - elif pyver > (2, 3, 4): - return SimpleXMLRPCServer.resolve_dotted_attribute( - self.instance, method, self.allow_dotted_names) - class AuthedSSLXMLRPCServer(BaseAuthedXMLRPCServer, SSLCommon.PlgBaseSSLServer, SimpleXMLRPCServer.SimpleXMLRPCServer): """ Extension to allow more fine-tuned SSL handling """ @@ -176,8 +112,24 @@ class ReqHandler: def ping(self): + authinfo = get_authinfo() + print "AUTHINFO: %s" % authinfo return "pong" +class TestServer(AuthedSSLXMLRPCServer): + """ + SSL XMLRPC server that authenticates clients based on their certificate. + """ + + def __init__(self, address, certs): + AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs) + + def auth_cb(self, request, client_address): + import random + peer_cert = request.get_peer_certificate() + email = peer_cert.get_subject().countryName + return "AUTH: %s - %d" % (email, random.randint(1, 100)) + if __name__ == '__main__': if len(sys.argv) < 4: @@ -190,7 +142,7 @@ certs['peer_ca_cert'] = sys.argv[3] print "Starting the server." - server = AuthedSSLXMLRPCServer(('localhost', 8886), None, certs) + server = TestServer(('localhost', 8886), certs) h = ReqHandler() server.register_instance(h) server.serve_forever() Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- XMLRPCServerProxy.py 9 Jul 2005 21:44:23 -0000 1.3 +++ XMLRPCServerProxy.py 10 Jul 2005 03:44:36 -0000 1.4 @@ -49,6 +49,32 @@ # Testing stuff ########################################################### + +import threading +import time +import random + +client_start = False + +_lock = threading.Lock() + +class TestClient(threading.Thread): + def __init__(self, certs): + self.server = PlgXMLRPCServerProxy("https://127.0.0.1:8886", certs) + threading.Thread.__init__(self) + + def run(self): + while not client_start: + time.sleep(0.05) + i = 0 + while i < 5: +# _lock.acquire() + print self.server.ping() + time.sleep(0.05) +# _lock.release() + i = i + 1 + + if __name__ == '__main__': if len(sys.argv) < 4: print "Usage: python XMLRPCServerProxy.py key_and_cert ca_cert peer_ca_cert" @@ -59,5 +85,19 @@ certs['ca_cert'] = sys.argv[2] certs['peer_ca_cert'] = sys.argv[3] - s = XMLRPCServerProxy("https://127.0.0.1:8886", certs) - print s.ping() + i = 100 + while i > 0: + t = TestClient(certs) + print "Created thread %d." % i + t.start() + i = i - 1 + + time.sleep(3) + print "Unleashing threads." + client_start = True + while True: + try: + time.sleep(0.25) + except KeyboardInterrupt: + os._exit(0) + From fedora-extras-commits at redhat.com Sun Jul 10 03:44:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:39 -0400 Subject: extras-buildsys/server Builder.py, 1.3, 1.4 User.py, 1.3, 1.4 UserInterface.py, 1.16, 1.17 main.py, 1.4, 1.5 Message-ID: <200507100344.j6A3idQE019436@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340/server Modified Files: Builder.py User.py UserInterface.py main.py Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Builder.py 7 Jul 2005 16:21:12 -0000 1.3 +++ Builder.py 10 Jul 2005 03:44:37 -0000 1.4 @@ -46,9 +46,9 @@ self._jobs = {} self._address = address if config_opts['ssl_builders']: - self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, certs) + self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs) else: - self._server = XMLRPCServerProxy.XMLRPCServerProxy(self._address, None) + self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._unavail_count = 0 self._arches = [] try: Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- User.py 26 Jun 2005 14:52:30 -0000 1.3 +++ User.py 10 Jul 2005 03:44:37 -0000 1.4 @@ -34,7 +34,6 @@ self.server_admin = False - class Authenticator: """ Talks to a database of users & capabilities Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- UserInterface.py 8 Jul 2005 18:12:31 -0000 1.16 +++ UserInterface.py 10 Jul 2005 03:44:37 -0000 1.17 @@ -24,6 +24,7 @@ import copy import BuildMaster import PackageJob +from plague import AuthedXMLRPCServer # Load in the config CONFIG_LOCATION = "/etc/plague/server/" @@ -212,20 +213,23 @@ Allow/Deny operations based on user privileges """ - def enqueue(self, user, package, cvs_tag, target, buildreq=None): - if not user.own_jobs: + def enqueue(self, package, cvs_tag, target, buildreq=None): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: return (-1, "Insufficient privileges.") return UserInterface.enqueue(self, user.email, package, cvs_tag, target, buildreq) - def enqueue_srpm(self, user, package, srpm_file, target, buildreq=None): - if not user.own_jobs: + def enqueue_srpm(self, package, srpm_file, target, buildreq=None): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: return (-1, "Insufficient privileges.") return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq) - def kill_job(self, user, email, jobid): - if not user.own_jobs: + def kill_job(self, email, jobid): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.own_jobs: return (-1, "Insufficient privileges.") if user.email != email: return (-1, "Insufficient privileges.") @@ -236,17 +240,21 @@ return self._kill_job(user.email, job, jobid) - def list_jobs(self, user, args_dict): + def list_jobs(self, args_dict): + user = AuthedXMLRPCServer.get_authinfo() return UserInterface.list_jobs(self, args_dict) - def update_builders(self, user): - if not user.server_admin: + def update_builders(self): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.server_admin: return (-1, "Insufficient privileges.") return UserInterface.update_builders(self) - def list_builders(self, user): - if not user.server_admin: + + def list_builders(self): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.server_admin: return (-1, "Insufficient privileges.") return UserInterface.list_builders(self) Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- main.py 7 Jul 2005 17:45:08 -0000 1.4 +++ main.py 10 Jul 2005 03:44:37 -0000 1.5 @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# copyright 2005 Duke University -# written by Seth Vidal +# +# Copyright 2005 Dan Williams and Red Hat, Inc. import sys From fedora-extras-commits at redhat.com Sun Jul 10 03:44:37 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 9 Jul 2005 23:44:37 -0400 Subject: extras-buildsys ChangeLog, 1.48, 1.49 Makefile, 1.6, 1.7 plague.spec, 1.9, 1.10 Message-ID: <200507100345.j6A3j7Mk019445@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19340 Modified Files: ChangeLog Makefile plague.spec Log Message: 2005-07-09 Dan Williams * Rework the authorization framework so we don't need to subclass/override subclass so much stuff * Make the specfile Python version independent Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ChangeLog 8 Jul 2005 18:12:25 -0000 1.48 +++ ChangeLog 10 Jul 2005 03:44:35 -0000 1.49 @@ -1,3 +1,10 @@ +2005-07-09 Dan Williams + + * Rework the authorization framework so we don't need to + subclass/override subclass so much stuff + + * Make the specfile Python version independent + 2005-07-08 Dan Williams * Pass archjob information along to the client, Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 8 Jul 2005 03:28:19 -0000 1.6 +++ Makefile 10 Jul 2005 03:44:35 -0000 1.7 @@ -27,6 +27,8 @@ @rm -rf /tmp/${PKGNAME}-$(VERSION) /tmp/${PKGNAME} @dir=$$PWD; cd /tmp; cp -a $$dir ${PKGNAME} @rm -f /tmp/${PKGNAME}/${PKGNAME}-daily.spec + @rm -rf /tmp/${PKGNAME}/build + @rm -rf /tmp/${PKGNAME}/dist @rm -rf /tmp/${PKGNAME}/builder/certs @rm -rf /tmp/${PKGNAME}/client/certs @rm -rf /tmp/${PKGNAME}/server/certs Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plague.spec 8 Jul 2005 04:41:13 -0000 1.9 +++ plague.spec 10 Jul 2005 03:44:35 -0000 1.10 @@ -1,5 +1,3 @@ -%define pythonver 2.4 - BuildArch: noarch Summary: Distributed build system for RPMs @@ -92,7 +90,7 @@ %files common %defattr(-, root, root) -%{_libdir}/python%{pythonver}/site-packages/plague/*.py* +%{_libdir}/python?.?/site-packages/plague/*.py* %files builder %defattr(-, root, root) From fedora-extras-commits at redhat.com Sun Jul 10 04:33:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:33:27 -0400 Subject: extras-buildsys/client client.py,1.10,1.11 Message-ID: <200507100433.j6A4XRdV020587@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20570/client Modified Files: client.py Log Message: Ignore IOErrors when printing jobs Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- client.py 10 Jul 2005 03:44:36 -0000 1.10 +++ client.py 10 Jul 2005 04:33:25 -0000 1.11 @@ -110,11 +110,14 @@ print "No jobs found that match the search criteria." else: for job in jobs: - print job - for archjob in archjobs: - if archjob[1] == job[0]: - print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) - print '' + try: + print job + for archjob in archjobs: + if archjob[1] == job[0]: + print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7]) + print '' + except IOError: + pass def kill(server, email, jobid): From fedora-extras-commits at redhat.com Sun Jul 10 04:33:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:33:53 -0400 Subject: extras-buildsys/server UserInterface.py,1.17,1.18 Message-ID: <200507100433.j6A4Xr9d020610@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593/server Modified Files: UserInterface.py Log Message: Validate email addresses Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- UserInterface.py 10 Jul 2005 03:44:37 -0000 1.17 +++ UserInterface.py 10 Jul 2005 04:33:51 -0000 1.18 @@ -53,6 +53,17 @@ return (dbcx, curs) +def validate_email(email): + for c in email: + # For now, legal characters are '@_-.+' plus alphanumeric + if (c == '@') or (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): + pass + else: + print "Bad char is '%s'" % c + return False + return True + + class UserInterface: """ Base UserInterface class. NO AUTHENTICATION. Subclass this to provide some. @@ -134,14 +145,15 @@ first = True if args_dict.has_key('email') and args_dict['email']: - # FIXME: validate email so users can't do random SQL queries - # in place of the email address - if first: - search = search + " WHERE " - first = False + if validate_email(args_dict['email']): + if first: + search = search + " WHERE " + first = False + else: + search = search + " AND " + search = search + 'username LIKE "%%%s%%"' % args_dict['email'] else: - search = search + " AND " - search = search + 'username LIKE "%%%s%%"' % args_dict['email'] + return (-1, "Error: Invalid query.", [], []) if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] From fedora-extras-commits at redhat.com Sun Jul 10 04:43:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:43:24 -0400 Subject: extras-buildsys/etc - New directory Message-ID: <200507100443.j6A4hORU020632@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20618/etc Log Message: Directory /cvs/fedora/extras-buildsys/etc added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 04:48:41 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:41 -0400 Subject: extras-buildsys/common daemonize.py,NONE,1.1 Message-ID: <200507100448.j6A4mfEk020713@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/common Added Files: daemonize.py Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder ***** Error reading new file: [Errno 2] No such file or directory: 'daemonize.py' From fedora-extras-commits at redhat.com Sun Jul 10 04:48:42 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:42 -0400 Subject: extras-buildsys/etc plague-builder.config, NONE, 1.1 plague-builder.init, NONE, 1.1 Message-ID: <200507100448.j6A4mgjl020718@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/etc Added Files: plague-builder.config plague-builder.init Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder --- NEW FILE plague-builder.config --- HOST=localhost ARCHS= --- NEW FILE plague-builder.init --- #!/bin/bash # # /etc/rc.d/init.d/plague-builder # # Start a plague builder instance # # chkconfig: 345 98 02 # description: Starts a plague builder instance # processname: plague-builder # config: /etc/sysconfig/plague-builder # pidfile: /var/run/plague-builder.pid # Source function library. . /etc/init.d/functions . /etc/sysconfig/plague-builder start() { echo -n "Starting plague-builder: " daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHS echo touch /var/lock/subsys/plague-builder return 0 } stop() { echo -n "Shutting down plague-builder: " killproc plague-builder echo rm -f /var/lock/subsys/plague-builder return 0 } restart() { stop start } case "$1" in start) start ;; stop) stop ;; status) status plague-builder ;; restart) stop start ;; condrestart) [ -f /var/lock/subsys/plague-builder ] && restart || : ;; *) echo "Usage: {start|stop|status|reload|restart[|probe]" exit 1 ;; esac exit $? From fedora-extras-commits at redhat.com Sun Jul 10 04:48:40 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:40 -0400 Subject: extras-buildsys/builder builder.py,1.10,1.11 Message-ID: <200507100448.j6A4meiB020707@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652/builder Modified Files: builder.py Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- builder.py 10 Jul 2005 03:44:35 -0000 1.10 +++ builder.py 10 Jul 2005 04:48:38 -0000 1.11 @@ -34,6 +34,7 @@ from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer +from plague import daemonize # Load in the config @@ -596,11 +597,40 @@ if __name__ == '__main__': - if len(sys.argv) < 3: + state={'opts': True, 'host': None, 'archs': [], + 'daemon': False, 'pidfile': None, 'logfile': None} + + for i in sys.argv[1:]: + if state['logfile']=='': + state['logfile']=i + continue + if state['pidfile']=='': + state['pidfile']=i + continue + if i.startswith('-'): + if state['opts']: + if i=='-d': + state['daemon']=True + elif i=='-p': + state['pidfile']='' + elif i=='-l': + state['logfile']='' + elif i=='--': + state['opts']=False + continue + if not state['host']: + state['host']=i + else: + state['archs'].append(i) + + if not state['host'] or not state['archs'] or (state['pidfile']=='') or (state['logfile']==''): print "Usage:\n" - print " %s \n" % sys.argv[0] + print " %s [-p ] [-l ] [-d]\n" % sys.argv[0] print " - hostname or IP address of this machine" print " - space-separated list of arches this machine can build" + print " - file to write the PID to" + print " - file to write messages to instead of stdout" + print " -d - daemonize (i.e., detach from the terminal)" # pretty-print the available archlist archlist = "" @@ -613,8 +643,22 @@ print " Available arches: [ %s ]\n" % archlist sys.exit(1) - g_our_hostname = sys.argv[1] - localarches = sys.argv[2:] + g_our_hostname = state['host'] + localarches = state['archs'] + + if state['daemon']: + ret=daemonize.createDaemon() + if ret: + print "Daemonizing failed!" + sys.exit(2) + + if state['pidfile']: + open(state['pidfile'], 'w').write('%d\n' % os.getpid()) + + if state['logfile']: + log=open(state['logfile'], 'a') + sys.stdout=log + sys.stderr=log work_dir = config_opts['builder_work_dir'] if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): From fedora-extras-commits at redhat.com Sun Jul 10 04:48:40 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 00:48:40 -0400 Subject: extras-buildsys ChangeLog,1.49,1.50 plague.spec,1.10,1.11 Message-ID: <200507100449.j6A4nAj1020724@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652 Modified Files: ChangeLog plague.spec Log Message: 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemonize support for the builder Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 10 Jul 2005 03:44:35 -0000 1.49 +++ ChangeLog 10 Jul 2005 04:48:38 -0000 1.50 @@ -1,5 +1,10 @@ 2005-07-09 Dan Williams + Patch from Ignacio Vazquez-Abrams + * Add initscript/daemonize support for the builder + +2005-07-09 Dan Williams + * Rework the authorization framework so we don't need to subclass/override subclass so much stuff Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plague.spec 10 Jul 2005 03:44:35 -0000 1.10 +++ plague.spec 10 Jul 2005 04:48:38 -0000 1.11 @@ -33,6 +33,9 @@ Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1 Requires: mock >= 0.3, pyOpenSSL +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description builder The Plague build client does the actual RPM package building on slave @@ -70,12 +73,27 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder +install -D -m 0755 etc/plague-builder-init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder %clean rm -rf $RPM_BUILD_ROOT +%post builder +/sbin/chkconfig --add plague-builder +. %{_sysconfdir}/sysconfig/%{name}-builder +if [ -z "$ARCHS" ] ; then + sed -ie "s/^ARCHS=.*$/ARCHS=$(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/')/" %{_sysconfdir}/sysconfig/%{name}-builder +endif + +%preun builder +if [ $1 = 0 ]; then + /sbin/service plague-builder stop &> /dev/null + /sbin/chkconfig --del plague-builder +fi + %files %defattr(-, root, root) %doc README ChangeLog @@ -98,6 +116,8 @@ %dir %{_sysconfdir}/%{name}/builder %config(noreplace) %{_sysconfdir}/%{name}/builder/CONFIG.py* %dir %{_sysconfdir}/%{name}/builder/certs +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder +%{_initrddir}/%{name}-builder %files client %defattr(-, root, root) From fedora-extras-commits at redhat.com Sun Jul 10 05:13:49 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 01:13:49 -0400 Subject: extras-buildsys README,1.6,1.7 Message-ID: <200507100513.j6A5Dn37021887@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21870 Modified Files: README Log Message: fix some minor typos and put linebreaks into README Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 7 Jul 2005 04:05:46 -0000 1.6 +++ README 10 Jul 2005 05:13:47 -0000 1.7 @@ -2,57 +2,88 @@ System Requirements: - Python 2.3 or 2.4 - - m2crypto as long as it's not 0.10 + - pyOpenSSL - sqlite python bindings - - mock (http://www.dulug.duke.edu/~skvidal/mock/) - + - mock (http://linux.duke.edu/~skvidal/mock/) + - createrepo Getting Started ------------------------------------------ -To allow users to retrieve logs and other status, you need to run an HTTP server that allows access to the result dir (the 'server_work_dir' config option). - -You will also need to set up the infrastructure for the yum repository that the builders connect to and retrieve the latest packages. This can be either HTTP, NFS, SMB, etc. You then need to point 'yum' to this repo in step (5) of the Builder Setup. +To allow users to retrieve logs and other status, you need to run an HTTP +server that allows access to the result dir (the 'server_work_dir' config +option). + +You will also need to set up the infrastructure for the yum repository that the +builders connect to and retrieve the latest packages. This can be either HTTP, +NFS, SMB, etc. You then need to point 'yum' to this repo in step (5) of the +Builder Setup. Builder Setup: 1) In the CVS checkout directory on the client, execute: make DESTDIR=/ install -2) Create a user for the builder. The builder drops root privileges before running the build, but must have root to be able to do initial setup -3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs directory +2) Create a user for the builder. The builder drops root privileges before + running the build, but must have root to be able to do initial setup +3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs + directory 4) Things to modify in the client's CONFIG.py: - - Modify the 'distro' and 'repo' options to match the targets you've configured in /etc/mock/. These targets are usually in the form of "distro-target-arch-repo". 'arch' and 'target' are passed by the build system dynamically, but 'distro' and 'repo' are hardcoded in the config file. Examples are "fedora-development-i386-core" and "fedora-development-i386-extras". -5) Configure the mock target files in /etc/mock. You only need one target file for each major arch you support. For example, you don't need separate 'ia32e' or 'amd64' config files, since these just use the normal 'x86_64' config file + - Modify the 'distro' and 'repo' options to match the targets you've + configured in /etc/mock/. These targets are usually in the form of + "distro-target-arch-repo". 'arch' and 'target' are passed by the build + system dynamically, but 'distro' and 'repo' are hardcoded in the config + file. Examples are "fedora-development-i386-core" and + "fedora-development-i386-extras". +5) Configure the mock target files in /etc/mock. You only need one target + file for each major arch you support. For example, you don't need separate + 'ia32e' or 'amd64' config files, since these just use the normal 'x86_64' + config file 6) Start the client. ex: "/usr/bin/plague-builder 127.0.0.1 i386 i686" On the Server: -1) Follow the instructions at the bottom of this file titled "Configuring SSL for your Build System" +1) Follow the instructions at the bottom of this file titled "Configuring SSL + for your Build System" 2) In the CVS checkout directory, execute: make DESTDIR=/ install -3) Copy the server Key, Cert, and CA Cert to the /etc/plague/server/certs directory -4) Copy the client authentication CA Cert to the /etc/plague/server/certs directory +3) Copy the server Key, Cert, and CA Cert to the /etc/plague/server/certs + directory +4) Copy the client authentication CA Cert to the /etc/plague/server/certs + directory 5) Things to modify in the server's CONFIG.py: - - Update the Key, Cert, and CA Cert, and client auth CA Cert file options to point to the files in steps 3 and 4 - - Modify the 'targets' option to add/remove the arches and targets you'll be building - - Modify the 'builders' option to point to the build clients you'll be using. Note the "https". - - If you want to do simple SRPM builds, set the 'use_srpm_not_cvs' option to true + - Update the Key, Cert, and CA Cert, and client auth CA Cert file options + to point to the files in steps 3 and 4 + - Modify the 'targets' option to add/remove the arches and targets you'll + be building + - Modify the 'builders' option to point to the build clients you'll be + using. Note the "https". + - If you want to do simple SRPM builds, set the 'use_srpm_not_cvs' option + to true 6) Start the server. ex: "/usr/bin/plague-server 127.0.0.1" Operation: -1) You must add a user account for any user who wishes to use the build system. This is accomplished with the 'plague-user-manager.py' tool, installed by default in /usr/bin. You add a user like this: - /usr/bin/plague-user-manager.py /etc/plague/server/userdb add dcbw at redhat.com own_jobs kill_any_job modify_users server_admin -2) Clients then run plague-client to queue jobs. When first run, plague-client creates the ~/.plague-client.cfg file - - Point the client to the server's address +1) You must add a user account for any user who wishes to use the build system. + This is accomplished with the 'plague-user-manager.py' tool, installed by + default in /usr/bin. You add a user like this: + /usr/bin/plague-user-manager.py /etc/plague/server/userdb add \ + dcbw at redhat.com own_jobs kill_any_job modify_users server_admin + +2) Clients then run plague-client to queue jobs. When first run, + plague-client creates the ~/.plague-client.cfg file + - Point the client to the server's address - Point the client to the correct certificates - - Make sure you change the email address in ~/.plague-client to match that of the 'user-cert' certificate + - Make sure you change the email address in ~/.plague-client to match + that of the 'user-cert' certificate + 3) To build a package, you use plague-client like so: /usr/bin/plague-client build ethtool /home/dcbw/ethtool-1.8-4.src.rpm devel -4) If the client returns "Package ethtool enqueued." then the enqueue was successful + +4) If the client returns "Package ethtool enqueued." then the enqueue was + successful You can list your own jobs with: /usr/bin/plague-client list @@ -63,7 +94,11 @@ Architectural Overview: ------------------------------------------ -The build system is composed of a single build server, and multiple build clients. Clients run an XMLRPC server to which the build-server delivers build jobs. The build server runs an XMLRPC server to allow submission of jobs, and to retrieve basic status information about both clients and the build system as a whole. +The build system is composed of a single build server, and multiple build +clients. Clients run an XMLRPC server to which the build-server delivers +build jobs. The build server runs an XMLRPC server to allow submission of +jobs, and to retrieve basic status information about both clients and the +build system as a whole. @@ -72,17 +107,40 @@ usage: build-client
    ie : build-client localhost sparc sparcv9 sparcv8 -Currently, build clients are limited to building one job at a time. This limitation may be removed in the future. They do not queue pending jobs, but will reject build requests when something is already building. The build server is expected to queue and manage jobs at this time, and serialize requests to build clients. This may not be the case in the future. +Currently, build clients are limited to building one job at a time. This +limitation may be removed in the future. They do not queue pending jobs, +but will reject build requests when something is already building. The build +server is expected to queue and manage jobs at this time, and serialize +requests to build clients. This may not be the case in the future. main() `- Creates: XMLRPCBuildClientServer - `- Creates: i386Arch, x86_64Arch, PPCArch, etc (subclasses of BuildClientMach) - -The client creates an XMLRPC server object (XMLRPCBuildClientServer), and then processes requests in an infinite loop. Every so often (currently 5 seconds) the server allows each build job that is still in process to update its status and perform work. The XMLRPCBuildClientServer keeps a list of local build jobs, which are architecture specific, and forwards requests and commands for each job to that specific job, keyed off a unique id. - -Each build job (BuildClientMach and its architecture-specific subclasses like i386Arch) proceeds through a number of states. Build jobs are periodically given time to do work (BuildClientMach.process()) by their BuildClientInstance (from XMLRPCBuildClientServer._process()), which is in turn periodically given time by the client's main loop. During their processing time, build jobs check their state, see if any actions have completed, and advance to the next state if needed. Communication with mock and retrieval of status from mock are done with popen2.Popen4() so that mock does not block the XMLRPC server from talking to the build server. + `- Creates: i386Arch, x86_64Arch, PPCArch, etc (subclasses + of BuildClientMach) -All communication with the build server is done through SSL to ensure the identity of each party. Both the XMLRPC server and the result file server are SSL-enabled, and require SSL certificates and keys to operate. See later section in this document on how to configure SSL certificates for your build system. +The client creates an XMLRPC server object (XMLRPCBuildClientServer), and +then processes requests in an infinite loop. Every so often (currently +5 seconds) the server allows each build job that is still in process to +update its status and perform work. The XMLRPCBuildClientServer keeps a +list of local build jobs, which are architecture specific, and forwards +requests and commands for each job to that specific job, keyed off a +unique id. + +Each build job (BuildClientMach and its architecture-specific subclasses like +i386Arch) proceeds through a number of states. Build jobs are periodically +given time to do work (BuildClientMach.process()) by their BuildClientInstance +(from XMLRPCBuildClientServer._process()), which is in turn periodically given +time by the client's main loop. During their processing time, build jobs +check their state, see if any actions have completed, and advance to the next +state if needed. Communication with mock and retrieval of status from mock +are done with popen2.Popen4() so that mock does not block the XMLRPC server +from talking to the build server. + +All communication with the build server is done through SSL to ensure the +identity of each party. Both the XMLRPC server and the result file server are +SSL-enabled, and require SSL certificates and keys to operate. See later +section in this document on how to configure SSL certificates for your build +system. @@ -90,23 +148,51 @@ usage: build-server -The build server runs two threads. The first, the XMLRPC server (XMLRPCBuildMaster class), accepts requests to enqueue jobs for build and stuffs them into an sqlite database which contains all job details. The second thread, the Build Master (BuildMaster class), pulls 'waiting' jobs from the database and builds them. A third top-level object that runs in the same thread as the Build Master is the BuildClientManager, which keeps track of build clients (ArchWelders) and their status. +The build server runs two threads. The first, the XMLRPC server +(XMLRPCBuildMaster class), accepts requests to enqueue jobs for build and +stuffs them into an sqlite database which contains all job details. The second +thread, the Build Master (BuildMaster class), pulls 'waiting' jobs from the +database and builds them. A third top-level object that runs in the same +thread as the Build Master is the BuildClientManager, which keeps track of +build clients (ArchWelders) and their status. main() |- Creates: XMLRPCBuildMaster |- Creates: BuildClientManager |- `- Creates: BuildClient (one for each remote build client) - |- `- Creates: BuildClientJob (one for each build job on each arch) + |- `- Creates: BuildClientJob (one for each build job + |- on each arch) `- Creates: BuildMaster `- Creates: BuildJob (one for each build job) -The BuildClientManager object serves as a central location for all tracking and status information about each build job on each arch. It creates an BuildClient instance for each remote build client. The BuildClient instance keeps track of specific jobs building on all architectures on that remote build client. It also serves as the XMLRPC client of the remote build client, proxying status information from it. - -BuildJobs must request that the BuildClientManager create a new BuildClientJob for each build on each architecture the BuildJob needs. If there is an available build client (since build clients only build one job at a time across all arches they support), the BuildClientManager will pass the request to the arch-specific BuildClient instance, which creates the new arch-specific BuildClientJob, and pass it back through the BuildClientManager to the parent BuildJob. If there is no available build client for the request, the BuildJob must periodically re-issue the build request to the BuildClientManager. - -BuildClientManager has a periodic processing routine that is called from the BuildMaster thread. This processing routine calls the BuildClient.process() routine on each BuildClient instance, which in turn updates its view of the remote build client's status. Thus, the BuildClientManager, through each BuildClient instance, knows the status and currently building job on each remote build client. - -BuildJobs track a single SRPM build through the entire build system. They are created from the BuildMaster thread whenever the BuildMaster finds a job entry in the sqlite database with the status of 'waiting'. BuildJobs proceed through a number of states: "initialize", "checkout", "make_srpm", "prep", "building", "finished", "cleanup", "failed", and "needsign". +The BuildClientManager object serves as a central location for all tracking and +status information about each build job on each arch. It creates a +BuildClient instance for each remote build client. The BuildClient instance +keeps track of specific jobs building on all architectures on that remote +build client. It also serves as the XMLRPC client of the remote build +client, proxying status information from it. + +BuildJobs must request that the BuildClientManager create a new BuildClientJob +for each build on each architecture the BuildJob needs. If there is an +available build client (since build clients only build one job at a time +across all arches they support), the BuildClientManager will pass the request +to the arch-specific BuildClient instance, which creates the new arch-specific +BuildClientJob, and pass it back through the BuildClientManager to the parent +BuildJob. If there is no available build client for the request, the BuildJob +must periodically re-issue the build request to the BuildClientManager. + +BuildClientManager has a periodic processing routine that is called from the +BuildMaster thread. This processing routine calls the BuildClient.process() +routine on each BuildClient instance, which in turn updates its view of the +remote build client's status. Thus, the BuildClientManager, through each +BuildClient instance, knows the status and currently building job on each +remote build client. + +BuildJobs track a single SRPM build through the entire build system. They are +created from the BuildMaster thread whenever the BuildMaster finds a job entry +in the sqlite database with the status of 'waiting'. BuildJobs proceed through +a number of states: "initialize", "checkout", "make_srpm", "prep", "building", +"finished", "cleanup", "failed", and "needsign". Flow goes like this: @@ -122,37 +208,55 @@ - failed jobs? => failed - otherwise => needsign -The BuildJob updates its status when it is periodically told to do so by the BuildManager. At this point, it will advance to the next state, or spawn build jobs that have not yet started if build clients for those architectures are now available. It stays in the "building" state until all jobs are first spawned, and then either completed or failed. - -All communication with build clients is done through SSL to ensure the identity of each party. When the client requests the SRPM to build, SSL is used. When the build server retrieves logs and RPMs from the build client, SSL is also used. This ensures that build clients can be more or less trusted, or at least that some random build client is not serving you packages that might contaminate your repository. See later section in this document on how to configure SSL certificates for your build system. +The BuildJob updates its status when it is periodically told to do so by the +BuildManager. At this point, it will advance to the next state, or spawn build +jobs that have not yet started if build clients for those architectures are +now available. It stays in the "building" state until all jobs are first +spawned, and then either completed or failed. + +All communication with build clients is done through SSL to ensure the +identity of each party. When the client requests the SRPM to build, SSL +is used. When the build server retrieves logs and RPMs from the build client, +SSL is also used. This ensures that build clients can be more or less trusted, +or at least that some random build client is not serving you packages that +might contaminate your repository. See later section in this document on how +to configure SSL certificates for your build system. Configuring SSL for your Build System -------------------------------------- -When you set up the build system, you essentially become a Certificate Authority. -Because the build server and the build clients communicate using SSL, they need -to exchange certificates to verify the others' identity. You must first create -a key/cert pair for the Build System Certificate Authority, which signs both -the build server's certificate, and each build client's certificate. +When you set up the build system, you essentially become a Certificate +Authority. Because the build server and the build clients communicate using +SSL, they need to exchange certificates to verify the others' identity. +You must first createa key/cert pair for the Build System Certificate +Authority, which signs both the build server's certificate, and each build +client's certificate. The Certificates on the Server: config_opts['server_cert'] -> server SSL certificate config_opts['server_key'] -> server private key -config_opts['ca_cert'] -> CA certificate used to sign both server and builder certificates -config_opts['ui_ca_cert'] -> CA cert that signs package maintainer's certificates, used to verify connections from plague-clients are authorized +config_opts['ca_cert'] -> CA certificate used to sign both server and builder + certificates +config_opts['ui_ca_cert'] -> CA cert that signs package maintainer's + certificates, used to verify connections from + plague-clients are authorized The Certificates on the Builders: config_opts['client_cert'] -> builder SSL certificate config_opts['client_key'] -> builder private key -config_opts['ca_cert'] -> _same_ as server's 'ca_cert', the CA certificate used to sign both server and builder certificates +config_opts['ca_cert'] -> _same_ as server's 'ca_cert', the CA certificate + used to sign both server and builder certificates -Package Maintainer certificates (used by /usr/bin/plague-client, from ~/.plague-client.cfg) +Package Maintainer certificates (used by /usr/bin/plague-client, +from ~/.plague-client.cfg) server-ca-cert -> _same_ as server and client's 'ca_cert' user-ca-cert -> CA cert that signed the package maintainer's 'user-cert' -user-key -> package maintainer's private key, can be blank if private key and certificate are in the same file -user-cert -> package maintainer's certificate, signed by 'user-ca-cert' and sent to build server to validate the plague-client's connection +user-key -> package maintainer's private key, can be blank if private key and + certificate are in the same file +user-cert -> package maintainer's certificate, signed by 'user-ca-cert' and + sent to build server to validate the plague-client's connection Setting up the Build System Certificate Authority @@ -173,7 +277,8 @@ 3. Generate the BSCA certificate -openssl req -new -x509 -key private/cakey.pem -out cacert.pem -extensions v3_ca -days 3650 +openssl req -new -x509 -key private/cakey.pem -out cacert.pem \ + -extensions v3_ca -days 3650 4. Generate a build server key @@ -208,7 +313,15 @@ or more clients. You may add clients using step 7 to create and sign their certificate requests. -9. Copy server_cert.pem, server_key.pem, and cacert.pem to a directory on the build server. IMPORTANT: make sure only the build server's user can read server_key.pem, since it is the server's private key. Then, modify the server's CONFIG.py file and point the respective config options to the _full_ path to each file. - -10. Copy client1_cert.pem, client1_key.pem, and cacert.pem to a direcrory on the build client. IMPORTANT: make sure only the build client's user can read client1_key.pem, since it is the client's private key. Then, modify the client's CONFIG.py file and point the respective config options to the _full_ path to each file. +9. Copy server_cert.pem, server_key.pem, and cacert.pem to a directory on the +build server. IMPORTANT: make sure only the build server's user can read +server_key.pem, since it is the server's private key. Then, modify the +server's CONFIG.py file and point the respective config options to the _full_ +path to each file. + +10. Copy client1_cert.pem, client1_key.pem, and cacert.pem to a direcrory on +the build client. IMPORTANT: make sure only the build client's user can read +client1_key.pem, since it is the client's private key. Then, modify the +client's CONFIG.py file and point the respective config options to the _full_ +path to each file. From rc040203 at freenet.de Sun Jul 10 05:45:26 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sun, 10 Jul 2005 07:45:26 +0200 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch,1.1,1.2 In-Reply-To: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> References: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> Message-ID: <1120974327.30532.394.camel@mccallum.corsepiu.local> On Fri, 2005-07-08 at 18:03 -0400, Adrian Reber wrote: > Author: adrian > > Update of /cvs/extras/rpms/jhead/FC-3 > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12182 > > Modified Files: > jhead-compiler-warnings.patch > Log Message: > don't reverse the other patch > > > jhead-compiler-warnings.patch: > > Index: jhead-compiler-warnings.patch > -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 > -@@ -9,7 +9,7 @@ > - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o > - > - $(OBJ)/%.o:$(SRC)/%.c > -- ${CC} ${CFLAGS} -Wall -c $< -o $@ > -+ ${CC} -O3 -Wall -c $< -o $@ You should be using the contents of RPM_OPT_FLAGS. Hard-coding -O3 should be non-acceptable unless there is a very well thought out reason to make an exception. I vote for putting this package on HOLD before this issue can be clarified. Ralf From fedora-extras-commits at redhat.com Sun Jul 10 06:08:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 02:08:26 -0400 Subject: extras-buildsys README,1.7,1.8 Message-ID: <200507100608.j6A68Qiu023051@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23034 Modified Files: README Log Message: change name of cacert.pem to ca_cert.pem to match default name in builder config files. Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- README 10 Jul 2005 05:13:47 -0000 1.7 +++ README 10 Jul 2005 06:08:24 -0000 1.8 @@ -20,14 +20,14 @@ Builder Setup. -Builder Setup: -1) In the CVS checkout directory on the client, execute: +Builder Setup: +1) In the CVS checkout directory on the builder system, execute: make DESTDIR=/ install 2) Create a user for the builder. The builder drops root privileges before running the build, but must have root to be able to do initial setup 3) Copy the client Key, Cert, and CA Cert to the /etc/plague/builder/certs directory -4) Things to modify in the client's CONFIG.py: +4) Things to modify in the builder's CONFIG.py: - Modify the 'distro' and 'repo' options to match the targets you've configured in /etc/mock/. These targets are usually in the form of "distro-target-arch-repo". 'arch' and 'target' are passed by the build @@ -272,12 +272,12 @@ 2. Generate a BSCA private key: -openssl genrsa -out private/cakey.pem 2048 +openssl genrsa -out private/ca_key.pem 2048 3. Generate the BSCA certificate -openssl req -new -x509 -key private/cakey.pem -out cacert.pem \ +openssl req -new -x509 -key private/ca_key.pem -out ca_cert.pem \ -extensions v3_ca -days 3650 @@ -313,13 +313,13 @@ or more clients. You may add clients using step 7 to create and sign their certificate requests. -9. Copy server_cert.pem, server_key.pem, and cacert.pem to a directory on the +9. Copy server_cert.pem, server_key.pem, and ca_cert.pem to a directory on the build server. IMPORTANT: make sure only the build server's user can read server_key.pem, since it is the server's private key. Then, modify the server's CONFIG.py file and point the respective config options to the _full_ path to each file. -10. Copy client1_cert.pem, client1_key.pem, and cacert.pem to a direcrory on +10. Copy client1_cert.pem, client1_key.pem, and ca_cert.pem to a direcrory on the build client. IMPORTANT: make sure only the build client's user can read client1_key.pem, since it is the client's private key. Then, modify the client's CONFIG.py file and point the respective config options to the _full_ From fedora-extras-commits at redhat.com Sun Jul 10 06:22:27 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 02:22:27 -0400 Subject: extras-buildsys plague.spec,1.11,1.12 Message-ID: <200507100622.j6A6MSBA023103@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23086 Modified Files: plague.spec Log Message: fix spec file for initscript Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- plague.spec 10 Jul 2005 04:48:38 -0000 1.11 +++ plague.spec 10 Jul 2005 06:22:25 -0000 1.12 @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder -install -D -m 0755 etc/plague-builder-init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder +install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder %clean From fedora-extras-commits at redhat.com Sun Jul 10 06:30:19 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 02:30:19 -0400 Subject: extras-buildsys/common Makefile,1.5,1.6 Message-ID: <200507100630.j6A6UJ0l023127@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23110/common Modified Files: Makefile Log Message: add daemonize.py to plague-common Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile 6 Jul 2005 21:20:55 -0000 1.5 +++ Makefile 10 Jul 2005 06:30:16 -0000 1.6 @@ -14,9 +14,10 @@ HTTPServer.py \ AuthedXMLRPCServer.py \ SSLCommon.py \ - SSLConnection.py \ + SSLConnection.py \ XMLRPCServerProxy.py \ lighttpdManager.py \ + daemonize.py \ __init__.py clean: From rc040203 at freenet.de Sun Jul 10 07:17:04 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Sun, 10 Jul 2005 09:17:04 +0200 Subject: rpms/bazaar/FC-4 bazaar.spec,1.8,1.9 In-Reply-To: <42CE8CF3.4050904@shahms.com> References: <200507071953.j67Jrqhl003122@cvs-int.fedora.redhat.com> <1120797191.30532.313.camel@mccallum.corsepiu.local> <42CE8CF3.4050904@shahms.com> Message-ID: <1120979824.30532.404.camel@mccallum.corsepiu.local> On Fri, 2005-07-08 at 07:25 -0700, Shahms King wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Ralf Corsepius wrote: > | On Thu, 2005-07-07 at 15:53 -0400, Shahms King wrote: > | > |>Author: shahms > | > | > |>Index: bazaar.spec > | > | > |>+# The stand alone annotate is meant to debug baz interals, not > installation > |>+# see: > http://lists.gnu.org/archive/html/gnu-arch-users/2005-04/msg00117.html > |>+if [ -f $RPM_BUILD_ROOT%{_bindir}/annotate ]; then > |>+ rm $RPM_BUILD_ROOT%{_bindir}/annotate > |>+fi > | > | > | Why so clumsy? > | rm -f $RPM_BUILD_ROOT%{_bindir}/annotate > | > | Ralf > > I don't find checking before removing clumsy, myself and I try to avoid > "rm -f" where possible simply on principle. What for? You want to remove annotate if it exists and that's what rm -f does. I can't imagine any situation where "test -f file && rm file" might be close to useful. Ralf From fedora-extras-commits at redhat.com Sun Jul 10 07:17:22 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 03:17:22 -0400 Subject: extras-buildsys/etc plague-builder.config, 1.1, 1.2 plague-builder.init, 1.1, 1.2 Message-ID: <200507100717.j6A7HMp2024423@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374/etc Modified Files: plague-builder.config plague-builder.init Log Message: - modify builder.py to use optparse for getting cli options default behavior now uses -a for adding architectures and checks the archs vs the archlist for this host. - modify the spec file to clean up %description for base package - modify init script and init script config file for new cli syntax for builder Index: plague-builder.config =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague-builder.config 10 Jul 2005 04:48:40 -0000 1.1 +++ plague-builder.config 10 Jul 2005 07:17:20 -0000 1.2 @@ -1,2 +1,3 @@ HOST=localhost -ARCHS= +# archsopt should be -a arch1 -a arch2 -a arch3 etc etc etc +ARCHSOPT='' Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plague-builder.init 10 Jul 2005 04:48:40 -0000 1.1 +++ plague-builder.init 10 Jul 2005 07:17:20 -0000 1.2 @@ -17,7 +17,7 @@ start() { echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHS + daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHSOPT echo touch /var/lock/subsys/plague-builder return 0 From fedora-extras-commits at redhat.com Sun Jul 10 07:17:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 03:17:16 -0400 Subject: extras-buildsys plague.spec,1.12,1.13 Message-ID: <200507100717.j6A7HkGj024426@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374 Modified Files: plague.spec Log Message: - modify builder.py to use optparse for getting cli options default behavior now uses -a for adding architectures and checks the archs vs the archlist for this host. - modify the spec file to clean up %description for base package - modify init script and init script config file for new cli syntax for builder Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plague.spec 10 Jul 2005 06:22:25 -0000 1.12 +++ plague.spec 10 Jul 2005 07:17:14 -0000 1.13 @@ -15,7 +15,7 @@ %description The Plague build system is a client/server distributed build system for -building RPM packages. This package +building RPM packages. This package provides the plague server. %package common From fedora-extras-commits at redhat.com Sun Jul 10 07:17:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sun, 10 Jul 2005 03:17:16 -0400 Subject: extras-buildsys/builder builder.py,1.11,1.12 Message-ID: <200507100717.j6A7Hlgh024429@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24374/builder Modified Files: builder.py Log Message: - modify builder.py to use optparse for getting cli options default behavior now uses -a for adding architectures and checks the archs vs the archlist for this host. - modify the spec file to clean up %description for base package - modify init script and init script config file for new cli syntax for builder Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- builder.py 10 Jul 2005 04:48:38 -0000 1.11 +++ builder.py 10 Jul 2005 07:17:14 -0000 1.12 @@ -35,6 +35,7 @@ from plague import lighttpdManager from plague import HTTPServer from plague import daemonize +from optparse import OptionParser # Load in the config @@ -600,63 +601,50 @@ state={'opts': True, 'host': None, 'archs': [], 'daemon': False, 'pidfile': None, 'logfile': None} - for i in sys.argv[1:]: - if state['logfile']=='': - state['logfile']=i - continue - if state['pidfile']=='': - state['pidfile']=i - continue - if i.startswith('-'): - if state['opts']: - if i=='-d': - state['daemon']=True - elif i=='-p': - state['pidfile']='' - elif i=='-l': - state['logfile']='' - elif i=='--': - state['opts']=False - continue - if not state['host']: - state['host']=i - else: - state['archs'].append(i) + archlist = "" + avail_arches = builder_dict.keys() + avail_arches.sort() + for a in avail_arches: + archlist = archlist + a + if a != avail_arches[len(avail_arches)-1]: + archlist = archlist + ", " + + usage = "Usage: %s [-p ] [-l ] [-d] -a arch1 [-a arch2] " % sys.argv[0] + parser = OptionParser(usage=usage) + parser.add_option("-p", "--pidfile", default=None, + help='file to write the PID to') + parser.add_option("-l", "--logfile", default=None, + help="location of file to write log output to") + parser.add_option("-d", "--daemon", default=False, action="store_true", + help="daemonize (i.e., detach from the terminal)") + parser.add_option("-a", "--arch", default=[], action='append', dest='archs', + help="archs this machine can build Available arches: [ %s ]" % archlist) + (opts, args) = parser.parse_args() - if not state['host'] or not state['archs'] or (state['pidfile']=='') or (state['logfile']==''): - print "Usage:\n" - print " %s [-p ] [-l ] [-d]\n" % sys.argv[0] - print " - hostname or IP address of this machine" - print " - space-separated list of arches this machine can build" - print " - file to write the PID to" - print " - file to write messages to instead of stdout" - print " -d - daemonize (i.e., detach from the terminal)" - - # pretty-print the available archlist - archlist = "" - avail_arches = builder_dict.keys() - avail_arches.sort() - for a in avail_arches: - archlist = archlist + a - if a != avail_arches[len(avail_arches)-1]: - archlist = archlist + ", " - print " Available arches: [ %s ]\n" % archlist + if len(args) == 0 or len(opts.archs) == 0: + print "Must specify hostname and at least one build arch." sys.exit(1) + + for arch in opts.archs: + if arch not in archlist: + print "Arch must be one of [ %s ]" % archlist + sys.exit(1) + + host = args[0] + g_our_hostname = host + localarches = opts.archs - g_our_hostname = state['host'] - localarches = state['archs'] - - if state['daemon']: + if opts.daemon: ret=daemonize.createDaemon() if ret: print "Daemonizing failed!" sys.exit(2) - if state['pidfile']: - open(state['pidfile'], 'w').write('%d\n' % os.getpid()) + if opts.pidfile: + open(opts.pidfile, 'w').write('%d\n' % os.getpid()) - if state['logfile']: - log=open(state['logfile'], 'a') + if opts.logfile: + log=open(opts.logfile, 'a') sys.stdout=log sys.stderr=log From fedora-extras-commits at redhat.com Sun Jul 10 07:36:20 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:20 -0400 Subject: rpms/gif2png - New directory Message-ID: <200507100736.j6A7aKho024542@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24522/gif2png Log Message: Directory /cvs/extras/rpms/gif2png added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:36:20 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:20 -0400 Subject: rpms/gif2png/devel - New directory Message-ID: <200507100736.j6A7aKbN024547@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24522/gif2png/devel Log Message: Directory /cvs/extras/rpms/gif2png/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:36:45 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:45 -0400 Subject: rpms/gif2png Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507100736.j6A7ajPD024594@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567 Added Files: Makefile import.log Log Message: Setup of module gif2png --- NEW FILE Makefile --- # Top level Makefile for module gif2png all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 10 07:36:45 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:36:45 -0400 Subject: rpms/gif2png/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507100736.j6A7ajaD024599@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24567/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gif2png --- NEW 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 Jul 10 07:37:31 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:37:31 -0400 Subject: rpms/gif2png import.log,1.1,1.2 Message-ID: <200507100737.j6A7bVPH024662@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24631 Modified Files: import.log Log Message: auto-import gif2png-2.5.1-1 on branch devel from gif2png-2.5.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gif2png/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2005 07:36:43 -0000 1.1 +++ import.log 10 Jul 2005 07:37:29 -0000 1.2 @@ -0,0 +1 @@ +gif2png-2_5_1-1:HEAD:gif2png-2.5.1-1.src.rpm:1120981039 From fedora-extras-commits at redhat.com Sun Jul 10 07:37:32 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:37:32 -0400 Subject: rpms/gif2png/devel gif2png.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507100737.j6A7bWIH024669@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24631/devel Modified Files: .cvsignore sources Added Files: gif2png.spec Log Message: auto-import gif2png-2.5.1-1 on branch devel from gif2png-2.5.1-1.src.rpm --- NEW FILE gif2png.spec --- ## $Id: gif2png.spec 1746 2005-07-10 07:33:23Z ensc at BIGO.ENSC.DE $ %{!?release_func:%global release_func() %1%{?dist}} Summary: A GIF to PNG converter Name: gif2png Version: 2.5.1 Release: %release_func 1 License: BSD Group: Applications/Multimedia URL: http://www.catb.org/~esr/gif2png/ Source0: http://www.catb.org/~esr/gif2png/%name-%version.tar.gz BuildRoot: %_tmppath/%name-%version-%release-root BuildRequires: libpng-devel %package -n web2png Summary: A GIF to PNG converter for entire directory hierarchies Group: Applications/Multimedia Requires: gif2png = %version-%release Requires: python %description The gif2png program converts files from the obsolescent Graphic Interchange Format to Portable Network Graphics. The conversion preserves all graphic information, including transparency, perfectly. The gif2png program can even recover data from corrupted GIFs. There exists a 'web2png' program in a separate package which is able to convert entire directory hierarchies. %description -n web2png The gif2png program converts files from the obsolescent Graphic Interchange Format to Portable Network Graphics. The conversion preserves all graphic information, including transparency, perfectly. The gif2png program can even recover data from corrupted GIFs. The distribution also includes a Python script, web2png, that will convert entire web hierarchies (images and HTML or PHP pages). %prep %setup -q %build %configure %__make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %__make DESTDIR="$RPM_BUILD_ROOT" install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %_bindir/gif2png %_mandir/*/gif2png.* %files -n web2png %defattr(-,root,root,-) %_bindir/web2png %_mandir/*/web2png.* %changelog * Tue Jul 5 2005 Enrico Scholz - 2.5.1-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gif2png/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2005 07:36:43 -0000 1.1 +++ .cvsignore 10 Jul 2005 07:37:29 -0000 1.2 @@ -0,0 +1 @@ +gif2png-2.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gif2png/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2005 07:36:43 -0000 1.1 +++ sources 10 Jul 2005 07:37:30 -0000 1.2 @@ -0,0 +1 @@ +85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 07:41:35 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:41:35 -0400 Subject: rpms/gif2png/FC-3 - New directory Message-ID: <200507100741.j6A7fZ2f024764@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24740/FC-3 Log Message: Directory /cvs/extras/rpms/gif2png/FC-3 added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:41:36 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:41:36 -0400 Subject: rpms/gif2png/FC-4 - New directory Message-ID: <200507100741.j6A7faGu024769@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24740/FC-4 Log Message: Directory /cvs/extras/rpms/gif2png/FC-4 added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 07:43:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:43:07 -0400 Subject: rpms/gif2png/FC-3 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 gif2png.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507100743.j6A7h7m1024823@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24793/FC-3 Added Files: .cvsignore Makefile gif2png.spec sources Log Message: initial checkin --- NEW FILE .cvsignore --- gif2png-2.5.1.tar.gz ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' ***** Error reading new file: [Errno 2] No such file or directory: 'gif2png.spec' --- NEW FILE sources --- 85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 07:43:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:43:07 -0400 Subject: rpms/gif2png/FC-4 .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 gif2png.spec, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507100743.j6A7h7ix024828@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24793/FC-4 Added Files: .cvsignore Makefile gif2png.spec sources Log Message: initial checkin --- NEW FILE .cvsignore --- gif2png-2.5.1.tar.gz ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' ***** Error reading new file: [Errno 2] No such file or directory: 'gif2png.spec' --- NEW FILE sources --- 85bb8ee345fc41c218de19dda0164806 gif2png-2.5.1.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 07:47:31 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:47:31 -0400 Subject: common tobuild,1.1885,1.1886 Message-ID: <200507100747.j6A7lVE3024922@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24905 Modified Files: tobuild Log Message: request build of rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1885 retrieving revision 1.1886 diff -u -r1.1885 -r1.1886 --- tobuild 9 Jul 2005 21:18:19 -0000 1.1885 +++ tobuild 10 Jul 2005 07:47:29 -0000 1.1886 @@ -32,3 +32,4 @@ ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel +ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 07:47:56 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:47:56 -0400 Subject: common tobuild,1.1886,1.1887 Message-ID: <200507100747.j6A7luhj024985@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24968 Modified Files: tobuild Log Message: request build of rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1886 retrieving revision 1.1887 diff -u -r1.1886 -r1.1887 --- tobuild 10 Jul 2005 07:47:29 -0000 1.1886 +++ tobuild 10 Jul 2005 07:47:54 -0000 1.1887 @@ -33,3 +33,4 @@ ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 +ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 10 07:48:21 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:48:21 -0400 Subject: common tobuild,1.1887,1.1888 Message-ID: <200507100748.j6A7mLfn025047@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25030 Modified Files: tobuild Log Message: request build of rpms/gif2png/devel gif2png-2_5_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1887 retrieving revision 1.1888 diff -u -r1.1887 -r1.1888 --- tobuild 10 Jul 2005 07:47:54 -0000 1.1887 +++ tobuild 10 Jul 2005 07:48:19 -0000 1.1888 @@ -34,3 +34,4 @@ oliver rpms/icmpdn/devel icmpdn-0_3-2 devel ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 +ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 10 07:49:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:49:07 -0400 Subject: rpms/gif2png/FC-3 branch,NONE,1.1 Message-ID: <200507100749.j6A7n7qs025076@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25059/FC-3 Added Files: branch Log Message: initial checkin --- NEW FILE branch --- FC-3 From fedora-extras-commits at redhat.com Sun Jul 10 07:49:08 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 10 Jul 2005 03:49:08 -0400 Subject: rpms/gif2png/FC-4 branch,NONE,1.1 Message-ID: <200507100749.j6A7n8Tg025092@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/gif2png/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25059/FC-4 Added Files: branch Log Message: initial checkin --- NEW FILE branch --- FC-4 From adrian at fht-esslingen.de Sun Jul 10 10:05:32 2005 From: adrian at fht-esslingen.de (Adrian Reber) Date: Sun, 10 Jul 2005 12:05:32 +0200 Subject: rpms/jhead/FC-3 jhead-compiler-warnings.patch,1.1,1.2 In-Reply-To: <1120974327.30532.394.camel@mccallum.corsepiu.local> References: <200507082204.j68M3xVn012207@cvs-int.fedora.redhat.com> <1120974327.30532.394.camel@mccallum.corsepiu.local> Message-ID: <20050710100532.GA12084@lisas.de> On Sun, Jul 10, 2005 at 07:45:26AM +0200, Ralf Corsepius wrote: > On Fri, 2005-07-08 at 18:03 -0400, Adrian Reber wrote: > > Author: adrian > > > > Update of /cvs/extras/rpms/jhead/FC-3 > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12182 > > > > Modified Files: > > jhead-compiler-warnings.patch > > Log Message: > > don't reverse the other patch > > > > > > jhead-compiler-warnings.patch: > > > > Index: jhead-compiler-warnings.patch > > > -+++ jhead-2.4.new/makefile 2005-06-10 15:39:56.000000000 +0200 > > -@@ -9,7 +9,7 @@ > > - objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/exif.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o > > - > > - $(OBJ)/%.o:$(SRC)/%.c > > -- ${CC} ${CFLAGS} -Wall -c $< -o $@ > > -+ ${CC} -O3 -Wall -c $< -o $@ > You should be using the contents of RPM_OPT_FLAGS. > > Hard-coding -O3 should be non-acceptable unless there is a very well > thought out reason to make an exception. > > I vote for putting this package on HOLD before this issue can be > clarified. This patch is removing the hard-coding -O3 again. The tarball does -O3 and I had a patch which removed it. Then a second patch reversed it to -O3 again by accident and this patch reverses it back to ${CFLAGS}. Adrian From fedora-extras-commits at redhat.com Sun Jul 10 10:52:13 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 06:52:13 -0400 Subject: common tobuild,1.1888,1.1889 Message-ID: <200507101052.j6AAqDRA032552@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32535 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1888 retrieving revision 1.1889 diff -u -r1.1888 -r1.1889 --- tobuild 10 Jul 2005 07:48:19 -0000 1.1888 +++ tobuild 10 Jul 2005 10:52:11 -0000 1.1889 @@ -1,37 +1 @@ -# this is the build control file. the format is -# user repo tag target status -# -ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel -jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 -ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 -ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 -ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel -ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 -ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 -ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel -scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 -scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 -scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel -adrian rpms/jhead/devel jhead-2_4-1_fc5 devel -lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel -uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -adrian rpms/jhead/devel jhead-2_4-2_fc5 devel -adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 -adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 -adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 -adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 -adrian rpms/jhead/devel jhead-2_4-3_fc5 devel -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 -petersen rpms/scim/devel scim-1_3_3-1_fc5 devel -ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 -ixs rpms/barcode/devel barcode-0_98-6_fc5 devel -ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 -ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel -ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 -oliver rpms/icmpdn/devel icmpdn-0_3-2 devel -ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 -ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 -ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 10:56:34 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 06:56:34 -0400 Subject: rpms/moomps/FC-3 .cvsignore,1.3,1.4 Message-ID: <200507101056.j6AAuYW7032584@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32567 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 May 2005 19:39:10 -0000 1.3 +++ .cvsignore 10 Jul 2005 10:56:32 -0000 1.4 @@ -1 +1 @@ -moomps-5.1.tar.bz2 +moomps-5.2.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 10 11:00:46 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 07:00:46 -0400 Subject: rpms/moodss/FC-3 .cvsignore,1.4,1.5 Message-ID: <200507101100.j6AB0kn3032635@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32618 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 May 2005 20:03:42 -0000 1.4 +++ .cvsignore 10 Jul 2005 11:00:44 -0000 1.5 @@ -1 +1 @@ -moodss-20.1.tar.bz2 +moodss-20.2.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 10 11:02:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 10 Jul 2005 07:02:01 -0400 Subject: common tobuild,1.1889,1.1890 Message-ID: <200507101102.j6AB2osS001246@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32613 Modified Files: tobuild Log Message: readded header Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1889 retrieving revision 1.1890 diff -u -r1.1889 -r1.1890 --- tobuild 10 Jul 2005 10:52:11 -0000 1.1889 +++ tobuild 10 Jul 2005 11:01:59 -0000 1.1890 @@ -1 +1,4 @@ -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +# this is the build control file. the format is +# user repo tag target status +# + From fedora-extras-commits at redhat.com Sun Jul 10 11:06:23 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sun, 10 Jul 2005 07:06:23 -0400 Subject: common tobuild,1.1890,1.1891 Message-ID: <200507101106.j6AB6rPJ001287@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1270 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1890 retrieving revision 1.1891 diff -u -r1.1890 -r1.1891 --- tobuild 10 Jul 2005 11:01:59 -0000 1.1890 +++ tobuild 10 Jul 2005 11:06:19 -0000 1.1891 @@ -2,3 +2,4 @@ # user repo tag target status # +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 11:31:36 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 10 Jul 2005 07:31:36 -0400 Subject: common tobuild,1.1891,1.1892 Message-ID: <200507101131.j6ABVadM001647@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1630 Modified Files: tobuild Log Message: repair broken commit Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1891 retrieving revision 1.1892 diff -u -r1.1891 -r1.1892 --- tobuild 10 Jul 2005 11:06:19 -0000 1.1891 +++ tobuild 10 Jul 2005 11:31:34 -0000 1.1892 @@ -1,5 +1,38 @@ # this is the build control file. the format is # user repo tag target status # - +ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel +jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 +ivazquez rpms/libifp/FC-3 libifp-1_0_0_1-1_fc3 fc3 +ivazquez rpms/libifp/FC-4 libifp-1_0_0_1-1_fc4 fc4 +ivazquez rpms/libifp/devel libifp-1_0_0_1-1_fc5 devel +ivazquez rpms/fyre/FC-3 fyre-1_0_0-9_fc3 fc3 +ivazquez rpms/fyre/FC-4 fyre-1_0_0-9_fc4 fc4 +ivazquez rpms/fyre/devel fyre-1_0_0-9_fc5 devel +scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 +scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 +scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel +adrian rpms/jhead/devel jhead-2_4-1_fc5 devel +lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel +uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel +adrian rpms/jhead/devel jhead-2_4-2_fc5 devel +adrian rpms/jhead/FC-4 jhead-2_4-2_fc4 fc4 +adrian rpms/jhead/FC-3 jhead-2_4-2_fc3 fc3 +adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 +adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 +adrian rpms/jhead/devel jhead-2_4-3_fc5 devel +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-1_fc4 fc4 +petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 +petersen rpms/scim/devel scim-1_3_3-1_fc5 devel +ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 +ixs rpms/barcode/devel barcode-0_98-6_fc5 devel +ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 +ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel +ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel +ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 +ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 +oliver rpms/icmpdn/devel icmpdn-0_3-2 devel +ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 +ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 +ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 10 13:49:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 09:49:21 -0400 Subject: rpms/xbase/devel xbase-2.0.0-fixconfig.patch, NONE, 1.1 xbase.spec, 1.1, 1.2 Message-ID: <200507101349.j6ADnLRc004251@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4183/devel Modified Files: xbase.spec Added Files: xbase-2.0.0-fixconfig.patch Log Message: Resolve bugzilla 162845 xbase-2.0.0-fixconfig.patch: --- NEW FILE xbase-2.0.0-fixconfig.patch --- --- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 +++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 @@ -5,7 +5,7 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/xbase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase.spec 4 Jul 2005 14:54:32 -0000 1.1 +++ xbase.spec 10 Jul 2005 13:49:18 -0000 1.2 @@ -1,11 +1,12 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz +Patch0: xbase-2.0.0-fixconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-static @@ -72,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 +- fix xbase-config --ld (bugzilla 162845) + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) From fedora-extras-commits at redhat.com Sun Jul 10 13:49:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 09:49:15 -0400 Subject: rpms/xbase/FC-3 xbase-2.0.0-fixconfig.patch, NONE, 1.1 xbase.spec, 1.1, 1.2 Message-ID: <200507101349.j6ADnjKB004255@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4183/FC-3 Modified Files: xbase.spec Added Files: xbase-2.0.0-fixconfig.patch Log Message: Resolve bugzilla 162845 xbase-2.0.0-fixconfig.patch: --- NEW FILE xbase-2.0.0-fixconfig.patch --- --- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 +++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 @@ -5,7 +5,7 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-3/xbase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase.spec 4 Jul 2005 14:54:32 -0000 1.1 +++ xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 @@ -1,11 +1,12 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz +Patch0: xbase-2.0.0-fixconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-static @@ -72,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 +- fix xbase-config --ld (bugzilla 162845) + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) From fedora-extras-commits at redhat.com Sun Jul 10 13:49:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 09:49:15 -0400 Subject: rpms/xbase/FC-4 xbase-2.0.0-fixconfig.patch, NONE, 1.1 xbase.spec, 1.1, 1.2 Message-ID: <200507101349.j6ADnjTZ004258@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4183/FC-4 Modified Files: xbase.spec Added Files: xbase-2.0.0-fixconfig.patch Log Message: Resolve bugzilla 162845 xbase-2.0.0-fixconfig.patch: --- NEW FILE xbase-2.0.0-fixconfig.patch --- --- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 +++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 @@ -5,7 +5,7 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-4/xbase.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbase.spec 4 Jul 2005 14:54:32 -0000 1.1 +++ xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 @@ -1,11 +1,12 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ Source0: http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz +Patch0: xbase-2.0.0-fixconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-static @@ -72,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 +- fix xbase-config --ld (bugzilla 162845) + * Fri Jul 1 2005 Tom "spot" Callaway 2.0.0-2 - add BuildRequires: doxygen - remove latex docs (html is fine) From fedora-extras-commits at redhat.com Sun Jul 10 14:21:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:20 -0400 Subject: rpms/libapreq2 - New directory Message-ID: <200507101421.j6AELKRb005448@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5428/libapreq2 Log Message: Directory /cvs/extras/rpms/libapreq2 added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 14:21:20 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:20 -0400 Subject: rpms/libapreq2/devel - New directory Message-ID: <200507101421.j6AELKEI005453@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5428/libapreq2/devel Log Message: Directory /cvs/extras/rpms/libapreq2/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 14:21:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:41 -0400 Subject: rpms/libapreq2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507101421.j6AELfAF005504@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5473 Added Files: Makefile import.log Log Message: Setup of module libapreq2 --- NEW FILE Makefile --- # Top level Makefile for module libapreq2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 10 14:21:41 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:21:41 -0400 Subject: rpms/libapreq2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507101421.j6AELfdH005509@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5473/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libapreq2 --- NEW 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 Jul 10 14:22:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:22:47 -0400 Subject: rpms/libapreq2 import.log,1.1,1.2 Message-ID: <200507101422.j6AEMlMS005580@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5547 Modified Files: import.log Log Message: auto-import libapreq2-2.05-0.6 on branch devel from libapreq2-2.05-0.6.src.rpm Initial import. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libapreq2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2005 14:21:38 -0000 1.1 +++ import.log 10 Jul 2005 14:22:45 -0000 1.2 @@ -0,0 +1 @@ +libapreq2-2_05-0_6:HEAD:libapreq2-2.05-0.6.src.rpm:1121005356 From fedora-extras-commits at redhat.com Sun Jul 10 14:22:47 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 10:22:47 -0400 Subject: rpms/libapreq2/devel libapreq2-build.patch, NONE, 1.1 libapreq2-httpd.conf, NONE, 1.1 libapreq2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507101422.j6AEMlqF005589@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libapreq2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5547/devel Modified Files: .cvsignore sources Added Files: libapreq2-build.patch libapreq2-httpd.conf libapreq2.spec Log Message: auto-import libapreq2-2.05-0.6 on branch devel from libapreq2-2.05-0.6.src.rpm Initial import. libapreq2-build.patch: --- NEW FILE libapreq2-build.patch --- --- glue/Makefile.am~ 2005-04-16 05:19:36.000000000 +0300 +++ glue/Makefile.am 2005-05-05 12:14:29.000000000 +0300 @@ -15,7 +15,7 @@ cd perl; $(MAKE) test perl_install: - cd perl; $(MAKE) install + cd perl; $(MAKE) pure_install perl_clean: -cd perl; $(MAKE) clean --- NEW FILE libapreq2-httpd.conf --- # # mod_apreq HTTP Parsing Library Module # LoadModule apreq_module modules/mod_apreq2.so --- NEW FILE libapreq2.spec --- %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}} Name: libapreq2 Version: 2.05 Release: 0.6 Summary: Generic Apache Request Library Group: System Environment/Libraries License: Apache Software License URL: http://httpd.apache.org/apreq/ Source0: http://www.cpan.org/authors/id/J/JO/JOESUF/%{name}-%{version}-dev.tar.gz Source1: %{name}-httpd.conf Patch0: %{name}-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 BuildRequires: httpd-devel >= 2.0.48 BuildRequires: libtool BuildRequires: apr-devel >= 0.9.4 BuildRequires: apr-util-devel >= 0.9.4 BuildRequires: perl(ExtUtils::XSBuilder) BuildRequires: mod_perl-devel >= 2.0.0-0.rc5 Requires: httpd-mmn = %(cat $(%{apxs} -q INCLUDEDIR)/.mmn || echo ERROR) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Provides: libapreq = %{version}-%{release} %description %{summary}. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: httpd-devel >= 2.0.48 Provides: libapreq-devel = %{version}-%{release} %description devel %{summary}. %package -n perl-%{name} Summary: Perl interface to %{name} Group: Development/Libraries Requires: mod_perl >= 2.0.0-0.rc5 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-libapreq = %{version}-%{release} %description -n perl-%{name} %{summary}. %prep %setup -q -n %{name}-%{version}-dev %patch0 ./buildconf %build %configure \ --disable-dependency-tracking \ --disable-static \ --with-apache2-apxs=%{apxs} \ --enable-perl-glue \ --with-perl-opts=INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/apreq.conf cp -pR docs/html __docs ; rm __docs/installdox find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check || : # make test # requires write access to system locations? %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig [ $1 -eq 1 ] && %{_initrddir}/httpd condrestart >/dev/null || : %postun /sbin/ldconfig %{_initrddir}/httpd condrestart >/dev/null || : %files %defattr(-,root,root,-) %doc CHANGES LICENSE NOTICE README %config(noreplace) %{_sysconfdir}/httpd/conf.d/apreq.conf %{_libdir}/libapreq2.so.* %{_libdir}/httpd/modules/mod_apreq2.so %exclude %{_libdir}/httpd/modules/mod_apreq2.la %files devel %defattr(-,root,root,-) %doc __docs/* %{_bindir}/apreq2-config %{_includedir}/apreq2/ %{_includedir}/httpd/apreq2/ %{_libdir}/libapreq2.so %exclude %{_libdir}/libapreq2.la %files -n perl-%{name} %defattr(-,root,root,-) %doc glue/perl/README %{perl_vendorarch}/auto/APR/ %{perl_vendorarch}/Apache2/ %{perl_vendorarch}/APR/ %{_mandir}/man3/A*::*.3* %changelog * Wed Jun 29 2005 Ville Skytt?? - 2.05-0.6 - Rebuild with mod_perl 2.0.1. - Drop static libs. * Sat Jun 18 2005 Ville Skytt?? - 2.05-0.5 - Rebuild for FC4. * Tue May 24 2005 Ville Skytt?? - 2.05-0.4 - Require httpd-mmn. * Sat May 21 2005 Ville Skytt?? - 2.05-0.3 - Rebuild with mod_perl 2.0.0. * Wed May 18 2005 Ville Skytt?? - 2.05-0.2 - Prevent %%post from failing at first install if httpd is not running. - Provide (perl-)libapreq(-devel). * Thu May 5 2005 Ville Skytt?? - 2.05-0.1 - 2.05-dev, aclocal patch applied upstream. * Sat Dec 4 2004 Ville Skytt?? - 0:2.04_03-0.fdr.2 - Buildrequire mod_perl-devel, not mod_perl. * Wed Aug 18 2004 Ville Skytt?? - 0:2.03_04-0.fdr.1 - Update to 2.03_04. - Disable dependency tracking to speed up the build. * Thu May 27 2004 Ville Skytt?? - 0:2.03-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2005 14:21:39 -0000 1.1 +++ .cvsignore 10 Jul 2005 14:22:45 -0000 1.2 @@ -0,0 +1 @@ +libapreq2-2.05-dev.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2005 14:21:39 -0000 1.1 +++ sources 10 Jul 2005 14:22:45 -0000 1.2 @@ -0,0 +1 @@ +0985e102b6d2bc9c747a56b04a85cba6 libapreq2-2.05-dev.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 16:15:00 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 12:15:00 -0400 Subject: rpms/bochs/FC-4 .cvsignore, 1.4, 1.5 bochs.spec, 1.9, 1.10 sources, 1.4, 1.5 bochs-precision.patch, 1.1, NONE Message-ID: <200507101615.j6AGFU6e008156@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bochs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8116/FC-4 Modified Files: .cvsignore bochs.spec sources Removed Files: bochs-precision.patch Log Message: 2.2.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bochs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 May 2005 15:36:35 -0000 1.4 +++ .cvsignore 10 Jul 2005 16:14:57 -0000 1.5 @@ -1,2 +1,2 @@ dlxlinux4.tar.gz -bochs-2.2.tar.gz +bochs-2.2.1.tar.gz Index: bochs.spec =================================================================== RCS file: /cvs/extras/rpms/bochs/FC-4/bochs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bochs.spec 29 May 2005 18:08:59 -0000 1.9 +++ bochs.spec 10 Jul 2005 16:14:57 -0000 1.10 @@ -1,6 +1,6 @@ Name: bochs -Version: 2.2 -Release: 2 +Version: 2.2.1 +Release: 1%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators @@ -11,7 +11,6 @@ Patch0: %{name}-nonet-build.patch Patch1: %{name}-dlxreadme.patch Patch2: %{name}-config.patch -Patch3: %{name}-precision.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils @@ -44,7 +43,6 @@ %setup -q %patch0 -p0 %patch1 -p0 -%patch3 -p0 # Uh-oh, great! %{__perl} -pi -e \ 's|wx_needs_gtk2=0|wx_needs_gtk2=1| ; @@ -124,6 +122,9 @@ %changelog +* Sat Jul 9 2005 Ville Skytt?? - 2.2.1-1 +- 2.2.1, precision patch applied upstream. + * Sun May 29 2005 Ville Skytt?? - 2.2-2 - Try to fix x86_64 build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bochs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 May 2005 15:36:35 -0000 1.4 +++ sources 10 Jul 2005 16:14:57 -0000 1.5 @@ -1,2 +1,2 @@ 379269841ae5aef95e4ec56d6d186532 dlxlinux4.tar.gz -2f0d82bda2193242a2d7ece1917016c1 bochs-2.2.tar.gz +50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz --- bochs-precision.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 10 16:15:01 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 10 Jul 2005 12:15:01 -0400 Subject: rpms/bochs/devel .cvsignore, 1.4, 1.5 bochs.spec, 1.9, 1.10 sources, 1.4, 1.5 bochs-precision.patch, 1.1, NONE Message-ID: <200507101615.j6AGFVaZ008161@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bochs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8116/devel Modified Files: .cvsignore bochs.spec sources Removed Files: bochs-precision.patch Log Message: 2.2.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 May 2005 15:36:35 -0000 1.4 +++ .cvsignore 10 Jul 2005 16:14:58 -0000 1.5 @@ -1,2 +1,2 @@ dlxlinux4.tar.gz -bochs-2.2.tar.gz +bochs-2.2.1.tar.gz Index: bochs.spec =================================================================== RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bochs.spec 29 May 2005 18:08:59 -0000 1.9 +++ bochs.spec 10 Jul 2005 16:14:58 -0000 1.10 @@ -1,6 +1,6 @@ Name: bochs -Version: 2.2 -Release: 2 +Version: 2.2.1 +Release: 1%{?dist} Summary: Portable x86 PC emulator Group: Applications/Emulators @@ -11,7 +11,6 @@ Patch0: %{name}-nonet-build.patch Patch1: %{name}-dlxreadme.patch Patch2: %{name}-config.patch -Patch3: %{name}-precision.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: docbook-utils @@ -44,7 +43,6 @@ %setup -q %patch0 -p0 %patch1 -p0 -%patch3 -p0 # Uh-oh, great! %{__perl} -pi -e \ 's|wx_needs_gtk2=0|wx_needs_gtk2=1| ; @@ -124,6 +122,9 @@ %changelog +* Sat Jul 9 2005 Ville Skytt?? - 2.2.1-1 +- 2.2.1, precision patch applied upstream. + * Sun May 29 2005 Ville Skytt?? - 2.2-2 - Try to fix x86_64 build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bochs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 May 2005 15:36:35 -0000 1.4 +++ sources 10 Jul 2005 16:14:58 -0000 1.5 @@ -1,2 +1,2 @@ 379269841ae5aef95e4ec56d6d186532 dlxlinux4.tar.gz -2f0d82bda2193242a2d7ece1917016c1 bochs-2.2.tar.gz +50484c75d8175fcd97a81432ac18fb71 bochs-2.2.1.tar.gz --- bochs-precision.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 10 19:59:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 15:59:34 -0400 Subject: extras-buildsys ChangeLog,1.50,1.51 Message-ID: <200507101959.j6AJxYZ3011853@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11822 Modified Files: ChangeLog Log Message: 2005-07-10 Dan Williams * server/PackageJob.py server/BuildMaster.py - Reduce total threadcount by breaking PackageJob runs into two threads, so that no thread executes while the package is waiting for a builder Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChangeLog 10 Jul 2005 04:48:38 -0000 1.50 +++ ChangeLog 10 Jul 2005 19:59:32 -0000 1.51 @@ -1,3 +1,11 @@ +2005-07-10 Dan Williams + + * server/PackageJob.py + server/BuildMaster.py + - Reduce total threadcount by breaking PackageJob runs into + two threads, so that no thread executes while the package + is waiting for a builder + 2005-07-09 Dan Williams Patch from Ignacio Vazquez-Abrams From fedora-extras-commits at redhat.com Sun Jul 10 19:59:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 15:59:35 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.12, 1.13 BuilderManager.py, 1.1, 1.2 PackageJob.py, 1.4, 1.5 Message-ID: <200507101959.j6AJxZSf011861@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11822/server Modified Files: BuildMaster.py BuilderManager.py PackageJob.py Log Message: 2005-07-10 Dan Williams * server/PackageJob.py server/BuildMaster.py - Reduce total threadcount by breaking PackageJob runs into two threads, so that no thread executes while the package is waiting for a builder Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- BuildMaster.py 8 Jul 2005 18:12:31 -0000 1.12 +++ BuildMaster.py 10 Jul 2005 19:59:32 -0000 1.13 @@ -282,7 +282,6 @@ self._building_jobs_lock.acquire() self._building_jobs.append(job) self._building_jobs_lock.release() - job.start() self._new_queue = [] Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- BuilderManager.py 5 Jul 2005 21:08:03 -0000 1.1 +++ BuilderManager.py 10 Jul 2005 19:59:32 -0000 1.2 @@ -131,7 +131,7 @@ for req in self._queue: parent = req['parent'] stage = parent.get_cur_stage() - if (stage != 'prep') and (stage != 'building'): + if (stage != 'prep') and (stage != 'building') and (stage != 'waiting'): self._queue.remove(req) continue # Find a free builder for this request Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PackageJob.py 7 Jul 2005 18:17:51 -0000 1.4 +++ PackageJob.py 10 Jul 2005 19:59:32 -0000 1.5 @@ -64,10 +64,26 @@ def __str__(self): return self.args - - -http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") +class PackageJobController(threading.Thread): + """ + A class that controls PackageJob objects through specific phases. + Python seems to have issues with threads, so to reduce the total + running threadcount, we split the PackageJob runs up into two threads, + one for everything up to the "build" stage, and then the actual + "build" stage. This class provides the actual running thread. + """ + def __init__(self, pkg_job, start_stage, end_stage): + self._pkg_job = pkg_job + if not end_stage: + end_stage = 'aaaaa' + self._end_stage = end_stage + self._pkg_job._set_cur_stage(start_stage) + threading.Thread.__init__(self) + + def run(self): + while not self._pkg_job.is_done() and not self._pkg_job.get_cur_stage() == self._end_stage: + self._pkg_job.process() def is_build_job_stage_valid(stage): @@ -75,21 +91,24 @@ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] + stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] if stage in stages: return True return False - -class PackageJob(threading.Thread): +class PackageJob: """ Controller object for building 1 SRPM on multiple arches """ + http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir") + def __init__(self, uid, username, package, cvs_tag, repo, buildmaster, hostname): - self.curstage = 'initialize' + self.curstage = '' self.bm = buildmaster - self.hostname = hostname self.uid = uid + pjc = PackageJobController(self, 'initialize', 'waiting') + + self.hostname = hostname self.username = username self.starttime = time.time() self.endtime = None @@ -109,7 +128,7 @@ self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() - threading.Thread.__init__(self) + pjc.start() def get_cur_stage(self): return self.curstage @@ -332,7 +351,7 @@ shutil.copy(self.srpm_path, self.stage_dir) # Must also copy SRPM to where the build client can get it over HTTP - http_pkg_path = self._make_stage_dir(http_dir) + http_pkg_path = self._make_stage_dir(self.http_dir) self.srpm_http_path = os.path.join(http_pkg_path, srpm) shutil.copy(self.srpm_path, self.srpm_http_path) self.srpm_path = srpm_in_dir @@ -345,7 +364,7 @@ def _request_one_arch_job(self, arch): # Construct SPRM URL - srpm_http_base = self.srpm_http_path[len(http_dir):] + srpm_http_base = self.srpm_http_path[len(self.http_dir):] if config_opts['ssl_builders'] == True: method = "https://" else: @@ -368,6 +387,13 @@ if self.archjobs[job.arch] != None: log("%s (%s/%s): Already have archjob for this arch (%s). New job UID is %s." % (self.uid, self.package, job.arch, self.archjobs[job.arch].jobid, job.jobid)) self.archjobs[job.arch] = job + + # If this is the first archjob, that means we are now building. + # So we start up the second PackageJobController thread. + if self.curstage == 'waiting': + t = PackageJobController(self, 'building', None) + t.start() + self._archjobs_lock.release() log("%s (%s/%s): Builder UID is %s" % (self.uid, self.package, job.arch, job.jobid)) @@ -401,48 +427,48 @@ def wake(self): self._event.set() - def run(self): - while not self.is_done(): - # Advance to next stage based on current stage + def process(self): + # Advance to next stage based on current stage + try: wait = False - - try: - if self.curstage == 'initialize': - self._checkout() - elif self.curstage == 'checkout': - self._make_srpm() - elif self.curstage == 'make_srpm': - self._prep() - elif self.curstage == 'prep' or self.curstage == 'building': - wait = self._monitor() - elif self.curstage == 'finished': - self._add_to_repo() - elif self.curstage == 'addtorepo': - wait = True - elif self.curstage == 'repodone': - self._succeeded() - except PrepError, e: - if not self.no_cvs: - shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) - subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - self.email_result(resultstring=e.args, subject=subj) - self._failed() - except BuildError, e: - subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - self.email_result(resultstring=e.args, subject=subj) - # Kill remaining jobs on other arches - self._archjobs_lock.acquire() - for job in self.archjobs.values(): - if job: - job.die() - self._archjobs_lock.release() - self._failed() - else: - # Wait to be woken up when long-running operations complete - if wait: - while not self._event.isSet(): - self._event.wait() - self._event.clear() + if self.curstage == 'initialize': + self._checkout() + elif self.curstage == 'checkout': + self._make_srpm() + elif self.curstage == 'make_srpm': + self._prep() + self._set_cur_stage('waiting') + # When prep is done, the first thread ends + elif self.curstage == 'building': + wait = self._monitor() + elif self.curstage == 'finished': + self._add_to_repo() + elif self.curstage == 'addtorepo': + wait = True + elif self.curstage == 'repodone': + self._succeeded() + except PrepError, e: + if not self.no_cvs: + shutil.rmtree(self.checkout_tmpdir, ignore_errors=True) + subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + self._failed() + except BuildError, e: + subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) + self.email_result(resultstring=e.args, subject=subj) + # Kill remaining jobs on other arches + self._archjobs_lock.acquire() + for job in self.archjobs.values(): + if job: + job.die() + self._archjobs_lock.release() + self._failed() + else: + # Wait to be woken up when long-running operations complete + if wait: + while not self._event.isSet(): + self._event.wait() + self._event.clear() def _monitor(self): self._set_cur_stage('building') From fedora-extras-commits at redhat.com Sun Jul 10 20:02:16 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 16:02:16 -0400 Subject: extras-buildsys/server BuilderManager.py,1.2,1.3 Message-ID: <200507102002.j6AK2cLe012953@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12935/server Modified Files: BuilderManager.py Log Message: Add warning for http + ssl_builders Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BuilderManager.py 10 Jul 2005 19:59:32 -0000 1.2 +++ BuilderManager.py 10 Jul 2005 20:02:14 -0000 1.3 @@ -74,6 +74,9 @@ if address.startswith('https') and not config_opts['ssl_builders']: print "Builder address (%s) starts with 'https', but the 'ssl_builders' option is set to False." % address os._exit(1) + elif address.startswith('http:') and config_opts['ssl_builders']: + print "Builder address (%s) starts with 'http', but the 'ssl_builders' option is set to True." % address + os._exit(1) # If the address is already in our running_builders list, skip it skip = False From fedora-extras-commits at redhat.com Sun Jul 10 20:32:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:16 -0400 Subject: rpms/perl-Class-Data-Inheritable - New directory Message-ID: <200507102032.j6AKWGSI013074@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/perl-Class-Data-Inheritable Log Message: Directory /cvs/extras/rpms/perl-Class-Data-Inheritable added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 20:32:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:17 -0400 Subject: rpms/perl-Class-Data-Inheritable/devel - New directory Message-ID: <200507102032.j6AKWHp4013079@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13054/perl-Class-Data-Inheritable/devel Log Message: Directory /cvs/extras/rpms/perl-Class-Data-Inheritable/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 10 20:32:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:30 -0400 Subject: rpms/perl-Class-Data-Inheritable Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200507102032.j6AKWUu3013130@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13099 Added Files: Makefile import.log Log Message: Setup of module perl-Class-Data-Inheritable --- NEW FILE Makefile --- # Top level Makefile for module perl-Class-Data-Inheritable all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 10 20:32:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:31 -0400 Subject: rpms/perl-Class-Data-Inheritable/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507102032.j6AKWVf5013136@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13099/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Class-Data-Inheritable --- NEW 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 Jul 10 20:32:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:49 -0400 Subject: rpms/perl-Class-Data-Inheritable import.log,1.1,1.2 Message-ID: <200507102032.j6AKWn2g013195@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164 Modified Files: import.log Log Message: auto-import perl-Class-Data-Inheritable-0.02-3 on branch devel from perl-Class-Data-Inheritable-0.02-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Jul 2005 20:32:28 -0000 1.1 +++ import.log 10 Jul 2005 20:32:47 -0000 1.2 @@ -0,0 +1 @@ +perl-Class-Data-Inheritable-0_02-3:HEAD:perl-Class-Data-Inheritable-0.02-3.src.rpm:1121027623 From fedora-extras-commits at redhat.com Sun Jul 10 20:32:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 10 Jul 2005 16:32:49 -0400 Subject: rpms/perl-Class-Data-Inheritable/devel perl-Class-Data-Inheritable.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507102032.j6AKWnpv013202@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13164/devel Modified Files: .cvsignore sources Added Files: perl-Class-Data-Inheritable.spec Log Message: auto-import perl-Class-Data-Inheritable-0.02-3 on branch devel from perl-Class-Data-Inheritable-0.02-3.src.rpm --- NEW FILE perl-Class-Data-Inheritable.spec --- Name: perl-Class-Data-Inheritable Version: 0.02 Release: 3%{?dist} Summary: Inheritable, overridable class data Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Class-Data-Inheritable/ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Class-Data-Inheritable-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Class::Data::Inheritable is for creating accessor/mutators to class data. That is, if you want to store something about your class as a whole (instead of about a single object). This data is then inherited by your subclasses and can be overriden. %prep %setup -q -n Class-Data-Inheritable-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{perl_vendorlib}/Class %{_mandir}/man3/*.3* %changelog * Sun Jul 10 2005 Tom "spot" Callaway 0.02-3 - changed /Class/Data to /Class, for proper ownership * 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-Data-Inheritable/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Jul 2005 20:32:29 -0000 1.1 +++ .cvsignore 10 Jul 2005 20:32:47 -0000 1.2 @@ -0,0 +1 @@ +Class-Data-Inheritable-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Jul 2005 20:32:29 -0000 1.1 +++ sources 10 Jul 2005 20:32:47 -0000 1.2 @@ -0,0 +1 @@ +d3a9fff92ede1085643341179fd9263b Class-Data-Inheritable-0.02.tar.gz From fedora-extras-commits at redhat.com Sun Jul 10 22:05:53 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 10 Jul 2005 18:05:53 -0400 Subject: devel/sylpheed .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 sylpheed.spec, 1.18, 1.19 Message-ID: <200507102206.j6AM6NC8015516@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15494 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Sun Jul 10 2005 Michael Schwendt - 2.0.0-0.4.beta5 - Update to 2.0.0beta5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 5 Jul 2005 17:05:40 -0000 1.8 +++ .cvsignore 10 Jul 2005 22:05:30 -0000 1.9 @@ -1 +1 @@ -sylpheed-2.0.0beta4.tar.bz2 +sylpheed-2.0.0beta5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 5 Jul 2005 17:06:03 -0000 1.8 +++ sources 10 Jul 2005 22:05:30 -0000 1.9 @@ -1 +1 @@ -675b998ac6e4d2d6c0dce1442209de83 sylpheed-2.0.0beta4.tar.bz2 +4f022a15bda3d01b025d02e3875bf09a sylpheed-2.0.0beta5.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sylpheed.spec 6 Jul 2005 13:42:16 -0000 1.18 +++ sylpheed.spec 10 Jul 2005 22:05:31 -0000 1.19 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.4.beta4 +Release: 0.4.beta5 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,8 +16,7 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -BuildRequires: autoconf -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta4.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta5.tar.bz2 Source1: sylpheed.1 Patch2: sylpheed-default-browser.patch @@ -39,12 +38,11 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta4 +%setup -q -n %{name}-2.0.0beta5 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop %build -autoconf %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ %{?_without_compface:--disable-compface} \ %{?_with_ldap:--enable-ldap} \ @@ -83,6 +81,9 @@ %{_mandir}/man1 %changelog +* Sun Jul 10 2005 Michael Schwendt - 2.0.0-0.4.beta5 +- Update to 2.0.0beta5. + * Tue Jul 5 2005 Michael Schwendt - 2.0.0-0.4.beta4 - Update to 2.0.0beta4. From fedora-extras-commits at redhat.com Mon Jul 11 00:30:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 20:30:38 -0400 Subject: extras-buildsys/server ArchJob.py, 1.4, 1.5 Builder.py, 1.4, 1.5 CONFIG.py, 1.16, 1.17 Message-ID: <200507110030.j6B0UcX3018054@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18033/server Modified Files: ArchJob.py Builder.py CONFIG.py Log Message: - Add some locking around most calls to xmlrpc servers since Python is is flakey here with threads Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ArchJob.py 8 Jul 2005 17:23:45 -0000 1.4 +++ ArchJob.py 11 Jul 2005 00:30:36 -0000 1.5 @@ -106,6 +106,7 @@ del attrdict def _send_repo_unlocked(self): + self.builder.xmlrpc_lock_acquire() try: self._server.repo_unlocked(self.jobid) except socket.error, e: @@ -114,9 +115,11 @@ self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass + self.builder.xmlrpc_lock_release() def _dl_files(self): files = [] + self.builder.xmlrpc_lock_acquire() try: files = self._server.files(self.jobid) except socket.error, e: @@ -125,6 +128,7 @@ self.par_job.package, self.arch, self.bci.address(), e) except xmlrpclib.ProtocolError, e: pass + self.builder.xmlrpc_lock_release() return files def process(self): @@ -234,7 +238,9 @@ def die(self): if self.status == 'initialize' or self.status == 'running': + self.builder.xmlrpc_lock_acquire() self._server.die(self.jobid) + self.builder.xmlrpc_lock_release() self._set_status('done') Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Builder.py 10 Jul 2005 03:44:37 -0000 1.4 +++ Builder.py 11 Jul 2005 00:30:36 -0000 1.5 @@ -37,6 +37,11 @@ certs['peer_ca_cert'] = config_opts['ca_cert'] +# Python's xmlrpclib & httplib are a bit dodgy with +# threads, so lets lock xmlrpc operations +builder_xmlrpc_lock = threading.Lock() + + class Builder(threading.Thread): """ Tracks all jobs on a builder instance """ @@ -51,10 +56,13 @@ self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._unavail_count = 0 self._arches = [] + builder_xmlrpc_lock.acquire() try: self._arches = self._server.supported_arches() except socket.error: + builder_xmlrpc_lock.release() raise RuntimeError + builder_xmlrpc_lock.release() self._alive = True self._arches.append('noarch') self._server_lock = threading.Lock() @@ -62,6 +70,12 @@ self._prepping_jobs = False threading.Thread.__init__(self) + def xmlrpc_lock_acquire(self): + builder_xmlrpc_lock.acquire() + + def xmlrpc_lock_release(self): + builder_xmlrpc_lock.release() + def arches(self): return self._arches @@ -83,12 +97,14 @@ if not arch in self._arches or not self.available(): raise RuntimeError + builder_xmlrpc_lock.acquire() self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) except (socket.error, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() + builder_xmlrpc_lock.release() if jobid == 0: raise RuntimeError @@ -102,6 +118,7 @@ def _update_cur_job(self): cur_jobid = None + builder_xmlrpc_lock.acquire() self._server_lock.acquire() try: (jobid, status) = self._server.get_cur_job() @@ -110,6 +127,7 @@ else: self._unavail_count = 0 self._server_lock.release() + builder_xmlrpc_lock.release() # Update the current job's status if self._unavail_count == 0: Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- CONFIG.py 6 Jul 2005 21:21:00 -0000 1.16 +++ CONFIG.py 11 Jul 2005 00:30:36 -0000 1.17 @@ -87,6 +87,6 @@ # Builder Clients -config_opts['builders'] = [ 'http://127.0.0.1:8888' ] +config_opts['builders'] = [ 'https://127.0.0.1:8888' ] From fedora-extras-commits at redhat.com Mon Jul 11 02:11:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 22:11:09 -0400 Subject: extras-buildsys plague.spec,1.13,1.14 Message-ID: <200507110211.j6B2B9Nd020583@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20554 Modified Files: plague.spec Log Message: Ignore SRPMs and debuginfo RPMs for the createrepo, Patch from Ignacio Vazquez-Abrams to fix builder spec's %post section Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plague.spec 10 Jul 2005 07:17:14 -0000 1.13 +++ plague.spec 11 Jul 2005 02:11:07 -0000 1.14 @@ -84,8 +84,8 @@ %post builder /sbin/chkconfig --add plague-builder . %{_sysconfdir}/sysconfig/%{name}-builder -if [ -z "$ARCHS" ] ; then - sed -ie "s/^ARCHS=.*$/ARCHS=$(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/')/" %{_sysconfdir}/sysconfig/%{name}-builder +if [ -z "$ARCHSOPT" ] ; then + sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder endif %preun builder From fedora-extras-commits at redhat.com Mon Jul 11 02:11:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 22:11:10 -0400 Subject: extras-buildsys/server Repo.py,1.8,1.9 Message-ID: <200507110211.j6B2BAvL020589@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20554/server Modified Files: Repo.py Log Message: Ignore SRPMs and debuginfo RPMs for the createrepo, Patch from Ignacio Vazquez-Abrams to fix builder spec's %post section Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Repo.py 9 Jul 2005 21:54:08 -0000 1.8 +++ Repo.py 11 Jul 2005 02:11:08 -0000 1.9 @@ -82,7 +82,7 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() - (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q %s' % self._repodir) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % self._repodir) if s != 0: print "createrepo failed with exit status %d!" % s From fedora-extras-commits at redhat.com Mon Jul 11 02:26:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 22:26:08 -0400 Subject: extras-buildsys plague.spec,1.14,1.15 Message-ID: <200507110226.j6B2Q8mP020626@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20609 Modified Files: plague.spec Log Message: Fix builder %post Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plague.spec 11 Jul 2005 02:11:07 -0000 1.14 +++ plague.spec 11 Jul 2005 02:26:05 -0000 1.15 @@ -86,7 +86,7 @@ . %{_sysconfdir}/sysconfig/%{name}-builder if [ -z "$ARCHSOPT" ] ; then sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder -endif +fi %preun builder if [ $1 = 0 ]; then From fedora-extras-commits at redhat.com Mon Jul 11 03:23:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:23:24 -0400 Subject: extras-buildsys/server main.py,1.5,1.6 Message-ID: <200507110323.j6B3NOJG021843@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781/server Modified Files: main.py Log Message: 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemon support for the server Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- main.py 10 Jul 2005 03:44:37 -0000 1.5 +++ main.py 11 Jul 2005 03:23:22 -0000 1.6 @@ -60,12 +60,35 @@ ################################################################# if __name__ == '__main__': - if len(sys.argv) < 2: - print "Usage:\n" - print " %s \n" % sys.argv[0] + usage = "Usage: %s [-p ] [-l ] [-d] " % sys.argv[0] + parser = OptionParser(usage=usage) + parser.add_option("-p", "--pidfile", default=None, + help='file to write the PID to') + parser.add_option("-l", "--logfile", default=None, + help="location of file to write log output to") + parser.add_option("-d", "--daemon", default=False, action="store_true", + help="daemonize (i.e., detach from the terminal)") + (opts, args) = parser.parse_args() + + if (not len(args) == 1): + print "Must specify a single hostname." sys.exit(1) - hostname = sys.argv[1] + hostname = args[0] + + if opts.daemon: + ret=daemonize.createDaemon() + if ret: + print "Daemonizing failed!" + sys.exit(2) + + if opts.pidfile: + open(opts.pidfile, 'w').write('%d\n' % os.getpid()) + + if opts.logfile: + log=open(opts.logfile, 'a') + sys.stdout=log + sys.stderr=log builder_manager = BuilderManager.BuilderManager() From fedora-extras-commits at redhat.com Mon Jul 11 03:23:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:23:23 -0400 Subject: extras-buildsys ChangeLog,1.51,1.52 plague.spec,1.15,1.16 Message-ID: <200507110323.j6B3NNfF021833@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781 Modified Files: ChangeLog plague.spec Log Message: 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemon support for the server Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ChangeLog 10 Jul 2005 19:59:32 -0000 1.51 +++ ChangeLog 11 Jul 2005 03:23:21 -0000 1.52 @@ -1,5 +1,10 @@ 2005-07-10 Dan Williams + Patch from Ignacio Vazquez-Abrams + * Add initscript/daemon support for the server + +2005-07-10 Dan Williams + * server/PackageJob.py server/BuildMaster.py - Reduce total threadcount by breaking PackageJob runs into Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- plague.spec 11 Jul 2005 02:26:05 -0000 1.15 +++ plague.spec 11 Jul 2005 03:23:21 -0000 1.16 @@ -12,6 +12,10 @@ Requires: python-sqlite, pyOpenSSL, createrepo Requires: %{name}-common = %{version}-%{release} Requires: lighttpd +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description The Plague build system is a client/server distributed build system for @@ -34,6 +38,7 @@ Requires: yum >= 2.2.1 Requires: mock >= 0.3, pyOpenSSL Requires(post): /sbin/chkconfig +Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -75,14 +80,27 @@ make DESTDIR=$RPM_BUILD_ROOT install install -D -m 0644 etc/plague-builder.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-builder install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder +install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server +install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server %clean rm -rf $RPM_BUILD_ROOT +%post +/sbin/chkconfig --add plague-server +/sbin/service plague-server condrestart >> /dev/null || : + +%preun +if [ $1 = 0 ]; then + /sbin/service plague-server stop &> /dev/null + /sbin/chkconfig --del plague-server +fi + %post builder /sbin/chkconfig --add plague-builder +/sbin/service plague-builder condrestart >> /dev/null || : . %{_sysconfdir}/sysconfig/%{name}-builder if [ -z "$ARCHSOPT" ] ; then sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder @@ -105,6 +123,8 @@ %dir %{_sysconfdir}/%{name}/server/certs %dir %{_sysconfdir}/%{name}/server/addl_pkg_arches %{_sysconfdir}/%{name}/server/addl_pkg_arches/* +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +%{_initrddir}/%{name}-server %files common %defattr(-, root, root) From fedora-extras-commits at redhat.com Mon Jul 11 03:23:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:23:23 -0400 Subject: extras-buildsys/etc plague-server.config, NONE, 1.1 plague-server.init, NONE, 1.1 plague-builder.init, 1.2, 1.3 Message-ID: <200507110323.j6B3NNb4021839@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21781/etc Modified Files: plague-builder.init Added Files: plague-server.config plague-server.init Log Message: 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams * Add initscript/daemon support for the server --- NEW FILE plague-server.config --- HOST=localhost --- NEW FILE plague-server.init --- #!/bin/bash # # /etc/rc.d/init.d/plague-server # # Start a plague server instance # # chkconfig: 345 98 02 # description: Starts a plague server instance # processname: plague-server # config: /etc/sysconfig/plague-server # pidfile: /var/run/plague-server.pid # Source function library. . /etc/init.d/functions . /etc/sysconfig/plague-server start() { echo -n "Starting plague-server: " daemon plague-server -d -p /var/run/plague-server.pid -l /var/log/plague-server.log $HOST echo touch /var/lock/subsys/plague-server return 0 } stop() { echo -n "Shutting down plague-server: " killproc plague-server echo rm -f /var/lock/subsys/plague-server return 0 } restart() { stop start } case "$1" in start) start ;; stop) stop ;; status) status plague-server ;; restart) stop start ;; condrestart) [ -f /var/lock/subsys/plague-server ] && restart || : ;; *) echo "Usage: {start|stop|status|reload|restart[|probe]" exit 1 ;; esac exit $? Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plague-builder.init 10 Jul 2005 07:17:20 -0000 1.2 +++ plague-builder.init 11 Jul 2005 03:23:21 -0000 1.3 @@ -17,7 +17,7 @@ start() { echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOSTNAME $ARCHSOPT + daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOST $ARCHSOPT echo touch /var/lock/subsys/plague-builder return 0 From fedora-extras-commits at redhat.com Mon Jul 11 03:26:23 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:26:23 -0400 Subject: extras-buildsys/server main.py,1.6,1.7 Message-ID: <200507110326.j6B3QNBE021884@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21867/server Modified Files: main.py Log Message: Import daemonize module Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- main.py 11 Jul 2005 03:23:22 -0000 1.6 +++ main.py 11 Jul 2005 03:26:21 -0000 1.7 @@ -21,6 +21,7 @@ from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer +from plague import daemonize import SimpleXMLRPCServer sys.path.append('/usr/share/plague/server') From rc040203 at freenet.de Mon Jul 11 03:38:00 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Mon, 11 Jul 2005 05:38:00 +0200 Subject: APPROVED: perl-Class-Data-Inheritable Message-ID: <1121053081.30532.423.camel@mccallum.corsepiu.local> %description Class::Data::Inheritable is for creating accessor/mutators to class data. That is, if you want to store something about your class as a whole (instead of about a single object). This data is then inherited by your subclasses and can be overriden. Maintainer: Tom "Spot" Callaway Reviewer: Ralf Cors?pius From fedora-extras-commits at redhat.com Mon Jul 11 03:42:09 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:42:09 -0400 Subject: extras-buildsys/common HTTPServer.py,1.4,1.5 Message-ID: <200507110342.j6B3g99E021924@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21907/common Modified Files: HTTPServer.py Log Message: Python 2.2 fixups Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- HTTPServer.py 7 Jul 2005 19:10:14 -0000 1.4 +++ HTTPServer.py 11 Jul 2005 03:42:06 -0000 1.5 @@ -129,13 +129,18 @@ print "Creating random test data..." f = open(os.path.join(srcdir, "testfile.dat"), "w") x = 1 + import random while x < 10000: - f.write(os.urandom(50)) + try: + f.write(os.urandom(50)) + except AttributeError: + s = str(random.randint(0, 255)) + f.write(s) x = x + 1 f.close() print "Starting the server." - server = PlgHTTPServer(('localhost', 8886), srcdir, certs) + server = PlgHTTPServerManager(('localhost', 8886), srcdir, certs) server.start() while True: From fedora-extras-commits at redhat.com Mon Jul 11 03:46:17 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 10 Jul 2005 23:46:17 -0400 Subject: extras-buildsys/common XMLRPCServerProxy.py,1.4,1.5 Message-ID: <200507110346.j6B3kHgH021965@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21948/common Modified Files: XMLRPCServerProxy.py Log Message: Python 2.2 fixups Index: XMLRPCServerProxy.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/XMLRPCServerProxy.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- XMLRPCServerProxy.py 10 Jul 2005 03:44:36 -0000 1.4 +++ XMLRPCServerProxy.py 11 Jul 2005 03:46:15 -0000 1.5 @@ -30,7 +30,11 @@ def make_connection(self, host): # Handle username and password. - host, extra_headers, x509 = self.get_host_info(host) + try: + host, extra_headers, x509 = self.get_host_info(host) + except AttributeError: + # Yay for Python 2.2 + pass _host, _port = urllib.splitport(host) return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx) From adrian at lisas.de Mon Jul 11 06:12:46 2005 From: adrian at lisas.de (Adrian Reber) Date: Mon, 11 Jul 2005 08:12:46 +0200 Subject: APPROVED: nexuiz-data Message-ID: <20050711061246.GA16410@lisas.de> %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, 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. Maintained by : Adrian Reber & Matthias Saou Reviewed by : Matthias Saou & Adrian Reber From adrian at lisas.de Mon Jul 11 06:13:59 2005 From: adrian at lisas.de (Adrian Reber) Date: Mon, 11 Jul 2005 08:13:59 +0200 Subject: APPROVED: nexuiz Message-ID: <20050711061359.GB16410@lisas.de> %description Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, focused on providing basic, old style deathmatches. Maintained by : Adrian Reber & Matthias Saou Reviewed by : Matthias Saou & Adrian Reber -------------- 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 Mon Jul 11 09:19:46 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:19:46 -0400 Subject: web/html/docs/release-notes/fc4/ru - New directory Message-ID: <200507110919.j6B9Jk2u029561@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29547/ru Log Message: Directory /cvs/fedora/web/html/docs/release-notes/fc4/ru added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 09:21:48 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:21:48 -0400 Subject: web/html/docs/release-notes/fc4/ru/figs - New directory Message-ID: <200507110921.j6B9Lm2n029596@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/figs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29576/figs Log Message: Directory /cvs/fedora/web/html/docs/release-notes/fc4/ru/figs added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 09:21:48 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:21:48 -0400 Subject: web/html/docs/release-notes/fc4/ru/stylesheet-images - New directory Message-ID: <200507110921.j6B9LmmY029601@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29576/stylesheet-images Log Message: Directory /cvs/fedora/web/html/docs/release-notes/fc4/ru/stylesheet-images added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 09:57:25 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:57:25 -0400 Subject: web/html/docs/release-notes/fc4/ru fedora.css, NONE, 1.1 index.php, NONE, 1.1 Message-ID: <200507110957.j6B9vPTR029784@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728 Added Files: fedora.css index.php Log Message: Adding Russian translation of shipped release notes. --- 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; } ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Mon Jul 11 09:57:26 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:57:26 -0400 Subject: web/html/docs/release-notes/fc4/ru/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: <200507110957.j6B9vQZb029792@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/stylesheet-images In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728/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: Adding Russian translation of shipped release notes. From fedora-extras-commits at redhat.com Mon Jul 11 09:57:26 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 05:57:26 -0400 Subject: web/html/docs/release-notes/fc4/ru/figs Fedora_Desktop.png, NONE, 1.1 Message-ID: <200507110957.j6B9vQ8v029789@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/ru/figs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29728/figs Added Files: Fedora_Desktop.png Log Message: Adding Russian translation of shipped release notes. From fedora-extras-commits at redhat.com Mon Jul 11 10:00:21 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Mon, 11 Jul 2005 06:00:21 -0400 Subject: web/html/docs/release-notes index.php,1.3,1.4 Message-ID: <200507111000.j6BA0Lss029826@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29809 Modified Files: index.php Log Message: Out of process, but working somehow Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 10 Jun 2005 21:17:39 -0000 1.3 +++ index.php 11 Jul 2005 10:00:19 -0000 1.4 @@ -25,6 +25,7 @@
  • Fedora Core 3
      • From fedora-extras-commits at redhat.com Mon Jul 11 14:19:46 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 11 Jul 2005 10:19:46 -0400 Subject: common tobuild,1.1892,1.1893 Message-ID: <200507111419.j6BEJkq0003305@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3288 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1892 retrieving revision 1.1893 diff -u -r1.1892 -r1.1893 --- tobuild 10 Jul 2005 11:31:34 -0000 1.1892 +++ tobuild 11 Jul 2005 14:19:44 -0000 1.1893 @@ -36,3 +36,4 @@ ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 11 14:20:53 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 11 Jul 2005 10:20:53 -0400 Subject: common tobuild,1.1893,1.1894 Message-ID: <200507111420.j6BEKs1E003372@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3355 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1893 retrieving revision 1.1894 diff -u -r1.1893 -r1.1894 --- tobuild 11 Jul 2005 14:19:44 -0000 1.1893 +++ tobuild 11 Jul 2005 14:20:51 -0000 1.1894 @@ -37,3 +37,4 @@ ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel +oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 11 14:21:22 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 11 Jul 2005 10:21:22 -0400 Subject: common tobuild,1.1894,1.1895 Message-ID: <200507111421.j6BELMTN003438@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3421 Modified Files: tobuild Log Message: request build of rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1894 retrieving revision 1.1895 diff -u -r1.1894 -r1.1895 --- tobuild 11 Jul 2005 14:20:51 -0000 1.1894 +++ tobuild 11 Jul 2005 14:21:20 -0000 1.1895 @@ -38,3 +38,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 +oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 11 14:43:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:43:42 -0400 Subject: rpms/logjam/devel logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.15, 1.16 Message-ID: <200507111443.j6BEhgUx003534@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/devel Modified Files: logjam.spec Added Files: logjam-4.5-patch8-manfix.patch Log Message: New version. logjam-4.5-patch8-manfix.patch: --- NEW FILE logjam-4.5-patch8-manfix.patch --- --- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500 +++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500 @@ -328,7 +328,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- logjam.spec 14 Apr 2005 21:51:26 -0000 1.15 +++ logjam.spec 11 Jul 2005 14:43:40 -0000 1.16 @@ -1,38 +1,42 @@ %define use_xmms 1 -Name: logjam -Version: 4.4.1 -Release: 8 -Epoch: 1 -Summary: GTK2 client for LiveJournal -License: GPL -Group: User Interface/Desktops -URL: http://logjam.danga.com/ -Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2 -Requires: curl >= 7.9, gtkspell +Name: logjam +Version: 4.5 +Release: 0.1patch8%{?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 +Requires: curl >= 7.9, gtkspell %if %{use_xmms} -BuildRequires: xmms-devel +BuildRequires: xmms-devel %endif -BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel -BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel -Obsoletes: loserjabber, logjam-gnome -BuildRoot: %{_tmppath}/logjam-%{version}.root -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-gtkhtml3.6.patch -Patch4: logjam-4.4.1-cleanups.patch -Patch5: logjam-4.4.1-fedora-desktop.patch +BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel +BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel +BuildRequires: libsoup-devel, sqlite-devel +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 +Patch5: logjam-4.5-patch8-manfix.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). %if %{use_xmms} %package xmms -Summary: LogJam helper binary -Group: User Interface/Desktops -Requires: logjam, xmms -BuildRequires: xmms-devel +Summary: LogJam helper binary +Group: User Interface/Desktops +Requires: logjam, xmms +BuildRequires: xmms-devel %description xmms This is a helper binary for LogJam which is used to get the @@ -40,19 +44,23 @@ %endif %prep -%setup -n %{name}-%{version} -q +%setup -n %{name}-%{version}-patch8 -q %patch0 -p1 -b .offline-segfaultfix %patch1 -p1 -b .rupo %patch2 -p1 -b .backdated -%patch3 -p1 -b .gtkhtml36 -%patch4 -p1 -b .cleanups -%patch5 -p1 -b .desktop +%patch3 -p1 -b .cleanups +%patch4 -p1 -b .desktop +%patch5 -p1 -b .manfix %build -%configure \ +%configure --with-sqlite3 \ %if %{use_xmms} --with-xmms %endif +cp libtool protocol/liblivejournal +cd gen +./regen.sh +cd .. make %install @@ -83,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 4.5-0.1patch8 +- bump to patch8 + * Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-8 - actually apply patch. :P From fedora-extras-commits at redhat.com Mon Jul 11 14:43:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:43:36 -0400 Subject: rpms/logjam/FC-3 logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.6, 1.7 Message-ID: <200507111444.j6BEi6g8003540@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/FC-3 Modified Files: logjam.spec Added Files: logjam-4.5-patch8-manfix.patch Log Message: New version. logjam-4.5-patch8-manfix.patch: --- NEW FILE logjam-4.5-patch8-manfix.patch --- --- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500 +++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500 @@ -328,7 +328,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- logjam.spec 11 Feb 2005 06:01:16 -0000 1.6 +++ logjam.spec 11 Jul 2005 14:43:34 -0000 1.7 @@ -1,37 +1,42 @@ %define use_xmms 1 -Name: logjam -Version: 4.4.1 -Release: 3 -Epoch: 1 -Summary: The GTK2-client for LiveJournal -License: GPL -Group: User Interface/Desktops -URL: http://logjam.danga.com/ -Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2 -Source1: logjam.desktop -Requires: curl >= 7.9, gtkspell +Name: logjam +Version: 4.5 +Release: 0.1patch8%{?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 +Requires: curl >= 7.9, gtkspell %if %{use_xmms} -BuildRequires: xmms-devel +BuildRequires: xmms-devel %endif -BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel -BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel -Obsoletes: loserjabber, logjam-gnome -BuildRoot: %{_tmppath}/logjam-%{version}.root -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-gtkhtml3.1.patch +BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel +BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel +BuildRequires: libsoup-devel +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 +Patch5: logjam-4.5-patch8-manfix.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). %if %{use_xmms} %package xmms -Summary: LogJam helper binary -Group: User Interface/Desktops -Requires: logjam, xmms -BuildRequires: xmms-devel +Summary: LogJam helper binary +Group: User Interface/Desktops +Requires: logjam, xmms +BuildRequires: xmms-devel %description xmms This is a helper binary for LogJam which is used to get the @@ -39,17 +44,23 @@ %endif %prep -%setup -n %{name}-%{version} -q +%setup -n %{name}-%{version}-patch8 -q %patch0 -p1 -b .offline-segfaultfix %patch1 -p1 -b .rupo %patch2 -p1 -b .backdated -%patch3 -p1 -b .gtkhtml31 +%patch3 -p1 -b .cleanups +%patch4 -p1 -b .desktop +%patch5 -p1 -b .manfix %build %configure \ %if %{use_xmms} --with-xmms %endif +cp libtool protocol/liblivejournal +cd gen +./regen.sh +cd .. make %install @@ -57,19 +68,19 @@ mkdir -p $RPM_BUILD_ROOT %makeinstall %find_lang %{name} -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora-Extras \ - %{SOURCE1} + --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT/%{_datadir}/applications/logjam.desktop %files -f %{name}.lang %defattr(-,root,root) +%doc doc/README COPYING doc/TODO %{_bindir}/logjam %{_mandir}/man1/logjam.1.gz %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/logjam* -%doc doc/README COPYING doc/TODO %if %{use_xmms} %files xmms @@ -80,6 +91,26 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 4.5-0.1patch8 +- bump to patch8 + +* Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-8 +- actually apply patch. :P + +* Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-7 +- touch up package included .desktop file and use it. + +* Wed Apr 6 2005 Tom "spot" Callaway 4.4.1-6 +- Fix dual .desktop file issue + +* Fri Mar 13 2005 Tom "spot" Callaway 4.4.1-5 +- Cleanups for compiler errors brought to light in Bugzilla 149865 +- Change X-Fedora-Extras to X-Fedora + +* Fri Feb 25 2005 Tom "spot" Callaway 4.4.1-4 +- Rebuilt for FC4/devel +- Replace Gtkhtml 3.1 patch with Gtkhtml 3.6 patch + * Thu Feb 10 2005 Tom "spot" Callaway 4.4.1-3 - Bump to current version - Compile fix patch is obsoleted @@ -140,7 +171,7 @@ * Tue Apr 29 2003 Tom "spot" Callaway - bump to 4.1.2 - and i follow the tracks that lead me down, i'll never follow whats right - + * Sat Apr 12 2003 Tom "spot" Callaway - bump to 4.1.1 - black velvet with that slow southern style @@ -163,7 +194,7 @@ * Mon Jan 07 2002 Tom "spot" Callaway - 3.0.2 release, spec cleanups * Mon Nov 12 2001 Tom "spot" Callaway - - 3.0.1 release, lots of new features/bugfixes. + - 3.0.1 release, lots of new features/bugfixes. * Fri Sep 07 2001 Tom "spot" Callaway - Rebuild without ssl for compat. :~( * Thu Sep 06 2001 Tom "spot" Callaway From fedora-extras-commits at redhat.com Mon Jul 11 14:43:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:43:36 -0400 Subject: rpms/logjam/FC-4 logjam-4.5-patch8-manfix.patch, NONE, 1.1 logjam.spec, 1.15, 1.16 Message-ID: <200507111444.j6BEi7h6003541@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3478/FC-4 Modified Files: logjam.spec Added Files: logjam-4.5-patch8-manfix.patch Log Message: New version. logjam-4.5-patch8-manfix.patch: --- NEW FILE logjam-4.5-patch8-manfix.patch --- --- logjam-4.5-patch8/doc/Makefile.in.BAD 2005-07-11 09:22:14.000000000 -0500 +++ logjam-4.5-patch8/doc/Makefile.in 2005-07-11 09:22:24.000000000 -0500 @@ -328,7 +328,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: $(mkinstalldirs) $(DESTDIR)$(man1dir) Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- logjam.spec 14 Apr 2005 21:51:26 -0000 1.15 +++ logjam.spec 11 Jul 2005 14:43:34 -0000 1.16 @@ -1,38 +1,42 @@ %define use_xmms 1 -Name: logjam -Version: 4.4.1 -Release: 8 -Epoch: 1 -Summary: GTK2 client for LiveJournal -License: GPL -Group: User Interface/Desktops -URL: http://logjam.danga.com/ -Source: http://logjam.danga.com/download/logjam-%{version}.tar.bz2 -Requires: curl >= 7.9, gtkspell +Name: logjam +Version: 4.5 +Release: 0.1patch8%{?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 +Requires: curl >= 7.9, gtkspell %if %{use_xmms} -BuildRequires: xmms-devel +BuildRequires: xmms-devel %endif -BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel -BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel -Obsoletes: loserjabber, logjam-gnome -BuildRoot: %{_tmppath}/logjam-%{version}.root -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-gtkhtml3.6.patch -Patch4: logjam-4.4.1-cleanups.patch -Patch5: logjam-4.4.1-fedora-desktop.patch +BuildRequires: curl-devel, gtk2-devel, gtkspell-devel, gtkhtml3-devel +BuildRequires: gettext, desktop-file-utils, aspell-devel, librsvg2-devel +BuildRequires: libsoup-devel, sqlite-devel +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 +Patch5: logjam-4.5-patch8-manfix.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). %if %{use_xmms} %package xmms -Summary: LogJam helper binary -Group: User Interface/Desktops -Requires: logjam, xmms -BuildRequires: xmms-devel +Summary: LogJam helper binary +Group: User Interface/Desktops +Requires: logjam, xmms +BuildRequires: xmms-devel %description xmms This is a helper binary for LogJam which is used to get the @@ -40,19 +44,23 @@ %endif %prep -%setup -n %{name}-%{version} -q +%setup -n %{name}-%{version}-patch8 -q %patch0 -p1 -b .offline-segfaultfix %patch1 -p1 -b .rupo %patch2 -p1 -b .backdated -%patch3 -p1 -b .gtkhtml36 -%patch4 -p1 -b .cleanups -%patch5 -p1 -b .desktop +%patch3 -p1 -b .cleanups +%patch4 -p1 -b .desktop +%patch5 -p1 -b .manfix %build -%configure \ +%configure --with-sqlite3 \ %if %{use_xmms} --with-xmms %endif +cp libtool protocol/liblivejournal +cd gen +./regen.sh +cd .. make %install @@ -83,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 4.5-0.1patch8 +- bump to patch8 + * Thu Apr 14 2005 Tom "spot" Callaway 4.4.1-8 - actually apply patch. :P From fedora-extras-commits at redhat.com Mon Jul 11 14:46:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:46:25 -0400 Subject: rpms/logjam/devel sources,1.3,1.4 Message-ID: <200507111446.j6BEkPTs003609@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558/devel Modified Files: sources Log Message: New sources. Index: sources =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Feb 2005 05:39:25 -0000 1.3 +++ sources 11 Jul 2005 14:46:23 -0000 1.4 @@ -1 +1,2 @@ f16f68a4a6b15fb5bb650614f3ff081c logjam-4.4.1.tar.bz2 +0acb70ccb88d6334af22e56e4b521c6b logjam-4.5-patch8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 14:46:19 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:46:19 -0400 Subject: rpms/logjam/FC-3 .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200507111446.j6BEkod3003613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558/FC-3 Modified Files: .cvsignore sources Log Message: New sources. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/.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 11 Jul 2005 14:46:17 -0000 1.4 @@ -1 +1,2 @@ logjam-4.4.1.tar.bz2 +logjam-4.5-patch8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Feb 2005 05:39:25 -0000 1.3 +++ sources 11 Jul 2005 14:46:17 -0000 1.4 @@ -1 +1,2 @@ f16f68a4a6b15fb5bb650614f3ff081c logjam-4.4.1.tar.bz2 +0acb70ccb88d6334af22e56e4b521c6b logjam-4.5-patch8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 14:46:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 10:46:20 -0400 Subject: rpms/logjam/FC-4 sources,1.3,1.4 Message-ID: <200507111446.j6BEko1B003617@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558/FC-4 Modified Files: sources Log Message: New sources. Index: sources =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Feb 2005 05:39:25 -0000 1.3 +++ sources 11 Jul 2005 14:46:18 -0000 1.4 @@ -1 +1,2 @@ f16f68a4a6b15fb5bb650614f3ff081c logjam-4.4.1.tar.bz2 +0acb70ccb88d6334af22e56e4b521c6b logjam-4.5-patch8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 15:22:58 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Mon, 11 Jul 2005 11:22:58 -0400 Subject: extras-buildsys/server main.py,1.7,1.8 Message-ID: <200507111522.j6BFMwX4004778@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4761/server Modified Files: main.py Log Message: import OptionParser Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- main.py 11 Jul 2005 03:26:21 -0000 1.7 +++ main.py 11 Jul 2005 15:22:56 -0000 1.8 @@ -23,6 +23,7 @@ from plague import HTTPServer from plague import daemonize import SimpleXMLRPCServer +from optparse import OptionParser sys.path.append('/usr/share/plague/server') From fedora-extras-commits at redhat.com Mon Jul 11 16:40:30 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 11 Jul 2005 12:40:30 -0400 Subject: fedora-security/audit README,1.2,1.3 Message-ID: <200507111640.j6BGeUGR006230@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6208 Modified Files: README Log Message: Note that this archive is just for issues known to the public; others are tracked separately. Index: README =================================================================== RCS file: /cvs/fedora/fedora-security/audit/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- README 28 Jun 2005 07:44:45 -0000 1.2 +++ README 11 Jul 2005 16:40:28 -0000 1.3 @@ -1,3 +1,5 @@ +** Note that you must not put embargoed issues into this directory ** + Process: A. Each time Mitre sends out a CVE update From jpo at di.uminho.pt Mon Jul 11 17:23:15 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Mon, 11 Jul 2005 18:23:15 +0100 Subject: libevent: FC-3 and FC-4 branches Message-ID: <42D2AB03.10508@di.uminho.pt> Ralf, Could you request the creation of the FC-3 and FC-4 branches in the following page http://fedoraproject.org/wiki/Extras/CVSSyncNeeded? tia, 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 Mon Jul 11 17:40:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:36 -0400 Subject: rpms/perl-Template-Toolkit - New directory Message-ID: <200507111740.j6BHeasL007481@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7461/perl-Template-Toolkit Log Message: Directory /cvs/extras/rpms/perl-Template-Toolkit added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 17:40:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:36 -0400 Subject: rpms/perl-Template-Toolkit/devel - New directory Message-ID: <200507111740.j6BHeak8007486@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7461/perl-Template-Toolkit/devel Log Message: Directory /cvs/extras/rpms/perl-Template-Toolkit/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 11 17:40:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:53 -0400 Subject: rpms/perl-Template-Toolkit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507111740.j6BHer57007537@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7506 Added Files: Makefile import.log Log Message: Setup of module perl-Template-Toolkit --- NEW FILE Makefile --- # Top level Makefile for module perl-Template-Toolkit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 11 17:40:53 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:40:53 -0400 Subject: rpms/perl-Template-Toolkit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507111740.j6BHerXW007542@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7506/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Template-Toolkit --- NEW 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 Jul 11 17:41:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:41:39 -0400 Subject: rpms/perl-Template-Toolkit import.log,1.1,1.2 Message-ID: <200507111741.j6BHfdOe007607@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7575 Modified Files: import.log Log Message: auto-import perl-Template-Toolkit-2.14-4 on branch devel from perl-Template-Toolkit-2.14-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Jul 2005 17:40:51 -0000 1.1 +++ import.log 11 Jul 2005 17:41:37 -0000 1.2 @@ -0,0 +1 @@ +perl-Template-Toolkit-2_14-4:HEAD:perl-Template-Toolkit-2.14-4.src.rpm:1121103752 From fedora-extras-commits at redhat.com Mon Jul 11 17:41:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 13:41:40 -0400 Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit-gdpngtest.patch, NONE, 1.1 perl-Template-Toolkit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507111741.j6BHfexH007615@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7575/devel Modified Files: .cvsignore sources Added Files: perl-Template-Toolkit-gdpngtest.patch perl-Template-Toolkit.spec Log Message: auto-import perl-Template-Toolkit-2.14-4 on branch devel from perl-Template-Toolkit-2.14-4.src.rpm perl-Template-Toolkit-gdpngtest.patch: --- NEW FILE perl-Template-Toolkit-gdpngtest.patch --- https://rt.cpan.org/NoAuth/Bug.html?id=7864 --- t/gd.t~ 2003-04-30 11:04:32.000000000 +0300 +++ t/gd.t 2005-03-14 02:49:02.956699022 +0200 @@ -84,7 +84,8 @@ -- test -- [% FILTER replace('.'); # - # This is test3 from GD-1.xx/t/GD.t + # This is test4 from GD-2.23/t/GD.t (note *.png-1): + # od -vAn -w35 -tx1 test.out.4.png-1 | tr -d ' ' # USE im = GD.Image(100,50); black = im.colorAllocate(0, 0, 0); @@ -96,13 +97,13 @@ END; -%][% im.png | hex -%] -- expect -- 89504e470d0a1a0a0000000d4948445200000064000000320203000000d75b962d0000 -000c504c5445000000ffffffff00000000ff011d334a000000bc49444154789cad94c1 +000c504c5445000000ffffffff00000000ff011d334a000000bc49444154388dad94c1 0d83300c451309ba01cc93117a203d3002d3f4403680037fca8a448526f1b710ea3fe6 c9f9b163db984b6ae4e3ce4755e7d64f88f2cf82787c151c0105eaf0ab708276ca0886 83bc7280d5919033a80c39826c1502a4a4fa1a608d6414c8e6c865e9ba560298894d32 926c9291680338636580b742e4a7ed8f7b10b2dc2272a27baafff5e1f9dca90eafb5f2 3ffc4f791ff0dee1fda6f428ef6b3e0bcafcf09953e694cfb6b20f941da2ec1dbeaba2 -b2fdf60111b64d2854ccf25e0000000049454e44ae426082 +b2fdf60111b64d28a110a5c20000000049454e44ae426082 -- test -- [% FILTER replace('.'); # --- NEW FILE perl-Template-Toolkit.spec --- Name: perl-Template-Toolkit Version: 2.14 Release: 4%{?dist} Summary: Template processing system Group: Development/Libraries License: GPL or Artistic URL: http://www.template-toolkit.org/ Source0: http://search.cpan.org/CPAN/authors/id/A/AB/ABW/Template-Toolkit-%{version}.tar.gz #Patch0: https://rt.cpan.org/NoAuth/Bug.html?id=7864 Patch0: %{name}-gdpngtest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1, tetex-dvips, tetex-latex BuildRequires: perl(AppConfig), perl(Text::Autoformat), perl(GD::Graph3d), perl(GD::Graph) BuildRequires: perl(GD::Text), perl(Image::Info), perl(Image::Size), perl(Pod::POM) BuildRequires: perl(Tie::DBI), perl(XML::DOM), perl(XML::RSS), perl(XML::XPath) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Template Toolkit is a collection of modules which implement a fast, flexible, powerful and extensible template processing system. It was originally designed and remains primarily useful for generating dynamic web content, but it can be used equally well for processing any other kind of text based documents: HTML, XML, POD, PostScript, LaTeX, and so on. %package examples Summary: Examples of how to use Template Toolkit Group: Documentation Requires: %{name} = %{version}-%{release} %description examples %{summary}. %prep %setup -q -n Template-Toolkit-%{version} %patch0 -p0 find lib -type f | xargs chmod -c -x # Filter false positive provides. cat < %{name}-prov #!/bin/sh %{__perl_provides} \ | grep -v 'perl(bytes)' \ | grep -v 'perl(CGI)' \ | grep -v 'perl(XML::DOM::' \ | grep -v 'perl(XML::XPath::' EOF %define __perl_provides %{_builddir}/Template-Toolkit-%{version}/%{name}-prov chmod +x %{__perl_provides} %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \ TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT _docs # install (+ INSTALLARCHLIB) instead of pure_install to get docs # and the template library installed too make install \ PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \ INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib} \ TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 find $RPM_BUILD_ROOT -type f -name perllocal.pod -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/* mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes HACKING README TODO _docs/* %{_bindir}/tpage %{_bindir}/ttree %{perl_vendorarch}/Template.pm %{perl_vendorarch}/auto/Template %{perl_vendorarch}/Template %{_datadir}/tt2 # The examples get their own package due to size. %exclude %{_datadir}/tt2/examples %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %files examples %defattr(-,root,root,-) %{_datadir}/tt2/examples %changelog * Mon Jul 11 2005 Tom "spot" Callaway - 2.14-4 - put examples in their own subpackage * Sat Jul 9 2005 Ville Skytt?? - 2.14-3 - Filter false positive provides. - Include template library, switch to %%{_datadir}/tt2. - Tune build dependencies for full test suite coverage. - Fix and enable GD tests. - Include more documentation. - Fine tune dir ownerships and file permissions. * Fri Jul 8 2005 Tom "spot" Callaway 2.14-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 2.14-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jul 2005 17:40:51 -0000 1.1 +++ .cvsignore 11 Jul 2005 17:41:38 -0000 1.2 @@ -0,0 +1 @@ +Template-Toolkit-2.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jul 2005 17:40:51 -0000 1.1 +++ sources 11 Jul 2005 17:41:38 -0000 1.2 @@ -0,0 +1 @@ +0eed60763ef2465c50f9b6a33e51cc14 Template-Toolkit-2.14.tar.gz From fedora-extras-commits at redhat.com Mon Jul 11 18:22:32 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 11 Jul 2005 14:22:32 -0400 Subject: rpms/rpmlint/FC-4 rpmlint-disttag.patch, NONE, 1.1 rpmlint-execs.patch, NONE, 1.1 rpmlint-initvars.patch, NONE, 1.1 rpmlint.spec, 1.14, 1.15 Message-ID: <200507111822.j6BIMWVp008873@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8832/FC-4 Modified Files: rpmlint.spec Added Files: rpmlint-disttag.patch rpmlint-execs.patch rpmlint-initvars.patch Log Message: * Thu Jul 7 2005 Ville Skytt?? - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully expanded shell variables and quotation in init scripts. rpmlint-disttag.patch: --- NEW FILE rpmlint-disttag.patch --- Index: TagsCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/TagsCheck.py,v retrieving revision 1.84 diff -u -r1.84 TagsCheck.py --- TagsCheck.py 1 Jul 2005 02:59:46 -0000 1.84 +++ TagsCheck.py 6 Jul 2005 14:19:23 -0000 @@ -419,6 +419,7 @@ packager_regex=re.compile(Config.getOption('Packager', DEFAULT_PACKAGER)) basename_regex=re.compile('/?([^/]+)$') changelog_version_regex=re.compile('[^>]([^ >]+)\s*$') +fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$') release_ext=Config.getOption('ReleaseExtension', 'mdk') extension_regex=release_ext and re.compile(release_ext + '$') use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1) @@ -626,7 +627,8 @@ expected=version + '-' + release if epoch is not None: expected=str(epoch) + ':' + expected - if expected != ret.group(1): + if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)): + printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected) # provides=pkg.provides() rpmlint-execs.patch: --- NEW FILE rpmlint-execs.patch --- Index: FilesCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/FilesCheck.py,v retrieving revision 1.87 diff -u -r1.87 FilesCheck.py --- FilesCheck.py 17 Jun 2005 09:48:34 -0000 1.87 +++ FilesCheck.py 6 Jul 2005 14:19:21 -0000 @@ -186,6 +186,7 @@ shellbang_regex=re.compile('^#!\s*(\S*)') interpreter_regex=re.compile('^/(usr/)?s?bin/[^/]+$') script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/') +libtool_archive_regex=re.compile('\.la$') for idx in range(0, len(dangling_exceptions)): dangling_exceptions[idx][0]=re.compile(dangling_exceptions[idx][0]) @@ -552,10 +553,10 @@ if res: if not interpreter_regex.search(res.group(1)): printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"') - else: + elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)): printError(pkg, 'script-without-shellbang', f) - if mode & 0111 == 0: + if mode & 0111 == 0 and not doc_regex.search(f): printError(pkg, 'non-executable-script', f, oct(perm)) if line.endswith('\r\n'): printError(pkg, 'wrong-script-end-of-line-encoding', f) rpmlint-initvars.patch: --- NEW FILE rpmlint-initvars.patch --- Index: InitScriptCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v retrieving revision 1.14 diff -u -r1.14 InitScriptCheck.py --- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14 +++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000 @@ -17,7 +17,7 @@ rc_regex=re.compile('^/etc(/rc.d)?/init.d/') chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE) -subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE) +subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE) chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE) status_regex=re.compile('^[^#]*status', re.MULTILINE) reload_regex=re.compile('^[^#]*reload', re.MULTILINE) @@ -86,7 +86,7 @@ error=1 if name[0] == '$': value=Pkg.substitute_shell_vars(name, content) - if value == basename: + if value == basename or value[0] == '$': error=0 if error: printError(pkg, 'incoherent-subsys', f, name) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rpmlint.spec 20 Jun 2005 18:02:36 -0000 1.14 +++ rpmlint.spec 11 Jul 2005 18:22:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.70 -Release: 2 +Release: 4%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,6 +10,9 @@ Source1: %{name}-fedora-config Patch0: %{name}-svcdefault.patch Patch1: %{name}-confmsg.patch +Patch2: %{name}-disttag.patch +Patch3: %{name}-initvars.patch +Patch4: %{name}-execs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,6 +32,9 @@ %setup -q %patch0 %patch1 +%patch2 +%patch3 +%patch4 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py for f in AUTHORS ChangeLog ; do @@ -80,6 +86,11 @@ %changelog +* Thu Jul 7 2005 Ville Skytt?? - 0.70-4 +- Fix false "positives" from libtool archives confused as scripts, + non-executable scripts installed in docs, FE disttags, unsuccessfully + expanded shell variables and quotation in init scripts. + * Mon Jun 20 2005 Ville Skytt?? - 0.70-2 - 0.70, use sed instead of perl during build. - Default configuration improvements: allow Development/Debug group (for From fedora-extras-commits at redhat.com Mon Jul 11 18:22:33 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 11 Jul 2005 14:22:33 -0400 Subject: rpms/rpmlint/devel rpmlint-disttag.patch, NONE, 1.1 rpmlint-execs.patch, NONE, 1.1 rpmlint-initvars.patch, NONE, 1.1 rpmlint.spec, 1.14, 1.15 Message-ID: <200507111822.j6BIMXjg008885@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8832/devel Modified Files: rpmlint.spec Added Files: rpmlint-disttag.patch rpmlint-execs.patch rpmlint-initvars.patch Log Message: * Thu Jul 7 2005 Ville Skytt?? - 0.70-4 - Fix false "positives" from libtool archives confused as scripts, non-executable scripts installed in docs, FE disttags, unsuccessfully expanded shell variables and quotation in init scripts. rpmlint-disttag.patch: --- NEW FILE rpmlint-disttag.patch --- Index: TagsCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/TagsCheck.py,v retrieving revision 1.84 diff -u -r1.84 TagsCheck.py --- TagsCheck.py 1 Jul 2005 02:59:46 -0000 1.84 +++ TagsCheck.py 6 Jul 2005 14:19:23 -0000 @@ -419,6 +419,7 @@ packager_regex=re.compile(Config.getOption('Packager', DEFAULT_PACKAGER)) basename_regex=re.compile('/?([^/]+)$') changelog_version_regex=re.compile('[^>]([^ >]+)\s*$') +fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$') release_ext=Config.getOption('ReleaseExtension', 'mdk') extension_regex=release_ext and re.compile(release_ext + '$') use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1) @@ -626,7 +627,8 @@ expected=version + '-' + release if epoch is not None: expected=str(epoch) + ':' + expected - if expected != ret.group(1): + if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)): + printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected) # provides=pkg.provides() rpmlint-execs.patch: --- NEW FILE rpmlint-execs.patch --- Index: FilesCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/FilesCheck.py,v retrieving revision 1.87 diff -u -r1.87 FilesCheck.py --- FilesCheck.py 17 Jun 2005 09:48:34 -0000 1.87 +++ FilesCheck.py 6 Jul 2005 14:19:21 -0000 @@ -186,6 +186,7 @@ shellbang_regex=re.compile('^#!\s*(\S*)') interpreter_regex=re.compile('^/(usr/)?s?bin/[^/]+$') script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/') +libtool_archive_regex=re.compile('\.la$') for idx in range(0, len(dangling_exceptions)): dangling_exceptions[idx][0]=re.compile(dangling_exceptions[idx][0]) @@ -552,10 +553,10 @@ if res: if not interpreter_regex.search(res.group(1)): printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"') - else: + elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)): printError(pkg, 'script-without-shellbang', f) - if mode & 0111 == 0: + if mode & 0111 == 0 and not doc_regex.search(f): printError(pkg, 'non-executable-script', f, oct(perm)) if line.endswith('\r\n'): printError(pkg, 'wrong-script-end-of-line-encoding', f) rpmlint-initvars.patch: --- NEW FILE rpmlint-initvars.patch --- Index: InitScriptCheck.py =================================================================== RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v retrieving revision 1.14 diff -u -r1.14 InitScriptCheck.py --- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14 +++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000 @@ -17,7 +17,7 @@ rc_regex=re.compile('^/etc(/rc.d)?/init.d/') chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE) -subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE) +subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE) chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE) status_regex=re.compile('^[^#]*status', re.MULTILINE) reload_regex=re.compile('^[^#]*reload', re.MULTILINE) @@ -86,7 +86,7 @@ error=1 if name[0] == '$': value=Pkg.substitute_shell_vars(name, content) - if value == basename: + if value == basename or value[0] == '$': error=0 if error: printError(pkg, 'incoherent-subsys', f, name) Index: rpmlint.spec =================================================================== RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rpmlint.spec 20 Jun 2005 18:03:06 -0000 1.14 +++ rpmlint.spec 11 Jul 2005 18:22:30 -0000 1.15 @@ -1,6 +1,6 @@ Name: rpmlint Version: 0.70 -Release: 3 +Release: 4%{?dist} Summary: Tool for checking common errors in RPM packages Group: Development/Tools @@ -10,6 +10,9 @@ Source1: %{name}-fedora-config Patch0: %{name}-svcdefault.patch Patch1: %{name}-confmsg.patch +Patch2: %{name}-disttag.patch +Patch3: %{name}-initvars.patch +Patch4: %{name}-execs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,6 +32,9 @@ %setup -q %patch0 %patch1 +%patch2 +%patch3 +%patch4 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \ FilesCheck.py I18NCheck.py for f in AUTHORS ChangeLog ; do @@ -80,6 +86,11 @@ %changelog +* Thu Jul 7 2005 Ville Skytt?? - 0.70-4 +- Fix false "positives" from libtool archives confused as scripts, + non-executable scripts installed in docs, FE disttags, unsuccessfully + expanded shell variables and quotation in init scripts. + * Mon Jun 20 2005 Ville Skytt?? - 0.70-3 - 0.70, use sed instead of perl during build. - Default configuration improvements: allow Development/Debug group (for From ville.skytta at iki.fi Mon Jul 11 18:37:47 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Mon, 11 Jul 2005 21:37:47 +0300 Subject: APPROVED: perl-Template-Toolkit Message-ID: <1121107067.2892.308.camel@localhost.localdomain> The Template Toolkit is a collection of modules which implement a fast, flexible, powerful and extensible template processing system. Reviewer: Ville Skytt? Maintainer: Tom Callaway From fedora-extras-commits at redhat.com Mon Jul 11 19:00:01 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 11 Jul 2005 15:00:01 -0400 Subject: owners - Imported sources Message-ID: <200507111900.j6BJ012e009065@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9051 Log Message: Initial import Status: Vendor Tag: FEDORA Release Tags: V0_0 N owners/owners.list No conflicts created by this import From fedora-extras-commits at redhat.com Mon Jul 11 19:16:04 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 11 Jul 2005 15:16:04 -0400 Subject: fedora-security/audit fc4,1.18,1.19 Message-ID: <200507111916.j6BJG4Rl010289@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10272 Modified Files: fc4 Log Message: Note mysql fix for CAN-2004-2149 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fc4 10 Jul 2005 20:41:25 -0000 1.18 +++ fc4 11 Jul 2005 19:16:02 -0000 1.19 @@ -305,7 +305,7 @@ 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) 2004-2154 version (cups, fixed 1.2.21rc1) -2004-2149 ** mysql +2004-2149 version (mysql, fixed 4.1.5) 2004-2136 ignore (dm-crypt) design 2004-2135 ignore (kernel) design 2004-2093 ignore (rsync, not security issue) From fedora-extras-commits at redhat.com Mon Jul 11 19:35:52 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Mon, 11 Jul 2005 15:35:52 -0400 Subject: owners owners.list,1.1.1.1,1.2 Message-ID: <200507111935.j6BJZqTI010410@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10393 Modified Files: owners.list Log Message: description field Index: owners.list =================================================================== RCS file: /cvs/fedora/owners/owners.list,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- owners.list 11 Jul 2005 18:59:59 -0000 1.1.1.1 +++ owners.list 11 Jul 2005 19:35:50 -0000 1.2 @@ -1,5 +1,5 @@ # Format: -# product|component|initialowner|initialqacontact|initialcclist +# product|component|description|initialowner|initialqacontact|initialcclist # # If you don't know what product & component are, ask someone who knows bugzilla :) # initialowner is the initial owner of bugs on this component @@ -8,9 +8,9 @@ # # All e-mail addresses used here MUST correspond to existing bugzilla accounts! -Fedora Infrastructure|Account System|sopwith at redhat.com||wtogami at redhat.com -Fedora Infrastructure|cvs|gafton at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com -Fedora Infrastructure|extras buildsys|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com -Fedora Infrastructure|other|wtogami at redhat.com||sopwith at redhat.com -Fedora Infrastructure|update system|lmacken at redhat.com|notting at redhat.com| -Fedora Infrastructure|website|gdk at redhat.com|sopwith at redhat.com|wtogami at redhat.com +Fedora Infrastructure|Account System|accounts.fedora.redhat.com|sopwith at redhat.com||wtogami at redhat.com +Fedora Infrastructure|cvs|For issues related to the Fedora CVS system.|gafton at redhat.com|katzj at redhat.com|notting at redhat.com,wtogami at redhat.com,sopwith at redhat.com +Fedora Infrastructure|extras buildsys|For issues related to the Fedora Extras build system.|skvidal at phy.duke.edu|katzj at redhat.com|wtogami at redhat.com +Fedora Infrastructure|other|Anything else|wtogami at redhat.com||sopwith at redhat.com +Fedora Infrastructure|update system|The Fedora Core update system|lmacken at redhat.com|notting at redhat.com| +Fedora Infrastructure|website|For issues related to the Fedora web site.|gdk at redhat.com|sopwith at redhat.com|wtogami at redhat.com From fedora-extras-commits at redhat.com Mon Jul 11 20:13:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 11 Jul 2005 16:13:39 -0400 Subject: extras-buildsys/server BuilderManager.py,1.3,1.4 Repo.py,1.9,1.10 Message-ID: <200507112013.j6BKDdO6011759@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11740/server Modified Files: BuilderManager.py Repo.py Log Message: Use cached-mode createrepo (requires latest CVS) and reload builders on the fly Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BuilderManager.py 10 Jul 2005 20:02:14 -0000 1.3 +++ BuilderManager.py 11 Jul 2005 20:13:37 -0000 1.4 @@ -36,7 +36,9 @@ self._builders_lock = threading.Lock() # List of addresses of possible builders + self._builders_lock.acquire() self.possible_builders = config_opts['builders'] + self._builders_lock.release() self.running_builders = [] builder_list = self.update_builders() @@ -68,6 +70,11 @@ def update_builders(self): self._builders_lock.acquire() + + # Load in any new builders from the config file + execfile("/etc/plague/server/CONFIG.py") + self.possible_builders = config_opts['builders'] + builder_list = [] for address in self.possible_builders: # If the address is "https" but we aren't set up for SSL, exit Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Repo.py 11 Jul 2005 02:11:08 -0000 1.9 +++ Repo.py 11 Jul 2005 20:13:37 -0000 1.10 @@ -37,6 +37,9 @@ self._repodir = os.path.join(config_opts['repo_dir'], target) if not os.path.exists(self._repodir): os.makedirs(self._repodir) + self._repo_cache_dir = os.path.join(config_opts['repo_dir'], "cache", target) + if not os.path.exists(self._repo_cache_dir): + os.makedirs(self._repo_cache_dir) self._lock = threading.Lock() self._repo_additions = [] self._lock_count = 0 @@ -82,9 +85,9 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() - (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % self._repodir) + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: - print "createrepo failed with exit status %d!" % s + print "Error: createrepo failed with exit status %d!" % s def run(self): From fedora-extras-commits at redhat.com Mon Jul 11 20:33:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:33:02 -0400 Subject: rpms/gambas/FC-3 gambas.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200507112033.j6BKX2fC011850@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11804/FC-3 Modified Files: gambas.spec sources Log Message: Bump to 1.0.8 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gambas.spec 4 Jul 2005 14:35:30 -0000 1.4 +++ gambas.spec 11 Jul 2005 20:32:59 -0000 1.5 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.6-gcc4.patch +Patch0: gambas-1.0.7-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,12 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 +- bump for another new version + +* Thu Jul 7 2005 Tom "spot" Callaway 1.0.7-1 +- bump for new version + * Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 - clean up BuildRequires - remove doubling of README in %doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 16:43:05 -0000 1.2 +++ sources 11 Jul 2005 20:32:59 -0000 1.3 @@ -1 +1,2 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 +730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 20:33:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:33:02 -0400 Subject: rpms/gambas/FC-4 .cvsignore, 1.2, 1.3 gambas.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507112033.j6BKX2aN011858@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11804/FC-4 Modified Files: .cvsignore gambas.spec sources Log Message: Bump to 1.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/.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 11 Jul 2005 20:33:00 -0000 1.3 @@ -1 +1,2 @@ gambas-1.0.6.tar.bz2 +gambas-1.0.8.tar.bz2 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gambas.spec 4 Jul 2005 14:35:31 -0000 1.4 +++ gambas.spec 11 Jul 2005 20:33:00 -0000 1.5 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.6-gcc4.patch +Patch0: gambas-1.0.7-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,12 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 +- bump for another new version + +* Thu Jul 7 2005 Tom "spot" Callaway 1.0.7-1 +- bump for new version + * Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 - clean up BuildRequires - remove doubling of README in %doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 16:43:05 -0000 1.2 +++ sources 11 Jul 2005 20:33:00 -0000 1.3 @@ -1 +1,2 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 +730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 20:33:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:33:03 -0400 Subject: rpms/gambas/devel gambas.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200507112033.j6BKX3a6011865@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11804/devel Modified Files: gambas.spec sources Log Message: Bump to 1.0.8 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gambas.spec 4 Jul 2005 14:34:38 -0000 1.4 +++ gambas.spec 11 Jul 2005 20:33:01 -0000 1.5 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.6-gcc4.patch +Patch0: gambas-1.0.7-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,12 @@ %{_datadir}/gambas/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 +- bump for another new version + +* Thu Jul 7 2005 Tom "spot" Callaway 1.0.7-1 +- bump for new version + * Mon Jul 4 2005 Tom "spot" Callaway 1.0.6-3 - clean up BuildRequires - remove doubling of README in %doc Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 16:43:05 -0000 1.2 +++ sources 11 Jul 2005 20:33:01 -0000 1.3 @@ -1 +1,2 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 +730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 From fedora-extras-commits at redhat.com Mon Jul 11 20:35:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:35:20 -0400 Subject: owners owners.list,1.5,1.6 Message-ID: <200507112035.j6BKZKGE011915@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11896 Modified Files: owners.list Log Message: perl-Template-Toolkit Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- owners.list 11 Jul 2005 20:02:38 -0000 1.5 +++ owners.list 11 Jul 2005 20:35:18 -0000 1.6 @@ -559,6 +559,7 @@ Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-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-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-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 Mon Jul 11 20:37:51 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Mon, 11 Jul 2005 16:37:51 -0400 Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.1, 1.2 Message-ID: <200507112037.j6BKbpaG011973@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Template-Toolkit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11954/devel Modified Files: perl-Template-Toolkit.spec Log Message: Remove BR: perl(Tie::DBI) Index: perl-Template-Toolkit.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Template-Toolkit.spec 11 Jul 2005 17:41:38 -0000 1.1 +++ perl-Template-Toolkit.spec 11 Jul 2005 20:37:49 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Template-Toolkit Version: 2.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Template processing system Group: Development/Libraries License: GPL or Artistic @@ -13,7 +13,7 @@ BuildRequires: perl >= 1:5.6.1, tetex-dvips, tetex-latex BuildRequires: perl(AppConfig), perl(Text::Autoformat), perl(GD::Graph3d), perl(GD::Graph) BuildRequires: perl(GD::Text), perl(Image::Info), perl(Image::Size), perl(Pod::POM) -BuildRequires: perl(Tie::DBI), perl(XML::DOM), perl(XML::RSS), perl(XML::XPath) +BuildRequires: perl(XML::DOM), perl(XML::RSS), perl(XML::XPath) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -94,6 +94,10 @@ %{_datadir}/tt2/examples %changelog +* Mon Jul 11 2005 Tom "spot" Callaway - 2.14-5 +- don't need Tie::DBI as a BuildRequires, since we're not running + the tests + * Mon Jul 11 2005 Tom "spot" Callaway - 2.14-4 - put examples in their own subpackage From fedora-extras-commits at redhat.com Mon Jul 11 20:49:03 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 11 Jul 2005 16:49:03 -0400 Subject: common tobuild,1.1895,1.1896 Message-ID: <200507112049.j6BKn3uJ012534@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12517 Modified Files: tobuild Log Message: request build of rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1895 retrieving revision 1.1896 diff -u -r1.1895 -r1.1896 --- tobuild 11 Jul 2005 14:21:20 -0000 1.1895 +++ tobuild 11 Jul 2005 20:49:01 -0000 1.1896 @@ -39,3 +39,4 @@ oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 +awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 12 00:53:33 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:53:33 -0400 Subject: rpms/kinput2/devel kinput2.spec,1.2,1.3 Message-ID: <200507120053.j6C0rXRF017389@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17372 Modified Files: kinput2.spec Log Message: * Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc5 - use proper xinput script for kinput2-wnn. Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kinput2.spec 30 Jun 2005 11:24:25 -0000 1.2 +++ kinput2.spec 12 Jul 2005 00:53:31 -0000 1.3 @@ -25,7 +25,7 @@ Name: kinput2 Version: v3.1 -Release: 25%{?dist} +Release: 26%{?dist} License: Distributable BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: xorg-x11-devel @@ -169,7 +169,7 @@ install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna %endif %if %{is_wnn_used} -install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn +install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn %endif %clean @@ -244,6 +244,9 @@ %{_sysconfdir}/X11/xinit/xinput.d %changelog +* Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc5 +- use proper xinput script for kinput2-wnn. + * Thu Jun 30 2005 Akira TAGOH - v3.1-25.fc5 - Import into Extras. From fedora-extras-commits at redhat.com Tue Jul 12 00:54:25 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:54:25 -0400 Subject: common tobuild,1.1896,1.1897 Message-ID: <200507120054.j6C0sP3c017452@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17435 Modified Files: tobuild Log Message: request build of rpms/kinput2/devel kinput2-v3_1-26_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1896 retrieving revision 1.1897 diff -u -r1.1896 -r1.1897 --- tobuild 11 Jul 2005 20:49:01 -0000 1.1896 +++ tobuild 12 Jul 2005 00:54:23 -0000 1.1897 @@ -40,3 +40,4 @@ oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 +tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 12 00:57:43 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:57:43 -0400 Subject: rpms/kinput2/FC-4 kinput2.spec,1.2,1.3 Message-ID: <200507120057.j6C0vhte017488@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17471 Modified Files: kinput2.spec Log Message: * Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc4 - use proper xinput script for kinput2-wnn Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/FC-4/kinput2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kinput2.spec 30 Jun 2005 11:20:53 -0000 1.2 +++ kinput2.spec 12 Jul 2005 00:57:41 -0000 1.3 @@ -25,7 +25,7 @@ Name: kinput2 Version: v3.1 -Release: 24%{?dist} +Release: 26%{?dist} License: Distributable BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: xorg-x11-devel @@ -169,7 +169,7 @@ install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-canna %endif %if %{is_wnn_used} -install -D -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn +install -D -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/%{name}-wnn %endif %clean @@ -244,7 +244,10 @@ %{_sysconfdir}/X11/xinit/xinput.d %changelog -* Thu Jul 30 2005 Akira TAGOH - v3.1-24.fc4 +* Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc4 +- use proper xinput script for kinput2-wnn + +* Thu Jun 30 2005 Akira TAGOH - v3.1-24.fc4 - Import into Extras for FC4. * Tue Feb 8 2005 Akira TAGOH - v3.1-24 From fedora-extras-commits at redhat.com Tue Jul 12 00:58:34 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 20:58:34 -0400 Subject: common tobuild,1.1897,1.1898 Message-ID: <200507120058.j6C0wYRY017550@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17533 Modified Files: tobuild Log Message: request build of rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1897 retrieving revision 1.1898 diff -u -r1.1897 -r1.1898 --- tobuild 12 Jul 2005 00:54:23 -0000 1.1897 +++ tobuild 12 Jul 2005 00:58:32 -0000 1.1898 @@ -41,3 +41,4 @@ oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel +tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 12 01:04:19 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:04:19 -0400 Subject: rpms/uim/devel .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 uim.spec, 1.14, 1.15 Message-ID: <200507120104.j6C14nrH018664@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18643 Modified Files: .cvsignore sources uim.spec Log Message: * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch - uim-0.4.6-fix-typo-in-configure.patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Apr 2005 12:51:45 -0000 1.6 +++ .cvsignore 12 Jul 2005 01:03:48 -0000 1.7 @@ -5,3 +5,4 @@ uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz uim-0.4.6.tar.gz +uim-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Apr 2005 12:51:45 -0000 1.5 +++ sources 12 Jul 2005 01:03:48 -0000 1.6 @@ -1 +1 @@ -a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz +1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- uim.spec 29 Jun 2005 13:10:18 -0000 1.14 +++ uim.spec 12 Jul 2005 01:03:48 -0000 1.15 @@ -4,8 +4,8 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.6 -Release: 5 +Version: 0.4.7 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ @@ -17,8 +17,6 @@ Requires(post): %{_sbindir}/alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig -Patch0: uim-0.4.6-multilib.patch -Patch1: uim-0.4.6-fix-typo-in-configure.patch Patch2: uim-0.4.6-dont-require-devel-pkgs.patch %package devel @@ -124,8 +122,6 @@ %prep %setup -q -%patch0 -p1 -b .multilib -%patch1 -p1 -b .typo %patch2 -p1 -b .dlopen # patch creation: @@ -229,6 +225,7 @@ %{_libdir}/uim/plugin/libuim-custom-enabler.so %{_datadir}/uim/pixmaps %{_datadir}/uim/helperdata +%{_mandir}/man1/uim-xim.1* %files devel %defattr (-, root, root) @@ -291,6 +288,12 @@ %{_datadir}/uim/skk*.scm %changelog +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc5 +- New upstream release. +- removed the patches. fixed in upstream. + - uim-0.4.6-multilib.patch + - uim-0.4.6-fix-typo-in-configure.patch + * Wed Jun 29 2005 Akira TAGOH - 0.4.6-5 - built with --without-scim explicitly. it doesn't work actually. From fedora-extras-commits at redhat.com Tue Jul 12 01:07:26 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:07:26 -0400 Subject: common tobuild,1.1898,1.1899 Message-ID: <200507120107.j6C17QlH018755@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18731 Modified Files: tobuild Log Message: request build of rpms/uim/devel uim-0_4_7-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1898 retrieving revision 1.1899 diff -u -r1.1898 -r1.1899 --- tobuild 12 Jul 2005 00:58:32 -0000 1.1898 +++ tobuild 12 Jul 2005 01:07:24 -0000 1.1899 @@ -42,3 +42,4 @@ awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 +tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 12 01:22:49 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:22:49 -0400 Subject: rpms/uim/FC-4 uim-0.4.6-dont-require-devel-pkgs.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 uim.spec, 1.11, 1.12 Message-ID: <200507120122.j6C1Mngj018818@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18794 Modified Files: .cvsignore sources uim.spec Added Files: uim-0.4.6-dont-require-devel-pkgs.patch Log Message: * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch - uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-dont-require-devel-pkgs.patch: --- NEW FILE uim-0.4.6-dont-require-devel-pkgs.patch --- diff -ruN uim-0.4.6.orig/uim/anthy.c uim-0.4.6/uim/anthy.c --- uim-0.4.6.orig/uim/anthy.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/anthy.c 2005-06-13 18:57:15.000000000 +0900 @@ -43,8 +43,8 @@ #define LIBANTHY_SO "libanthy.dylib" #define LIBANTHYDIC_SO "libanthydic.dylib" #else - #define LIBANTHY_SO "libanthy.so" - #define LIBANTHYDIC_SO "libanthydic.so" + #define LIBANTHY_SO "libanthy.so.0" + #define LIBANTHYDIC_SO "libanthydic.so.0" #endif /*__APPLE__*/ diff -ruN uim-0.4.6.orig/uim/canna.c uim-0.4.6/uim/canna.c --- uim-0.4.6.orig/uim/canna.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/canna.c 2005-06-13 18:56:33.000000000 +0900 @@ -48,7 +48,7 @@ /* #define UIM_CANNA_DEBUG */ #define MAX_CONTEXT 256 -#define LIBCANNA_SO "libcanna.so" +#define LIBCANNA_SO "libcanna.so.1" #define BUFSIZE 1024 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Apr 2005 12:51:45 -0000 1.6 +++ .cvsignore 12 Jul 2005 01:22:47 -0000 1.7 @@ -5,3 +5,4 @@ uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz uim-0.4.6.tar.gz +uim-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Apr 2005 12:51:45 -0000 1.5 +++ sources 12 Jul 2005 01:22:47 -0000 1.6 @@ -1 +1 @@ -a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz +1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-4/uim.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- uim.spec 16 May 2005 10:07:53 -0000 1.11 +++ uim.spec 12 Jul 2005 01:22:47 -0000 1.12 @@ -4,20 +4,21 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.6 -Release: 3 +Version: 0.4.7 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries URL: http://uim.freedesktop.org/ Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz Source1: xinput.d-uim -Patch0: uim-0.4.6-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel BuildRequires: anthy-devel Canna-devel Requires(post): %{_sbindir}/alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig +Patch2: uim-0.4.6-dont-require-devel-pkgs.patch + %package devel Summary: Development files for the Uim library Group: Development/Libraries @@ -117,11 +118,11 @@ %description skk This package provides support for SKK, a Japanese input method. -%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) +%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) %prep %setup -q -%patch0 -p1 -b .multilib +%patch2 -p1 -b .dlopen # patch creation: libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf @@ -129,7 +130,7 @@ touch uim/config.h.in %build -%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule +%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim make %install @@ -142,7 +143,7 @@ %find_lang %{name} -find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list +find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang # compress large doc @@ -214,6 +215,7 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* %dir %{_datadir}/uim @@ -223,18 +225,17 @@ %{_libdir}/uim/plugin/libuim-custom-enabler.so %{_datadir}/uim/pixmaps %{_datadir}/uim/helperdata +%{_mandir}/man1/uim-xim.1* %files devel %defattr (-, root, root) %dir %{_datadir}/uim -%{_bindir}/uim-sh %{_includedir}/uim/ %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_datadir}/uim/uim-sh.scm %files gtk2 %defattr (-, root, root) @@ -242,6 +243,7 @@ %{_bindir}/uim-helper-candwin-gtk %{_bindir}/uim-helper-toolbar-gtk %{_bindir}/uim-helper-toolbar-gtk-systray +%{_bindir}/uim-pref-gtk %{_bindir}/uim-toolbar-gtk %{_bindir}/uim-toolbar-gtk-systray %{_bindir}/uim-im-switcher-gtk @@ -286,6 +288,20 @@ %{_datadir}/uim/skk*.scm %changelog +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc4 +- New upstream release. +- removed the patches. fixed in upstream. + - uim-0.4.6-multilib.patch + - uim-0.4.6-fix-typo-in-configure.patch + +* Wed Jun 29 2005 Akira TAGOH - 0.4.6-5 +- built with --without-scim explicitly. it doesn't work actually. + +* Mon Jun 13 2005 Akira TAGOH - 0.4.6-4 +- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building. +- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen + the shared libraries without -devel packages. + * Mon May 16 2005 Akira TAGOH - 0.4.6-3 - uim-0.4.6-multilib.patch: applied to fix a build issue for libquiminputcontextplugin.so. (John Thacker, #156880) From fedora-extras-commits at redhat.com Tue Jul 12 01:23:29 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:23:29 -0400 Subject: common tobuild,1.1899,1.1900 Message-ID: <200507120123.j6C1NTm0018880@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18863 Modified Files: tobuild Log Message: request build of rpms/uim/FC-4 uim-0_4_7-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1899 retrieving revision 1.1900 diff -u -r1.1899 -r1.1900 --- tobuild 12 Jul 2005 01:07:24 -0000 1.1899 +++ tobuild 12 Jul 2005 01:23:27 -0000 1.1900 @@ -43,3 +43,4 @@ tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel +tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 12 01:30:35 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:30:35 -0400 Subject: rpms/uim/FC-3 uim-0.4.6-dont-require-devel-pkgs.patch, NONE, 1.1 uim-0.4.6-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 uim.spec, 1.4, 1.5 xinput.d-uim, 1.1, 1.2 Message-ID: <200507120130.j6C1UZ5f018935@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18907 Modified Files: .cvsignore sources uim.spec xinput.d-uim Added Files: uim-0.4.6-dont-require-devel-pkgs.patch uim-0.4.6-multilib.patch Log Message: * Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 - New upstream release. - removed the patches. fixed in upstream. - uim-0.4.6-multilib.patch - uim-0.4.6-fix-typo-in-configure.patch uim-0.4.6-dont-require-devel-pkgs.patch: --- NEW FILE uim-0.4.6-dont-require-devel-pkgs.patch --- diff -ruN uim-0.4.6.orig/uim/anthy.c uim-0.4.6/uim/anthy.c --- uim-0.4.6.orig/uim/anthy.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/anthy.c 2005-06-13 18:57:15.000000000 +0900 @@ -43,8 +43,8 @@ #define LIBANTHY_SO "libanthy.dylib" #define LIBANTHYDIC_SO "libanthydic.dylib" #else - #define LIBANTHY_SO "libanthy.so" - #define LIBANTHYDIC_SO "libanthydic.so" + #define LIBANTHY_SO "libanthy.so.0" + #define LIBANTHYDIC_SO "libanthydic.so.0" #endif /*__APPLE__*/ diff -ruN uim-0.4.6.orig/uim/canna.c uim-0.4.6/uim/canna.c --- uim-0.4.6.orig/uim/canna.c 2005-02-05 11:50:05.000000000 +0900 +++ uim-0.4.6/uim/canna.c 2005-06-13 18:56:33.000000000 +0900 @@ -48,7 +48,7 @@ /* #define UIM_CANNA_DEBUG */ #define MAX_CONTEXT 256 -#define LIBCANNA_SO "libcanna.so" +#define LIBCANNA_SO "libcanna.so.1" #define BUFSIZE 1024 uim-0.4.6-multilib.patch: --- NEW FILE uim-0.4.6-multilib.patch --- diff -ur uim-0.4.6.orig/configure.ac uim-0.4.6/configure.ac --- uim-0.4.6.orig/configure.ac 2005-05-11 11:46:09.000000000 -0400 +++ uim-0.4.6/configure.ac 2005-05-11 11:46:26.000000000 -0400 @@ -613,7 +613,7 @@ fi LDFLAGS=$_SAVE_LDFLAGS - QT_LIBS="-L/usr/X11R6/lib $QT_LDFLAGS $QT_LIB -lXext -lX11" + QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11" _SAVE_CXXFLAGS=$CXXFLAGS _SAVE_LIBS=$LIBS Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Feb 2005 05:39:46 -0000 1.5 +++ .cvsignore 12 Jul 2005 01:30:32 -0000 1.6 @@ -4,3 +4,4 @@ uim-0.4.5.tar.gz uim-0.4.5-autoreconf.patch.bz2 uim-0.4.5.1.tar.gz +uim-0.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2005 04:51:20 -0000 1.4 +++ sources 12 Jul 2005 01:30:32 -0000 1.5 @@ -1 +1 @@ -10d48b4a5db1f19b8cf9f5099265aa4c uim-0.4.5.1.tar.gz +1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/uim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- uim.spec 24 Feb 2005 05:39:46 -0000 1.4 +++ uim.spec 12 Jul 2005 01:30:32 -0000 1.5 @@ -4,17 +4,20 @@ Summary: A multilingual input method library Name: uim -Version: 0.4.5.1 -Release: 1 +Version: 0.4.7 +Release: 1%{?dist} License: GPL/BSD Group: System Environment/Libraries -URL: http://freedesktop.org/Software/uim -Source0: http://freedesktop.org/Software/UimDownload/%{name}-%{version}.tar.gz +URL: http://uim.freedesktop.org/ +Source0: http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz Source1: xinput.d-uim BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: gtk2-devel -BuildRequires: gnome-panel-devel -Requires(post,postun): %{_sbindir}/alternatives +BuildRequires: gtk2-devel gnome-panel-devel qt-devel ncurses-devel +BuildRequires: anthy-devel Canna-devel +Requires(post): %{_sbindir}/alternatives /sbin/ldconfig +Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig + +Patch2: uim-0.4.6-dont-require-devel-pkgs.patch %package devel Summary: Development files for the Uim library @@ -25,40 +28,50 @@ Summary: GTK+2 support for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %package gnome Summary: GNOME Applet for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} -Requires(post,postun): %{_sbindir}/bonobo-activation-sysconf +Requires(post): %{_sbindir}/bonobo-activation-sysconf +Requires(postun): %{_sbindir}/bonobo-activation-sysconf + +%package qt +Summary: Qt support for Uim +Group: User Interface/Desktops +Requires: uim = %{version}-%{release} %package anthy Summary: Anthy support for Uim Group: System Environment/Libraries Requires: anthy Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %package canna Summary: Canna support for Uim Group: System Environment/Libraries Requires: Canna Canna-devel Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %package skk Summary: SKK support for Uim Group: System Environment/Libraries Requires: skkdic Requires: uim = %{version}-%{release} -Requires(post,postun): gtk2 +Requires(post): gtk2 +Requires(postun): gtk2 %description Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +support Gtk+'s immodule, Qt's immodule and XIM. This package provides the input method library, the XIM bridge and most of the input methods. @@ -71,8 +84,7 @@ %description devel Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all -languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +languages. This package contains the header files and the libraries which is needed for developing Uim applications. @@ -80,19 +92,23 @@ %description gtk2 Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all -languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +languages. This package provides the Gtk IM module and helper program. %description gnome Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all -languages. Currently, it can input to applications which -support Gtk+'s immodule or XIM. +languages. This package provides the GNOME panel applet. +%description qt +Uim is a multilingual input method library. Uim aims to +provide secure and useful input methods for all + +This package provides the Qt IM module and helper programs. + %description anthy This package provides support for Anthy, a Japanese input method. @@ -102,38 +118,40 @@ %description skk This package provides support for SKK, a Japanese input method. -%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) +%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules ) %prep %setup -q +%patch2 -p1 -b .dlopen -%ifarch x86_64 # patch creation: libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf # touch uim/config.h.in, otherwise autoheader will run again touch uim/config.h.in -%endif %build -%configure +%configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule --without-scim make %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim %find_lang %{name} -find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list +find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang # compress large doc bzip2 ChangeLog +# remove the unnecessary files +rm $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*.{a,la} + %clean rm -rf $RPM_BUILD_ROOT @@ -197,63 +215,121 @@ %lang(ja) %doc README.ja %{_bindir}/uim-fep* %{_bindir}/uim-helper-server +%{_bindir}/uim-sh %{_bindir}/uim-xim %{_libdir}/lib*.so.* %dir %{_datadir}/uim %{_datadir}/uim/tables %{_sysconfdir}/X11/xinit/xinput.d +%dir %{_libdir}/uim +%{_libdir}/uim/plugin/libuim-custom-enabler.so +%{_datadir}/uim/pixmaps +%{_datadir}/uim/helperdata +%{_mandir}/man1/uim-xim.1* %files devel %defattr (-, root, root) %dir %{_datadir}/uim -%{_bindir}/uim-sh -%{_includedir}/uim/* +%{_includedir}/uim/ %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %{_libdir}/lib*.a %{_libdir}/lib*.la %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%{_datadir}/uim/uim-sh.scm %files gtk2 %defattr (-, root, root) %{_bindir}/uim-candwin-gtk -%{_bindir}/uim-im-switcher -%{_bindir}/uim-input-pad-ja +%{_bindir}/uim-helper-candwin-gtk +%{_bindir}/uim-helper-toolbar-gtk +%{_bindir}/uim-helper-toolbar-gtk-systray +%{_bindir}/uim-pref-gtk %{_bindir}/uim-toolbar-gtk %{_bindir}/uim-toolbar-gtk-systray +%{_bindir}/uim-im-switcher-gtk +%{_bindir}/uim-input-pad-ja %{_libdir}/gtk-2.0/2.*/immodules %exclude %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a %dir %{_datadir}/uim -%{_datadir}/uim/icons +%{_datadir}/applications/uim.desktop %files gnome %defattr (-, root, root) +%{_libexecdir}/uim-helper-applet %{_libexecdir}/uim-toolbar-applet %{_libdir}/bonobo/servers/GNOME_UimApplet.server +%files qt +%defattr (-, root, root) +%{_bindir}/uim-candwin-qt +%{_bindir}/uim-chardict-qt +%{_bindir}/uim-im-switcher-qt +%{_bindir}/uim-pref-qt +%{_bindir}/uim-toolbar-qt +%{_libdir}/qt-3.*/plugins/inputmethods +%exclude %{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a + %files anthy %defattr (-, root, root) +%{_libdir}/uim/plugin/libuim-anthy.so %dir %{_datadir}/uim -%{_datadir}/uim/anthy.scm +%{_datadir}/uim/anthy*.scm %files canna %defattr (-, root, root) +%{_libdir}/uim/plugin/libuim-canna.so %dir %{_datadir}/uim -%{_datadir}/uim/canna.scm +%{_datadir}/uim/canna*.scm %files skk %defattr (-, root, root) +%{_libdir}/uim/plugin/libuim-skk.so %dir %{_datadir}/uim %{_datadir}/uim/skk*.scm %changelog +* Tue Jul 12 2005 Akira TAGOH - 0.4.7-1.fc3 +- New upstream release. +- removed the patches. fixed in upstream. + - uim-0.4.6-multilib.patch + - uim-0.4.6-fix-typo-in-configure.patch + +* Wed Jun 29 2005 Akira TAGOH - 0.4.6-5 +- built with --without-scim explicitly. it doesn't work actually. + +* Mon Jun 13 2005 Akira TAGOH - 0.4.6-4 +- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building. +- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen + the shared libraries without -devel packages. + +* Mon May 16 2005 Akira TAGOH - 0.4.6-3 +- uim-0.4.6-multilib.patch: applied to fix a build issue for + libquiminputcontextplugin.so. (John Thacker, #156880) + +* Fri May 6 2005 Akira TAGOH - 0.4.6-2 +- added BuildRequires: ncurses-devel. (#156880) + +* Mon Apr 18 2005 Akira TAGOH - 0.4.6-1 +- New upstream release. (#155173) + - fixed missing return statement issue. (#150304) +- Updated upstream URL. +- ensure to build with Canna and anthy. +- enabled Qt immodule. +- added QT_IM_MODULE=uim to xinput.d-uim + +* Fri Apr 1 2005 Michael Schwendt - 0.4.5.1-2 +- Include headers directory in -devel package. + +* Fri Mar 4 2005 Ville Skytt?? +- Split context marked dependency syntax to work around #118773. +- Add ldconfig scriptlet dependencies. + * Thu Feb 24 2005 Akira TAGOH - 0.4.5.1-1 - New upstream release. - security fix. - support xinput script. -* Sun Feb 20 2005 Thorsten Leemhuis 0.4.5-2 - Added autoreconf-patch; fixes build on x86_64 * Wed Jan 12 2005 Akira TAGOH 0.4.5-1 Index: xinput.d-uim =================================================================== RCS file: /cvs/extras/rpms/uim/FC-3/xinput.d-uim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xinput.d-uim 24 Feb 2005 05:39:46 -0000 1.1 +++ xinput.d-uim 12 Jul 2005 01:30:32 -0000 1.2 @@ -1,3 +1,4 @@ XIM=uim XIM_PROGRAM=uim-xim GTK_IM_MODULE=uim +QT_IM_MODULE=uim From fedora-extras-commits at redhat.com Tue Jul 12 01:32:06 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 11 Jul 2005 21:32:06 -0400 Subject: common tobuild,1.1900,1.1901 Message-ID: <200507120132.j6C1W6iK018999@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18982 Modified Files: tobuild Log Message: request build of rpms/uim/FC-3 uim-0_4_7-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1900 retrieving revision 1.1901 diff -u -r1.1900 -r1.1901 --- tobuild 12 Jul 2005 01:23:27 -0000 1.1900 +++ tobuild 12 Jul 2005 01:32:04 -0000 1.1901 @@ -44,3 +44,4 @@ tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 +tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 12 03:39:58 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Mon, 11 Jul 2005 23:39:58 -0400 Subject: rpms/proj import.log,1.7,1.8 Message-ID: <200507120339.j6C3dw1x021416@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21384 Modified Files: import.log Log Message: auto-import proj-4.4.9-1 on branch FC-4 from proj-4.4.9-1.src.rpm Updated to proj-4.4.9 and to address bug 150013 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/proj/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 8 Jul 2005 05:23:35 -0000 1.7 +++ import.log 12 Jul 2005 03:39:56 -0000 1.8 @@ -4,3 +4,4 @@ proj-4_4_8-0_fdr_4_2:FC-2:proj-4.4.8-0.fdr.4.2.src.rpm:1109868421 proj-4_4_9-0:HEAD:proj-4.4.9-0.src.rpm:1120711939 proj-4_4_9-1:HEAD:proj-4.4.9-1.src.rpm:1120800198 +proj-4_4_9-1:FC-4:proj-4.4.9-1.src.rpm:1121139578 From fedora-extras-commits at redhat.com Tue Jul 12 03:39:59 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Mon, 11 Jul 2005 23:39:59 -0400 Subject: rpms/proj/FC-4 pj_gridinfo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 proj.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507120339.j6C3dx2l021426@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21384/FC-4 Modified Files: .cvsignore proj.spec sources Added Files: pj_gridinfo.patch Log Message: auto-import proj-4.4.9-1 on branch FC-4 from proj-4.4.9-1.src.rpm Updated to proj-4.4.9 and to address bug 150013 pj_gridinfo.patch: --- NEW FILE pj_gridinfo.patch --- *** src/pj_gridinfo.c 2004-10-29 21:03:03.000000000 -0700 --- src/pj_gridinfo.c.new 2005-07-07 21:48:25.000000000 -0700 *************** *** 490,496 **** { if( getenv("PROJ_DEBUG") != NULL ) fprintf( stderr, "pj_gridinfo_init_ntv2(): " ! "failed to find parent %8.8s for %.\n", (const char *) header+24, gi->ct->id ); for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} --- 490,496 ---- { if( getenv("PROJ_DEBUG") != NULL ) fprintf( stderr, "pj_gridinfo_init_ntv2(): " ! "failed to find parent %8.8s for %s\n", (const char *) header+24, gi->ct->id ); for( lnk = gp; lnk->next != NULL; lnk = lnk->next ) {} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proj/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Jan 2005 09:45:21 -0000 1.2 +++ .cvsignore 12 Jul 2005 03:39:57 -0000 1.3 @@ -1,2 +1,2 @@ -proj-4.4.8.tar.gz proj-nad27-1.1.tar.gz +proj-4.4.9.tar.gz Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/FC-4/proj.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- proj.spec 22 May 2005 16:33:49 -0000 1.4 +++ proj.spec 12 Jul 2005 03:39:57 -0000 1.5 @@ -1,16 +1,17 @@ Name: proj -Version: 4.4.8 -Release: 6 +Version: 4.4.9 +Release: 1%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering License: MIT URL: http://www.remotesensing.org/proj/ -Source0: ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8.tar.gz +Source0: ftp://ftp.remotesensing.org/pub/proj/proj-%{version}.tar.gz Source1: ftp://ftp.remotesensing.org/pub/proj/proj-nad27-1.1.tar.gz Source2: http://packages.debian.org/changelogs/pool/main/p/proj/proj_4.4.8-3/proj.copyright Patch0: proj.copyright.patch Patch1: proj.test_scripts.patch +Patch2: pj_gridinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package devel @@ -48,6 +49,10 @@ gzip -dc %{SOURCE1} | tar -xvvf - cd .. +# Patch for Bug 150013 +cp %{PATCH2} ./ +%patch2 -p0 -b .buildroot + %build %configure make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -88,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Thu Jul 7 2005 Shawn McCann - 4.4.9-1 +- Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source. + * Sun May 22 2005 Michael Schwendt - 4.4.8-6 - rebuilt @@ -120,4 +128,3 @@ - to comply with both Fedora and RedHat 9 packaging guidelines. - Split files into proj, proj-devel, and proj-nad (additional grids) - and adjusted the EXE path in the test scripts. - Index: sources =================================================================== RCS file: /cvs/extras/rpms/proj/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:45:21 -0000 1.2 +++ sources 12 Jul 2005 03:39:57 -0000 1.3 @@ -1,2 +1,2 @@ -1bdfb7bf5df081d029828ed47b780519 proj-4.4.8.tar.gz 66537aa24ad729d43db383abe2bf7707 proj-nad27-1.1.tar.gz +3cc5c2407c213aadfd154c8df80efd6c proj-4.4.9.tar.gz From oliver at linux-kernel.at Tue Jul 12 07:16:54 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Tue, 12 Jul 2005 09:16:54 +0200 Subject: libevent: FC-3 and FC-4 branches In-Reply-To: <42D2AB03.10508@di.uminho.pt> References: <42D2AB03.10508@di.uminho.pt> Message-ID: <42D36E66.6090107@linux-kernel.at> On 07/11/2005 07:23 PM, Jos? Pedro Oliveira wrote: > Ralf, > > Could you request the creation of the FC-3 and FC-4 branches in the > following page http://fedoraproject.org/wiki/Extras/CVSSyncNeeded? Someone allready did, it seems. Best, Oliver From fedora-extras-commits at redhat.com Tue Jul 12 07:55:55 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 12 Jul 2005 03:55:55 -0400 Subject: fedora-security/audit fc4,1.19,1.20 Message-ID: <200507120755.j6C7ttb8026293@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26274 Modified Files: fc4 Log Message: Updates from CVE mails 20050711 Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fc4 11 Jul 2005 19:16:02 -0000 1.19 +++ fc4 12 Jul 2005 07:55:53 -0000 1.20 @@ -1,7 +1,7 @@ -Up to date CVE as of CVE email 20050710 -Up to date FC4 as of 20050710 +Up to date CVE as of CVE email 20050711 +Up to date FC4 as of 20050711 -** marks items that need attention +** are items that need attention 2005-2177 ** net-snmp (fixed 5.2.1.2) 2005-2114 ** mozilla @@ -9,6 +9,7 @@ 2005-2088 VULNERABLE (httpd) 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] +2005-1768 version (kernel, fixed 2.6.6) 2005-1765 ** kernel 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] From fedora-extras-commits at redhat.com Tue Jul 12 15:33:45 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 12 Jul 2005 11:33:45 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.22,1.23 Message-ID: <200507121533.j6CFXjlD004008@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3991 Modified Files: bittorrent.spec Log Message: * Tue Jul 11 2005 Paul Howarth 4.1.2-5 - 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 offer build option not to delete usr/group on uninstall - don't generate redundant python-abi dependency for FC >= 4 Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bittorrent.spec 7 Jul 2005 06:08:31 -0000 1.22 +++ bittorrent.spec 12 Jul 2005 15:33:43 -0000 1.23 @@ -1,11 +1,10 @@ %define desktopvendor fedora -%define delete_user_on_uninstall 0 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent Version: 4.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -21,7 +20,10 @@ BuildRequires: python-devel desktop-file-utils gettext Requires: python +# FC4 and later auto-generate python version dependency +%if "%{fedora}" < "4" || 0%{?rhel} Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +%endif Provides: python-khashmir Obsoletes: python-khashmir < %{version}-%{release} @@ -31,10 +33,6 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -%if %{delete_user_on_uninstall} -Requires(postun): %{_sbindir}/userdel -Requires(postun): %{_sbindir}/groupdel -%endif Requires(postun): /sbin/service %description @@ -107,7 +105,7 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +%{__python} setup.py build %install %{__rm} -rf $RPM_BUILD_ROOT @@ -121,7 +119,7 @@ %{__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}/pixmaps/bittorrent.png +%{__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 @@ -153,18 +151,17 @@ if [ $1 -gt 0 ]; then /sbin/service btseed condrestart &>/dev/null || : /sbin/service bttrack condrestart &>/dev/null || : -%if %{delete_user_on_uninstall} -else - %{_sbindir}/userdel torrent &>/dev/null || : - %{_sbindir}/groupdel torrent &>/dev/null || : -%endif 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 -f bittorrent.lang %defattr(-,root,root,-) @@ -202,9 +199,17 @@ %{_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 Jul 11 2005 Paul Howarth 4.1.2-5 +- 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 offer build option not to delete usr/group on uninstall +- don't generate redundant python-abi dependency for FC >= 4 + * Thu Jul 7 2005 Paul Howarth 4.1.2-4 - bump and rebuild From fedora-extras-commits at redhat.com Tue Jul 12 15:35:23 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 12 Jul 2005 11:35:23 -0400 Subject: web/html/download mirrors.php,1.20,1.21 Message-ID: <200507121535.j6CFZNFo004039@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4022 Modified Files: mirrors.php Log Message: Added links for ftp.unina.it Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mirrors.php 6 Jul 2005 19:19:18 -0000 1.20 +++ mirrors.php 12 Jul 2005 15:35:21 -0000 1.21 @@ -310,6 +310,8 @@
    • Netherlands From fedora-extras-commits at redhat.com Tue Jul 12 16:38:48 2005 From: fedora-extras-commits at redhat.com (Elena Zannoni (ezannoni)) Date: Tue, 12 Jul 2005 12:38:48 -0400 Subject: web/html/projects/systemtap index.php,NONE,1.1 Message-ID: <200507121638.j6CGcm3o005525@cvs-int.fedora.redhat.com> Author: ezannoni Update of /cvs/fedora/web/html/projects/systemtap In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5509 Added Files: index.php Log Message: Initial web page creation for the systemtap project. ***** Error reading new file: [Errno 2] No such file or directory: 'index.php' From fedora-extras-commits at redhat.com Tue Jul 12 17:20:25 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Tue, 12 Jul 2005 13:20:25 -0400 Subject: web/html/download mirrors.php,1.21,1.22 Message-ID: <200507121720.j6CHKPtN006817@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6800 Modified Files: mirrors.php Log Message: Added trailing slash on ftp://ftp.unina.it....../ for consistency's sake. Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mirrors.php 12 Jul 2005 15:35:21 -0000 1.21 +++ mirrors.php 12 Jul 2005 17:20:23 -0000 1.22 @@ -310,7 +310,7 @@
      • From fedora-extras-commits at redhat.com Tue Jul 12 19:46:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 12 Jul 2005 15:46:31 -0400 Subject: rpms/blacs/devel Bmake.inc, 1.1, 1.2 Bmake.inc.64bit, 1.1, 1.2 blacs.spec, 1.6, 1.7 Message-ID: <200507121946.j6CJkVED011348@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/devel Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: shared lib version of blacs Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc 24 Apr 2005 17:42:47 -0000 1.1 +++ Bmake.inc 12 Jul 2005 19:46:29 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc.64bit 5 May 2005 14:43:52 -0000 1.1 +++ Bmake.inc.64bit 12 Jul 2005 19:46:29 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib64 MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6 +++ blacs.spec 12 Jul 2005 19:46:29 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -16,9 +16,13 @@ Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit BuildRequires: gcc-gfortran -BuildRequires: lapack, blas, lam -Requires: lapack, blas, lam +# Lam before 7.1.1-5 is missing: +# -shared library support +# -fPIC compilation flag +BuildRequires: lapack, blas, lam >= 7.1.1-5 +Requires: lapack, blas, lam >= 7.1.1-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blacs-shared.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -31,11 +35,20 @@ parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. +%package devel +Summary: Development libraries for blacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for blacs. + %prep %setup -q -c -n %{name} %setup -q -D -T -a 1 -n %{name} +%patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 +%ifarch ppc64 sparc64 x86_64 ia64 cp -f %{SOURCE9} ./Bmake.inc %else cp -f %{SOURCE2} . @@ -44,10 +57,10 @@ %build cd BLACS/ make mpi + cd TESTING/ make -cd .. -cd .. +cd ../.. cp %{SOURCE3} mpi_prop.ps cp %{SOURCE4} blacs_install.ps @@ -62,13 +75,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} cd BLACS/LIB -for f in *.a; do +for f in *.a *.so*; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done cd ../TESTING/EXE cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir} cd ${RPM_BUILD_ROOT}%{_libdir} +for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do + ln -fs $i.so.1.0.0 $i.so.1 + ln -s $i.so.1.0.0 $i.so +done +cd .. %post -p /sbin/ldconfig @@ -78,12 +96,22 @@ rm -fr ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,0755) %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps %{_bindir}/x*test_MPI-LINUX-0 -%{_libdir}/libmpiblacs* +%{_libdir}/libmpiblacs*.so.* + +%files devel +%defattr(-,root,root,0755) +%{_libdir}/libmpiblacs*.a +%{_libdir}/libmpiblacs*.so %changelog +* Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 +- split static lib and .so into -devel package +- fix Bmake files for shared library support +- build shared libraries + * Tue May 10 2005 Tom "spot" Callaway 1.1-8 - g77 needs some special compile flags, edited Bmake.inc* From fedora-extras-commits at redhat.com Tue Jul 12 19:46:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 12 Jul 2005 15:46:25 -0400 Subject: rpms/blacs/FC-3 Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.6, 1.7 Message-ID: <200507121946.j6CJkuUd011353@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/FC-3 Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: shared lib version of blacs Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/Bmake.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Bmake.inc 10 May 2005 19:23:54 -0000 1.3 +++ Bmake.inc 12 Jul 2005 19:46:23 -0000 1.4 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = g77 - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/Bmake.inc.64bit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc.64bit 10 May 2005 19:23:54 -0000 1.2 +++ Bmake.inc.64bit 12 Jul 2005 19:46:23 -0000 1.3 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib64 MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = g77 - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -ff90 -Wno-globals -fno-globals -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6 +++ blacs.spec 12 Jul 2005 19:46:23 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -16,9 +16,13 @@ Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit BuildRequires: gcc-g77 -BuildRequires: lapack, blas, lam -Requires: lapack, blas, lam +# Lam before 7.1.1-5 is missing: +# -shared library support +# -fPIC compilation flag +BuildRequires: lapack, blas, lam >= 7.1.1-5 +Requires: lapack, blas, lam >= 7.1.1-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blacs-shared.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -31,11 +35,20 @@ parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. +%package devel +Summary: Development libraries for blacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for blacs. + %prep %setup -q -c -n %{name} %setup -q -D -T -a 1 -n %{name} +%patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 +%ifarch ppc64 sparc64 x86_64 ia64 cp -f %{SOURCE9} ./Bmake.inc %else cp -f %{SOURCE2} . @@ -44,10 +57,10 @@ %build cd BLACS/ make mpi + cd TESTING/ make -cd .. -cd .. +cd ../.. cp %{SOURCE3} mpi_prop.ps cp %{SOURCE4} blacs_install.ps @@ -62,13 +75,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} cd BLACS/LIB -for f in *.a; do +for f in *.a *.so*; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done cd ../TESTING/EXE cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir} cd ${RPM_BUILD_ROOT}%{_libdir} +for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do + ln -fs $i.so.1.0.0 $i.so.1 + ln -s $i.so.1.0.0 $i.so +done +cd .. %post -p /sbin/ldconfig @@ -78,12 +96,22 @@ rm -fr ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,0755) %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps %{_bindir}/x*test_MPI-LINUX-0 -%{_libdir}/libmpiblacs* +%{_libdir}/libmpiblacs*.so.* + +%files devel +%defattr(-,root,root,0755) +%{_libdir}/libmpiblacs*.a +%{_libdir}/libmpiblacs*.so %changelog +* Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 +- split static lib and .so into -devel package +- fix Bmake files for shared library support +- build shared libraries + * Tue May 10 2005 Tom "spot" Callaway 1.1-8 - g77 needs some special compile flags, edited Bmake.inc* From fedora-extras-commits at redhat.com Tue Jul 12 19:46:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 12 Jul 2005 15:46:26 -0400 Subject: rpms/blacs/FC-4 Bmake.inc, 1.1, 1.2 Bmake.inc.64bit, 1.1, 1.2 blacs.spec, 1.6, 1.7 Message-ID: <200507121946.j6CJku8O011358@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11293/FC-4 Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: shared lib version of blacs Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc 24 Apr 2005 17:42:47 -0000 1.1 +++ Bmake.inc 12 Jul 2005 19:46:24 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc.64bit,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Bmake.inc.64bit 5 May 2005 14:43:52 -0000 1.1 +++ Bmake.inc.64bit 12 Jul 2005 19:46:24 -0000 1.2 @@ -38,14 +38,17 @@ # Name and location of the BLACS library. See section 2 for # details on BLACS debug level (BLACSDBGLVL). # ---------------------------------------------------------- - BLACSdir = $(BTOPdir)/LIB - BLACSDBGLVL = 0 - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSFINITS = $(BLACSdir)/libmpiblacsF77init.so - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSCINITS = $(BLACSdir)/libmpiblacsCinit.so - BLACSLIB = $(BLACSdir)/libmpiblacs.a - BLACSLIBS = $(BLACSdir)/libmpiblacs.so + BLACSdir = $(BTOPdir)/LIB + BLACSDBGLVL = 0 + BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a + BLACSFINITS = libmpiblacsF77init.so.1 + BLACSFINITSL = -lmpiblacsF77init + BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a + BLACSCINITS = libmpiblacsCinit.so.1 + BLACSCINITSL = -lmpiblacsCinit + BLACSLIB = $(BLACSdir)/libmpiblacs.a + BLACSLIBS = libmpiblacs.so.1 + BLACSLIBSL = -lmpiblacs # ------------------------------------- # Name and location of the MPI library. @@ -53,14 +56,14 @@ MPIdir = /usr MPILIBdir = $(MPIdir)/lib64 MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpi.a - LAMLIBS = $(MPILIBdir)/liblam.a $(MPILIBdir)/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi + MPILIB = -lmpi + LAMLIBS = -llam -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil # ------------------------------------- # All libraries required by the tester. # ------------------------------------- - BTLIBS = $(BLACSFINIT) $(BLACSLIB) $(BLACSFINIT) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) + BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS) # ---------------------------------------------------------------- # The directory to put the installation help routines' executables @@ -201,12 +204,12 @@ # macros should be obvious from the names. #============================================================================= F77 = gfortran - F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) + F77NO_OPTFLAGS = $(RPM_OPT_FLAGS) -fPIC F77FLAGS = $(F77NO_OPTFLAGS) -O F77LOADER = $(F77) F77LOADFLAGS = CC = gcc - CCFLAGS = $(RPM_OPT_FLAGS) + CCFLAGS = $(RPM_OPT_FLAGS) -fPIC CCLOADER = $(CC) CCLOADFLAGS = Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- blacs.spec 13 Jun 2005 04:14:58 -0000 1.6 +++ blacs.spec 12 Jul 2005 19:46:24 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -16,9 +16,13 @@ Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit BuildRequires: gcc-gfortran -BuildRequires: lapack, blas, lam -Requires: lapack, blas, lam +# Lam before 7.1.1-5 is missing: +# -shared library support +# -fPIC compilation flag +BuildRequires: lapack, blas, lam >= 7.1.1-5 +Requires: lapack, blas, lam >= 7.1.1-5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: blacs-shared.patch %description The BLACS (Basic Linear Algebra Communication Subprograms) project is @@ -31,11 +35,20 @@ parallel machine. The BLACS exist in order to make linear algebra applications both easier to program and more portable. +%package devel +Summary: Development libraries for blacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for blacs. + %prep %setup -q -c -n %{name} %setup -q -D -T -a 1 -n %{name} +%patch0 -p1 cd BLACS/ -%ifarch ppc64 sparc64 x86_64 +%ifarch ppc64 sparc64 x86_64 ia64 cp -f %{SOURCE9} ./Bmake.inc %else cp -f %{SOURCE2} . @@ -44,10 +57,10 @@ %build cd BLACS/ make mpi + cd TESTING/ make -cd .. -cd .. +cd ../.. cp %{SOURCE3} mpi_prop.ps cp %{SOURCE4} blacs_install.ps @@ -62,13 +75,18 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} cd BLACS/LIB -for f in *.a; do +for f in *.a *.so*; do cp -f $f ${RPM_BUILD_ROOT}%{_libdir}/$f done cd ../TESTING/EXE cp -f x*test_MPI-LINUX-0 ${RPM_BUILD_ROOT}%{_bindir} cd ${RPM_BUILD_ROOT}%{_libdir} +for i in libmpiblacs libmpiblacsF77init libmpiblacsCinit; do + ln -fs $i.so.1.0.0 $i.so.1 + ln -s $i.so.1.0.0 $i.so +done +cd .. %post -p /sbin/ldconfig @@ -78,12 +96,22 @@ rm -fr ${RPM_BUILD_ROOT} %files -%defattr(-,root,root) +%defattr(-,root,root,0755) %doc mpi_prop.ps blacs_install.ps mpiblacs_issues.ps f77blacsqref.ps cblacsqref.ps lawn94.ps %{_bindir}/x*test_MPI-LINUX-0 -%{_libdir}/libmpiblacs* +%{_libdir}/libmpiblacs*.so.* + +%files devel +%defattr(-,root,root,0755) +%{_libdir}/libmpiblacs*.a +%{_libdir}/libmpiblacs*.so %changelog +* Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 +- split static lib and .so into -devel package +- fix Bmake files for shared library support +- build shared libraries + * Tue May 10 2005 Tom "spot" Callaway 1.1-8 - g77 needs some special compile flags, edited Bmake.inc* From fedora-extras-commits at redhat.com Tue Jul 12 19:59:21 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 12 Jul 2005 15:59:21 -0400 Subject: rpms/bash-completion/FC-4 .cvsignore, 1.6, 1.7 bash-completion.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200507121959.j6CJxLiv011479@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11444/FC-4 Modified Files: .cvsignore bash-completion.spec sources Log Message: 20050712. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2005 18:50:09 -0000 1.6 +++ .cvsignore 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -bash-completion-20050121.tar.bz2 +bash-completion-20050712.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bash-completion.spec 3 Mar 2005 19:46:39 -0000 1.7 +++ bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 @@ -1,12 +1,12 @@ Name: bash-completion -Version: 20050121 -Release: 2 +Version: 20050712 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2 +Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -127,6 +127,9 @@ %changelog +* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +- 20050712. + * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2005 18:50:09 -0000 1.6 +++ sources 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 +4f38a59eabf97a6dd7db0f10c0ee5063 bash-completion-20050712.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 12 19:59:22 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 12 Jul 2005 15:59:22 -0400 Subject: rpms/bash-completion/devel .cvsignore, 1.6, 1.7 bash-completion.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200507121959.j6CJxMCr011487@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11444/devel Modified Files: .cvsignore bash-completion.spec sources Log Message: 20050712. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 26 Feb 2005 18:50:09 -0000 1.6 +++ .cvsignore 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -bash-completion-20050121.tar.bz2 +bash-completion-20050712.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bash-completion.spec 3 Mar 2005 19:46:39 -0000 1.7 +++ bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 @@ -1,12 +1,12 @@ Name: bash-completion -Version: 20050121 -Release: 2 +Version: 20050712 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ -Source0: http://www.caliban.org/files/bash/bash-completion-20050121.tar.bz2 +Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -127,6 +127,9 @@ %changelog +* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +- 20050712. + * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Feb 2005 18:50:09 -0000 1.6 +++ sources 12 Jul 2005 19:59:19 -0000 1.7 @@ -1 +1 @@ -fafeed562b01a8dee079eb851579f2d2 bash-completion-20050121.tar.bz2 +4f38a59eabf97a6dd7db0f10c0ee5063 bash-completion-20050712.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 12 20:12:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 12 Jul 2005 16:12:34 -0400 Subject: extras-buildsys/server CONFIG.py, 1.17, 1.18 PackageJob.py, 1.5, 1.6 main.py, 1.8, 1.9 Message-ID: <200507122012.j6CKCYwh012700@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644/server Modified Files: CONFIG.py PackageJob.py main.py Log Message: 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running * Add aliasing/mapping of plague targets to CVS targets, to allow for different CVS directory names than what our targets are Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- CONFIG.py 11 Jul 2005 00:30:36 -0000 1.17 +++ CONFIG.py 12 Jul 2005 20:12:32 -0000 1.18 @@ -57,6 +57,16 @@ # config_opts['targets'] = { 'devel' : ['i386'] } + +# If you're using CVS building, sometimes the CVS directory layout won't match +# the targets we've defined in config_opts['target']. Add aliases for them +# here, like "{ 'devel': 'development', '4': 'FC-4' } +# +# Mapping - our_target: cvs_target + +config_opts['cvs_target_map'] = {} + + # Target Optional Arches # # These are arches that submitters _may_ build packages on, but packages won't Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PackageJob.py 10 Jul 2005 19:59:32 -0000 1.5 +++ PackageJob.py 12 Jul 2005 20:12:32 -0000 1.6 @@ -286,8 +286,17 @@ def _make_srpm(self): self._set_cur_stage('make_srpm') + + # Map our target (self.target) to the CVS target alias, since CVS may have + # different target names that we expose + cvs_target_map = config_opts['cvs_target_map'] + try: + cvs_target = cvs_target_map[self.target] + except KeyError: + cvs_target = self.target + self.srpm_path = None - srpm_dir = os.path.join(self.checkout_tmpdir, self.package, self.target) + srpm_dir = os.path.join(self.checkout_tmpdir, self.package, cvs_target) if not os.path.exists(srpm_dir): msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag) raise PrepError(msg) Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- main.py 11 Jul 2005 15:22:56 -0000 1.8 +++ main.py 12 Jul 2005 20:12:32 -0000 1.9 @@ -18,6 +18,7 @@ import sys import os +import socket from plague import AuthedXMLRPCServer from plague import lighttpdManager from plague import HTTPServer @@ -101,16 +102,22 @@ # Create the BuildMaster XMLRPC server UI_PORT = 8887 ui = None - if config_opts['ssl_frontend'] == True: - ui_certs = {} - ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] - ui_certs['ca_cert'] = config_opts['ca_cert'] - ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] - ui = UserInterfaceSSLAuth(builder_manager, bm) - bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) - else: - ui = UserInterfaceNoAuth(builder_manager, bm) - bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) + try: + if config_opts['ssl_frontend'] == True: + ui_certs = {} + ui_certs['key_and_cert'] = config_opts['server_key_and_cert'] + ui_certs['ca_cert'] = config_opts['ca_cert'] + ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert'] + ui = UserInterfaceSSLAuth(builder_manager, bm) + bm_server = AuthenticatedSSLXMLRPCServer((hostname, UI_PORT), ui_certs) + else: + ui = UserInterfaceNoAuth(builder_manager, bm) + bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, UI_PORT)) + except socket.error, e: + if e[0] == 98: # Address already in use + print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) + os._exit(1) + bm_server.register_instance(ui) # SRPM fileserver From fedora-extras-commits at redhat.com Tue Jul 12 20:12:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 12 Jul 2005 16:12:28 -0400 Subject: extras-buildsys ChangeLog,1.52,1.53 Message-ID: <200507122012.j6CKCwqh012717@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644 Modified Files: ChangeLog Log Message: 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running * Add aliasing/mapping of plague targets to CVS targets, to allow for different CVS directory names than what our targets are Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ChangeLog 11 Jul 2005 03:23:21 -0000 1.52 +++ ChangeLog 12 Jul 2005 20:12:23 -0000 1.53 @@ -1,3 +1,11 @@ +2005-07-12 Dan Williams + + * Warn user and exit if server or builder is already running + + * Add aliasing/mapping of plague targets to CVS targets, to + allow for different CVS directory names than what our + targets are + 2005-07-10 Dan Williams Patch from Ignacio Vazquez-Abrams From fedora-extras-commits at redhat.com Tue Jul 12 20:12:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 12 Jul 2005 16:12:33 -0400 Subject: extras-buildsys/builder builder.py,1.12,1.13 Message-ID: <200507122013.j6CKD3i6012720@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12644/builder Modified Files: builder.py Log Message: 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running * Add aliasing/mapping of plague targets to CVS targets, to allow for different CVS directory names than what our targets are Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- builder.py 10 Jul 2005 07:17:14 -0000 1.12 +++ builder.py 12 Jul 2005 20:12:30 -0000 1.13 @@ -678,10 +678,16 @@ print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) xmlrpc_port = config_opts['xmlrpc_port'] - if config_opts['ssl_buildserver']: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) - else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None) + try: + if config_opts['ssl_buildserver']: + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) + else: + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_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?" % (g_our_hostname, xmlrpc_port) + os._exit(1) + bcs = XMLRPCBuilderServer(localarches) xmlserver.register_instance(bcs) From fedora-extras-commits at redhat.com Tue Jul 12 20:20:50 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 16:20:50 -0400 Subject: web/include navigation.inc,1.6,1.7 Message-ID: <200507122020.j6CKKoqv012840@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/web/include In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12823 Modified Files: navigation.inc Log Message: add systemtap to projects list Index: navigation.inc =================================================================== RCS file: /cvs/fedora/web/include/navigation.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- navigation.inc 24 Jun 2005 16:02:32 -0000 1.6 +++ navigation.inc 12 Jul 2005 20:20:48 -0000 1.7 @@ -37,6 +37,7 @@ //"QA"=>array("uri"=>"/projects/qa/"), "SELinux"=>array("uri"=>"/projects/selinux/"), "Stateless Linux"=>array("uri"=>"/projects/stateless/"), + "SystemTap"=>array("uri"=>"/projects/systemtap/"), "Translations"=>array("uri"=>"/projects/translations/"), "Virtualization"=>array("uri"=>"/projects/virtualization/"), //"Additional Projects"=>array("uri"=>"/projects/additional-projects/"), From fedora-extras-commits at redhat.com Tue Jul 12 21:51:49 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 17:51:49 -0400 Subject: rpms/mercurial/devel .cvsignore, 1.2, 1.3 mercurial.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507122151.j6CLpnDm014394@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14373 Modified Files: .cvsignore mercurial.spec sources Log Message: * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/.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 12 Jul 2005 21:51:47 -0000 1.3 @@ -1 +1 @@ -mercurial-0.6.tar.gz +mercurial-0.6b.tar.gz Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mercurial.spec 1 Jul 2005 19:53:16 -0000 1.1 +++ mercurial.spec 12 Jul 2005 21:51:47 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6 +Version: 0.6b Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Jul 12 2005 Jeremy Katz - 0.6b +- update to new upstream 0.6b + * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 19:53:16 -0000 1.2 +++ sources 12 Jul 2005 21:51:47 -0000 1.3 @@ -1 +1 @@ -25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz +502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 21:52:40 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 17:52:40 -0400 Subject: rpms/mercurial/FC-3 mercurial.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200507122152.j6CLqeiR014453@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14434 Modified Files: mercurial.spec sources Log Message: * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/mercurial.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mercurial.spec 1 Jul 2005 19:53:16 -0000 1.1 +++ mercurial.spec 12 Jul 2005 21:52:38 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6 +Version: 0.6b Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Jul 12 2005 Jeremy Katz - 0.6b +- update to new upstream 0.6b + * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 19:53:16 -0000 1.2 +++ sources 12 Jul 2005 21:52:38 -0000 1.3 @@ -1 +1 @@ -25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz +502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 21:52:53 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 12 Jul 2005 17:52:53 -0400 Subject: rpms/mercurial/FC-4 mercurial.spec,1.1,1.2 sources,1.2,1.3 Message-ID: <200507122152.j6CLqroP014507@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14488 Modified Files: mercurial.spec sources Log Message: * Tue Jul 12 2005 Jeremy Katz - 0.6b - update to new upstream 0.6b Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mercurial.spec 1 Jul 2005 19:53:16 -0000 1.1 +++ mercurial.spec 12 Jul 2005 21:52:51 -0000 1.2 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.6 +Version: 0.6b Release: 1%{?dist} License: GPL Group: Development/Tools @@ -34,6 +34,9 @@ %changelog +* Tue Jul 12 2005 Jeremy Katz - 0.6b +- update to new upstream 0.6b + * Fri Jul 1 2005 Jeremy Katz - 0.6-1 - Initial build. Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 19:53:16 -0000 1.2 +++ sources 12 Jul 2005 21:52:51 -0000 1.3 @@ -1 +1 @@ -25f9ce77b3e5e257d33a982d4ca7c43f mercurial-0.6.tar.gz +502b7de4244017cb0b16658acbbbddc2 mercurial-0.6b.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 22:35:38 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 12 Jul 2005 18:35:38 -0400 Subject: rpms/nfswatch/devel .cvsignore, 1.2, 1.3 nfswatch.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507122235.j6CMZcZM015931@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/nfswatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15910 Modified Files: .cvsignore nfswatch.spec sources Log Message: New upstream version 4.99.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nfswatch/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2005 08:05:17 -0000 1.2 +++ .cvsignore 12 Jul 2005 22:35:35 -0000 1.3 @@ -1 +1 @@ -nfswatch-4.99.2.tar.gz +nfswatch-4.99.4.tar.gz Index: nfswatch.spec =================================================================== RCS file: /cvs/extras/rpms/nfswatch/devel/nfswatch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nfswatch.spec 1 Jun 2005 12:42:01 -0000 1.3 +++ nfswatch.spec 12 Jul 2005 22:35:35 -0000 1.4 @@ -1,13 +1,13 @@ # $Id$ Summary: An NFS traffic monitoring tool Name: nfswatch -Version: 4.99.2 -Release: 3%{?dist} +Version: 4.99.4 +Release: 1%{?dist} License: BSD URL: http://nfswatch.sourceforge.net Group: Applications/Internet -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sf.net/nfswatch/%{name}-%{version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,50 +47,20 @@ %{_mandir}/man8/* %changelog -* Wed Jun 1 2005 Christian Iseli +* Tue Jul 12 2005 Christian Iseli 4.99.4-1 + - new upstream version + +* Wed Jun 1 2005 Christian Iseli 4.99.2-3 - rebuilt -* Mon May 09 2005 Christian Iseli +* Mon May 09 2005 Christian Iseli 4.99.2-2 - rebuilt -* Fri Apr 22 2005 Christian Iseli - - 2005-04-22 17:50 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.2. - - 2005-04-22 17:46 c4chris - * nfswatch.spec: Fix spec file for Fedora Extras. - - 2005-04-22 17:30 c4chris - * Makefile: Handle RPM_OPT_FLAGS in Makefile. - - 2005-02-25 22:54 c4chris - * rpcfilter.c, rpcutil.c, xdr.c: Add a few comments. - - 2005-02-25 17:49 c4chris - * nfswatch.spec: Update changelog. - -* Fri Feb 25 2005 Christian Iseli - - 2005-02-25 17:43 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.1. - - 2005-02-25 17:34 c4chris - * nfswatch.h, util.c: Fix c_proc size in a couple structures. - - 2005-02-25 16:14 c4chris - * nfswatch.8: Add Linux info to man page. - - 2005-02-25 15:09 c4chris - * rpcutil.c: Fix xdr_callmsg usage on 64-bit Linux. - - 2005-02-25 10:52 c4chris - * linux.map.h, netaddr.c, parsenfsfh.c, rpcfilter.c, util.c: Parse - NFS file handles in Linux. - - 2005-02-23 23:50 c4chris - * linux.map.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c: Get NFS3 to compile on Linux. Cleanup a bit. - - 2005-02-23 22:41 c4chris - * Makefile, externs.h, rpcdefs.h, rpcfilter.c, xdr.c: Finish NFS3 - setup for Solaris. - - 2005-02-23 16:11 c4chris - * externs.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c, xdr.c: Started crude hack to get NFS3 working - on Solaris. - - 2005-02-07 19:21 c4chris - * linux.map.h, nfslogsum.c, nfswatch.h, osf.map.h, pktfilter.c, - rpcfilter.c, sgi.map.h, ultrix.map.h, util.c: Start work on - NFSv3. Remove ND (Sun's network disk) stuff. +* Fri Apr 22 2005 Christian Iseli 4.99.2-1 + - new upstream version + +* Fri Feb 25 2005 Christian Iseli 4.99.1-1 + - new upstream version -* Sun Feb 6 2005 Christian Iseli +* Sun Feb 6 2005 Christian Iseli 4.99.0-1 - Create spec file. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nfswatch/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2005 08:05:17 -0000 1.2 +++ sources 12 Jul 2005 22:35:35 -0000 1.3 @@ -1 +1 @@ -874d4206284725c2373c20565bc31539 nfswatch-4.99.2.tar.gz +2e287f204158dafe830fbf4341aecf66 nfswatch-4.99.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 22:41:34 2005 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 12 Jul 2005 18:41:34 -0400 Subject: rpms/nfswatch/FC-4 .cvsignore, 1.2, 1.3 nfswatch.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507122241.j6CMfYP8016006@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/nfswatch/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15985 Modified Files: .cvsignore nfswatch.spec sources Log Message: New upstream version 4.99.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nfswatch/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Apr 2005 08:05:17 -0000 1.2 +++ .cvsignore 12 Jul 2005 22:41:32 -0000 1.3 @@ -1 +1 @@ -nfswatch-4.99.2.tar.gz +nfswatch-4.99.4.tar.gz Index: nfswatch.spec =================================================================== RCS file: /cvs/extras/rpms/nfswatch/FC-4/nfswatch.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nfswatch.spec 1 Jun 2005 12:39:40 -0000 1.3 +++ nfswatch.spec 12 Jul 2005 22:41:32 -0000 1.4 @@ -1,13 +1,13 @@ # $Id$ Summary: An NFS traffic monitoring tool Name: nfswatch -Version: 4.99.2 -Release: 3%{?dist} +Version: 4.99.4 +Release: 1%{?dist} License: BSD URL: http://nfswatch.sourceforge.net Group: Applications/Internet -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sf.net/nfswatch/%{name}-%{version}.tar.gz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,50 +47,20 @@ %{_mandir}/man8/* %changelog -* Wed Jun 1 2005 Christian Iseli +* Tue Jul 12 2005 Christian Iseli 4.99.4-1 + - new upstream version + +* Wed Jun 1 2005 Christian Iseli 4.99.2-3 - rebuilt for FC4 -* Mon May 09 2005 Christian Iseli +* Mon May 09 2005 Christian Iseli 4.99.2-2 - rebuilt -* Fri Apr 22 2005 Christian Iseli - - 2005-04-22 17:50 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.2. - - 2005-04-22 17:46 c4chris - * nfswatch.spec: Fix spec file for Fedora Extras. - - 2005-04-22 17:30 c4chris - * Makefile: Handle RPM_OPT_FLAGS in Makefile. - - 2005-02-25 22:54 c4chris - * rpcfilter.c, rpcutil.c, xdr.c: Add a few comments. - - 2005-02-25 17:49 c4chris - * nfswatch.spec: Update changelog. - -* Fri Feb 25 2005 Christian Iseli - - 2005-02-25 17:43 c4chris - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.1. - - 2005-02-25 17:34 c4chris - * nfswatch.h, util.c: Fix c_proc size in a couple structures. - - 2005-02-25 16:14 c4chris - * nfswatch.8: Add Linux info to man page. - - 2005-02-25 15:09 c4chris - * rpcutil.c: Fix xdr_callmsg usage on 64-bit Linux. - - 2005-02-25 10:52 c4chris - * linux.map.h, netaddr.c, parsenfsfh.c, rpcfilter.c, util.c: Parse - NFS file handles in Linux. - - 2005-02-23 23:50 c4chris - * linux.map.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c: Get NFS3 to compile on Linux. Cleanup a bit. - - 2005-02-23 22:41 c4chris - * Makefile, externs.h, rpcdefs.h, rpcfilter.c, xdr.c: Finish NFS3 - setup for Solaris. - - 2005-02-23 16:11 c4chris - * externs.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c, xdr.c: Started crude hack to get NFS3 working - on Solaris. - - 2005-02-07 19:21 c4chris - * linux.map.h, nfslogsum.c, nfswatch.h, osf.map.h, pktfilter.c, - rpcfilter.c, sgi.map.h, ultrix.map.h, util.c: Start work on - NFSv3. Remove ND (Sun's network disk) stuff. +* Fri Apr 22 2005 Christian Iseli 4.99.2-1 + - new upstream version + +* Fri Feb 25 2005 Christian Iseli 4.99.1-1 + - new upstream version -* Sun Feb 6 2005 Christian Iseli +* Sun Feb 6 2005 Christian Iseli 4.99.0-1 - Create spec file. Index: sources =================================================================== RCS file: /cvs/extras/rpms/nfswatch/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Apr 2005 08:05:17 -0000 1.2 +++ sources 12 Jul 2005 22:41:32 -0000 1.3 @@ -1 +1 @@ -874d4206284725c2373c20565bc31539 nfswatch-4.99.2.tar.gz +2e287f204158dafe830fbf4341aecf66 nfswatch-4.99.4.tar.gz From fedora-extras-commits at redhat.com Tue Jul 12 22:58:53 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 12 Jul 2005 18:58:53 -0400 Subject: CVSROOT avail,1.8,1.9 Message-ID: <200507122258.j6CMwrwJ016091@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072 Modified Files: avail Log Message: Adding a row for the FDP page, and a newly trained committer. Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- avail 5 Jul 2005 22:04:21 -0000 1.8 +++ avail 12 Jul 2005 22:58:51 -0000 1.9 @@ -45,3 +45,5 @@ unavail | | fedora-security avail | mjc,bressers,jorton,notting,gafton,sopwith,katzj | fedora-security + +avail | pfrields | web/html/projects/docs From ed at eh3.com Wed Jul 13 00:01:11 2005 From: ed at eh3.com (Ed Hill) Date: Tue, 12 Jul 2005 20:01:11 -0400 Subject: APPROVED: keychain Message-ID: <1121212871.15220.17.camel@ernie> Package summary: Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents. It acts as a front-end to the agents, allowing you to easily have one long-running agent process per system, rather than per login session. This dramatically reduces the number of times you need to enter your passphrase from once per new login session to once every time your local machine is rebooted. Maintainer: Alexander Dalloz Reviewers: Ed Hill, Ville Skytt?, Chris Grau -- Edward H. Hill III, PhD office: MIT Dept. of EAPS; Rm 54-1424; 77 Massachusetts Ave. Cambridge, MA 02139-4307 emails: eh3 at mit.edu ed at eh3.com URLs: http://web.mit.edu/eh3/ http://eh3.com/ phone: 617-253-0098 fax: 617-253-4464 From fedora-extras-commits at redhat.com Wed Jul 13 07:55:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:55:53 -0400 Subject: rpms/gkrellm-freq/devel - New directory Message-ID: <200507130755.j6D7trMO029577@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29552/gkrellm-freq/devel Log Message: Directory /cvs/extras/rpms/gkrellm-freq/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 07:55:53 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:55:53 -0400 Subject: rpms/gkrellm-freq - New directory Message-ID: <200507130755.j6D7trnX029572@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29552/gkrellm-freq Log Message: Directory /cvs/extras/rpms/gkrellm-freq added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 07:56:19 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:56:19 -0400 Subject: rpms/gkrellm-freq Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507130756.j6D7uJ0L029628@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29597 Added Files: Makefile import.log Log Message: Setup of module gkrellm-freq --- NEW FILE Makefile --- # Top level Makefile for module gkrellm-freq all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 13 07:56:20 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:56:20 -0400 Subject: rpms/gkrellm-freq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507130756.j6D7uKZa029633@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29597/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gkrellm-freq --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Jul 13 07:57:09 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Wed, 13 Jul 2005 09:57:09 +0200 Subject: APPROVED : gkrellm-aclock & gkrellm-freq Message-ID: <20050713095709.24b68c50@python2> gkrellm-aclock : Analog clock plugin for GKrellM, the GNU Krell Monitor. gkrellm-freq : This plugin for GKrellM, the GNU Krell Monitor, displays the current CPU speed using the "dynamic" cpufrequency scheme. Maintainer : Matthias Saou Reviewer : Michael Schwendt -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1390_FC4.s3 Load : 0.41 0.52 0.46 From fedora-extras-commits at redhat.com Wed Jul 13 07:57:05 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:57:05 -0400 Subject: rpms/gkrellm-freq import.log,1.1,1.2 Message-ID: <200507130757.j6D7vZuP029695@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29661 Modified Files: import.log Log Message: auto-import gkrellm-freq-0.1.1-1 on branch devel from gkrellm-freq-0.1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jul 2005 07:56:17 -0000 1.1 +++ import.log 13 Jul 2005 07:57:03 -0000 1.2 @@ -0,0 +1 @@ +gkrellm-freq-0_1_1-1:HEAD:gkrellm-freq-0.1.1-1.src.rpm:1121241411 From fedora-extras-commits at redhat.com Wed Jul 13 07:57:06 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 03:57:06 -0400 Subject: rpms/gkrellm-freq/devel gkrellm-freq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507130757.j6D7va6v029699@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29661/devel Modified Files: .cvsignore sources Added Files: gkrellm-freq.spec Log Message: auto-import gkrellm-freq-0.1.1-1 on branch devel from gkrellm-freq-0.1.1-1.src.rpm --- NEW FILE gkrellm-freq.spec --- %define gkplugindir %{_libdir}/gkrellm2/plugins Summary: CPU frequency display plugin for GKrellM Name: gkrellm-freq Version: 0.1.1 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.peakunix.net/gkfreq/ Source: http://www.peakunix.net/downloads/gkfreq-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gkrellm >= 2.2.0 BuildRequires: gkrellm-devel >= 2.2.0 %description This plugin for GKrellM, the GNU Krell Monitor, displays the current CPU speed using the "dynamic" cpufrequency scheme. %prep %setup -n gkfreq-%{version} %build # Trivial manual build, the "build" script does the same without our optflags %{__cc} %{optflags} -fPIC `pkg-config gtk+-2.0 --cflags` -c gkfreq.c %{__cc} %{optflags} -fPIC -shared -o gkfreq.so gkfreq.o %install %{__rm} -rf %{buildroot} %{__install} -D -m 0755 gkfreq.so \ %{buildroot}%{gkplugindir}/gkfreq.so %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc CHANGES COPYING README %{gkplugindir}/gkfreq.so %changelog * Tue Jul 12 2005 Matthias Saou 0.1.1-1 - Initial RPM release, split out from my old gkrellm-plugins package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2005 07:56:17 -0000 1.1 +++ .cvsignore 13 Jul 2005 07:57:03 -0000 1.2 @@ -0,0 +1 @@ +gkfreq-0.1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2005 07:56:18 -0000 1.1 +++ sources 13 Jul 2005 07:57:03 -0000 1.2 @@ -0,0 +1 @@ +d4186d02a9fbc55bbf1854399e78946a gkfreq-0.1.1.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 08:00:51 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:00:51 -0400 Subject: rpms/gkrellm-aclock - New directory Message-ID: <200507130800.j6D80p0V029813@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29789/gkrellm-aclock Log Message: Directory /cvs/extras/rpms/gkrellm-aclock added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 08:00:52 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:00:52 -0400 Subject: rpms/gkrellm-aclock/devel - New directory Message-ID: <200507130800.j6D80qve029818@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29789/gkrellm-aclock/devel Log Message: Directory /cvs/extras/rpms/gkrellm-aclock/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 08:01:51 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:01:51 -0400 Subject: rpms/gkrellm-aclock Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507130801.j6D81pEF030915@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30901 Added Files: Makefile import.log Log Message: Setup of module gkrellm-aclock --- NEW FILE Makefile --- # Top level Makefile for module gkrellm-aclock all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 13 08:02:16 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:02:16 -0400 Subject: rpms/gkrellm-aclock/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507130802.j6D82GjO030936@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30901/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gkrellm-aclock --- NEW 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 Jul 13 08:06:47 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:06:47 -0400 Subject: rpms/gkrellm-aclock import.log,1.1,1.2 Message-ID: <200507130807.j6D87Jfl031286@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31252 Modified Files: import.log Log Message: auto-import gkrellm-aclock-0.3.3-1 on branch devel from gkrellm-aclock-0.3.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jul 2005 08:01:49 -0000 1.1 +++ import.log 13 Jul 2005 08:06:30 -0000 1.2 @@ -0,0 +1 @@ +gkrellm-aclock-0_3_3-1:HEAD:gkrellm-aclock-0.3.3-1.src.rpm:1121241930 From fedora-extras-commits at redhat.com Wed Jul 13 08:06:50 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:06:50 -0400 Subject: rpms/gkrellm-aclock/devel gkrellm-aclock.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507130807.j6D87QbP031288@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31252/devel Modified Files: .cvsignore sources Added Files: gkrellm-aclock.spec Log Message: auto-import gkrellm-aclock-0.3.3-1 on branch devel from gkrellm-aclock-0.3.3-1.src.rpm --- NEW FILE gkrellm-aclock.spec --- %define gkplugindir %{_libdir}/gkrellm2/plugins Summary: Analog clock plugin for GKrellM Name: gkrellm-aclock Version: 0.3.3 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.geocities.com/m_muthukumar/gkrellaclock.html Source: http://www.geocities.com/m_muthukumar/gkrellaclock-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gkrellm >= 2.2.0 BuildRequires: gkrellm-devel >= 2.2.0 %description Analog clock plugin for GKrellM, the GNU Krell Monitor. %prep %setup -n gkrellAclock-%{version} %build %{__make} CFLAGS="%{optflags}" %install %{__rm} -rf %{buildroot} %{__install} -D -m 0755 gkrellaclock.so \ %{buildroot}%{gkplugindir}/gkrellaclock.so %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog README %{gkplugindir}/gkrellaclock.so %changelog * Tue Jul 12 2005 Matthias Saou 0.3.3-1 - Initial RPM release, split out from my old gkrellm-plugins package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2005 08:02:14 -0000 1.1 +++ .cvsignore 13 Jul 2005 08:06:47 -0000 1.2 @@ -0,0 +1 @@ +gkrellaclock-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2005 08:02:14 -0000 1.1 +++ sources 13 Jul 2005 08:06:47 -0000 1.2 @@ -0,0 +1 @@ +6524cd0f5e803071776e97075ed1462c gkrellaclock-0.3.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 08:16:07 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 04:16:07 -0400 Subject: owners owners.list,1.6,1.7 Message-ID: <200507130816.j6D8G7wr031614@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31597 Modified Files: owners.list Log Message: Added gkrellm-aclock and gkrellm-freq. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- owners.list 11 Jul 2005 20:35:18 -0000 1.6 +++ owners.list 13 Jul 2005 08:16:05 -0000 1.7 @@ -193,6 +193,8 @@ Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.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| Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|compton at pcompton.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 09:22:16 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 13 Jul 2005 05:22:16 -0400 Subject: fedora-security/audit fc4,1.20,1.21 Message-ID: <200507130922.j6D9MGUA000452@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv435 Modified Files: fc4 Log Message: Update based on FEDORA-2005-553 which is move to upstream 1.4.1 plus backported patches Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fc4 12 Jul 2005 07:55:53 -0000 1.20 +++ fc4 13 Jul 2005 09:22:13 -0000 1.21 @@ -39,6 +39,7 @@ 2005-1705 version (gdb, fixed 6.3) 2005-1704 version (gdb, fixed 6.3) 2005-1704 ** (binutils) [since FEDORA-2005-498] +2005-1689 backport (krb5) [since FEDORA-2005-553] 2005-1686 ignore (gedit, not a vulnerability) 2005-1636 VULNERABLE (mysql, fixed 4.1.12) minor issue 2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0 @@ -91,6 +92,8 @@ 2005-1228 backport (gzip) from srpm 2005-1194 backport (nasm) from srpm 2005-1184 ignore (kernel) expected to not be an issue +2005-1175 backport (krb5) [since FEDORA-2005-553] +2005-1174 backport (krb5) [since FEDORA-2005-553] 2005-1160 version (firefox, mozilla) 2005-1159 version (firefox, mozilla) 2005-1158 version (firefox, fixed 1.0.3) @@ -184,11 +187,12 @@ 2005-0504 version (kernel, doesn't build in 2.6) 2005-0490 version (curl, fixed 7.13.1) 2005-0488 VULNERABLE (telnet) [#159299] +2005-0488 backport (krb5) [since FEDORA-2005-553] 2005-0473 version (gaim, fixed 1.1.3) 2005-0472 version (gaim, fixed 1.1.3) -2005-0469 backport (krb5, fixed 1.4.1) patch in srpm +2005-0469 version (krb5, fixed 1.4.1) [since FEDORA-2005-553] was backport since GA 2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch -2005-0468 backport (krb5, fixed 1.4.1) patch in srpm +2005-0468 version (krb5, fixed 1.4.1) [since FEDORA-2005-553] was backport since GA 2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch 2005-0449 version (kernel, fixed 2.6.11) 2005-0448 VULNERABLE (perl) @@ -673,6 +677,7 @@ 2004-0177 version (kernel, fixed 2.6.6) 2004-0176 version (ethereal, fixed 0.10.3) 2004-0175 version (openssh, fixed 3.4p1) +2004-0175 backport (krb5) [since FEDORA-2005-553] 2004-0174 version (httpd, fixed 2.0.49) 2004-0173 version (httpd, fixed 2.0.49) 2004-0164 version (racoon) From fedora-extras-commits at redhat.com Wed Jul 13 09:26:48 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 05:26:48 -0400 Subject: common tobuild,1.1901,1.1902 Message-ID: <200507130926.j6D9Qmb7000524@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv507 Modified Files: tobuild Log Message: request build of rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1901 retrieving revision 1.1902 diff -u -r1.1901 -r1.1902 --- tobuild 12 Jul 2005 01:32:04 -0000 1.1901 +++ tobuild 13 Jul 2005 09:26:46 -0000 1.1902 @@ -45,3 +45,4 @@ tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 +thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 13 09:27:30 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 05:27:30 -0400 Subject: common tobuild,1.1902,1.1903 Message-ID: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv569 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1902 retrieving revision 1.1903 diff -u -r1.1902 -r1.1903 --- tobuild 13 Jul 2005 09:26:46 -0000 1.1902 +++ tobuild 13 Jul 2005 09:27:28 -0000 1.1903 @@ -46,3 +46,4 @@ tagoh rpms/uim/FC-4 uim-0_4_7-1_fc4 fc4 tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel +thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 13 09:29:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:29:47 -0400 Subject: rpms/ddskk - New directory Message-ID: <200507130929.j6D9Tl1c000662@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642/ddskk Log Message: Directory /cvs/extras/rpms/ddskk added to the repository From fedora-extras-commits at redhat.com Wed Jul 13 09:29:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:29:47 -0400 Subject: rpms/ddskk/devel - New directory Message-ID: <200507130929.j6D9TlY2000667@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv642/ddskk/devel Log Message: Directory /cvs/extras/rpms/ddskk/devel added to the repository From paul at city-fan.org Wed Jul 13 09:29:57 2005 From: paul at city-fan.org (Paul Howarth) Date: Wed, 13 Jul 2005 10:29:57 +0100 Subject: common tobuild,1.1902,1.1903 In-Reply-To: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> References: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> Message-ID: <42D4DF15.8080304@city-fan.org> Matthias Saou (thias) wrote: > Author: thias > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv569 > > Modified Files: > tobuild > Log Message: > request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 for devel Did I miss a notification about the build system being re-enabled? Paul. From fedora-extras-commits at redhat.com Wed Jul 13 09:30:07 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:07 -0400 Subject: rpms/ddskk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507130930.j6D9U7lW000718@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687 Added Files: Makefile import.log Log Message: Setup of module ddskk --- NEW FILE Makefile --- # Top level Makefile for module ddskk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 13 09:30:07 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:07 -0400 Subject: rpms/ddskk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507130930.j6D9U7Q8000723@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv687/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ddskk --- NEW 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 Jul 13 09:30:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:46 -0400 Subject: rpms/ddskk import.log,1.1,1.2 Message-ID: <200507130930.j6D9UkE2000788@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756 Modified Files: import.log Log Message: auto-import ddskk-12.2.0-6 on branch devel from ddskk-12.2.0-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ddskk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Jul 2005 09:30:04 -0000 1.1 +++ import.log 13 Jul 2005 09:30:44 -0000 1.2 @@ -0,0 +1 @@ +ddskk-12_2_0-6:HEAD:ddskk-12.2.0-6.src.rpm:1121247036 From fedora-extras-commits at redhat.com Wed Jul 13 09:30:47 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 13 Jul 2005 05:30:47 -0400 Subject: rpms/ddskk/devel ddskk-init.el, NONE, 1.1 ddskk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507130930.j6D9UlZt000794@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ddskk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv756/devel Modified Files: .cvsignore sources Added Files: ddskk-init.el ddskk.spec Log Message: auto-import ddskk-12.2.0-6 on branch devel from ddskk-12.2.0-6.src.rpm --- NEW FILE ddskk-init.el --- ;;; ddskk-init.el (require 'skk-setup) (require 'skk-leim) (setq skk-server-host "localhost") (setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L") (setq skk-tut-file "/usr/share/skk/SKK.tut") --- NEW FILE ddskk.spec --- # [for Emacs] -*- coding: utf-8 -*- %define apelminver 10.2 %define pkgdir %{_datadir}/xemacs/mule-packages Summary: Daredevil SKK - Simple Kana to Kanji conversion program for Emacs Name: ddskk Version: 12.2.0 Release: 6 License: GPL Group: Applications/Editors URL: http://openlab.ring.gr.jp/skk/main.html Source0: http://openlab.ring.gr.jp/skk/maintrunk/ddskk-%{version}.tar.bz2 Source1: ddskk-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch BuildRequires: emacs, apel >= %{apelminver} Requires: apel >= %{apelminver} Provides: skk Obsoletes: skk, ddskk-el %description Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program, an input method of Japanese). It forked from the maintrunk, SKK version 10.56. It consists of a simple core and many optional programs which provide extensive features, however, our target is to more simplify core, and more expand its optional features. This package does not include dictionaries or a skkserver. Please install them separately. %package xemacs Summary: Daredevil SKK - Simple Kana to Kanji conversion program for XEmacs Group: Applications/Editors Requires: apel-xemacs BuildRequires: apel-xemacs, xemacs %description xemacs Daredevil SKK is a branch of SKK (Simple Kana to Kanji conversion program, an input method of Japanese). It forked from the maintrunk, SKK version 10.56. It consists of a simple core and many optional programs which provide extensive features, however, our target is to more simplify core, and more expand its optional features. This package does not include dictionaries or a skkserver. Please install them separately. %prep %setup -q %build %install rm -fr %buildroot mkdir -p %buildroot%{_datadir}/emacs/site-lisp/site-start.d/ # needed for make install-info mkdir -p %buildroot%{_datadir}/info make EMACS=emacs PREFIX=%buildroot%{_prefix} \ SKK_LISPDIR=%buildroot%{_datadir}/emacs/site-lisp/ddskk install install -m 644 etc/SKK.tut %buildroot%{_datadir}/skk install -m 644 etc/SKK.tut.E %buildroot%{_datadir}/skk install -m 644 %SOURCE1 %buildroot%{_datadir}/emacs/site-lisp/site-start.d rm -f %buildroot/%{_infodir}/dir make clean make PACKAGEDIR=%buildroot%{pkgdir} install-package # don't compress ja info pages %define __os_install_post %{nil} %clean rm -fr %buildroot %post /sbin/install-info %{_infodir}/skk.info %{_infodir}/dir %preun /sbin/install-info --delete %{_infodir}/skk.info %{_infodir}/dir %files %defattr(-,root,root) %doc ChangeLog READMEs %{_datadir}/emacs/site-lisp/ddskk %{_datadir}/emacs/site-lisp/site-start.d/ddskk-init.el %{_datadir}/skk %{_infodir}/* %files xemacs defattr(-,root,root) %doc ChangeLog READMEs %{pkgdir} %changelog * Wed Jul 13 2005 Jens Petersen - 12.2.0-6 - initial import to Fedora Extras - bring back the xemacs subpackages * Wed Feb 23 2005 Elliot Lee 12.2.0-5 - Remove xemacs * Wed Oct 6 2004 Jens Petersen - 12.2.0-4 - drop requirements on emacs/xemacs for -nox users (Lars Hupfeldt Nielsen, 134479) * Wed Sep 22 2004 Jens Petersen - 12.2.0-3 - clean up ddskk-init.el * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Nov 5 2003 Jens Petersen - 12.2.0-1 - 12.2.0 release - ddskk-11.6.0-tmp-file.patch no longer needed * Mon Jul 28 2003 Jens Petersen - 11.6.0-12 - ddskk no longer provides ddskk-el - don't compress Japanese info files - install/uninstall info manual in info dir file during post/preun * Thu Jul 10 2003 Jens Petersen - 11.6.0-11 - apply ddskk-11.6.0-tmp-file.patch from debian to fix temp file vulnerability CAN-2003-0539 (#98924) * Wed Jan 22 2003 Tim Powers - rebuilt * Tue Dec 24 2002 Jens Petersen 11.6.0-9 - place xemacs package under datadir - setup quietly - use buildroot macro instead of RPM_BUILD_ROOT - include info files except info dir file - own mule-packages and down - update url - encode spec file in utf-8 * Fri Jun 21 2002 Tim Powers - automated rebuild * Thu May 23 2002 Tim Powers - automated rebuild * Mon Mar 11 2002 Jens Petersen 21.6.0-6 - provide ddskk-el to make rpmlint happy - don't buildrequire semi * Mon Feb 25 2002 Jens Petersen 21.6.0-5 - free ride through the build system * Thu Jan 31 2002 Jens Petersen 21.6.0-4 - install in mule-packages not site-packages - own lisp/skk dir * Wed Jan 09 2002 Tim Powers 21.6.0-3 - automated rebuild * Tue Jan 8 2002 Jens Petersen 21.6.0-2 - Updated changelog entry below for 21.6.0-1 * Tue Jan 8 2002 Jens Petersen 21.6.0-1 - Update to 11.6.0 release - Make XEmacs package - Add filevar for iso-8859-1 coding for teg - Don't need to mkdir site-lisp/ddskk datadir/skk, but need datadir/info * Wed Aug 29 2001 Trond Eivind Glomsr??d 21.3.20010617-2 - Add semi as a BuildPrereq (#45159) - s/Copyright/License/ - Don't define a name on top and then use it in the header * Mon Jun 25 2001 SATO Satoru 21.3.20010617-1 - 2001.6.17 - fix the dependency (now we have the apel alone). - ddskk-el is disused * Wed Feb 28 2001 SATO Satoru - fix the Group * Wed Feb 28 2001 SATO Satoru - fix the dependencies: [Build]Requires - add ddskk-init.el * Wed Feb 28 2001 SATO Satoru - rebuild to re-import into the tree - new upstream snapshot * Mon Dec 28 2000 SATO Satoru - fix SPEC * Mon Dec 25 2000 SATO Satoru - new upstream (cvs current snapshot) * Mon Sep 11 2000 Matt Wilson - added %%defattr(-,root,root) to the el subpackage * Tue Sep 6 2000 Satoru Sato - fix SPEC (check dependencies) * Tue Sep 5 2000 Satoru Sato - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ddskk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Jul 2005 09:30:05 -0000 1.1 +++ .cvsignore 13 Jul 2005 09:30:45 -0000 1.2 @@ -0,0 +1 @@ +ddskk-12.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ddskk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Jul 2005 09:30:05 -0000 1.1 +++ sources 13 Jul 2005 09:30:45 -0000 1.2 @@ -0,0 +1 @@ +3b0f2a2ff13508d6dbb2a3b09369c444 ddskk-12.2.0.tar.bz2 From thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net Wed Jul 13 09:33:21 2005 From: thias at spam.spam.spam.spam.spam.spam.spam.egg.and.spam.freshrpms.net (Matthias Saou) Date: Wed, 13 Jul 2005 11:33:21 +0200 Subject: common tobuild,1.1902,1.1903 In-Reply-To: <42D4DF15.8080304@city-fan.org> References: <200507130927.j6D9RUAZ000586@cvs-int.fedora.redhat.com> <42D4DF15.8080304@city-fan.org> Message-ID: <20050713113321.3eaa441c@python2> Paul Howarth wrote : > Matthias Saou (thias) wrote: > > Author: thias > > > > Update of /cvs/extras/common > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv569 > > > > Modified Files: > > tobuild > > Log Message: > > request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 for devel > > Did I miss a notification about the build system being re-enabled? Nope, but AFAIK, when the build system comes back up, it processes all the requests from the file, so I assumed I could safely spool the requests, although I obviously don't expect any builds to happen right now. Maybe I assumed wrong? Matthias -- Clean custom Red Hat Linux rpm packages : http://freshrpms.net/ Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1390_FC4.s3 Load : 0.32 0.29 0.41 From fedora-extras-commits at redhat.com Wed Jul 13 10:20:46 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 13 Jul 2005 06:20:46 -0400 Subject: common tobuild,1.1903,1.1904 Message-ID: <200507131020.j6DAKkZB002044@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2027 Modified Files: tobuild Log Message: request build of rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1903 retrieving revision 1.1904 diff -u -r1.1903 -r1.1904 --- tobuild 13 Jul 2005 09:27:28 -0000 1.1903 +++ tobuild 13 Jul 2005 10:20:43 -0000 1.1904 @@ -47,3 +47,4 @@ tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel +awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 10:35:57 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:35:57 -0400 Subject: rpms/SoQt/devel SoQt.spec,1.9,1.10 Message-ID: <200507131035.j6DAZvGh002101@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/SoQt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2083 Modified Files: SoQt.spec Log Message: - Rebuild against Coin-2.4.3. - Let devel provide Coin2-SoQt-devel. Index: SoQt.spec =================================================================== RCS file: /cvs/extras/rpms/SoQt/devel/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 13 Jul 2005 10:35:55 -0000 1.10 @@ -4,7 +4,7 @@ Summary: High-level 3D visualization library Name: SoQt Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Libraries @@ -42,7 +42,7 @@ Requires: %{name} = %{version}-%{release} Requires: autoconf Requires: Coin2-devel qt-devel -Provides: Coin2-SoQt = %{version}-%{release} +Provides: Coin2-SoQt-devel = %{version}-%{release} Group: Development/Libraries %description devel @@ -96,6 +96,10 @@ %{_mandir}/man?/*.?.gz %changelog +* 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. From fedora-extras-commits at redhat.com Wed Jul 13 10:42:34 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:42:34 -0400 Subject: rpms/Coin2/FC-4 .cvsignore, 1.5, 1.6 Coin2.spec, 1.11, 1.12 sources, 1.5, 1.6 Coin-2.4.1-doxygen.diff, 1.1, NONE Message-ID: <200507131042.j6DAgYfS002162@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/Coin2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2141 Modified Files: .cvsignore Coin2.spec sources Removed Files: Coin-2.4.1-doxygen.diff Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 May 2005 07:36:38 -0000 1.5 +++ .cvsignore 13 Jul 2005 10:42:32 -0000 1.6 @@ -1,3 +1,3 @@ -Coin-2.4.1-libtool.diff.bz2 -Coin-2.4.1-simacros.diff.bz2 -Coin-2.4.1.tar.gz +Coin-2.4.3-libtool.diff.bz2 +Coin-2.4.3-simacros.diff.bz2 +Coin-2.4.3.tar.gz Index: Coin2.spec =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/Coin2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Coin2.spec 19 May 2005 06:35:04 -0000 1.11 +++ Coin2.spec 13 Jul 2005 10:42:32 -0000 1.12 @@ -1,15 +1,19 @@ +# +# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# + %define coin_includedir %{_includedir}/Coin2 %define coin_htmldir %{_datadir}/Coin2 -%define srcvers 2.4.1 - %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: %{srcvers} +Version: 2.4.3 Release: 1%{?dist} License: GPL @@ -21,10 +25,9 @@ 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.1-simacros.diff.bz2 -Patch4: Coin-2.4.1-libtool.diff.bz2 +Patch3: Coin-2.4.3-simacros.diff.bz2 +Patch4: Coin-2.4.3-libtool.diff.bz2 Patch5: coin-2.3.0-man3.diff -Patch6: Coin-2.4.1-doxygen.diff BuildRequires: xorg-x11-Mesa-libGL BuildRequires: xorg-x11-Mesa-libGLU @@ -57,7 +60,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 sed -i -e 's, at LIBFREETYPE_SONAME@,"%{libfreetype_SONAME}",' \ src/glue/freetype.c @@ -112,6 +114,9 @@ %doc %{coin_htmldir} %changelog +* Thu Jul 07 2005 Ralf Corsepius - 0:2.4.3-1 +- Upstream update. + * Wed May 17 2005 Ralf Corsepius - 0:2.4.1-1 - Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/Coin2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2005 07:36:38 -0000 1.5 +++ sources 13 Jul 2005 10:42:32 -0000 1.6 @@ -1,3 +1,3 @@ -5f4301006d7568e39cdd641695d0c53d Coin-2.4.1-libtool.diff.bz2 -c0e21c3da25204eb5406196acf9d3587 Coin-2.4.1-simacros.diff.bz2 -9a6757dc9fb9fbeaa1c033ea670b31a1 Coin-2.4.1.tar.gz +e2dcc9dde9d97577d211f3caba10c7e0 Coin-2.4.3-libtool.diff.bz2 +4f4d4e4172db2107c578d0d99fde2888 Coin-2.4.3-simacros.diff.bz2 +57c039a55133c5037ebef6759d26f603 Coin-2.4.3.tar.gz --- Coin-2.4.1-doxygen.diff DELETED --- From fedora-extras-commits at redhat.com Wed Jul 13 10:49:13 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:49:13 -0400 Subject: common tobuild,1.1904,1.1905 Message-ID: <200507131049.j6DAnD3D002298@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2281 Modified Files: tobuild Log Message: request build of rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1904 retrieving revision 1.1905 diff -u -r1.1904 -r1.1905 --- tobuild 13 Jul 2005 10:20:43 -0000 1.1904 +++ tobuild 13 Jul 2005 10:49:11 -0000 1.1905 @@ -48,3 +48,4 @@ thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 +corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 10:51:29 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Wed, 13 Jul 2005 06:51:29 -0400 Subject: common tobuild,1.1905,1.1906 Message-ID: <200507131051.j6DApTBL002338@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2321 Modified Files: tobuild Log Message: request build of rpms/SoQt/devel SoQt-1_2_0-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1905 retrieving revision 1.1906 diff -u -r1.1905 -r1.1906 --- tobuild 13 Jul 2005 10:49:11 -0000 1.1905 +++ tobuild 13 Jul 2005 10:51:27 -0000 1.1906 @@ -49,3 +49,4 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 +corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 13 11:27:09 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 13 Jul 2005 07:27:09 -0400 Subject: common tobuild,1.1906,1.1907 Message-ID: <200507131127.j6DBR9wp003593@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3576 Modified Files: tobuild Log Message: request build of rpms/icmpdn/FC-3 icmpdn-0_3-2 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1906 retrieving revision 1.1907 diff -u -r1.1906 -r1.1907 --- tobuild 13 Jul 2005 10:51:27 -0000 1.1906 +++ tobuild 13 Jul 2005 11:27:07 -0000 1.1907 @@ -50,3 +50,4 @@ awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel +oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 11:27:22 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 13 Jul 2005 07:27:22 -0400 Subject: common tobuild,1.1907,1.1908 Message-ID: <200507131127.j6DBRMmg003630@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3611 Modified Files: tobuild Log Message: request build of rpms/icmpdn/FC-4 icmpdn-0_3-2 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1907 retrieving revision 1.1908 diff -u -r1.1907 -r1.1908 --- tobuild 13 Jul 2005 11:27:07 -0000 1.1907 +++ tobuild 13 Jul 2005 11:27:20 -0000 1.1908 @@ -51,3 +51,4 @@ corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 +oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 13:02:10 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 13 Jul 2005 09:02:10 -0400 Subject: owners owners.list,1.7,1.8 Message-ID: <200507131303.j6DD3Ce2006427@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6408 Modified Files: owners.list Log Message: transfer package leafnode to contributor "eyecon" Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- owners.list 13 Jul 2005 08:16:05 -0000 1.7 +++ owners.list 13 Jul 2005 13:02:08 -0000 1.8 @@ -325,7 +325,7 @@ 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|| Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org| -Fedora Extras|leafnode|A leafsite NNTP server|extras-qa at fedoraproject.org|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| Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 13:07:27 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 13 Jul 2005 09:07:27 -0400 Subject: owners owners.list,1.8,1.9 Message-ID: <200507131307.j6DD7Ruj006490@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6454 Modified Files: owners.list Log Message: substitute || with |extras-qa at fedoraproject.org| for consistency with the other ~95% of the packages Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- owners.list 13 Jul 2005 13:02:08 -0000 1.8 +++ owners.list 13 Jul 2005 13:07:25 -0000 1.9 @@ -37,7 +37,7 @@ Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| 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|| +Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|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| @@ -66,7 +66,7 @@ Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|cd-discid|utility to get CDDB discid information|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|| +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|centericq|Text mode menu- and window-driven IM|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -76,9 +76,9 @@ 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| -Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|| +Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.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|| +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| 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 @@ -96,15 +96,15 @@ Fedora Extras|cvsgraph|A CVS/RCS repository grapher|ville.skytta at iki.fi|extras-qa at fedoraproject.org| 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|| +Fedora Extras|cvsup|CVS-Optimized General-Purpose Network File Distribution System client|adrian at lisas.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| Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org| -Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|| -Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|| +Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org| Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| @@ -125,17 +125,17 @@ Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|| +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|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|| -Fedora Extras|enemies-of-carlotta|A simple mailing list manager|redhat-bugzilla at camperquake.de|| +Fedora Extras|enchant|An Enchanting Spell Checking Library|j.m.maurer at student.utwente.nl|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| 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|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|| -Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|| -Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|| +Fedora Extras|exim-doc|Documentation for the exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|ez-ipupdate|Client for Dynamic DNS Services|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|factory|A C++ class library for multivariate polynomial data|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| @@ -148,22 +148,22 @@ Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|firefox|firefox browser|wtogami at redhat.com|| +Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org| 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|| +Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|fltk|A C++ user interface toolkit for X11, Win32, and MacOS X|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|flumotion|flumotion - the Fluendo Streaming Server|thomas at apestaart.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| Fedora Extras|fluxconf|Configuration utility for fluxbox|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|fortune-mod|A program which will display a fortune|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org| -Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|| +Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|freedroid|Clone of the C64 Game Paradroid|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|| +Fedora Extras|freenx|freenx application/thin-client serve|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|freeze|freeze/melt/fcat compression utilities|Nicolas.Mailhot at laPoste.net|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| @@ -189,10 +189,10 @@ 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|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|| +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| Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|| +Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.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| @@ -225,7 +225,7 @@ 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-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|| +Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -274,7 +274,7 @@ 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| -Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|| +Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org| @@ -292,7 +292,7 @@ Fedora Extras|inkscape|A vector-based drawing program using SVG|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| -Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|| +Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org| @@ -307,7 +307,7 @@ Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|k3b-ape|Monkey's audio decoder/encoder plugin for K3b|mihai at xcyb.org|extras-qa at fedoraproject.org| -Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|| +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|kernel-module-thinkpad|IBM ThinkPad support kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org| @@ -323,7 +323,7 @@ Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org| 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|| +Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.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| @@ -375,7 +375,7 @@ Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libstatgrab|Make system statistics|oliver at linux-kernel.at|extras-qa at fedoraproject.org| -Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|| +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|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org| @@ -415,26 +415,26 @@ 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|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|| -Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|| +Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|mgopen-fonts|Truetype greek fonts|paskalis at di.uoa.gr|extras-qa at fedoraproject.org| Fedora Extras|mhash|Thread-safe hash algorithms library|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|mhonarc|A Perl mail-to-HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|| +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|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| -Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|| -Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|| -Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|| +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| Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org| Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com||wtogami at redhat.com +Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com 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|| +Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|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|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org| @@ -451,10 +451,10 @@ Fedora Extras|nomarch|GPLed Arc de-archiver|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org| Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| -Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|| +Fedora Extras|nx|Proxy system for X11|zipsonic at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|ocaml|The Objective Caml compiler and programming environment|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org| -Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|| +Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|openal|Open Audio Library|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org| @@ -465,7 +465,7 @@ Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|| +Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|Package Review|Choose this to request QA on a new package|dkl at redhat.com|dkl at redhat.com| @@ -572,7 +572,7 @@ 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-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|| +Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org| 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|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org| @@ -664,7 +664,7 @@ Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|recode|Conversion between character sets and surfaces.|extras-orphan at fedoraproject.org|| +Fedora Extras|recode|Conversion between character sets and surfaces.|extras-orphan at fedoraproject.org|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| @@ -680,7 +680,7 @@ Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|rzip|A large-file compression program|i at stingr.net|| +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|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org| @@ -693,18 +693,18 @@ 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| -Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|| +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|| -Fedora Extras|SDL_mixer|Simple DirectMedia Layer - Sample Mixer Library|extras-orphan at fedoraproject.org|| -Fedora Extras|SDL_net|SDL portable network library|extras-orphan 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_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|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| Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|| +Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org| 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| @@ -731,13 +731,13 @@ Fedora Extras|synaptic|Graphical frontend for APT package manager|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org| Fedora Extras|synce|For bugs related to the synce component|gafton at redhat.com|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|| +Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org| 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|tdl|To-do list manager|extras-orphan at fedoraproject.org|| -Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|| +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| Fedora Extras|tetex-armtex|Support for typesetting Armenian with TeX and LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|tetex-beamer|A LaTeX class for producing presentations and slides|jpo at di.uminho.pt|extras-qa at fedoraproject.org| @@ -755,7 +755,7 @@ Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|| +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|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org| @@ -782,7 +782,7 @@ 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| -Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de||wtogami at redhat.com +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|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| @@ -791,7 +791,7 @@ 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|| +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|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| @@ -806,10 +806,10 @@ 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| Fedora Extras|xbindkeys|Binds keys or mouse buttons to shell commands under X|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|| +Fedora Extras|xboard|An X Window System graphical chessboard|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xca|Graphical X.509 certificate management tool|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|xcin|A XIM server input method for Traditional Chinese|llch at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|| +Fedora Extras|xdaliclock|A clock for the X Window System|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|xdesktopwaves|Simulation of water waves on the X Window System desktop|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|xemacs|A different version of Emacs|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|xemacs-sumo|XEmacs Lisp packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 14:10:17 2005 From: fedora-extras-commits at redhat.com (Ed Hill (edhill)) Date: Wed, 13 Jul 2005 10:10:17 -0400 Subject: owners owners.list,1.9,1.10 Message-ID: <200507131410.j6DEAHO5008248@cvs-int.fedora.redhat.com> Author: edhill Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8231 Modified Files: owners.list Log Message: add ncview Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- owners.list 13 Jul 2005 13:07:25 -0000 1.9 +++ owners.list 13 Jul 2005 14:10:15 -0000 1.10 @@ -437,6 +437,7 @@ Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|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|ncview|A visual browser for netCDF format files|ed at eh3.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|nethack-falconseye|NetHack - Falcon's Eye|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 14:18:06 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Wed, 13 Jul 2005 10:18:06 -0400 Subject: web/html/download mirrors.php,1.22,1.23 Message-ID: <200507131418.j6DEI6DA008285@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8268 Modified Files: mirrors.php Log Message: Added dti.ad.jp urls for ftp and http Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mirrors.php 12 Jul 2005 17:20:23 -0000 1.22 +++ mirrors.php 13 Jul 2005 14:18:04 -0000 1.23 @@ -518,6 +518,8 @@
    • ftp://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
    • http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/
    • rsync://ftp.nara.wide.ad.jp/fedora/
      • +
    • ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/
      • +
    • http://ftp.dti.ad.jp/pub/Linux/Fedora/core/
  • Korea From fedora-extras-commits at redhat.com Wed Jul 13 15:21:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:21:07 -0400 Subject: extras-buildsys ChangeLog,1.53,1.54 Message-ID: <200507131521.j6DFL7Ig009636@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601 Modified Files: ChangeLog Log Message: 2005-07-13 Dan Williams * common/AuthedXMLRPCServer.py common/SSLCommon.py common/SSLConnection.py - Play better with Python 2.2 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ChangeLog 12 Jul 2005 20:12:23 -0000 1.53 +++ ChangeLog 13 Jul 2005 15:21:05 -0000 1.54 @@ -1,3 +1,10 @@ +2005-07-13 Dan Williams + + * common/AuthedXMLRPCServer.py + common/SSLCommon.py + common/SSLConnection.py + - Play better with Python 2.2 + 2005-07-12 Dan Williams * Warn user and exit if server or builder is already running From fedora-extras-commits at redhat.com Wed Jul 13 15:21:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:21:07 -0400 Subject: extras-buildsys/common AuthedXMLRPCServer.py, 1.3, 1.4 SSLCommon.py, 1.9, 1.10 SSLConnection.py, 1.1, 1.2 Message-ID: <200507131521.j6DFL7t7009644@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/common Modified Files: AuthedXMLRPCServer.py SSLCommon.py SSLConnection.py Log Message: 2005-07-13 Dan Williams * common/AuthedXMLRPCServer.py common/SSLCommon.py common/SSLConnection.py - Play better with Python 2.2 Index: AuthedXMLRPCServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AuthedXMLRPCServer.py 10 Jul 2005 03:44:36 -0000 1.3 +++ AuthedXMLRPCServer.py 13 Jul 2005 15:21:05 -0000 1.4 @@ -84,6 +84,9 @@ if sys.version_info[:3] > (2, 2, 3): SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) + else: + self.funcs = {} + self.instance = None def get_authinfo(self, request, client_address): if self.authinfo_callback: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- SSLCommon.py 6 Jul 2005 21:20:55 -0000 1.9 +++ SSLCommon.py 13 Jul 2005 15:21:05 -0000 1.10 @@ -88,30 +88,10 @@ self.server_port = port -class PlgHTTPSResponse(httplib.HTTPResponse): - def __init__(self, sock, debuglevel=0, strict=0, method=None): - self.fp = socket._fileobject(sock, "rb", 0) - self.debuglevel = debuglevel - self.strict = strict - self._method = method - - self.msg = None - - # from the Status-Line of the response - self.version = httplib._UNKNOWN # HTTP-Version - self.status = httplib._UNKNOWN # Status-Code - self.reason = httplib._UNKNOWN # Reason-Phrase - - self.chunked = httplib._UNKNOWN # is "chunked" being used? - self.chunk_left = httplib._UNKNOWN # bytes left to read in current chunk - self.length = httplib._UNKNOWN # number of bytes left in response - self.will_close = httplib._UNKNOWN # conn will close at end of response - - class PlgHTTPSConnection(httplib.HTTPConnection): "This class allows communication via SSL." - response_class = PlgHTTPSResponse + response_class = httplib.HTTPResponse def __init__(self, host, port=None, ssl_context=None, strict=None): httplib.HTTPConnection.__init__(self, host, port, strict) Index: SSLConnection.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SSLConnection.py 6 Jul 2005 21:20:55 -0000 1.1 +++ SSLConnection.py 13 Jul 2005 15:21:05 -0000 1.2 @@ -25,6 +25,10 @@ so I'm making a proxy instead of subclassing. """ self.__dict__["conn"] = conn + self.__dict__["close_refcount"] = 0 + self.__dict__["closed"] = False + def __del__(self): + self.__dict__["conn"].close() def __getattr__(self,name): return getattr(self.__dict__["conn"], name) def __setattr__(self,name, value): @@ -49,11 +53,21 @@ We need to use socket._fileobject Because SSL.Connection doesn't have a 'dup'. Not exactly sure WHY this is, but this is backed up by comments in socket.py and SSL/connection.c + + Since httplib.HTTPSResponse/HTTPConnection depend on the + socket being duplicated when they close it, we refcount the + socket object and don't actually close until its count is 0. """ - return socket._fileobject(self, mode, bufsize) + self.__dict__["close_refcount"] = self.__dict__["close_refcount"] + 1 + return PlgFileObject(self, mode, bufsize) def close(self): - self.shutdown() - self.__dict__["conn"].close() + if self.__dict__["closed"]: + return + if self.__dict__["close_refcount"] == 0: + self.shutdown() + self.__dict__["conn"].close() + self.__dict__["closed"] = True + self.__dict__["close_refcount"] = self.__dict__["close_refcount"] - 1 def recv(self, bufsize): ret = None try: @@ -62,3 +76,16 @@ pass return ret +class PlgFileObject(socket._fileobject): + def close(self): + """ + socket._fileobject doesn't actually _close_ the socket, + which we want it to do, so we have to override. + """ + try: + if self._sock: + self.flush() + self._sock.close() + finally: + self._sock = None + From fedora-extras-commits at redhat.com Wed Jul 13 15:26:12 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 13 Jul 2005 11:26:12 -0400 Subject: rpms/kyum/devel .cvsignore, 1.2, 1.3 kyum.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200507131526.j6DFQChn009682@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9661 Modified Files: .cvsignore kyum.spec sources Log Message: Description: Update to new upstream release, build failed, upstream author notified about the issue. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jun 2005 16:37:40 -0000 1.2 +++ .cvsignore 13 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -kyum-0.7.1.tar.gz +kyum-0.7.2.tar.gz Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 +++ kyum.spec 13 Jul 2005 15:26:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: kyum -Version: 0.7.1 -Release: 3 +Version: 0.7.2 +Release: 1 Summary: Graphical User Frontend (GUI) for yum @@ -67,6 +67,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-1 +- Update to new upstream release + * Tue Jun 21 2005 Jochen Schmitt 0.7.1-3 - Add precompiled python files into package Index: sources =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jun 2005 16:37:40 -0000 1.2 +++ sources 13 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -2d12023542d55affa51d6312a761b70a kyum-0.7.1.tar.gz +0c2eb29c22a4a23d3971eb0ce8d79f99 kyum-0.7.2.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 15:47:16 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 13 Jul 2005 11:47:16 -0400 Subject: CVSROOT avail,1.9,1.10 config,1.2,1.3 loginfo,1.10,1.11 Message-ID: <200507131547.j6DFlG5u010025@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/devel/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10004 Modified Files: avail config loginfo Log Message: Update config files. Index: avail =================================================================== RCS file: /cvs/devel/CVSROOT/avail,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- avail 12 Jul 2005 22:58:51 -0000 1.9 +++ avail 13 Jul 2005 15:47:14 -0000 1.10 @@ -16,34 +16,3 @@ avail | gafton,notting,sopwith,wtogami,katzj | CVSROOT # trusted developers that can add modules avail | | CVSROOT/modules -avail | kwade | CVSROOT/avail - -# Fedora Web site -unavail | | web -avail | gafton,tfox,notting,sopwith,gdk,katzj,kwade | web -avail | havill,hp,bennet | web -avail | katzj | web/html/projects/anaconda-installer -avail | bfox | web/html/projects/config-tools -avail | blizzard,krh | web/html/projects/desktop -avail | wcohen | web/html/projects/additional-projects/benchmarks -avail | sopwith,dwalsh,kwade | web/html/projects/selinux -avail | ezannoni | web/html/projects/additional-projects/gdb -avail | alikins,trobert | web/html/download -avail | llch | web/html/projects/i18n -avail | sarahs | web/html/projects/translations -avail | harald | web/html/projects/config-tools -avail | kwade | web/html/docs -avail | sarahs | web/html/participate/translation-faq -avail | sarahs | web/html/participate/translation-guide -avail | sarahs | web/html/participate/translation-windows -avail | dmalcolm | web/html/projects/stateless -avail | dmalcolm | web/html/docs/stateless -avail | riel | web/html/docs/virtualisation -avail | riel | web/html/projects/virtualisation -avail | ezannoni | web/html/projects/systemtap -avail | harald | web/html/docs/udev - -unavail | | fedora-security -avail | mjc,bressers,jorton,notting,gafton,sopwith,katzj | fedora-security - -avail | pfrields | web/html/projects/docs Index: config =================================================================== RCS file: /cvs/devel/CVSROOT/config,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config 30 Mar 2005 17:52:18 -0000 1.2 +++ config 13 Jul 2005 15:47:14 -0000 1.3 @@ -2,7 +2,7 @@ #SystemAuth=no # Put CVS lock files in this directory rather than directly in the repository. -LockDir=/var/lock/cvs/fedora +LockDir=/var/lock/cvs/devel # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top # level of the new working directory when using the `cvs checkout' Index: loginfo =================================================================== RCS file: /cvs/devel/CVSROOT/loginfo,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- loginfo 3 Jun 2005 21:21:59 -0000 1.10 +++ loginfo 13 Jul 2005 15:47:14 -0000 1.11 @@ -26,6 +26,5 @@ # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal ALL $CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com -ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com +ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/devel localdelivery at cvs-int.fedora.redhat.com From fedora-extras-commits at redhat.com Wed Jul 13 15:47:40 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Wed, 13 Jul 2005 11:47:40 -0400 Subject: CVSROOT modules,1.2,1.3 Message-ID: <200507131547.j6DFleJC010049@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/devel/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10032 Modified Files: modules Log Message: update config files Index: modules =================================================================== RCS file: /cvs/devel/CVSROOT/modules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- modules 3 Jun 2005 21:15:57 -0000 1.2 +++ modules 13 Jul 2005 15:47:38 -0000 1.3 @@ -25,4 +25,4 @@ # can be useful for creating a module that consists of many directories # spread out over the entire source repository. -fedora . +devel . From fedora-extras-commits at redhat.com Wed Jul 13 15:51:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:51:44 -0400 Subject: extras-buildsys/server BuildMaster.py,1.13,1.14 Message-ID: <200507131551.j6DFpikU010099@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10082/server Modified Files: BuildMaster.py Log Message: Exit when we can't open the job database. Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- BuildMaster.py 10 Jul 2005 19:59:32 -0000 1.13 +++ BuildMaster.py 13 Jul 2005 15:51:42 -0000 1.14 @@ -123,7 +123,9 @@ s = "%s" % e if s == 'unable to open database file': print "Unable to open the jobs database. Exiting..." - os._exit(1) + else: + print "Error: sqlite could not open the database. Reason: %s" % s + os._exit(1) self.curs = self.dbcx.cursor() ensure_job_db_tables(self.dbcx) From fedora-extras-commits at redhat.com Wed Jul 13 15:53:10 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 11:53:10 -0400 Subject: extras-buildsys/server BuildMaster.py,1.14,1.15 Message-ID: <200507131553.j6DFrAfQ010122@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10105/server Modified Files: BuildMaster.py Log Message: Simplify database error message. Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- BuildMaster.py 13 Jul 2005 15:51:42 -0000 1.14 +++ BuildMaster.py 13 Jul 2005 15:53:08 -0000 1.15 @@ -120,11 +120,7 @@ try: self.dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3) except sqlite.DatabaseError, e: - s = "%s" % e - if s == 'unable to open database file': - print "Unable to open the jobs database. Exiting..." - else: - print "Error: sqlite could not open the database. Reason: %s" % s + 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) From fedora-extras-commits at redhat.com Wed Jul 13 16:07:59 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:07:59 -0400 Subject: rpms/libfwbuilder/FC-3 .cvsignore, 1.3, 1.4 libfwbuilder.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507131607.j6DG7xL3011290@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/libfwbuilder/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11269 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 17:53:10 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:07:57 -0000 1.4 @@ -1,2 +1 @@ -libfwbuilder-2.0.5.tar.gz -libfwbuilder-2.0.6.tar.gz +libfwbuilder-2.0.8.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/libfwbuilder.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libfwbuilder.spec 3 Mar 2005 17:53:10 -0000 1.4 +++ libfwbuilder.spec 13 Jul 2005 16:07:57 -0000 1.5 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.6 -Release: 1 +Version: 2.0.8 +Release: 1.FC3 License: GPL Group: System Environment/Libraries Url: http://www.fwbuilder.org/ @@ -70,6 +70,9 @@ %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC3 +- New upstream version + * Thu Mar 3 2005 Steve Grubb 2.0.6-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 17:53:10 -0000 1.3 +++ sources 13 Jul 2005 16:07:57 -0000 1.4 @@ -1,2 +1 @@ -7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz -d53a69f5774fc987779ac0df4e54beb6 libfwbuilder-2.0.6.tar.gz +a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 16:10:43 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:10:43 -0400 Subject: rpms/libfwbuilder/FC-4 .cvsignore, 1.3, 1.4 libfwbuilder.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507131610.j6DGAhg3011363@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/libfwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11342 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:04:58 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:10:41 -0000 1.4 @@ -1,2 +1 @@ -libfwbuilder-2.0.5.tar.gz -libfwbuilder-2.0.6.tar.gz +libfwbuilder-2.0.8.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/libfwbuilder.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libfwbuilder.spec 22 May 2005 22:58:26 -0000 1.7 +++ libfwbuilder.spec 13 Jul 2005 16:10:41 -0000 1.8 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1.FC4 License: GPL Group: System Environment/Libraries URL: http://www.fwbuilder.org/ @@ -71,6 +71,9 @@ %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:04:58 -0000 1.3 +++ sources 13 Jul 2005 16:10:41 -0000 1.4 @@ -1,2 +1 @@ -7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz -d53a69f5774fc987779ac0df4e54beb6 libfwbuilder-2.0.6.tar.gz +a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 16:12:14 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:12:14 -0400 Subject: rpms/libfwbuilder/devel .cvsignore, 1.3, 1.4 libfwbuilder.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507131612.j6DGCEuG011438@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/libfwbuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11417 Modified Files: .cvsignore libfwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:04:58 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:12:12 -0000 1.4 @@ -1,2 +1 @@ -libfwbuilder-2.0.5.tar.gz -libfwbuilder-2.0.6.tar.gz +libfwbuilder-2.0.8.tar.gz Index: libfwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libfwbuilder.spec 22 May 2005 22:58:26 -0000 1.7 +++ libfwbuilder.spec 13 Jul 2005 16:12:12 -0000 1.8 @@ -1,7 +1,7 @@ Name: libfwbuilder Summary: Firewall Builder API -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1 License: GPL Group: System Environment/Libraries URL: http://www.fwbuilder.org/ @@ -71,6 +71,9 @@ %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - build on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:04:58 -0000 1.3 +++ sources 13 Jul 2005 16:12:12 -0000 1.4 @@ -1,2 +1 @@ -7fe07b07e13d21e20d10185276c2318e libfwbuilder-2.0.5.tar.gz -d53a69f5774fc987779ac0df4e54beb6 libfwbuilder-2.0.6.tar.gz +a554710b26bc42c895187f6a2b78b27f libfwbuilder-2.0.8.tar.gz From fedora-extras-commits at redhat.com Wed Jul 13 16:25:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 12:25:25 -0400 Subject: extras-buildsys/common .cvsignore,1.1,1.2 Message-ID: <200507131625.j6DGPPfZ011525@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11508/common Modified Files: .cvsignore Log Message: Add more files Index: .cvsignore =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jun 2005 12:53:36 -0000 1.1 +++ .cvsignore 13 Jul 2005 16:25:23 -0000 1.2 @@ -5,3 +5,4 @@ SimpleSSLXMLRPCServer.pyc SSLCommon.pyc SSLXMLRPCServerProxy.pyc +SSLConnection.pyc From fedora-extras-commits at redhat.com Wed Jul 13 16:40:52 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:40:52 -0400 Subject: rpms/fwbuilder/FC-3 .cvsignore, 1.3, 1.4 fwbuilder.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507131640.j6DGeq0I011717@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/fwbuilder/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11696 Modified Files: .cvsignore fwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC3 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 17:55:26 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:40:50 -0000 1.4 @@ -1,2 +1,4 @@ fwbuilder-2.0.5.tar.gz fwbuilder-2.0.6.tar.gz +fwbuilder-2.0.8.tar.gz +fwbuilder.desktop Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-3/fwbuilder.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fwbuilder.spec 3 Mar 2005 18:46:53 -0000 1.5 +++ fwbuilder.spec 13 Jul 2005 16:40:50 -0000 1.6 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.6 -Release: 1 +Version: 2.0.8 +Release: 1.FC3 License: GPL Group: Applications/System URL: http://www.fwbuilder.org/ @@ -10,7 +10,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.6 +BuildRequires: libfwbuilder-devel = 2.0.8 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -85,6 +85,12 @@ %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt +%doc doc/ReleaseNotes_2.0.6.html +%doc doc/ReleaseNotes_2.0.6.txt +%doc doc/ReleaseNotes_2.0.7.html +%doc doc/ReleaseNotes_2.0.7.txt +%doc doc/ReleaseNotes_2.0.8.html +%doc doc/ReleaseNotes_2.0.8.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* @@ -152,6 +158,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC3 +- New upstream version + * Thu Mar 3 2005 Steve Grubb 2.0.6-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 17:55:26 -0000 1.3 +++ sources 13 Jul 2005 16:40:50 -0000 1.4 @@ -1,2 +1,2 @@ -03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz -41554801c43e14a48b19ade91e5a14cd fwbuilder-2.0.6.tar.gz +37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz +8047b8aabc56f1005f7e551278083922 fwbuilder.desktop From fedora-extras-commits at redhat.com Wed Jul 13 16:41:53 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:41:53 -0400 Subject: rpms/fwbuilder/FC-4 .cvsignore, 1.3, 1.4 fwbuilder.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507131641.j6DGfrfp011817@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/fwbuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11794 Modified Files: .cvsignore fwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:05:57 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:41:51 -0000 1.4 @@ -1,2 +1,4 @@ fwbuilder-2.0.5.tar.gz fwbuilder-2.0.6.tar.gz +fwbuilder-2.0.8.tar.gz +fwbuilder.desktop Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/fwbuilder.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fwbuilder.spec 22 May 2005 22:58:47 -0000 1.8 +++ fwbuilder.spec 13 Jul 2005 16:41:51 -0000 1.9 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1.FC4 License: GPL Group: Applications/System @@ -11,7 +11,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.6 +BuildRequires: libfwbuilder-devel = 2.0.8 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -86,6 +86,12 @@ %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt +%doc doc/ReleaseNotes_2.0.6.html +%doc doc/ReleaseNotes_2.0.6.txt +%doc doc/ReleaseNotes_2.0.7.html +%doc doc/ReleaseNotes_2.0.7.txt +%doc doc/ReleaseNotes_2.0.8.html +%doc doc/ReleaseNotes_2.0.8.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* @@ -153,6 +159,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1.FC4 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:05:57 -0000 1.3 +++ sources 13 Jul 2005 16:41:51 -0000 1.4 @@ -1,2 +1,2 @@ -03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz -41554801c43e14a48b19ade91e5a14cd fwbuilder-2.0.6.tar.gz +37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz +8047b8aabc56f1005f7e551278083922 fwbuilder.desktop From fedora-extras-commits at redhat.com Wed Jul 13 16:42:55 2005 From: fedora-extras-commits at redhat.com (Steve Grubb (sgrubb)) Date: Wed, 13 Jul 2005 12:42:55 -0400 Subject: rpms/fwbuilder/devel .cvsignore, 1.3, 1.4 fwbuilder.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507131642.j6DGgtOo011932@cvs-int.fedora.redhat.com> Author: sgrubb Update of /cvs/extras/rpms/fwbuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11911 Modified Files: .cvsignore fwbuilder.spec sources Log Message: * Wed Jul 13 2005 Steve Grubb 2.0.8-1 - New upstream version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Mar 2005 18:05:57 -0000 1.3 +++ .cvsignore 13 Jul 2005 16:42:53 -0000 1.4 @@ -1,2 +1,4 @@ fwbuilder-2.0.5.tar.gz fwbuilder-2.0.6.tar.gz +fwbuilder-2.0.8.tar.gz +fwbuilder.desktop Index: fwbuilder.spec =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/fwbuilder.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fwbuilder.spec 22 May 2005 22:58:47 -0000 1.8 +++ fwbuilder.spec 13 Jul 2005 16:42:53 -0000 1.9 @@ -1,7 +1,7 @@ Name: fwbuilder Summary: Firewall Builder -Version: 2.0.6 -Release: 3 +Version: 2.0.8 +Release: 1 License: GPL Group: Applications/System @@ -11,7 +11,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: qt-devel >= 1:3.0.0 BuildRequires: desktop-file-utils -BuildRequires: libfwbuilder-devel = 2.0.6 +BuildRequires: libfwbuilder-devel = 2.0.8 %description Firewall Builder consists of a GUI and set of policy compilers for @@ -86,6 +86,12 @@ %doc doc/ReleaseNotes_2.0.4.txt %doc doc/ReleaseNotes_2.0.5.html %doc doc/ReleaseNotes_2.0.5.txt +%doc doc/ReleaseNotes_2.0.6.html +%doc doc/ReleaseNotes_2.0.6.txt +%doc doc/ReleaseNotes_2.0.7.html +%doc doc/ReleaseNotes_2.0.7.txt +%doc doc/ReleaseNotes_2.0.8.html +%doc doc/ReleaseNotes_2.0.8.txt %{_mandir}/man1/fwbuilder.1* %{_mandir}/man1/fwblookup.1* %{_mandir}/man1/fwbedit.1* @@ -153,6 +159,9 @@ %{_mandir}/man1/fwb_ipt.1* %changelog +* Wed Jul 13 2005 Steve Grubb 2.0.8-1 +- New upstream version + * Sun May 22 2005 Jeremy Katz - 2.0.6-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/fwbuilder/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Mar 2005 18:05:57 -0000 1.3 +++ sources 13 Jul 2005 16:42:53 -0000 1.4 @@ -1,2 +1,2 @@ -03fe6aaa6f8c7728bd3015a4df187c70 fwbuilder-2.0.5.tar.gz -41554801c43e14a48b19ade91e5a14cd fwbuilder-2.0.6.tar.gz +37d4266b95967c3d4295ec5efdfa0c23 fwbuilder-2.0.8.tar.gz +8047b8aabc56f1005f7e551278083922 fwbuilder.desktop From fedora-extras-commits at redhat.com Wed Jul 13 17:20:00 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 13 Jul 2005 13:20:00 -0400 Subject: owners owners.list,1.10,1.11 Message-ID: <200507131720.j6DHK0Ra013444@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13425 Modified Files: owners.list Log Message: update gai and gai-pal Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- owners.list 13 Jul 2005 14:10:15 -0000 1.10 +++ owners.list 13 Jul 2005 17:19:58 -0000 1.11 @@ -169,10 +169,10 @@ 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|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|gai|Generic Applet Interface|msalim at cs.indiana.edu|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| Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| -Fedora Extras|gai-pal|GAI Pal applet|msalim at cs.indiana.edu|extras-qa at fedoraproject.org| +Fedora Extras|gai-pal|GAI Pal applet|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|galculator|GTK 2 based scientific calculator|compton at pcompton.com|extras-qa at fedoraproject.org| Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|anvil at livna.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 18:27:37 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:27:37 -0400 Subject: owners owners.list,1.11,1.12 Message-ID: <200507131827.j6DIRbL8014849@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14832 Modified Files: owners.list Log Message: Fix spaces that were on the liboil line, for a strange reason. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- owners.list 13 Jul 2005 17:19:58 -0000 1.11 +++ owners.list 13 Jul 2005 18:27:35 -0000 1.12 @@ -359,7 +359,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|liboil | Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|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| Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org| Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 13 18:32:43 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:32:43 -0400 Subject: common tobuild,1.1908,1.1909 Message-ID: <200507131832.j6DIWhjv014957@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940 Modified Files: tobuild Log Message: request build of rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1908 retrieving revision 1.1909 diff -u -r1.1908 -r1.1909 --- tobuild 13 Jul 2005 11:27:20 -0000 1.1908 +++ tobuild 13 Jul 2005 18:32:41 -0000 1.1909 @@ -52,3 +52,4 @@ corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 +thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 18:33:29 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:33:29 -0400 Subject: common tobuild,1.1909,1.1910 Message-ID: <200507131833.j6DIXTAL015024@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15007 Modified Files: tobuild Log Message: request build of rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1909 retrieving revision 1.1910 diff -u -r1.1909 -r1.1910 --- tobuild 13 Jul 2005 18:32:41 -0000 1.1909 +++ tobuild 13 Jul 2005 18:33:27 -0000 1.1910 @@ -53,3 +53,4 @@ oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 +thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 18:34:13 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:34:13 -0400 Subject: common tobuild,1.1910,1.1911 Message-ID: <200507131834.j6DIYDrt015115@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15098 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1910 retrieving revision 1.1911 diff -u -r1.1910 -r1.1911 --- tobuild 13 Jul 2005 18:33:27 -0000 1.1910 +++ tobuild 13 Jul 2005 18:34:11 -0000 1.1911 @@ -54,3 +54,4 @@ oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 +thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 13 18:37:45 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 13 Jul 2005 14:37:45 -0400 Subject: common tobuild,1.1911,1.1912 Message-ID: <200507131837.j6DIbjiM015148@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15131 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1911 retrieving revision 1.1912 diff -u -r1.1911 -r1.1912 --- tobuild 13 Jul 2005 18:34:11 -0000 1.1911 +++ tobuild 13 Jul 2005 18:37:43 -0000 1.1912 @@ -55,3 +55,4 @@ thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 +thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 13 19:36:14 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 15:36:14 -0400 Subject: extras-buildsys/etc plague-builder.init, 1.3, 1.4 plague-builder.config, 1.2, NONE Message-ID: <200507131936.j6DJaEAZ016492@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16444/etc Modified Files: plague-builder.init Removed Files: plague-builder.config Log Message: 2005-07-13 Dan Williams * builder/builder.py builder/CONFIG.py etc/plague-builder.config etc/plague-builder.init - Move arches and hostname into the CONFIG.py file, since its already instance-specific. Change the initscripts to reference the config file, which gets passed to the builder on the command line now. Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plague-builder.init 11 Jul 2005 03:23:21 -0000 1.3 +++ plague-builder.init 13 Jul 2005 19:36:12 -0000 1.4 @@ -13,11 +13,9 @@ # Source function library. . /etc/init.d/functions -. /etc/sysconfig/plague-builder - start() { echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log $HOST $ARCHSOPT + daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log -c /etc/plague/builder/CONFIG.py echo touch /var/lock/subsys/plague-builder return 0 --- plague-builder.config DELETED --- From fedora-extras-commits at redhat.com Wed Jul 13 19:36:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 15:36:08 -0400 Subject: extras-buildsys ChangeLog,1.54,1.55 Message-ID: <200507131936.j6DJacqO016495@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16444 Modified Files: ChangeLog Log Message: 2005-07-13 Dan Williams * builder/builder.py builder/CONFIG.py etc/plague-builder.config etc/plague-builder.init - Move arches and hostname into the CONFIG.py file, since its already instance-specific. Change the initscripts to reference the config file, which gets passed to the builder on the command line now. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ChangeLog 13 Jul 2005 15:21:05 -0000 1.54 +++ ChangeLog 13 Jul 2005 19:36:06 -0000 1.55 @@ -1,5 +1,16 @@ 2005-07-13 Dan Williams + * builder/builder.py + builder/CONFIG.py + etc/plague-builder.config + etc/plague-builder.init + - Move arches and hostname into the CONFIG.py file, since + its already instance-specific. Change the initscripts + to reference the config file, which gets passed + to the builder on the command line now. + +2005-07-13 Dan Williams + * common/AuthedXMLRPCServer.py common/SSLCommon.py common/SSLConnection.py From fedora-extras-commits at redhat.com Wed Jul 13 19:36:08 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 13 Jul 2005 15:36:08 -0400 Subject: extras-buildsys/builder CONFIG.py,1.5,1.6 builder.py,1.13,1.14 Message-ID: <200507131936.j6DJadTS016499@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16444/builder Modified Files: CONFIG.py builder.py Log Message: 2005-07-13 Dan Williams * builder/builder.py builder/CONFIG.py etc/plague-builder.config etc/plague-builder.init - Move arches and hostname into the CONFIG.py file, since its already instance-specific. Change the initscripts to reference the config file, which gets passed to the builder on the command line now. Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CONFIG.py 6 Jul 2005 21:20:49 -0000 1.5 +++ CONFIG.py 13 Jul 2005 19:36:06 -0000 1.6 @@ -22,6 +22,8 @@ config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 +config_opts['hostname'] = 'localhost' +config_opts['arches'] = ['i386', 'i486', 'i586', 'i686'] BUILDER_DIR = "/etc/plague/builder" Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- builder.py 12 Jul 2005 20:12:30 -0000 1.13 +++ builder.py 13 Jul 2005 19:36:06 -0000 1.14 @@ -38,17 +38,9 @@ from optparse import OptionParser -# Load in the config -execfile("/etc/plague/builder/CONFIG.py") - use_lighttpd = False -g_our_hostname = None certs = {} -certs['key_and_cert'] = config_opts['builder_key_and_cert'] -certs['ca_cert'] = config_opts['ca_cert'] -certs['peer_ca_cert'] = config_opts['ca_cert'] - def get_url_for_file(file_path): """ Return a URL pointing to a particular file in our work dir """ @@ -62,7 +54,7 @@ method = "https://" else: method = "http://" - full_url = method + g_our_hostname + ":" + port + "/" + file_part + full_url = method + config_opts['hostname'] + ":" + port + "/" + file_part return urllib.quote(full_url) @@ -469,16 +461,16 @@ return bcp -def log(string): - if config_opts['debug']: - print string - class XMLRPCBuilderServer: def __init__(self, localarches): self.ids = {} # unique id => awclass instance self.localarches = localarches self.cur_job = 0 + def log(string): + if config_opts['debug']: + print string + def process(self): # Give jobs some time to update their status and do their thing jobid = 0 @@ -490,7 +482,7 @@ def start(self, target, arch, srpm_url): if self.cur_job != 0: - log("Tried to build '%s' when already buiding something" % srpm_url) + self.log("Tried to build '%s' when already buiding something" % srpm_url) return 0 cur_time = time.time() @@ -505,10 +497,10 @@ self.ids[uniqid] = job job.start() filename = os.path.basename(srpm_url) - log("%s: started %s on %s arch %s at time %d" % (uniqid, filename, + self.log("%s: started %s on %s arch %s at time %d" % (uniqid, filename, target, arch, cur_time)) else: - log("%s: Failed request for %s on %s UNSUPPORTED arch %s at time %d" % + self.log("%s: Failed request for %s on %s UNSUPPORTED arch %s at time %d" % (uniqid, srpm_url, target, arch, cur_time)) uniqid = 0 self.cur_job = uniqid @@ -609,7 +601,7 @@ if a != avail_arches[len(avail_arches)-1]: archlist = archlist + ", " - usage = "Usage: %s [-p ] [-l ] [-d] -a arch1 [-a arch2] " % sys.argv[0] + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, help='file to write the PID to') @@ -617,22 +609,32 @@ help="location of file to write log output to") parser.add_option("-d", "--daemon", default=False, action="store_true", help="daemonize (i.e., detach from the terminal)") - parser.add_option("-a", "--arch", default=[], action='append', dest='archs', - help="archs this machine can build Available arches: [ %s ]" % archlist) + parser.add_option("-c", "--configfile", default=None, + help="location of the builder config file") (opts, args) = parser.parse_args() - if len(args) == 0 or len(opts.archs) == 0: - print "Must specify hostname and at least one build arch." + if not opts.configfile: + print "Must specify the config file." sys.exit(1) - - for arch in opts.archs: + + if not os.path.exists(opts.configfile): + print "Could not find the config file %s" % opts.configfile + sys.exit(1) + + if not os.access(opts.configfile, os.R_OK): + print "Could not read the config file %s" % opts.configfile + sys.exit(1) + + # Load in the config + execfile(opts.configfile) + certs['key_and_cert'] = config_opts['builder_key_and_cert'] + certs['ca_cert'] = config_opts['ca_cert'] + certs['peer_ca_cert'] = config_opts['ca_cert'] + + for arch in config_opts['arches']: if arch not in archlist: - print "Arch must be one of [ %s ]" % archlist + print "Arch '%s' must be one of [ %s ]" % (arch, archlist) sys.exit(1) - - host = args[0] - g_our_hostname = host - localarches = opts.archs if opts.daemon: ret=daemonize.createDaemon() @@ -644,9 +646,9 @@ open(opts.pidfile, 'w').write('%d\n' % os.getpid()) if opts.logfile: - log=open(opts.logfile, 'a') - sys.stdout=log - sys.stderr=log + logf=open(opts.logfile, 'a') + sys.stdout=logf + sys.stderr=logf work_dir = config_opts['builder_work_dir'] if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): @@ -662,12 +664,12 @@ key_and_cert = config_opts['builder_key_and_cert'] else: key_and_cert = None - http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert) + http_server = lighttpdManager.lighttpdManager(http_cnf_file, config_opts['hostname'], port, work_dir, True, key_and_cert) else: if config_opts['ssl_buildserver']: - http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, certs) + http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs) else: - http_server = HTTPServer.PlgHTTPServerManager((g_our_hostname, port), work_dir, None) + http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, None) http_server.start() # Stop running as root @@ -676,19 +678,19 @@ time.sleep(1) os._exit(1) - print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches)) + print "Binding to address '%s' with arches: [%s]" % (config_opts['hostname'], string.join(config_opts['arches'])) xmlrpc_port = config_opts['xmlrpc_port'] try: if config_opts['ssl_buildserver']: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs) + xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((config_opts['hostname'], xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None) + xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((config_opts['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?" % (g_our_hostname, xmlrpc_port) + print "Error: couldn't bind to address '%s:%s'. Is the builder already running?" % (config_opts['hostname'], xmlrpc_port) os._exit(1) - bcs = XMLRPCBuilderServer(localarches) + bcs = XMLRPCBuilderServer(config_opts['arches']) xmlserver.register_instance(bcs) last_time = time.time() @@ -706,5 +708,8 @@ last_time = time.time() http_server.stop() - time.sleep(2) + try: + time.sleep(2) + except KeyboardInterrupt, e: + pass os._exit(0) From fedora-extras-commits at redhat.com Wed Jul 13 20:03:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 13 Jul 2005 16:03:53 -0400 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.9,1.10 Message-ID: <200507132003.j6DK3rUS017693@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17675 Modified Files: xemacs-sumo.spec Log Message: Remove mew and skk, they're in separate packages again (#162952). Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xemacs-sumo.spec 2 Jun 2005 16:56:41 -0000 1.9 +++ xemacs-sumo.spec 13 Jul 2005 20:03:28 -0000 1.10 @@ -3,7 +3,7 @@ Summary: XEmacs Lisp packages Name: xemacs-sumo Version: %(echo %{sumo_ver} | tr -d -) -Release: 6 +Release: 7 License: GPL Group: Applications/Editors Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2 @@ -27,12 +27,9 @@ Provides: ruby-mode-xemacs Obsoletes: ruby-mode-xemacs tm # Provides/Obsoletes for upgradeability from the latest FC version, needed -# until (if?) there will be separate apel, mew, and ddskk packages for -# XEmacs again. ddskk-xemacs is not provided because the -# version shipping here is the original skk, not ddskk. It is obsoleted -# anyway to for the sake of smooth upgrades. -Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2 -Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5 +# until (if?) there will be a separate apel package for XEmacs again. +Provides: apel-xemacs = 10.2 +Obsoletes: apel-xemacs < 10.6-6 Patch0: %{name}-jde-equal.patch Patch1: %{name}-sql-abbrev.patch Patch6: auctex-texsite-jlatex-detect-69129.patch @@ -125,6 +122,14 @@ %build %define _xemacs_batch xemacs-nox -batch -vanilla +# mew is provided by mew-xemacs, and skk by ddskk-xemacs +%_xemacs_batch -l package-admin -eval \ + "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" +rmdir xemacs-packages/{etc,lisp,man}/mew +%_xemacs_batch -l package-admin -eval \ + "(package-admin-delete-binary-package 'skk \"mule-packages\")" +rmdir mule-packages/{etc,lisp,man}/skk + export EMACSPACKAGEPATH=`pwd` %_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* @@ -197,6 +202,9 @@ %changelog +* Wed Jul 13 2005 Ville Skytt?? - 20050505-7 +- Remove mew and skk, they're in separate packages again (#162952). + * Thu Jun 2 2005 Ville Skytt?? - 20050505-6 - Make sure we're using files included in this package when byte-recompiling patched *.el; also allows the byte-compilation From fedora-extras-commits at redhat.com Wed Jul 13 20:08:29 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 13 Jul 2005 16:08:29 -0400 Subject: fedora-security/audit fc4,1.21,1.22 Message-ID: <200507132008.j6DK8T9S017760@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17743 Modified Files: fc4 Log Message: net-snmp updates. Commit this quick before the mail with all the Mozilla issues comes in. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fc4 13 Jul 2005 09:22:13 -0000 1.21 +++ fc4 13 Jul 2005 20:08:27 -0000 1.22 @@ -3,9 +3,10 @@ ** are items that need attention -2005-2177 ** net-snmp (fixed 5.2.1.2) +2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla 2005-2096 backport (zlib) [since FEDORA-2005-523] +2005-2096 backport (rpm) [since FEDORA-2005-565] 2005-2088 VULNERABLE (httpd) 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] @@ -34,7 +35,7 @@ 2005-1751 ** nmap 2005-1751 ** openldap 2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518] -2005-1740 version (net-snmp, fixed 5.2.1) +2005-1740 backport (net-snmp, not fixed) 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1] 2005-1705 version (gdb, fixed 6.3) 2005-1704 version (gdb, fixed 6.3) From fedora-extras-commits at redhat.com Wed Jul 13 21:49:17 2005 From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon)) Date: Wed, 13 Jul 2005 17:49:17 -0400 Subject: rpms/leafnode/FC-4 .cvsignore, 1.3, 1.4 leafnode.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507132149.j6DLnHtO019201@cvs-int.fedora.redhat.com> Author: eyecon Update of /cvs/extras/rpms/leafnode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19180 Modified Files: .cvsignore leafnode.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:40:45 -0000 1.3 +++ .cvsignore 13 Jul 2005 21:49:15 -0000 1.4 @@ -1 +1 @@ -leafnode-1.9.53.rel.tar.bz2 +leafnode-1.11.3.rel.tar.bz2 Index: leafnode.spec =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/leafnode.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- leafnode.spec 22 May 2005 22:37:21 -0000 1.8 +++ leafnode.spec 13 Jul 2005 21:49:15 -0000 1.9 @@ -1,6 +1,6 @@ Name: leafnode -Version: 1.9.53 -Release: 3 +Version: 1.11.3 +Release: 2.FC4 Summary: Leaf site offline NNTP server License: MIT, GPL, LGPL @@ -23,10 +23,10 @@ newsserver of the ISP. %description -l de -Leafnode ist ein offline-Newsserver, der vor allem f?r den typischen +Leafnode ist ein offline-Newsserver, der vor allem fr den typischen Einzelnutzer-Rechner ohne permanente Internetanbindung geeignet ist. Leafnode bezieht automatisch die Newsgroups, die der oder die Nutzer -regelm??ig lesen, vom Newsserver des Providers. +regelm???ig lesen, vom Newsserver des Providers. %prep @@ -76,7 +76,7 @@ %doc COPYING COPYING.GPL COPYING.LGPL CREDITS ChangeLog ChangeLog.old %doc FAQ.* INSTALL -%doc NEWS PCRE_README README* TODO ADD-ONS +%doc NEWS README* TODO ADD-ONS %lang(de) %doc _doc_german/doc_german %dir %attr(2755,news,news) %spooldir @@ -92,6 +92,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 13 2005 David Hart - 1.11.3-2 +- Rebuilt +- Update to 1.11.3 release (Jun 8 05) +- Remove PCRE_README +- Reorganize and clean up config file. Separate global, per-news server + and remote access options. +- Change initial options to assume broadband rather than dial-up. +- TODO: Edit all text files for grammar, spelling and lucidity. + * Sun May 22 2005 Jeremy Katz - 1.9.53-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:40:45 -0000 1.3 +++ sources 13 Jul 2005 21:49:15 -0000 1.4 @@ -1 +1 @@ -79c3b65ded9dbf86b065d79ae98a5211 leafnode-1.9.53.rel.tar.bz2 +ba30c14e2950cdd98891a997b5a6eab8 leafnode-1.11.3.rel.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 13 22:35:25 2005 From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon)) Date: Wed, 13 Jul 2005 18:35:25 -0400 Subject: rpms/leafnode/FC-4 leafnode.spec,1.9,1.10 Message-ID: <200507132235.j6DMZPLM020433@cvs-int.fedora.redhat.com> Author: eyecon Update of /cvs/extras/rpms/leafnode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416 Modified Files: leafnode.spec Log Message: Index: leafnode.spec =================================================================== RCS file: /cvs/extras/rpms/leafnode/FC-4/leafnode.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- leafnode.spec 13 Jul 2005 21:49:15 -0000 1.9 +++ leafnode.spec 13 Jul 2005 22:35:23 -0000 1.10 @@ -1,6 +1,6 @@ Name: leafnode Version: 1.11.3 -Release: 2.FC4 +Release: 2%{?dist} Summary: Leaf site offline NNTP server License: MIT, GPL, LGPL From fedora-extras-commits at redhat.com Thu Jul 14 06:26:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:26:53 -0400 Subject: rpms/synaptic/FC-4 synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.11, 1.12 Message-ID: <200507140627.j6E6RNxc030007@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929/FC-4 Modified Files: .cvsignore sources synaptic.spec Added Files: synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch Log Message: 0.57.2 from Panu (#159189). synaptic-0.57-desktop.patch: --- NEW FILE synaptic-0.57-desktop.patch --- --- synaptic-0.57/data/synaptic.desktop.in.dt 2005-06-08 18:59:14.000000000 +0300 +++ synaptic-0.57/data/synaptic.desktop.in 2005-07-07 15:25:00.000000000 +0300 @@ -2,11 +2,10 @@ _Name=Synaptic Package Manager _GenericName=Package Manager _Comment=Install, remove and upgrade software packages -Exec=gksu -u root /usr/sbin/synaptic +Exec=synaptic Icon=synaptic.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 -Categories=PackageManager;GTK;System;Application -NotShowIn=KDE \ No newline at end of file +Categories=PackageManager;GTK;System;Application; synaptic-0.57-firefox.patch: --- NEW FILE synaptic-0.57-firefox.patch --- --- synaptic/gtk/rgmainwindow.cc.firefox 2005-07-12 22:24:04.000000000 +0300 +++ synaptic/gtk/rgmainwindow.cc 2005-07-12 22:24:57.000000000 +0300 @@ -2293,7 +2293,15 @@ system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &"); } #endif - else if (is_binary_in_path("mozilla")) { + else if (is_binary_in_path("firefox")) { + // mozilla eats bookmarks when run under sudo (because it does not + // change $HOME) - is this needed for firefox as well? + if(getenv("SUDO_USER") != NULL) { + struct passwd *pw = getpwuid(0); + setenv("HOME", pw->pw_dir, 1); + } + system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &"); + } else if (is_binary_in_path("mozilla")) { // mozilla eats bookmarks when run under sudo (because it does not // change $HOME) if(getenv("SUDO_USER") != NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 +++ .cvsignore 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -synaptic-0.55.3.tar.gz +synaptic-0.57.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:31:07 -0000 1.4 +++ sources 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz +dd753e953caa053279d342e3bc269128 synaptic-0.57.2.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-4/synaptic.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- synaptic.spec 6 Apr 2005 22:13:32 -0000 1.11 +++ synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 @@ -2,18 +2,17 @@ Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.55.3 -Release: 3 +Version: 0.57.2 +Release: 1%{?dist} License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Patch0: synaptic-0.57-desktop.patch +Patch1: synaptic-0.57-firefox.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk -# This isn't really a requirement mozilla works as well for a help browser, -# however konqueror and firefox don't apparently work so... -Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 @@ -30,9 +29,11 @@ %prep %setup -q +%patch0 -p1 -b .dt +%patch1 -p1 -b .firefox %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} %install @@ -41,7 +42,7 @@ %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic @@ -64,22 +65,16 @@ EOF # Remove the default menu entries and install our own -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop -# need to remove original Exec and fixup later as the default .desktop -# uses gksu which isn't available desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode=0644 \ --add-category X-Fedora \ - --add-category Application \ --add-category SystemSetup \ - --remove-key=Exec \ data/%{name}.desktop -echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +99,19 @@ %{_mandir}/man8/%{name}.8* %changelog +* Tue Jul 12 2005 Panu Matilainen 0.57.2-1 +- remove explicit yelp dependency, add support for browsing help with + firefox (#163036) +- configure with --disable-dependency-tracking + +* Thu Jul 07 2005 Panu Matilainen +- update to 0.57.2 +- remove kde-desktop file +- correct path in desktop file + +* Wed Jun 29 2005 Panu Matilainen 0.57-1 +- update to 0.57 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Jul 14 06:26:52 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:26:52 -0400 Subject: rpms/synaptic/FC-3 synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.8, 1.9 Message-ID: <200507140627.j6E6RMRx030002@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929/FC-3 Modified Files: .cvsignore sources synaptic.spec Added Files: synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch Log Message: 0.57.2 from Panu (#159189). synaptic-0.57-desktop.patch: --- NEW FILE synaptic-0.57-desktop.patch --- --- synaptic-0.57/data/synaptic.desktop.in.dt 2005-06-08 18:59:14.000000000 +0300 +++ synaptic-0.57/data/synaptic.desktop.in 2005-07-07 15:25:00.000000000 +0300 @@ -2,11 +2,10 @@ _Name=Synaptic Package Manager _GenericName=Package Manager _Comment=Install, remove and upgrade software packages -Exec=gksu -u root /usr/sbin/synaptic +Exec=synaptic Icon=synaptic.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 -Categories=PackageManager;GTK;System;Application -NotShowIn=KDE \ No newline at end of file +Categories=PackageManager;GTK;System;Application; synaptic-0.57-firefox.patch: --- NEW FILE synaptic-0.57-firefox.patch --- --- synaptic/gtk/rgmainwindow.cc.firefox 2005-07-12 22:24:04.000000000 +0300 +++ synaptic/gtk/rgmainwindow.cc 2005-07-12 22:24:57.000000000 +0300 @@ -2293,7 +2293,15 @@ system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &"); } #endif - else if (is_binary_in_path("mozilla")) { + else if (is_binary_in_path("firefox")) { + // mozilla eats bookmarks when run under sudo (because it does not + // change $HOME) - is this needed for firefox as well? + if(getenv("SUDO_USER") != NULL) { + struct passwd *pw = getpwuid(0); + setenv("HOME", pw->pw_dir, 1); + } + system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &"); + } else if (is_binary_in_path("mozilla")) { // mozilla eats bookmarks when run under sudo (because it does not // change $HOME) if(getenv("SUDO_USER") != NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 +++ .cvsignore 14 Jul 2005 06:26:49 -0000 1.5 @@ -1 +1 @@ -synaptic-0.55.3.tar.gz +synaptic-0.57.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:31:07 -0000 1.4 +++ sources 14 Jul 2005 06:26:49 -0000 1.5 @@ -1 +1 @@ -cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz +dd753e953caa053279d342e3bc269128 synaptic-0.57.2.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/FC-3/synaptic.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- synaptic.spec 29 Jan 2005 21:20:56 -0000 1.8 +++ synaptic.spec 14 Jul 2005 06:26:49 -0000 1.9 @@ -1,21 +1,21 @@ - -%define desktop_vendor fedora +%define desktop_vendor fedora Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.55.3 -Release: 2 +Version: 0.57.2 +Release: 1%{?dist} + License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Patch0: synaptic-0.57-desktop.patch +Patch1: synaptic-0.57-firefox.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk -# This isn't really a requirement mozilla works as well for a help browser, -# however konqueror and firefox don't apparently work so... -Requires: yelp -Requires(post,postun): scrollkeeper -BuildRequires: apt-devel >= 0:0.5.4, rpm-devel >= 0:4.0 +Requires(post): scrollkeeper +Requires(postun): scrollkeeper +BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils BuildRequires: libstdc++-devel, gettext BuildRequires: xmlto, perl-XML-Parser @@ -24,14 +24,16 @@ %description Synaptic is a graphical package management -program for apt. It provides the same features as the apt-get command line +program for apt. It provides the same features as the apt-get command line utility with a GUI front-end based on Gtk+ %prep %setup -q +%patch0 -p1 -b .dt +%patch1 -p1 -b .firefox %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} %install @@ -40,7 +42,7 @@ %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic @@ -63,22 +65,16 @@ EOF # Remove the default menu entries and install our own -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop -# need to remove original Exec and fixup later as the default .desktop -# uses gksu which isn't available desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode=0644 \ --add-category X-Fedora \ - --add-category Application \ --add-category SystemSetup \ - --remove-key=Exec \ data/%{name}.desktop -echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -103,6 +99,25 @@ %{_mandir}/man8/%{name}.8* %changelog +* Tue Jul 12 2005 Panu Matilainen 0.57.2-1 +- remove explicit yelp dependency, add support for browsing help with + firefox (#163036) +- configure with --disable-dependency-tracking + +* Thu Jul 07 2005 Panu Matilainen +- update to 0.57.2 +- remove kde-desktop file +- correct path in desktop file + +* Wed Jun 29 2005 Panu Matilainen 0.57-1 +- update to 0.57 + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + +* Fri Mar 4 2005 Ville Skytt?? +- Split context marked dependency syntax to work around #118773. + * Sat Jan 29 2005 Warren Togami 0.55.3-2 - ExcludeArch: x86_64 ppc64 @@ -172,7 +187,7 @@ * Thu Oct 23 2003 Panu Matilainen 0.45-0.fdr.1 - update to 0.45 -- support FC release naming +- support FC release naming * Thu Sep 25 2003 Panu Matilainen 0.44-0.fdr.1 - update to 0.44 @@ -191,7 +206,7 @@ * Sat Aug 02 2003 Panu Matilainen 0.40-0.fdr.1 - address issues in #313 / 13 -* Wed Jul 30 2003 Panu Matilainen +* Wed Jul 30 2003 Panu Matilainen - update to 0.40 - drop gtk requirement from 2.2 to 2.0 @@ -203,7 +218,7 @@ - automatically pick up rh version - drop patches (merged upstream) -* Tue May 27 2003 Panu Matilainen +* Tue May 27 2003 Panu Matilainen - patch to make it build with GTK 2.0 * Sat May 24 2003 Panu Matilainen 0.36.1-0.fdr.3 @@ -212,7 +227,7 @@ * Fri May 16 2003 Panu Matilainen 0.36.1-0.fdr.2 - missing buildrequires: gettext -* Thu Apr 24 2003 Panu Matilainen +* Thu Apr 24 2003 Panu Matilainen - add sources.list.d support * Tue Apr 22 2003 Panu Matilainen 0.36.1-0.fdr.1 From fedora-extras-commits at redhat.com Thu Jul 14 06:26:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:26:53 -0400 Subject: rpms/synaptic/devel synaptic-0.57-desktop.patch, NONE, 1.1 synaptic-0.57-firefox.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synaptic.spec, 1.11, 1.12 Message-ID: <200507140627.j6E6RO11030012@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/synaptic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29929/devel Modified Files: .cvsignore sources synaptic.spec Added Files: synaptic-0.57-desktop.patch synaptic-0.57-firefox.patch Log Message: 0.57.2 from Panu (#159189). synaptic-0.57-desktop.patch: --- NEW FILE synaptic-0.57-desktop.patch --- --- synaptic-0.57/data/synaptic.desktop.in.dt 2005-06-08 18:59:14.000000000 +0300 +++ synaptic-0.57/data/synaptic.desktop.in 2005-07-07 15:25:00.000000000 +0300 @@ -2,11 +2,10 @@ _Name=Synaptic Package Manager _GenericName=Package Manager _Comment=Install, remove and upgrade software packages -Exec=gksu -u root /usr/sbin/synaptic +Exec=synaptic Icon=synaptic.png Terminal=false MultipleArgs=false Type=Application Encoding=UTF-8 -Categories=PackageManager;GTK;System;Application -NotShowIn=KDE \ No newline at end of file +Categories=PackageManager;GTK;System;Application; synaptic-0.57-firefox.patch: --- NEW FILE synaptic-0.57-firefox.patch --- --- synaptic/gtk/rgmainwindow.cc.firefox 2005-07-12 22:24:04.000000000 +0300 +++ synaptic/gtk/rgmainwindow.cc 2005-07-12 22:24:57.000000000 +0300 @@ -2293,7 +2293,15 @@ system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &"); } #endif - else if (is_binary_in_path("mozilla")) { + else if (is_binary_in_path("firefox")) { + // mozilla eats bookmarks when run under sudo (because it does not + // change $HOME) - is this needed for firefox as well? + if(getenv("SUDO_USER") != NULL) { + struct passwd *pw = getpwuid(0); + setenv("HOME", pw->pw_dir, 1); + } + system("firefox " PACKAGE_DATA_DIR "/synaptic/html/index.html &"); + } else if (is_binary_in_path("mozilla")) { // mozilla eats bookmarks when run under sudo (because it does not // change $HOME) if(getenv("SUDO_USER") != NULL) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:31:07 -0000 1.4 +++ .cvsignore 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -synaptic-0.55.3.tar.gz +synaptic-0.57.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:31:07 -0000 1.4 +++ sources 14 Jul 2005 06:26:51 -0000 1.5 @@ -1 +1 @@ -cc548050f1da9207e815de284b7aee39 synaptic-0.55.3.tar.gz +dd753e953caa053279d342e3bc269128 synaptic-0.57.2.tar.gz Index: synaptic.spec =================================================================== RCS file: /cvs/extras/rpms/synaptic/devel/synaptic.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- synaptic.spec 6 Apr 2005 22:13:32 -0000 1.11 +++ synaptic.spec 14 Jul 2005 06:26:51 -0000 1.12 @@ -2,18 +2,17 @@ Summary: Graphical frontend for APT package manager. Name: synaptic -Version: 0.55.3 -Release: 3 +Version: 0.57.2 +Release: 1%{?dist} License: GPL Group: Applications/System -Source: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Source0: http://savannah.nongnu.org/download/synaptic/synaptic-%{version}.tar.gz +Patch0: synaptic-0.57-desktop.patch +Patch1: synaptic-0.57-firefox.patch URL: http://www.nongnu.org/synaptic/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: usermode-gtk -# This isn't really a requirement mozilla works as well for a help browser, -# however konqueror and firefox don't apparently work so... -Requires: yelp Requires(post): scrollkeeper Requires(postun): scrollkeeper BuildRequires: apt-devel >= 0.5.4, rpm-devel >= 4.0 @@ -30,9 +29,11 @@ %prep %setup -q +%patch0 -p1 -b .dt +%patch1 -p1 -b .firefox %build -%configure +%configure --disable-dependency-tracking make %{?_smp_mflags} %install @@ -41,7 +42,7 @@ %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic +ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/synaptic mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/synaptic @@ -64,22 +65,16 @@ EOF # Remove the default menu entries and install our own -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/synaptic.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/* rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig/synaptic.desktop -# need to remove original Exec and fixup later as the default .desktop -# uses gksu which isn't available desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode=0644 \ --add-category X-Fedora \ - --add-category Application \ --add-category SystemSetup \ - --remove-key=Exec \ data/%{name}.desktop -echo "Exec=%{_bindir}/%{name}" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop - %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +99,19 @@ %{_mandir}/man8/%{name}.8* %changelog +* Tue Jul 12 2005 Panu Matilainen 0.57.2-1 +- remove explicit yelp dependency, add support for browsing help with + firefox (#163036) +- configure with --disable-dependency-tracking + +* Thu Jul 07 2005 Panu Matilainen +- update to 0.57.2 +- remove kde-desktop file +- correct path in desktop file + +* Wed Jun 29 2005 Panu Matilainen 0.57-1 +- update to 0.57 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From ville.skytta at iki.fi Thu Jul 14 06:31:44 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 14 Jul 2005 09:31:44 +0300 Subject: APPROVED: gdome2 Message-ID: <1121322704.2872.53.camel@localhost.localdomain> gdome2 is a fast, light and complete DOM level 2 implementation based on libxml2. Although it has been written for the GNOME project, it can be used stand-alone. http://gdome2.cs.unibo.it/ Reviewer: Matthias Saou Maintainer: Ville Skytt? From fedora-extras-commits at redhat.com Thu Jul 14 06:35:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:29 -0400 Subject: rpms/gdome2 - New directory Message-ID: <200507140635.j6E6ZTHT030106@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086/gdome2 Log Message: Directory /cvs/extras/rpms/gdome2 added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 06:35:29 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:29 -0400 Subject: rpms/gdome2/devel - New directory Message-ID: <200507140635.j6E6ZTRY030111@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086/gdome2/devel Log Message: Directory /cvs/extras/rpms/gdome2/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 06:35:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:49 -0400 Subject: rpms/gdome2 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507140635.j6E6ZnD5030165@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30134 Added Files: Makefile import.log Log Message: Setup of module gdome2 --- NEW FILE Makefile --- # Top level Makefile for module gdome2 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 14 06:35:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:35:50 -0400 Subject: rpms/gdome2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507140635.j6E6Zod1030170@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30134/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gdome2 --- NEW 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 Jul 14 06:36:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:36:49 -0400 Subject: rpms/gdome2 import.log,1.1,1.2 Message-ID: <200507140637.j6E6bJNV030244@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30206 Modified Files: import.log Log Message: auto-import gdome2-0.8.1-0.2 on branch devel from gdome2-0.8.1-0.2.src.rpm Initial import. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gdome2/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 06:35:47 -0000 1.1 +++ import.log 14 Jul 2005 06:36:47 -0000 1.2 @@ -0,0 +1 @@ +gdome2-0_8_1-0_2:HEAD:gdome2-0.8.1-0.2.src.rpm:1121322999 From fedora-extras-commits at redhat.com Thu Jul 14 06:36:50 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:36:50 -0400 Subject: rpms/gdome2/devel gdome2-destdir.patch, NONE, 1.1 gdome2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507140636.j6E6aoLb030239@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30206/devel Modified Files: .cvsignore sources Added Files: gdome2-destdir.patch gdome2.spec Log Message: auto-import gdome2-0.8.1-0.2 on branch devel from gdome2-0.8.1-0.2.src.rpm Initial import. gdome2-destdir.patch: --- NEW FILE gdome2-destdir.patch --- --- gtk-doc/Makefile.am~ 2002-04-04 09:58:04.000000000 +0300 +++ gtk-doc/Makefile.am 2003-09-23 21:57:45.000000000 +0300 @@ -33,9 +33,9 @@ rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt install-data-local: - -install -d -m 0755 $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -install -d -m 0755 $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) .PHONY : html sgml templates scan --- gtk-doc/Makefile.in~ 2003-09-11 01:51:12.000000000 +0300 +++ gtk-doc/Makefile.in 2003-09-23 21:58:18.000000000 +0300 @@ -268,9 +268,9 @@ rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt install-data-local: - -install -d -m 0755 $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR) - -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR) + -install -d -m 0755 $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) + -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) .PHONY : html sgml templates scan --- NEW FILE gdome2.spec --- Name: gdome2 Version: 0.8.1 Release: 0.2 Summary: DOM level 2 library for accessing XML files. Group: System Environment/Libraries License: LGPL URL: http://gdome2.cs.unibo.it/ Source: http://gdome2.cs.unibo.it/tarball/%{name}-%{version}.tar.gz Patch0: %{name}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxml2-devel >= 2.4.26 BuildRequires: glib2-devel >= 2.2.0 %description gdome2 is a fast, light and complete DOM level 2 implementation based on libxml2. Although it has been written for the GNOME project, it can be used stand-alone. A DOM implementation (also called a host implementation) is what makes a parsed XML or HTML document available for processing via the DOM interface. gdome2 currently supports the "Core", "XML", "Events" and "MutationEvents" modules from the DOM 2 Recommendation (see http://www.w3.org/TR/DOM-Level-2-Core/ and http://www.w3.org/TR/DOM-L evel-2-Events/), and is supposed to become a full implementation of all the DOM Level 2 standard. Now gdome2 also partially supports the XPath module from the DOM level 3 drafts. %package devel Summary: Development files for gdome2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: glib2-devel >= 2.2.0 Requires: libxml2-devel >= 2.4.26 %description devel This package contains the header files and static libraries for developing with gdome2. %prep %setup -q %patch0 -p0 %build export GLIB_CONFIG="pkg-config glib-2.0" # to fix gdome-config(1) %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check || : # xpath check dumps core on FC4 with libxml2 2.6.19 if [ "`(xml2-config --version)`" = "2.6.19" ] ; then make check || : else make check fi %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.LIB MAINTAINERS README %{_libdir}/libgdome.so.* %files devel %defattr(-,root,root,-) %doc %{_datadir}/gtk-doc/ %{_bindir}/gdome-config %{_includedir}/libgdome/ %{_libdir}/libgdome.so %exclude %{_libdir}/libgdome.la %{_libdir}/gdomeConf.sh %{_datadir}/aclocal/gdome2.m4 %{_libdir}/pkgconfig/gdome2.pc %{_mandir}/man1/gdome-config.1* %changelog * Tue Jul 12 2005 Ville Skytt?? - 0.8.1-0.2 - Allow test suite to fail only with libxml2 2.6.19. - Drop some unneeded docs. * Wed Jun 22 2005 Ville Skytt?? - 0.8.1-0.1 - Rebuild for FC4, don't fail if test suite fails (it does w/libxml2 2.6.19). - Don't build static libs. * Thu Feb 12 2004 Ville Skytt?? - 0:0.8.1-0.fdr.1 - Update to 0.8.1. * Sun Oct 19 2003 Ville Skytt?? - 0:0.8.0-0.fdr.3 - Remove (empty) NEWS from docs. * Mon Oct 13 2003 Ville Skytt?? - 0:0.8.0-0.fdr.2 - Fix source permissions. * Tue Sep 23 2003 Ville Skytt?? - 0:0.8.0-0.fdr.1 - Update to 0.8.0. * Fri Aug 1 2003 Ville Skytt?? - 0:0.7.4-0.fdr.1 - Update to 0.7.4. - Fedorafied. * Sun Dec 29 2002 Paolo Casarini patch provided by Oron Peled - %defattr(-,root,root) wasn't set for documents in the devel package. This cause wrong ownership of docs in non-root builds. - Update URL: and Source: locations - s/Copyright:/License:/ * Sun Mar 31 2002 Paolo Casarini - updated descriptions and summaries * Sat Dec 15 2001 Paolo Casarini - updated descriptions and summaries * Tue Oct 23 2001 Paolo Casarini - added the gdome-config.1 man page * Mon Aug 6 2001 Paolo Casarini - Merge of the Andrew release with mine * Thu Aug 2 2001 Andrew Chatham - Spec file created * Tue Jul 3 2001 Paolo Casarini - Initial release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 06:35:47 -0000 1.1 +++ .cvsignore 14 Jul 2005 06:36:47 -0000 1.2 @@ -0,0 +1 @@ +gdome2-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 06:35:47 -0000 1.1 +++ sources 14 Jul 2005 06:36:47 -0000 1.2 @@ -0,0 +1 @@ +bfc114e59eec50cbda8e4ece751ff022 gdome2-0.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 06:39:35 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:39:35 -0400 Subject: rpms/gdome2/devel gdome2.spec,1.1,1.2 Message-ID: <200507140639.j6E6dZ3o030306@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30289 Modified Files: gdome2.spec Log Message: Use disttag. Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdome2.spec 14 Jul 2005 06:36:47 -0000 1.1 +++ gdome2.spec 14 Jul 2005 06:39:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: gdome2 Version: 0.8.1 -Release: 0.2 +Release: 1%{?dist} Summary: DOM level 2 library for accessing XML files. Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Thu Jul 14 2005 Ville Skytt?? - 0.8.1-1 +- Use disttag. + * Tue Jul 12 2005 Ville Skytt?? - 0.8.1-0.2 - Allow test suite to fail only with libxml2 2.6.19. - Drop some unneeded docs. From fedora-extras-commits at redhat.com Thu Jul 14 06:46:46 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:46:46 -0400 Subject: rpms/gdome2/devel gdome2.spec,1.2,1.3 Message-ID: <200507140646.j6E6kk2k030356@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gdome2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30339 Modified Files: gdome2.spec Log Message: ... Index: gdome2.spec =================================================================== RCS file: /cvs/extras/rpms/gdome2/devel/gdome2.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdome2.spec 14 Jul 2005 06:39:33 -0000 1.2 +++ gdome2.spec 14 Jul 2005 06:46:44 -0000 1.3 @@ -1,7 +1,7 @@ Name: gdome2 Version: 0.8.1 Release: 1%{?dist} -Summary: DOM level 2 library for accessing XML files. +Summary: DOM level 2 library for accessing XML files Group: System Environment/Libraries License: LGPL From fedora-extras-commits at redhat.com Thu Jul 14 06:47:40 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 02:47:40 -0400 Subject: owners owners.list,1.12,1.13 Message-ID: <200507140647.j6E6le2O030384@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30367 Modified Files: owners.list Log Message: Add gdome2. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- owners.list 13 Jul 2005 18:27:35 -0000 1.12 +++ owners.list 14 Jul 2005 06:47:38 -0000 1.13 @@ -185,6 +185,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|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| Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 14 07:24:21 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 14 Jul 2005 03:24:21 -0400 Subject: rpms/libifp/devel 10-libifp.rules, NONE, 1.1 libifp.hotplug, 1.1, 1.2 libifp.spec, 1.3, 1.4 libifp.usermap, 1.1, NONE Message-ID: <200507140724.j6E7OLHo031774@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31754 Modified Files: libifp.hotplug libifp.spec Added Files: 10-libifp.rules Removed Files: libifp.usermap Log Message: Modified for new udev --- NEW FILE 10-libifp.rules --- BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x100[135789]", RUN+="/sbin/libifp-hotplug" BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x101[01]", RUN+="/sbin/libifp-hotplug" Index: libifp.hotplug =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.hotplug,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libifp.hotplug 7 Jul 2005 23:02:41 -0000 1.1 +++ libifp.hotplug 14 Jul 2005 07:24:19 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/bash # -# /etc/hotplug/usb/libifp +# /sbin/libifp-hotplug # # Cloned off the usbcam hotplug script that is shipped by # Red Hat with gphoto2. In principle we could just call that one, Index: libifp.spec =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/libifp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libifp.spec 7 Jul 2005 23:02:41 -0000 1.3 +++ libifp.spec 14 Jul 2005 07:24:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: libifp Version: 1.0.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general-purpose library-driver for iRiver's iFP portable audio players Group: System Environment/Base @@ -8,7 +8,7 @@ URL: http://ifp-driver.sourceforge.net/ Source0: http://dl.sourceforge.net/ifp-driver/%{name}-%{version}.tar.gz Source1: libifp.hotplug -Source2: libifp.usermap +Source2: 10-libifp.rules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel doxygen @@ -39,8 +39,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; -install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp -install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/libifp.usermap +install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/libifp-hotplug +install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-libifp.rules %clean rm -rf $RPM_BUILD_ROOT @@ -53,7 +53,8 @@ %doc ChangeLog COPYING README TODO %{_bindir}/* %{_libdir}/*.so.* -%{_sysconfdir}/hotplug/usb/* +/sbin/* +%{_sysconfdir}/udev/rules.d/*.rules %files devel %defattr(-,root,root,-) @@ -63,6 +64,9 @@ %{_mandir}/man3/* %changelog +* Thu Jul 14 2005 Ignacio Vazquez-Abrams 1.0.0.1-2 +- Modified for new udev + * Thu Jul 7 2005 Ignacio Vazquez-Abrams - Added Per Bjornsson's hotplug files --- libifp.usermap DELETED --- From fedora-extras-commits at redhat.com Thu Jul 14 07:57:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:11 -0400 Subject: rpms/bwm-ng - New directory Message-ID: <200507140757.j6E7vBsI031884@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864/bwm-ng Log Message: Directory /cvs/extras/rpms/bwm-ng added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 07:57:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:11 -0400 Subject: rpms/bwm-ng/devel - New directory Message-ID: <200507140757.j6E7vB1J031889@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31864/bwm-ng/devel Log Message: Directory /cvs/extras/rpms/bwm-ng/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 07:57:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:28 -0400 Subject: rpms/bwm-ng Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507140757.j6E7vSSF031940@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909 Added Files: Makefile import.log Log Message: Setup of module bwm-ng --- NEW FILE Makefile --- # Top level Makefile for module bwm-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 Thu Jul 14 07:57:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:57:28 -0400 Subject: rpms/bwm-ng/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507140757.j6E7vSBw031945@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bwm-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 Thu Jul 14 07:58:01 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:58:01 -0400 Subject: rpms/bwm-ng import.log,1.1,1.2 Message-ID: <200507140758.j6E7w1tb032015@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983 Modified Files: import.log Log Message: auto-import bwm-ng-0.5-5 on branch devel from bwm-ng-0.5-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 07:57:26 -0000 1.1 +++ import.log 14 Jul 2005 07:57:59 -0000 1.2 @@ -0,0 +1 @@ +bwm-ng-0_5-5:HEAD:bwm-ng-0.5-5.src.rpm:1121327872 From fedora-extras-commits at redhat.com Thu Jul 14 07:58:02 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 03:58:02 -0400 Subject: rpms/bwm-ng/devel bwm-ng.conf, NONE, 1.1 bwm-ng.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507140758.j6E7w2vU032022@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/bwm-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983/devel Modified Files: .cvsignore sources Added Files: bwm-ng.conf bwm-ng.spec Log Message: auto-import bwm-ng-0.5-5 on branch devel from bwm-ng-0.5-5.src.rpm --- NEW FILE bwm-ng.conf --- DYNAMIC=1 PACKETS=0 INPUT=libstatgrab OUTPUT=curses --- NEW FILE bwm-ng.spec --- # $Id: bwm-ng.spec,v 1.7 2005/07/14 07:17:13 oliver Exp $ Summary: Bandwidth Monitor NG Name: bwm-ng Version: 0.5 Release: 5%{?dist} License: GPL Group: Applications/System URL: http://www.volker-gropp.de/ Source0: http://www.volker-gropp.de/bwm-ng/bwm-ng-%{version}.tar.gz Source1: bwm-ng.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: net-tools, procps BuildRequires: ncurses-devel, libstatgrab-devel %description A small and simple curses base bandwidth monitor. No big features. %prep %setup -q %build %configure --enable-64bit \ --enable-netstatbyte \ --enable-netstatlink \ --with-ncurses \ --with-time \ --with-getopt_long \ --with-getifaddrs \ --with-sysctl \ --with-procnetdev \ --with-libstatgrab \ --with-netstatlinux \ --without-strip %{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -D -m755 src/bwm-ng $RPM_BUILD_ROOT%{_bindir}/bwm-ng install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bwm-ng.conf install -D -m644 bwm-ng.1 $RPM_BUILD_ROOT%{_mandir}/man1/bwm-ng.1 %clean rm -rf $RPM_BUILD_ROOT %files %doc AUTHORS README changelog bwm-ng.conf-example bwm-ng.css %config %{_sysconfdir}/bwm-ng.conf %{_bindir}/bwm-ng %{_mandir}/man1/bwm-ng.1* %changelog * Thu Jul 14 2005 Oliver Falk - 0.5-5 - Integrated Matthias changes, after his review * Thu May 19 2005 Oliver Falk - 0.5-4.2 - Specfile cleanup * Fri Mar 25 2005 Oliver Falk - 0.5-4.1 - Check with lint says: bwm-ng hardcoded-packager-tag Oliver: FIXED * Wed Mar 16 2005 Oliver Falk - 0.5-4 - Fix, still build pre1 :-/ * Wed Mar 16 2005 Oliver Falk - 0.5-3 - Update to real 0.5, not only 0.5pre1 * Tue Feb 15 2005 Oliver Falk - 0.5-2 - Make use of libstatgrab, by using it in the default config * Tue Feb 15 2005 Oliver Falk - 0.5-1 - Fix warnings spotted by rpmlint - Update - Update dependencies and add various configure switches, so this little thingy is no longer _little_ :-) * Tue Oct 19 2004 Oliver Falk - 0.4-pre1-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 07:57:26 -0000 1.1 +++ .cvsignore 14 Jul 2005 07:58:00 -0000 1.2 @@ -0,0 +1 @@ +bwm-ng-0.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bwm-ng/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 07:57:26 -0000 1.1 +++ sources 14 Jul 2005 07:58:00 -0000 1.2 @@ -0,0 +1 @@ +4c5197527c985dc8b45973dfd00deca0 bwm-ng-0.5.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 08:00:51 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 04:00:51 -0400 Subject: owners owners.list,1.13,1.14 Message-ID: <200507140800.j6E80pNZ032105@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32088 Modified Files: owners.list Log Message: * Add bwm-ng Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- owners.list 14 Jul 2005 06:47:38 -0000 1.13 +++ owners.list 14 Jul 2005 08:00:49 -0000 1.14 @@ -57,6 +57,7 @@ Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 14 08:02:27 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 14 Jul 2005 04:02:27 -0400 Subject: common tobuild,1.1912,1.1913 Message-ID: <200507140803.j6E83UaX001011@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828 Modified Files: tobuild Log Message: request build of rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1912 retrieving revision 1.1913 diff -u -r1.1912 -r1.1913 --- tobuild 13 Jul 2005 18:37:43 -0000 1.1912 +++ tobuild 14 Jul 2005 08:02:07 -0000 1.1913 @@ -56,3 +56,4 @@ thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 +pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 08:04:58 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 14 Jul 2005 04:04:58 -0400 Subject: common tobuild,1.1913,1.1914 Message-ID: <200507140804.j6E84wQB001120@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1052 Modified Files: tobuild Log Message: request build of rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1913 retrieving revision 1.1914 diff -u -r1.1913 -r1.1914 --- tobuild 14 Jul 2005 08:02:07 -0000 1.1913 +++ tobuild 14 Jul 2005 08:04:31 -0000 1.1914 @@ -57,3 +57,4 @@ thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel +oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 09:14:01 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 14 Jul 2005 05:14:01 -0400 Subject: fedora-security/audit fc4,1.22,1.23 Message-ID: <200507140914.j6E9E1XP002819@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2802 Modified Files: fc4 Log Message: Yesterdays updates, including Mozilla and Firefox batch Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fc4 13 Jul 2005 20:08:27 -0000 1.22 +++ fc4 14 Jul 2005 09:13:59 -0000 1.23 @@ -1,13 +1,36 @@ -Up to date CVE as of CVE email 20050711 -Up to date FC4 as of 20050711 +Up to date CVE as of CVE email 20050714 +Up to date FC4 as of 20050714 ** are items that need attention +2005-2270 VULNERABLE (firefox, fixed 1.0.5) +2005-2270 VULNERABLE (mozilla, fixed 1.7.9) +2005-2269 VULNERABLE (firefox, fixed 1.0.5) +2005-2269 VULNERABLE (mozilla, fixed 1.7.9) +2005-2268 VULNERABLE (firefox, fixed 1.0.5) +2005-2268 VULNERABLE (mozilla, fixed 1.7.9) +2005-2267 VULNERABLE (firefox, fixed 1.0.5) +2005-2266 VULNERABLE (firefox, fixed 1.0.5) +2005-2266 VULNERABLE (mozilla, fixed 1.7.9) +2005-2265 VULNERABLE (firefox, fixed 1.0.5) +2005-2265 VULNERABLE (mozilla, fixed 1.7.9) +2005-2264 VULNERABLE (firefox, fixed 1.0.5) +2005-2263 VULNERABLE (firefox, fixed 1.0.5) +2005-2263 VULNERABLE (mozilla, fixed 1.7.9) +2005-2262 VULNERABLE (firefox, fixed 1.0.5) +2005-2261 VULNERABLE (thunderbird, fixed 1.0.5) +2005-2261 VULNERABLE (firefox, fixed 1.0.5) +2005-2261 VULNERABLE (mozilla, fixed 1.7.9) +2005-2260 VULNERABLE (firefox, fixed 1.0.5) +2005-2260 VULNERABLE (mozilla, fixed 1.7.9) 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561] 2005-2114 ** mozilla 2005-2096 backport (zlib) [since FEDORA-2005-523] 2005-2096 backport (rpm) [since FEDORA-2005-565] +2005-2095 VULNERABLE (squirrelmail) 2005-2088 VULNERABLE (httpd) +2005-1937 VULNERABLE (firefox, fixed 1.0.5) +2005-1937 VULNERABLE (mozilla, fixed 1.7.9) 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] 2005-1768 version (kernel, fixed 2.6.6) From fedora-extras-commits at redhat.com Thu Jul 14 11:05:05 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Thu, 14 Jul 2005 07:05:05 -0400 Subject: owners owners.list,1.14,1.15 Message-ID: <200507141105.j6EB5aVG005225@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5211 Modified Files: owners.list Log Message: Add perl-Want Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- owners.list 14 Jul 2005 08:00:49 -0000 1.14 +++ owners.list 14 Jul 2005 11:05:03 -0000 1.15 @@ -589,6 +589,7 @@ Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|anvil at livna.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 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 From fedora-extras-commits at redhat.com Thu Jul 14 14:13:15 2005 From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon)) Date: Thu, 14 Jul 2005 10:13:15 -0400 Subject: common tobuild,1.1914,1.1915 Message-ID: <200507141413.j6EEDFIR008789@cvs-int.fedora.redhat.com> Author: eyecon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8772 Modified Files: tobuild Log Message: request build of rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1914 retrieving revision 1.1915 diff -u -r1.1914 -r1.1915 --- tobuild 14 Jul 2005 08:04:31 -0000 1.1914 +++ tobuild 14 Jul 2005 14:13:13 -0000 1.1915 @@ -58,3 +58,4 @@ thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel +eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 14 14:57:35 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Thu, 14 Jul 2005 10:57:35 -0400 Subject: rpms/kyum/devel kyum-0.7.2-DlgInfo.patch, NONE, 1.1 kyum.spec, 1.5, 1.6 Message-ID: <200507141457.j6EEvZoK008956@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8936 Modified Files: kyum.spec Added Files: kyum-0.7.2-DlgInfo.patch Log Message: Description: Patch DlgInfo.h to solve problem of automated generating of Makefiles. kyum-0.7.2-DlgInfo.patch: --- NEW FILE kyum-0.7.2-DlgInfo.patch --- --- kyum-0.7.2/src/DlgInfo.h.org 2005-07-14 16:42:09.000000000 +0200 +++ kyum-0.7.2/src/DlgInfo.h 2005-07-14 16:43:14.000000000 +0200 @@ -31,6 +31,8 @@ class DlgInfo : public KDialogBase { + Q_OBJECT + public: enum MsgID { @@ -41,8 +43,6 @@ QCheckBox * m_pCheckDisable; MsgID m_msgID; - Q_OBJECT - public: DlgInfo(QWidget * pParent, MsgID msgID); virtual ~ DlgInfo(); Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kyum.spec 13 Jul 2005 15:26:10 -0000 1.5 +++ kyum.spec 14 Jul 2005 14:57:33 -0000 1.6 @@ -1,6 +1,6 @@ Name: kyum Version: 0.7.2 -Release: 1 +Release: 3 Summary: Graphical User Frontend (GUI) for yum @@ -9,6 +9,7 @@ URL: http://kde-apps.org/content/show.php?content=22185 Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch +Patch2: kyum-0.7.2-DlgInfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +29,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -67,6 +69,12 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Thu Jul 14 2005 Jochen Schmitt 0.7.2-3 +- Patch DlgInfo.h to generate proper Makefiles (calling of moc) + +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-2 +- Patch for missing DlgInfo.moc + * Wed Jul 13 2005 Jochen Schmitt 0.7.2-1 - Update to new upstream release From fedora-extras-commits at redhat.com Thu Jul 14 16:49:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 14 Jul 2005 12:49:28 -0400 Subject: owners owners.list,1.15,1.16 Message-ID: <200507141649.j6EGnSmB011543@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11526 Modified Files: owners.list Log Message: changed owner of libcdio Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- owners.list 14 Jul 2005 11:05:03 -0000 1.15 +++ owners.list 14 Jul 2005 16:49:25 -0000 1.16 @@ -335,7 +335,7 @@ Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|extras-qa at fedoraproject.org| -Fedora Extras|libcdio|A CD-ROM input and control library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|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|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 14 16:56:31 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 14 Jul 2005 12:56:31 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.5, 1.6 freeciv.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507141656.j6EGuVXL011586@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 14 2005 Brian Pepple - 2.0.3 - Update to 2.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 14 Jun 2005 21:22:30 -0000 1.5 +++ .cvsignore 14 Jul 2005 16:56:29 -0000 1.6 @@ -1,2 +1,2 @@ +freeciv-2.0.3.tar.bz2 stdsounds2.tar.gz -freeciv-2.0.2.tar.bz2 Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- freeciv.spec 14 Jun 2005 21:22:30 -0000 1.9 +++ freeciv.spec 14 Jul 2005 16:56:29 -0000 1.10 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: The Freeciv multi-player strategy game @@ -87,6 +87,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 14 2005 Brian Pepple - 2.0.3 +- Update to 2.0.3. + * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 - Update to 2.0.2. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Jun 2005 21:22:30 -0000 1.5 +++ sources 14 Jul 2005 16:56:29 -0000 1.6 @@ -1,2 +1,2 @@ +3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz -dadd040a767dd5e1a7f1e18c7dfa756f freeciv-2.0.2.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 14 17:00:15 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 14 Jul 2005 13:00:15 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.5, 1.6 freeciv.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507141700.j6EH0FGh011650@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11629 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 14 2005 Brian Pepple - 2.0.3 - Update to 2.0.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Jun 2005 14:55:39 -0000 1.5 +++ .cvsignore 14 Jul 2005 17:00:13 -0000 1.6 @@ -1,2 +1,2 @@ -freeciv-2.0.2.tar.bz2 +freeciv-2.0.3.tar.bz2 stdsounds2.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- freeciv.spec 16 Jun 2005 14:55:39 -0000 1.9 +++ freeciv.spec 14 Jul 2005 17:00:13 -0000 1.10 @@ -1,5 +1,5 @@ Name: freeciv -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: The Freeciv multi-player strategy game @@ -87,6 +87,9 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 14 2005 Brian Pepple - 2.0.3 +- Update to 2.0.3. + * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 - Update to 2.0.2. - Add dist tag. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Jun 2005 14:55:39 -0000 1.5 +++ sources 14 Jul 2005 17:00:13 -0000 1.6 @@ -1,2 +1,2 @@ -dadd040a767dd5e1a7f1e18c7dfa756f freeciv-2.0.2.tar.bz2 +3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 18:00:28 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 14 Jul 2005 14:00:28 -0400 Subject: mock mock-yum,NONE,1.1 Makefile,1.3,1.4 Message-ID: <200507141800.j6EI0SES013059@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029 Modified Files: Makefile Added Files: mock-yum Log Message: add mock-yum wrapper to remove the selinux LD_PRELOAD. also, only set the LD_PRELOAD for use with running yum --- NEW FILE mock-yum --- #!/usr/bin/python # Basically a copy of /usr/bin/yum that removes the LD_PRELOAD set by mock import os, sys if os.environ.has_key("LD_PRELOAD"): del os.environ["LD_PRELOAD"] import yum sys.path.insert(0, "/usr/share/yum-cli") import yummain try: yummain.main(sys.argv[1:]) except KeyboardInterrupt, e: print >> sys.stderr, "\n\nExiting on user cancel." sys.exit(1) Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 27 Jun 2005 03:43:11 -0000 1.3 +++ Makefile 14 Jul 2005 18:00:26 -0000 1.4 @@ -21,6 +21,7 @@ install: mkdir -p $(DESTDIR)/usr/bin/ install -m 755 mock.py $(DESTDIR)/usr/bin/mock + install -m 755 mock-yum $(DESTDIR)/usr/libexec/mock-yum mkdir -p $(DESTDIR)/var/lib/mock for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done From fedora-extras-commits at redhat.com Thu Jul 14 18:00:28 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 14 Jul 2005 14:00:28 -0400 Subject: mock/src mock-helper.c,1.6,1.7 Message-ID: <200507141800.j6EI0S2h013065@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/mock/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029/src Modified Files: mock-helper.c Log Message: add mock-yum wrapper to remove the selinux LD_PRELOAD. also, only set the LD_PRELOAD for use with running yum Index: mock-helper.c =================================================================== RCS file: /cvs/fedora/mock/src/mock-helper.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mock-helper.c 23 Jun 2005 20:00:45 -0000 1.6 +++ mock-helper.c 14 Jul 2005 18:00:26 -0000 1.7 @@ -133,7 +133,7 @@ /* argv[0] should by convention be the binary name to be executed */ void -do_command (const char *filename, char *const argv[]) +do_command (const char *filename, char *const argv[], int use_selinux_preload) { /* do not trust user environment; * copy over allowed env vars, after setting PATH and HOME ourselves @@ -163,7 +163,7 @@ #ifdef USE_SELINUX /* add LD_PRELOAD for our selinux lib if selinux is in use is set */ - if (is_selinux_enabled() > 0) + if ((is_selinux_enabled() > 0) && (use_selinux_preload == 1)) { ld_preload = strdup("LD_PRELOAD=libselinux-mock.so"); printf("adding ld_preload of %s\n", ld_preload); @@ -198,7 +198,7 @@ /* do we allow this dir ? */ check_dir_allowed (rootsdir, argv[2]); - do_command ("/usr/sbin/chroot", &(argv[1])); + do_command ("/usr/sbin/chroot", &(argv[1]), 0); } /* @@ -235,7 +235,7 @@ error ("unallowed mount type"); /* all checks passed, execute */ - do_command ("/bin/mount", &(argv[1])); + do_command ("/bin/mount", &(argv[1]), 0); } /* clean out a chroot dir */ @@ -254,7 +254,7 @@ check_dir_allowed (rootsdir, argv[3]); /* all checks passed, execute */ - do_command ("/bin/rm", &(argv[1])); + do_command ("/bin/rm", &(argv[1]), 0); } /* perform rpm commands on root */ @@ -273,7 +273,7 @@ check_dir_allowed (rootsdir, argv[3]); /* all checks passed, execute */ - do_command ("/bin/rpm", &(argv[1])); + do_command ("/bin/rpm", &(argv[1]), 0); } @@ -292,7 +292,7 @@ check_dir_allowed (rootsdir, argv[3]); /* all checks passed, execute */ - do_command ("/usr/bin/yum", &(argv[1])); + do_command ("/usr/libexec/mock-yum", &(argv[1]), 1); } @@ -308,7 +308,7 @@ check_dir_allowed (rootsdir, argv[2]); /* all checks passed, execute */ - do_command ("/bin/umount", &(argv[1])); + do_command ("/bin/umount", &(argv[1]), 1); } /* make /dev/ device nodes */ @@ -338,7 +338,7 @@ /* removed specific checks so we can make more than just /dev/null */ /* all checks passed, execute */ - do_command ("/bin/mknod", &(argv[1])); + do_command ("/bin/mknod", &(argv[1]), 0); } int From fedora-extras-commits at redhat.com Thu Jul 14 18:44:59 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:44:59 -0400 Subject: rpms/perl-Crypt-CBC - New directory Message-ID: <200507141845.j6EIixqH014304@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14280/perl-Crypt-CBC Log Message: Directory /cvs/extras/rpms/perl-Crypt-CBC added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 18:45:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:00 -0400 Subject: rpms/perl-Crypt-CBC/devel - New directory Message-ID: <200507141845.j6EIj0wM014309@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14280/perl-Crypt-CBC/devel Log Message: Directory /cvs/extras/rpms/perl-Crypt-CBC/devel added to the repository From andreas at bawue.net Thu Jul 14 18:46:32 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 14 Jul 2005 20:46:32 +0200 (CEST) Subject: APPROVED: perl-Crypt-CBC Message-ID: This is Crypt::CBC, a Perl-only implementation of the cryptographic cipher block chaining mode (CBC). In combination with a block cipher such as Crypt::DES or Crypt::IDEA, you can encrypt and decrypt messages of arbitrarily long length. The encrypted messages are compatible with the encryption format used by SSLeay. Reviewer: Ville Skytt? Maintainer: Andreas Thienemann From fedora-extras-commits at redhat.com Thu Jul 14 18:45:17 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:17 -0400 Subject: rpms/perl-Crypt-CBC Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507141845.j6EIjHPM014354@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327 Added Files: Makefile import.log Log Message: Setup of module perl-Crypt-CBC --- NEW FILE Makefile --- # Top level Makefile for module perl-Crypt-CBC all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 14 18:45:18 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:18 -0400 Subject: rpms/perl-Crypt-CBC/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507141845.j6EIjIxj014359@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Crypt-CBC --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From andreas at bawue.net Thu Jul 14 18:47:16 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 14 Jul 2005 20:47:16 +0200 (CEST) Subject: APPROVED: perl-Crypt-Blowfish Message-ID: Crypt::Blowfish is an XS-based implementation of the Blowfish cryptography algorithm designed by Bruce Schneier. It's designed to take full advantage of Crypt::CBC when desired. Blowfish keys may be up to 448 bits (56 bytes) long. Reviewer: Ville Skytt? Maintainer: Andreas Thienemann From fedora-extras-commits at redhat.com Thu Jul 14 18:45:56 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:56 -0400 Subject: rpms/perl-Crypt-CBC/devel perl-Crypt-CBC.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507141846.j6EIkR8c014429@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14391/devel Modified Files: .cvsignore sources Added Files: perl-Crypt-CBC.spec Log Message: auto-import perl-Crypt-CBC-2.14-1 on branch devel from perl-Crypt-CBC-2.14-1.src.rpm --- NEW FILE perl-Crypt-CBC.spec --- Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC Version: 2.14 Release: 1%{?dist} License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-CBC/ Source0: http://search.cpan.org/CPAN/authors/id/L/LD/LDS/Crypt-CBC-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl >= 2:5.8.0 %description This is Crypt::CBC, a Perl-only implementation of the cryptographic cipher block chaining mode (CBC). In combination with a block cipher such as Crypt::DES or Crypt::IDEA, you can encrypt and decrypt messages of arbitrarily long length. The encrypted messages are compatible with the encryption format used by SSLeay. %prep %setup -q -n Crypt-CBC-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README eg/ %{perl_vendorlib}/Crypt/ %{_mandir}/man3/*.3* %changelog * Thu Jul 14 2005 Andreas Thienemann - 2.14-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 18:45:16 -0000 1.1 +++ .cvsignore 14 Jul 2005 18:45:54 -0000 1.2 @@ -0,0 +1 @@ +Crypt-CBC-2.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 18:45:16 -0000 1.1 +++ sources 14 Jul 2005 18:45:54 -0000 1.2 @@ -0,0 +1 @@ +68a955e9d6440fa4752fd203ce5b8886 Crypt-CBC-2.14.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 18:45:56 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:45:56 -0400 Subject: rpms/perl-Crypt-CBC import.log,1.1,1.2 Message-ID: <200507141846.j6EIkQhw014425@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14391 Modified Files: import.log Log Message: auto-import perl-Crypt-CBC-2.14-1 on branch devel from perl-Crypt-CBC-2.14-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 18:45:15 -0000 1.1 +++ import.log 14 Jul 2005 18:45:54 -0000 1.2 @@ -0,0 +1 @@ +perl-Crypt-CBC-2_14-1:HEAD:perl-Crypt-CBC-2.14-1.src.rpm:1121366754 From fedora-extras-commits at redhat.com Thu Jul 14 18:48:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:01 -0400 Subject: rpms/perl-Crypt-Blowfish - New directory Message-ID: <200507141848.j6EIm1X9014535@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14509/perl-Crypt-Blowfish Log Message: Directory /cvs/extras/rpms/perl-Crypt-Blowfish added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 18:48:01 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:01 -0400 Subject: rpms/perl-Crypt-Blowfish/devel - New directory Message-ID: <200507141848.j6EIm1Gq014540@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14509/perl-Crypt-Blowfish/devel Log Message: Directory /cvs/extras/rpms/perl-Crypt-Blowfish/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 14 18:48:25 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:25 -0400 Subject: rpms/perl-Crypt-Blowfish Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507141848.j6EImP55014594@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14567 Added Files: Makefile import.log Log Message: Setup of module perl-Crypt-Blowfish --- NEW FILE Makefile --- # Top level Makefile for module perl-Crypt-Blowfish all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 14 18:48:26 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:48:26 -0400 Subject: rpms/perl-Crypt-Blowfish/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507141848.j6EImQor014599@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14567/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Crypt-Blowfish --- NEW 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 Jul 14 18:49:04 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:49:04 -0400 Subject: rpms/perl-Crypt-Blowfish import.log,1.1,1.2 Message-ID: <200507141849.j6EInYD4014675@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636 Modified Files: import.log Log Message: auto-import perl-Crypt-Blowfish-2.09-1 on branch devel from perl-Crypt-Blowfish-2.09-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Jul 2005 18:48:23 -0000 1.1 +++ import.log 14 Jul 2005 18:49:02 -0000 1.2 @@ -0,0 +1 @@ +perl-Crypt-Blowfish-2_09-1:HEAD:perl-Crypt-Blowfish-2.09-1.src.rpm:1121366942 From fedora-extras-commits at redhat.com Thu Jul 14 18:49:04 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:49:04 -0400 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14636/devel Modified Files: .cvsignore sources Added Files: perl-Crypt-Blowfish.spec Log Message: auto-import perl-Crypt-Blowfish-2.09-1 on branch devel from perl-Crypt-Blowfish-2.09-1.src.rpm --- NEW FILE perl-Crypt-Blowfish.spec --- Summary: XS Blowfish implementation for Perl Name: perl-Crypt-Blowfish Version: 2.09 Release: 1%{?dist} License: Distributable Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Blowfish/ Source0: http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl-Crypt-CBC BuildRequires: perl-Crypt-CBC %description Crypt::Blowfish is an XS-based implementation of the Blowfish cryptography algorithm designed by Bruce Schneier. It's designed to take full advantage of Crypt::CBC when desired. Blowfish keys may be up to 448 bits (56 bytes) long. %prep %setup -q -n Crypt-Blowfish-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name *.bs -a -size 0 -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/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYRIGHT Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/Crypt/ %{_mandir}/man3/*.3* %changelog * Thu Jul 14 2005 Andreas Thienemann - 2.09-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Jul 2005 18:48:24 -0000 1.1 +++ .cvsignore 14 Jul 2005 18:49:02 -0000 1.2 @@ -0,0 +1 @@ +Crypt-Blowfish-2.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Jul 2005 18:48:24 -0000 1.1 +++ sources 14 Jul 2005 18:49:02 -0000 1.2 @@ -0,0 +1 @@ +bbd037e1eb20778f3d636dff345ed02f Crypt-Blowfish-2.09.tar.gz From fedora-extras-commits at redhat.com Thu Jul 14 18:55:00 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 14:55:00 -0400 Subject: owners owners.list,1.16,1.17 Message-ID: <200507141855.j6EIt0jM014803@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14780 Modified Files: owners.list Log Message: Added perl-Crypt-Blowfish and perl-Crypt-CBC Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- owners.list 14 Jul 2005 16:49:25 -0000 1.16 +++ owners.list 14 Jul 2005 18:54:58 -0000 1.17 @@ -495,6 +495,8 @@ Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|anvil at livna.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org| +Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|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 Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From ville.skytta at iki.fi Thu Jul 14 18:58:00 2005 From: ville.skytta at iki.fi (Ville =?ISO-8859-1?Q?Skytt=E4?=) Date: Thu, 14 Jul 2005 21:58:00 +0300 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> References: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> Message-ID: <1121367480.2872.157.camel@localhost.localdomain> On Thu, 2005-07-14 at 14:49 -0400, Andreas Thienemann wrote: One more catch: > find $RPM_BUILD_ROOT -name *.bs -a -size 0 -exec rm -f {} ';' Adding quotes around *.bs would be better. Otherwise *.bs expands to Blowfish.bs already by the shell before "find" even runs, because Blowfish.bs happens to be in the same dir where that command is run. In this case, it doesn't really affect the results though, but better to always do it correctly. From fedora-extras-commits at redhat.com Thu Jul 14 19:04:29 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:04:29 -0400 Subject: common tobuild,1.1915,1.1916 Message-ID: <200507141904.j6EJ4pML016055@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16036 Modified Files: tobuild Log Message: request build of rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1915 retrieving revision 1.1916 diff -u -r1.1915 -r1.1916 --- tobuild 14 Jul 2005 14:13:13 -0000 1.1915 +++ tobuild 14 Jul 2005 19:04:25 -0000 1.1916 @@ -59,3 +59,4 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 +ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel From andreas at bawue.net Thu Jul 14 19:06:44 2005 From: andreas at bawue.net (Andreas Thienemann) Date: Thu, 14 Jul 2005 21:06:44 +0200 (CEST) Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 In-Reply-To: <1121367480.2872.157.camel@localhost.localdomain> References: <200507141849.j6EInZJx014679@cvs-int.fedora.redhat.com> <1121367480.2872.157.camel@localhost.localdomain> Message-ID: On Thu, 14 Jul 2005, Ville Skytt? wrote: > > find $RPM_BUILD_ROOT -name *.bs -a -size 0 -exec rm -f {} ';' > Adding quotes around *.bs would be better. Otherwise *.bs expands to > Blowfish.bs already by the shell before "find" even runs, because > Blowfish.bs happens to be in the same dir where that command is run. In > this case, it doesn't really affect the results though, but better to > always do it correctly. Thx. I think in this specific case, it would never shellexpand. But yeah, thanks for pointing it out. bye, andreas From fedora-extras-commits at redhat.com Thu Jul 14 19:07:08 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:07:08 -0400 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec,1.1,1.2 Message-ID: <200507141907.j6EJ786J016090@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16073 Modified Files: perl-Crypt-Blowfish.spec Log Message: Quotingfix Index: perl-Crypt-Blowfish.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-Blowfish.spec 14 Jul 2005 18:49:02 -0000 1.1 +++ perl-Crypt-Blowfish.spec 14 Jul 2005 19:07:06 -0000 1.2 @@ -1,7 +1,7 @@ Summary: XS Blowfish implementation for Perl Name: perl-Crypt-Blowfish Version: 2.09 -Release: 1%{?dist} +Release: 2%{?dist} License: Distributable Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-Blowfish/ @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name *.bs -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name "*.bs" -a -size 0 -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/* @@ -46,6 +46,10 @@ %{_mandir}/man3/*.3* %changelog +* Thu Jul 14 2005 Andreas Thienemann - 2.09-2 +- Fixed find line to not shellexpand. + + * Thu Jul 14 2005 Andreas Thienemann - 2.09-1 - Initial package From fedora-extras-commits at redhat.com Thu Jul 14 19:12:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:12:05 -0400 Subject: extras-buildsys ChangeLog,1.55,1.56 Message-ID: <200507141912.j6EJCZub016198@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148 Modified Files: ChangeLog Log Message: 2005-07-14 Dan Williams * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() - Fix misdeclaration of log() which caused a traceback in some instances * server/Builder.py - Kill any job the builder is running when the server starts up * server/BuildMaster.py - Restart interrupted jobs when the server starts up - Remove old query queue code that's no longer used * server/PackageJob.py server/UserInterface.py - is_build_job_stage_valid -> is_package_job_stage_valid Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ChangeLog 13 Jul 2005 19:36:06 -0000 1.55 +++ ChangeLog 14 Jul 2005 19:12:03 -0000 1.56 @@ -1,3 +1,22 @@ +2005-07-14 Dan Williams + + * builder/builder.py + - Make the builder not hang if you interrupt it in the middle + of a time.sleep() + - Fix misdeclaration of log() which caused a traceback in some + instances + + * server/Builder.py + - Kill any job the builder is running when the server starts up + + * server/BuildMaster.py + - Restart interrupted jobs when the server starts up + - Remove old query queue code that's no longer used + + * server/PackageJob.py + server/UserInterface.py + - is_build_job_stage_valid -> is_package_job_stage_valid + 2005-07-13 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Thu Jul 14 19:12:06 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:12:06 -0400 Subject: extras-buildsys/builder builder.py,1.14,1.15 Message-ID: <200507141912.j6EJCat0016201@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148/builder Modified Files: builder.py Log Message: 2005-07-14 Dan Williams * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() - Fix misdeclaration of log() which caused a traceback in some instances * server/Builder.py - Kill any job the builder is running when the server starts up * server/BuildMaster.py - Restart interrupted jobs when the server starts up - Remove old query queue code that's no longer used * server/PackageJob.py server/UserInterface.py - is_build_job_stage_valid -> is_package_job_stage_valid Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- builder.py 13 Jul 2005 19:36:06 -0000 1.14 +++ builder.py 14 Jul 2005 19:12:03 -0000 1.15 @@ -167,7 +167,10 @@ start_time = time.time() mockstatusfile = os.path.join(self._state_dir, 'status') while not os.path.exists(mockstatusfile): - time.sleep(0.5) + try: + time.sleep(0.5) + except KeyboardInterrupt: + pass # if mock exited with an error report that error and not # the missing status file. exit_status = self._pobj.poll() @@ -239,7 +242,10 @@ string = f.read(4) except OSError, e: if e.errno == errno.EAGAIN: - time.sleep(0.25) + try: + time.sleep(0.25) + except KeyboardInterrupt: + pass continue else: if len(string) < 4: @@ -467,7 +473,7 @@ self.localarches = localarches self.cur_job = 0 - def log(string): + def log(self, string): if config_opts['debug']: print string @@ -675,7 +681,10 @@ # Stop running as root if drop_privs() == -1: http_server.stop() - time.sleep(1) + try: + time.sleep(1) + except KeyboardInterrupt: + pass os._exit(1) print "Binding to address '%s' with arches: [%s]" % (config_opts['hostname'], string.join(config_opts['arches'])) From fedora-extras-commits at redhat.com Thu Jul 14 19:12:06 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:12:06 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.15, 1.16 Builder.py, 1.5, 1.6 PackageJob.py, 1.6, 1.7 UserInterface.py, 1.18, 1.19 Message-ID: <200507141912.j6EJCa21016205@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148/server Modified Files: BuildMaster.py Builder.py PackageJob.py UserInterface.py Log Message: 2005-07-14 Dan Williams * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() - Fix misdeclaration of log() which caused a traceback in some instances * server/Builder.py - Kill any job the builder is running when the server starts up * server/BuildMaster.py - Restart interrupted jobs when the server starts up - Remove old query queue code that's no longer used * server/PackageJob.py server/UserInterface.py - is_build_job_stage_valid -> is_package_job_stage_valid Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- BuildMaster.py 13 Jul 2005 15:53:08 -0000 1.15 +++ BuildMaster.py 14 Jul 2005 19:12:04 -0000 1.16 @@ -111,9 +111,6 @@ self._archjob_status_updates = {} self._archjob_status_updates_lock = threading.Lock() - self._query_queue = [] - self._query_queue_lock = threading.Lock() - self._building_jobs = [] self._building_jobs_lock = threading.Lock() @@ -125,11 +122,40 @@ self.curs = self.dbcx.cursor() ensure_job_db_tables(self.dbcx) + self._restart_interrupted_jobs() + threading.Thread.__init__(self) def __del__(self): self.dbcx.close() + def _restart_interrupted_jobs(self): + """ Restart interrupted jobs from our db. """ + self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed")') + self.dbcx.commit() + jobs = self.curs.fetchall() + + if len(jobs) == 0: + return + + for row in jobs: + uniqid = row[0] + # Kill any archjobs that are left around + self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uniqid) + self.dbcx.commit() + + # Now requeue the job + try: + repo = self.repos[row[4]] + except KeyError: + print "%s (%s): Target '%s' not found." % (uniqid, row[2], row[4]) + else: + job = PackageJob.PackageJob(uniqid, row[1], row[2], row[3], repo, self, self.hostname) + print "%s (%s): Restarting '%s' on target '%s'" % (uniqid, row[2], row[3], row[4]) + self._building_jobs_lock.acquire() + self._building_jobs.append(job) + self._building_jobs_lock.release() + def stop(self): self.should_stop = True for repo in self.repos.values(): @@ -285,28 +311,6 @@ self._new_queue_lock.release() - def queue_query(self, query): - self._query_queue_lock.acquire() - if query.sql: - self._query_queue.append(query) - self._query_queue_lock.release() - - def _process_queries(self): - self._query_queue_lock.acquire() - - for query in self._query_queue: - self.curs.execute(query.sql) - self.dbcx.commit() - data = self.curs.fetchall() - results = [] - for row in data: - tempX = [ item for item in row ] - results.append(tempX) - query.result = results - query.done = True - self._query_queue.remove(query) - self._query_queue_lock.release() - def _have_work(self): have_work = False self._new_queue_lock.acquire() @@ -316,13 +320,6 @@ if have_work: return True - self._query_queue_lock.acquire() - if len(self._query_queue) > 0: - have_work = True - self._query_queue_lock.release() - if have_work: - return True - self._status_updates_lock.acquire() if len(self._status_updates) > 0: have_work = True @@ -366,9 +363,6 @@ # Start any new jobs self._start_new_jobs() - # Execute any queued queries from other threads - self._process_queries() - last_time = time.time() while not self._have_work() and time.time() <= last_time + 5: time.sleep(0.25) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Builder.py 11 Jul 2005 00:30:36 -0000 1.5 +++ Builder.py 14 Jul 2005 19:12:04 -0000 1.6 @@ -54,6 +54,7 @@ self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs) else: self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) + self._server_lock = threading.Lock() self._unavail_count = 0 self._arches = [] builder_xmlrpc_lock.acquire() @@ -65,9 +66,19 @@ builder_xmlrpc_lock.release() self._alive = True self._arches.append('noarch') - self._server_lock = threading.Lock() self._stop = False self._prepping_jobs = False + + # Kill any jobs currently running on the builder + (jobid, status) = self._get_cur_job_and_status() + if jobid and jobid != 0: + builder_xmlrpc_lock.acquire() + try: + self._server.die(jobid) + except: + pass + builder_xmlrpc_lock.release() + threading.Thread.__init__(self) def xmlrpc_lock_acquire(self): @@ -115,8 +126,9 @@ return job - def _update_cur_job(self): - cur_jobid = None + def _get_cur_job_and_status(self): + jobid = None + status = None builder_xmlrpc_lock.acquire() self._server_lock.acquire() @@ -129,6 +141,11 @@ self._server_lock.release() builder_xmlrpc_lock.release() + return (jobid, status) + + def _update_cur_job(self): + (jobid, status) = self._get_cur_job_and_status() + # Update the current job's status if self._unavail_count == 0: try: Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PackageJob.py 12 Jul 2005 20:12:32 -0000 1.6 +++ PackageJob.py 14 Jul 2005 19:12:04 -0000 1.7 @@ -86,12 +86,12 @@ self._pkg_job.process() -def is_build_job_stage_valid(stage): +def is_package_job_stage_valid(stage): """ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'failed', 'addtorepo', 'repodone', 'needsign', 'finished', 'killed'] + stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] if stage in stages: return True return False Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- UserInterface.py 10 Jul 2005 04:33:51 -0000 1.18 +++ UserInterface.py 14 Jul 2005 19:12:04 -0000 1.19 @@ -157,7 +157,7 @@ if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] - if PackageJob.is_build_job_stage_valid(status): + if PackageJob.is_package_job_stage_valid(status): if first: search = search + " WHERE " first = False From fedora-extras-commits at redhat.com Thu Jul 14 19:25:24 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:25:24 -0400 Subject: extras-buildsys ChangeLog,1.56,1.57 Message-ID: <200507141925.j6EJPOFu016257@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16228 Modified Files: ChangeLog Log Message: 2005-07-14 Dan Williams * server/PackageJob.py - Include log URL in email notifications Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 14 Jul 2005 19:12:03 -0000 1.56 +++ ChangeLog 14 Jul 2005 19:25:22 -0000 1.57 @@ -1,5 +1,10 @@ 2005-07-14 Dan Williams + * server/PackageJob.py + - Include log URL in email notifications + +2005-07-14 Dan Williams + * builder/builder.py - Make the builder not hang if you interrupt it in the middle of a time.sleep() From fedora-extras-commits at redhat.com Thu Jul 14 19:25:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:25:25 -0400 Subject: extras-buildsys/server PackageJob.py,1.7,1.8 Message-ID: <200507141925.j6EJPP64016263@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16228/server Modified Files: PackageJob.py Log Message: 2005-07-14 Dan Williams * server/PackageJob.py - Include log URL in email notifications Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- PackageJob.py 14 Jul 2005 19:12:04 -0000 1.7 +++ PackageJob.py 14 Jul 2005 19:25:22 -0000 1.8 @@ -464,7 +464,8 @@ self._failed() except BuildError, e: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - self.email_result(resultstring=e.args, subject=subj) + msg = "%s\n\n Build logs may be found at %s" % (e.args, self._make_log_url()) + self.email_result(resultstring=msg, subject=subj) # Kill remaining jobs on other arches self._archjobs_lock.acquire() for job in self.archjobs.values(): @@ -541,9 +542,15 @@ self._set_cur_stage('repodone') self.wake() + def _make_log_url(self, arch=None): + return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release) + def _succeeded(self): self._set_cur_stage('needsign') - resultstring = "%s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target) + resultstring = """ %s (%s): Build on target %s succeeded. + + Build logs may be found at %s +""" % (self.uid, self.name, self.target, self._make_log_url()) self.email_result(resultstring) self.bm.notify_job_done(self) From fedora-extras-commits at redhat.com Thu Jul 14 19:27:45 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 14 Jul 2005 15:27:45 -0400 Subject: common tobuild,1.1916,1.1917 Message-ID: <200507141927.j6EJRjMR016316@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16299 Modified Files: tobuild Log Message: request build of rpms/splint/devel splint-3_1_1-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1916 retrieving revision 1.1917 diff -u -r1.1916 -r1.1917 --- tobuild 14 Jul 2005 19:04:25 -0000 1.1916 +++ tobuild 14 Jul 2005 19:27:43 -0000 1.1917 @@ -60,3 +60,4 @@ oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel +pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 19:31:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:31:32 -0400 Subject: common tobuild,1.1917,1.1918 Message-ID: <200507141932.j6EJW2nN016364@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332/common Modified Files: tobuild Log Message: quotefix and correct build order Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1917 retrieving revision 1.1918 diff -u -r1.1917 -r1.1918 --- tobuild 14 Jul 2005 19:27:43 -0000 1.1917 +++ tobuild 14 Jul 2005 19:31:30 -0000 1.1918 @@ -59,5 +59,6 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 +ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 19:31:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 15:31:32 -0400 Subject: rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish.spec,1.2,1.3 Message-ID: <200507141932.j6EJW2nb016367@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16332/devel Modified Files: perl-Crypt-Blowfish.spec Log Message: quotefix and correct build order Index: perl-Crypt-Blowfish.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Crypt-Blowfish.spec 14 Jul 2005 19:07:06 -0000 1.2 +++ perl-Crypt-Blowfish.spec 14 Jul 2005 19:31:30 -0000 1.3 @@ -27,7 +27,7 @@ %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name "*.bs" -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.bs' -a -size 0 -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/* From fedora-extras-commits at redhat.com Thu Jul 14 19:43:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 15:43:26 -0400 Subject: extras-buildsys Makefile,1.7,1.8 Message-ID: <200507141943.j6EJhQeu016430@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16413 Modified Files: Makefile Log Message: Add a 'test-srpm' target Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile 10 Jul 2005 03:44:35 -0000 1.7 +++ Makefile 14 Jul 2005 19:43:24 -0000 1.8 @@ -46,3 +46,8 @@ rm -rf build dist mkdir build dist rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba $(PKGNAME).spec + +test-srpm: archive + rm -rf build dist + mkdir build dist + rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -bs $(PKGNAME).spec From fedora-extras-commits at redhat.com Thu Jul 14 19:56:39 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 14 Jul 2005 15:56:39 -0400 Subject: owners owners.list,1.17,1.18 Message-ID: <200507141957.j6EJvAPt016497@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16480 Modified Files: owners.list Log Message: Officially orphan perl-Net-SCP, perl-Net-SSH, rpmproc. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- owners.list 14 Jul 2005 18:54:58 -0000 1.17 +++ owners.list 14 Jul 2005 19:56:37 -0000 1.18 @@ -547,9 +547,9 @@ 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-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 -Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Net-SSH|Perl extension for secure shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -680,7 +680,7 @@ Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|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|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|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 Thu Jul 14 20:01:38 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 16:01:38 -0400 Subject: rpms/perl-Crypt-CBC/devel perl-Crypt-CBC.spec,1.1,1.2 Message-ID: <200507142002.j6EK2X9e017612@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Crypt-CBC/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16512 Modified Files: perl-Crypt-CBC.spec Log Message: better handling of example files Index: perl-Crypt-CBC.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Crypt-CBC/devel/perl-Crypt-CBC.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Crypt-CBC.spec 14 Jul 2005 18:45:54 -0000 1.1 +++ perl-Crypt-CBC.spec 14 Jul 2005 20:01:12 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Encrypt Data with Cipher Block Chaining Mode Name: perl-Crypt-CBC Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} License: Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Crypt-CBC/ @@ -20,6 +20,7 @@ %prep %setup -q -n Crypt-CBC-%{version} +chmod 644 eg/*.pl %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -45,6 +46,10 @@ %{_mandir}/man3/*.3* %changelog +* Thu Jul 14 2005 Andreas Thienemann - 2.14-2 +- Remove execute permissions from example files + + * Thu Jul 14 2005 Andreas Thienemann - 2.14-1 - Initial package From fedora-extras-commits at redhat.com Thu Jul 14 20:02:35 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 14 Jul 2005 16:02:35 -0400 Subject: common tobuild,1.1918,1.1919 Message-ID: <200507142003.j6EK3U8s017632@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17610 Modified Files: tobuild Log Message: Change buildrevision Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1918 retrieving revision 1.1919 diff -u -r1.1918 -r1.1919 --- tobuild 14 Jul 2005 19:31:30 -0000 1.1918 +++ tobuild 14 Jul 2005 20:02:33 -0000 1.1919 @@ -59,6 +59,6 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_2-5_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel eyecon rpms/leafnode/FC-4 leafnode-1_11_3-2_fc4 fc4 -ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-1_fc5 devel -ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-1_fc5 devel +ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-2_fc5 devel +ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 14 20:54:36 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Thu, 14 Jul 2005 16:54:36 -0400 Subject: web/html/download mirrors.php,1.23,1.24 Message-ID: <200507142054.j6EKsa3s017834@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17817 Modified Files: mirrors.php Log Message: Added url for calserv.unl.edu Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mirrors.php 13 Jul 2005 14:18:04 -0000 1.23 +++ mirrors.php 14 Jul 2005 20:54:34 -0000 1.24 @@ -120,6 +120,7 @@
  • ftp://mirror.colorado.edu/pub/fedora/linux/core/
  • ftp://mirrors.csumb.edu/fedora/updates/ (Updates only)
  • ftp://ftp.applios.net/pub/fedora/linux/core
    • +
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
  • Canada From fedora-extras-commits at redhat.com Thu Jul 14 21:13:27 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:13:27 -0400 Subject: extras-buildsys/etc plague-builder.config, 1.3, 1.4 plague-builder.init, 1.4, 1.5 Message-ID: <200507142113.j6ELDRac019065@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19016/etc Modified Files: plague-builder.init Added Files: plague-builder.config Log Message: 2005-07-14 Dan Williams * etc/plague-builder.init etc/plague-builder.config - Allow multiple builders to be started/stopped at one time. plague-builder.config must be copied to /etc/sysconfig/plague-builder and have the CONFIGS variable defined to be a space-separated list of builder config files, with the whole list enclosed in quotes Index: plague-builder.config =================================================================== RCS file: plague-builder.config diff -N plague-builder.config --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ plague-builder.config 14 Jul 2005 21:13:25 -0000 1.4 @@ -0,0 +1 @@ +CONFIGS="/etc/plague/builder/CONFIG.py" Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague-builder.init 13 Jul 2005 19:36:12 -0000 1.4 +++ plague-builder.init 14 Jul 2005 21:13:25 -0000 1.5 @@ -13,19 +13,56 @@ # Source function library. . /etc/init.d/functions +. /etc/sysconfig/plague-builder + + +start_one() { + PORT=$1 + echo -n "Starting plague-builder on port $PORT: " + daemon plague-builder -d -p /var/run/plague-builder-$PORT.pid -l /var/log/plague-builder-$PORT.log -c $config + echo + touch /var/lock/subsys/plague-builder-$PORT + return 0 +} + start() { - echo -n "Starting plague-builder: " - daemon plague-builder -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log -c /etc/plague/builder/CONFIG.py - echo - touch /var/lock/subsys/plague-builder - return 0 + for config in $CONFIGS; do + # Get the builder's XMLRPC port #, which should be unique + PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` + start_one $PORT + done + return 0 } +stop_one() { + PORT=$1 + echo -n "Shutting down plague-builder on port $PORT: " + killproc plague-builder-$PORT + echo + rm -f /var/lock/subsys/plague-builder-$PORT + return 0 +} + stop() { - echo -n "Shutting down plague-builder: " - killproc plague-builder - echo - rm -f /var/lock/subsys/plague-builder + for config in $CONFIGS; do + # Get the builder's XMLRPC port #, which should be unique + PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` + stop_one $PORT + done + return 0 +} + +condrestart() { + [ -f /var/lock/subsys/plague-builder ] && restart || : + + for config in $CONFIGS; do + # Get the builder's XMLRPC port #, which should be unique + PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` + if [ -f /var/lock/subsys/plague-builder-$PORT ]; then + stop_one $PORT + start_one $PORT + fi + done return 0 } @@ -36,23 +73,23 @@ case "$1" in start) - start - ;; + start + ;; stop) - stop - ;; + stop + ;; status) - status plague-builder - ;; + status plague-builder + ;; restart) - stop - start - ;; + stop + start + ;; condrestart) - [ -f /var/lock/subsys/plague-builder ] && restart || : - ;; + condrestart + ;; *) - echo "Usage: {start|stop|status|reload|restart[|probe]" + echo "Usage: {start|stop|status|reload|restart[|probe]" exit 1 ;; esac From fedora-extras-commits at redhat.com Thu Jul 14 21:13:22 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:13:22 -0400 Subject: extras-buildsys ChangeLog,1.57,1.58 Message-ID: <200507142113.j6ELDqqM019068@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19016 Modified Files: ChangeLog Log Message: 2005-07-14 Dan Williams * etc/plague-builder.init etc/plague-builder.config - Allow multiple builders to be started/stopped at one time. plague-builder.config must be copied to /etc/sysconfig/plague-builder and have the CONFIGS variable defined to be a space-separated list of builder config files, with the whole list enclosed in quotes Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- ChangeLog 14 Jul 2005 19:25:22 -0000 1.57 +++ ChangeLog 14 Jul 2005 21:13:20 -0000 1.58 @@ -1,5 +1,14 @@ 2005-07-14 Dan Williams + * etc/plague-builder.init + etc/plague-builder.config + - Allow multiple builders to be started/stopped at one time. + plague-builder.config must be copied to /etc/sysconfig/plague-builder + and have the CONFIGS variable defined to be a space-separated + list of builder config files, with the whole list enclosed in quotes + +2005-07-14 Dan Williams + * server/PackageJob.py - Include log URL in email notifications From fedora-extras-commits at redhat.com Thu Jul 14 21:13:22 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:13:22 -0400 Subject: extras-buildsys/builder builder.py,1.15,1.16 Message-ID: <200507142113.j6ELDqui019071@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19016/builder Modified Files: builder.py Log Message: 2005-07-14 Dan Williams * etc/plague-builder.init etc/plague-builder.config - Allow multiple builders to be started/stopped at one time. plague-builder.config must be copied to /etc/sysconfig/plague-builder and have the CONFIGS variable defined to be a space-separated list of builder config files, with the whole list enclosed in quotes Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- builder.py 14 Jul 2005 19:12:03 -0000 1.15 +++ builder.py 14 Jul 2005 21:13:20 -0000 1.16 @@ -649,7 +649,10 @@ sys.exit(2) if opts.pidfile: - open(opts.pidfile, 'w').write('%d\n' % os.getpid()) + f = open(opts.pidfile, 'w') + f.write('%d\n' % os.getpid()) + f.flush() + f.close() if opts.logfile: logf=open(opts.logfile, 'a') From fedora-extras-commits at redhat.com Thu Jul 14 21:49:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:49:49 -0400 Subject: extras-buildsys plague.spec,1.16,1.17 Message-ID: <200507142150.j6ELoJ3c019175@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142 Modified Files: plague.spec Log Message: Fix up the builder initscript Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- plague.spec 11 Jul 2005 03:23:21 -0000 1.16 +++ plague.spec 14 Jul 2005 21:49:47 -0000 1.17 @@ -101,10 +101,6 @@ %post builder /sbin/chkconfig --add plague-builder /sbin/service plague-builder condrestart >> /dev/null || : -. %{_sysconfdir}/sysconfig/%{name}-builder -if [ -z "$ARCHSOPT" ] ; then - sed -ie "s/^ARCHSOPT=.*$/ARCHSOPT=\"'-a $(rpm --showrc | grep '^compatible build archs' | sed 's/^.*: \(.*\)$/\1/' | sed -e 's/ noarch\| fat//g' | sed -e 's/ / -a /g')'\"/" %{_sysconfdir}/sysconfig/%{name}-builder -fi %preun builder if [ $1 = 0 ]; then From fedora-extras-commits at redhat.com Thu Jul 14 21:49:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 17:49:50 -0400 Subject: extras-buildsys/etc plague-builder.init,1.5,1.6 Message-ID: <200507142150.j6ELoKpt019178@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19142/etc Modified Files: plague-builder.init Log Message: Fix up the builder initscript Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plague-builder.init 14 Jul 2005 21:13:25 -0000 1.5 +++ plague-builder.init 14 Jul 2005 21:49:47 -0000 1.6 @@ -18,8 +18,9 @@ start_one() { PORT=$1 + CONFIG_FILE=$2 echo -n "Starting plague-builder on port $PORT: " - daemon plague-builder -d -p /var/run/plague-builder-$PORT.pid -l /var/log/plague-builder-$PORT.log -c $config + daemon plague-builder -d -p /var/run/plague-builder-$PORT.pid -l /var/log/plague-builder-$PORT.log -c $CONFIG_FILE echo touch /var/lock/subsys/plague-builder-$PORT return 0 @@ -29,7 +30,7 @@ for config in $CONFIGS; do # Get the builder's XMLRPC port #, which should be unique PORT=`python -c "execfile('$config'); print config_opts['xmlrpc_port']"` - start_one $PORT + start_one $PORT $config done return 0 } From fedora-extras-commits at redhat.com Fri Jul 15 01:23:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 14 Jul 2005 21:23:18 -0400 Subject: extras-buildsys README,1.8,1.9 Message-ID: <200507150123.j6F1NIuN023944@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23927 Modified Files: README Log Message: Fix up the readme Index: README =================================================================== RCS file: /cvs/fedora/extras-buildsys/README,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- README 10 Jul 2005 06:08:24 -0000 1.8 +++ README 15 Jul 2005 01:23:15 -0000 1.9 @@ -1,4 +1,4 @@ -Fedora Extras Build System +fFedora Extras Build System System Requirements: - Python 2.3 or 2.4 @@ -94,42 +94,39 @@ Architectural Overview: ------------------------------------------ -The build system is composed of a single build server, and multiple build -clients. Clients run an XMLRPC server to which the build-server delivers -build jobs. The build server runs an XMLRPC server to allow submission of -jobs, and to retrieve basic status information about both clients and the -build system as a whole. +The build system is composed of a single build server, and multiple builders. +Builders run an XMLRPC server to which the build server delivers build jobs. +The build server runs an XMLRPC server to allow submission of jobs, and to +relay basic status information about both builders and the build system as a +whole to users. -The Build Client: +The Builder: -usage: build-client
    -ie : build-client localhost sparc sparcv9 sparcv8 +usage: /usr/bin/plague-builder -c -Currently, build clients are limited to building one job at a time. This -limitation may be removed in the future. They do not queue pending jobs, -but will reject build requests when something is already building. The build -server is expected to queue and manage jobs at this time, and serialize -requests to build clients. This may not be the case in the future. +Currently, builders are limited to building one job at a time, though there is +no restriction on running multiple builders on a single machine. They do not +queue pending jobs, but will reject build requests when something is already +building. The build server is expected to queue and manage jobs at this time, +and serialize requests to builders. main() - `- Creates: XMLRPCBuildClientServer + `- Creates: XMLRPCBuilderServer `- Creates: i386Arch, x86_64Arch, PPCArch, etc (subclasses - of BuildClientMach) + of BuilderMock) -The client creates an XMLRPC server object (XMLRPCBuildClientServer), and -then processes requests in an infinite loop. Every so often (currently -5 seconds) the server allows each build job that is still in process to -update its status and perform work. The XMLRPCBuildClientServer keeps a -list of local build jobs, which are architecture specific, and forwards -requests and commands for each job to that specific job, keyed off a -unique id. +The builder creates an XMLRPC server object (XMLRPCBuilderServer), and +then processes requests in an infinite loop. The build server queries each +client periodically for its status and the ID of the currently building job, if +any. -Each build job (BuildClientMach and its architecture-specific subclasses like + +Each build job (BuilderMock and its architecture-specific subclasses like i386Arch) proceeds through a number of states. Build jobs are periodically -given time to do work (BuildClientMach.process()) by their BuildClientInstance -(from XMLRPCBuildClientServer._process()), which is in turn periodically given +given time to do work (BuilderMock.process()) by the builder controller +(XMLRPCBuilderServer._process()), which is in turn periodically given time by the client's main loop. During their processing time, build jobs check their state, see if any actions have completed, and advance to the next state if needed. Communication with mock and retrieval of status from mock @@ -137,8 +134,8 @@ from talking to the build server. All communication with the build server is done through SSL to ensure the -identity of each party. Both the XMLRPC server and the result file server are -SSL-enabled, and require SSL certificates and keys to operate. See later +identity of each party. Both the XMLRPC server and the builder's file server +are SSL-enabled, and require SSL certificates and keys to operate. See later section in this document on how to configure SSL certificates for your build system. @@ -146,81 +143,72 @@ The Build Server: -usage: build-server +usage: /usr/bin/plague-server The build server runs two threads. The first, the XMLRPC server (XMLRPCBuildMaster class), accepts requests to enqueue jobs for build and stuffs them into an sqlite database which contains all job details. The second thread, the Build Master (BuildMaster class), pulls 'waiting' jobs from the database and builds them. A third top-level object that runs in the same -thread as the Build Master is the BuildClientManager, which keeps track of -build clients (ArchWelders) and their status. +thread as the Build Master is the BuilderManager, which keeps track of +builders and their status. main() - |- Creates: XMLRPCBuildMaster - |- Creates: BuildClientManager - |- `- Creates: BuildClient (one for each remote build client) - |- `- Creates: BuildClientJob (one for each build job + |- Creates: AuthedXMLRPCServer (system users talk to this object) + |- Creates: BuilderManager + |- `- Creates: Builder (one for each remote build client) + |- `- Creates: ArchJob (one for each build job |- on each arch) `- Creates: BuildMaster - `- Creates: BuildJob (one for each build job) + `- Creates: PackageJob (one for each build job) -The BuildClientManager object serves as a central location for all tracking and +The BuilderManager object serves as a central location for all tracking and status information about each build job on each arch. It creates a -BuildClient instance for each remote build client. The BuildClient instance -keeps track of specific jobs building on all architectures on that remote -build client. It also serves as the XMLRPC client of the remote build -client, proxying status information from it. - -BuildJobs must request that the BuildClientManager create a new BuildClientJob -for each build on each architecture the BuildJob needs. If there is an -available build client (since build clients only build one job at a time -across all arches they support), the BuildClientManager will pass the request -to the arch-specific BuildClient instance, which creates the new arch-specific -BuildClientJob, and pass it back through the BuildClientManager to the parent -BuildJob. If there is no available build client for the request, the BuildJob -must periodically re-issue the build request to the BuildClientManager. - -BuildClientManager has a periodic processing routine that is called from the -BuildMaster thread. This processing routine calls the BuildClient.process() -routine on each BuildClient instance, which in turn updates its view of the -remote build client's status. Thus, the BuildClientManager, through each -BuildClient instance, knows the status and currently building job on each -remote build client. +Builder instance for each remote builder. The Builder instance keeps track +of specific jobs building on all architectures on that remote builder. + +PackageJobs must queue requests with the BuilderManager for the architecture +specific build jobs they need. The BuilderManager will wait until a Builder +object is available to build the job, create the new ArchJob on the builder, +and notify the parent PackageJob of its new ArchJob. + +The BuilderManager has a periodic processing routine that is called from the +BuildMaster thread. This processing routine calls the Builder.process() +routine of each Builder instance, which in turn updates its view of the remote +builder's status. Thus, the BuilderManager, through each Builder instance, +knows the status and currently building job on each remote builder. -BuildJobs track a single SRPM build through the entire build system. They are +PackageJobs track a single SRPM build through the entire build system. They are created from the BuildMaster thread whenever the BuildMaster finds a job entry -in the sqlite database with the status of 'waiting'. BuildJobs proceed through +in the sqlite database with the status of 'waiting'. PackageJobs proceed through a number of states: "initialize", "checkout", "make_srpm", "prep", "building", -"finished", "cleanup", "failed", and "needsign". +"finished", "addtorepo", "failed", "killed", and "needsign". Flow goes like this: initialize => checkout checkout => make_srpm make_srpm => prep -prep => building +prep => (queue architecture-specific job requests with the BuilderManager) + building - All build jobs finished or failed? => finished - otherwise => building -finished => cleanup -cleanup +finished - failed jobs? => failed - - otherwise => needsign - -The BuildJob updates its status when it is periodically told to do so by the -BuildManager. At this point, it will advance to the next state, or spawn build -jobs that have not yet started if build clients for those architectures are -now available. It stays in the "building" state until all jobs are first -spawned, and then either completed or failed. - -All communication with build clients is done through SSL to ensure the -identity of each party. When the client requests the SRPM to build, SSL -is used. When the build server retrieves logs and RPMs from the build client, -SSL is also used. This ensures that build clients can be more or less trusted, -or at least that some random build client is not serving you packages that -might contaminate your repository. See later section in this document on how -to configure SSL certificates for your build system. + - otherwise => addtorepo +addtorepo + + => repodone +repodone => needsign + +All communication with builders is done through SSL to ensure the identity of +each party. When the builder requests the SRPM to build, SSL is used. When the +build server retrieves logs and RPMs from the builder, SSL is also used. This +ensures that builders can be more or less trusted, or at least that some random +builder is not serving you packages that might contaminate your repository. See +later section in this document on how to configure SSL certificates for your +build system. Configuring SSL for your Build System From fedora-extras-commits at redhat.com Fri Jul 15 03:57:27 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 14 Jul 2005 23:57:27 -0400 Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.3, 1.4 gaim-meanwhile.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507150357.j6F3vRSu026845@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26824 Modified Files: .cvsignore gaim-meanwhile.spec sources Log Message: Update to new release. Fixes bug #159942 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 18:47:24 -0000 1.3 +++ .cvsignore 15 Jul 2005 03:57:25 -0000 1.4 @@ -1 +1 @@ -gaim-meanwhile-1.2.3.tar.gz +gaim-meanwhile-1.2.4.tar.gz Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-meanwhile.spec 31 May 2005 18:47:24 -0000 1.2 +++ gaim-meanwhile.spec 15 Jul 2005 03:57:25 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Lotus Sametime Community Client plugin for Gaim License: GPL Group: Applications/Internet -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net @@ -39,6 +39,13 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 +- Update to latest upstream release +- Fixes bug 159942 + +* Tue Jul 12 2005 - jwboyer at jdub.homelinux.org 1.2.4-0.cvs +- Build test RPM + * Tue May 31 2005 - jwboyer at jdub.homelinux.org 1.2.3-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 18:47:24 -0000 1.3 +++ sources 15 Jul 2005 03:57:25 -0000 1.4 @@ -1 +1 @@ -161954f7d77c16bed378d91e8376c161 gaim-meanwhile-1.2.3.tar.gz +548fda06471ecaa0a93aabab7c1d6aee gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 03:59:17 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 14 Jul 2005 23:59:17 -0400 Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.3, 1.4 gaim-meanwhile.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507150359.j6F3xHOg026896@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-serv26875 Modified Files: .cvsignore gaim-meanwhile.spec sources Log Message: Update to new release. Fixes bug #159942 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 18:50:58 -0000 1.3 +++ .cvsignore 15 Jul 2005 03:59:14 -0000 1.4 @@ -1 +1 @@ -gaim-meanwhile-1.2.3.tar.gz +gaim-meanwhile-1.2.4.tar.gz Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-meanwhile.spec 31 May 2005 18:50:58 -0000 1.2 +++ gaim-meanwhile.spec 15 Jul 2005 03:59:15 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Lotus Sametime Community Client plugin for Gaim License: GPL Group: Applications/Internet -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net @@ -39,6 +39,13 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 +- Update to latest upstream release +- Fixes bug 159942 + +* Tue Jul 12 2005 - jwboyer at jdub.homelinux.org 1.2.4-0.cvs +- Build test RPM + * Tue May 31 2005 - jwboyer at jdub.homelinux.org 1.2.3-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 18:50:58 -0000 1.3 +++ sources 15 Jul 2005 03:59:15 -0000 1.4 @@ -1 +1 @@ -161954f7d77c16bed378d91e8376c161 gaim-meanwhile-1.2.3.tar.gz +7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 04:00:03 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:00:03 -0400 Subject: rpms/gaim-meanwhile/FC-3 .cvsignore, 1.3, 1.4 gaim-meanwhile.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200507150400.j6F4032v026937@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-serv26909 Modified Files: .cvsignore gaim-meanwhile.spec sources Log Message: Update to new release. Fixes bug #159942 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 May 2005 18:52:38 -0000 1.3 +++ .cvsignore 15 Jul 2005 04:00:01 -0000 1.4 @@ -1 +1 @@ -gaim-meanwhile-1.2.3.tar.gz +gaim-meanwhile.spec Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/gaim-meanwhile.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gaim-meanwhile.spec 31 May 2005 18:52:38 -0000 1.2 +++ gaim-meanwhile.spec 15 Jul 2005 04:00:01 -0000 1.3 @@ -6,7 +6,7 @@ Summary: Lotus Sametime Community Client plugin for Gaim License: GPL Group: Applications/Internet -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Source: http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz URL: http://meanwhile.sourceforge.net @@ -39,6 +39,13 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 +- Update to latest upstream release +- Fixes bug 159942 + +* Tue Jul 12 2005 - jwboyer at jdub.homelinux.org 1.2.4-0.cvs +- Build test RPM + * Tue May 31 2005 - jwboyer at jdub.homelinux.org 1.2.3-1 - Update to latest version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 May 2005 18:52:38 -0000 1.3 +++ sources 15 Jul 2005 04:00:01 -0000 1.4 @@ -1 +1 @@ -161954f7d77c16bed378d91e8376c161 gaim-meanwhile-1.2.3.tar.gz +7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile.spec From fedora-extras-commits at redhat.com Fri Jul 15 04:01:03 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:01:03 -0400 Subject: common tobuild,1.1919,1.1920 Message-ID: <200507150401.j6F413Kv028061@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27886 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1919 retrieving revision 1.1920 diff -u -r1.1919 -r1.1920 --- tobuild 14 Jul 2005 20:02:33 -0000 1.1919 +++ tobuild 15 Jul 2005 04:01:01 -0000 1.1920 @@ -62,3 +62,4 @@ ixs rpms/perl-Crypt-CBC/devel perl-Crypt-CBC-2_14-2_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel +jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 04:02:50 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:02:50 -0400 Subject: common tobuild,1.1920,1.1921 Message-ID: <200507150402.j6F42oOZ028138@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28121 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1920 retrieving revision 1.1921 diff -u -r1.1920 -r1.1921 --- tobuild 15 Jul 2005 04:01:01 -0000 1.1920 +++ tobuild 15 Jul 2005 04:02:33 -0000 1.1921 @@ -63,3 +63,4 @@ ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel +jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 15 04:07:51 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:07:51 -0400 Subject: rpms/gaim-meanwhile/FC-3 sources,1.4,1.5 Message-ID: <200507150407.j6F47pj5028230@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-serv28203 Modified Files: sources Log Message: Fixup sources file. Dunno what happened here Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jul 2005 04:00:01 -0000 1.4 +++ sources 15 Jul 2005 04:07:49 -0000 1.5 @@ -1 +1 @@ -7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile.spec +7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 04:08:31 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 00:08:31 -0400 Subject: common tobuild,1.1921,1.1922 Message-ID: <200507150408.j6F48Vil028292@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28275 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1921 retrieving revision 1.1922 diff -u -r1.1921 -r1.1922 --- tobuild 15 Jul 2005 04:02:33 -0000 1.1921 +++ tobuild 15 Jul 2005 04:08:29 -0000 1.1922 @@ -64,3 +64,4 @@ pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 +jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 06:30:24 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 15 Jul 2005 02:30:24 -0400 Subject: rpms/libcdio/devel .cvsignore, 1.5, 1.6 libcdio.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200507150630.j6F6UOU2030715@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30694 Modified Files: .cvsignore libcdio.spec sources Log Message: * Thu Jul 14 2005 Adrian Reber - 0.75-1 - Updated to 0.75. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Jun 2005 10:27:25 -0000 1.5 +++ .cvsignore 15 Jul 2005 06:30:22 -0000 1.6 @@ -1,2 +1,2 @@ -libcdio-0.74.tar.gz -libcdio-0.74.tar.gz.sig +libcdio-0.75.tar.gz +libcdio-0.75.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcdio.spec 5 Jun 2005 10:49:18 -0000 1.10 +++ libcdio.spec 15 Jul 2005 06:30:22 -0000 1.11 @@ -1,13 +1,13 @@ Name: libcdio -Version: 0.74 -Release: 2%{?dist} +Version: 0.75 +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.74.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.74.tar.gz.sig +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libcddb-devel >= 0.9.4 @@ -93,6 +93,9 @@ %changelog +* Thu Jul 14 2005 Adrian Reber - 0.75-1 +- Updated to 0.75. + * Fri Jun 03 2005 Adrian Reber - 0.74-2 - Updated to 0.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Jun 2005 10:27:25 -0000 1.5 +++ sources 15 Jul 2005 06:30:22 -0000 1.6 @@ -1,2 +1,2 @@ -2b1b03d96a992d171ebf2b13bcdcd866 libcdio-0.74.tar.gz -8dddd44a78d1eda7bdeac0afc30d6ba8 libcdio-0.74.tar.gz.sig +628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz +3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig From oliver at linux-kernel.at Fri Jul 15 07:19:34 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 15 Jul 2005 09:19:34 +0200 Subject: APPROVED: mod_security Message-ID: <42D76386.1090301@linux-kernel.at> mod_security: Security module for the Apache HTTP Server ModSecurity is an open source intrusion detection and prevention engine for web applications. It operates embedded into the web server, acting as a powerful umbrella - shielding web applications from attacks. Maintainer: Michael Fleming Reviewer: Oliver Falk Best, Oliver From fedora-extras-commits at redhat.com Fri Jul 15 07:21:38 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 15 Jul 2005 03:21:38 -0400 Subject: common tobuild,1.1922,1.1923 Message-ID: <200507150721.j6F7LcS8032129@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32112 Modified Files: tobuild Log Message: request build of rpms/mod_security/devel mod_security-1_8_7-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1922 retrieving revision 1.1923 diff -u -r1.1922 -r1.1923 --- tobuild 15 Jul 2005 04:08:29 -0000 1.1922 +++ tobuild 15 Jul 2005 07:21:36 -0000 1.1923 @@ -65,3 +65,4 @@ jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-1_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 +mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 08:30:06 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 15 Jul 2005 04:30:06 -0400 Subject: owners owners.list,1.18,1.19 Message-ID: <200507150830.j6F8U602001694@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1677 Modified Files: owners.list Log Message: added nexuiz and nexuiz-data Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- owners.list 14 Jul 2005 19:56:37 -0000 1.18 +++ owners.list 15 Jul 2005 08:30:04 -0000 1.19 @@ -447,6 +447,8 @@ Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance.|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|nexuiz|Multiplayer, deathmatch oriented first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|nexuiz-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|nget|A utility for retrieving files using the NNTP protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|ninja|A text based Internet Relay Chat (IRC) client|adrian at lisas.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Jul 15 10:21:58 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 15 Jul 2005 06:21:58 -0400 Subject: rpms/bittorrent/devel bittorrent.spec,1.23,1.24 Message-ID: <200507151021.j6FALwSw004898@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4881 Modified Files: bittorrent.spec Log Message: * Fri Jul 15 2005 Paul Howarth 4.1.2-6 - provides should be version-release tagged too Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bittorrent.spec 12 Jul 2005 15:33:43 -0000 1.23 +++ bittorrent.spec 15 Jul 2005 10:21:56 -0000 1.24 @@ -4,7 +4,7 @@ Name: bittorrent Version: 4.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -25,7 +25,7 @@ Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %endif -Provides: python-khashmir +Provides: python-khashmir = %{version}-%{release} Obsoletes: python-khashmir < %{version}-%{release} Requires(pre): %{_sbindir}/useradd @@ -50,7 +50,7 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Obsoletes: BitTorrent <= %{version} -Provides: BitTorrent +Provides: BitTorrent = %{version}-%{release} %description gui This package contains the GUI versions of the BitTorrent file transfer @@ -202,6 +202,9 @@ %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog +* Fri Jul 15 2005 Paul Howarth 4.1.2-6 +- provides should be version-release tagged too + * Tue Jul 11 2005 Paul Howarth 4.1.2-5 - move icon to %{_datadir}/icons/hicolor/48x48/apps instead of %{_datadir}/pixmaps and update icon cache on installation if From fedora-extras-commits at redhat.com Fri Jul 15 12:13:01 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 15 Jul 2005 08:13:01 -0400 Subject: rpms/bittorrent/devel bittorrent.spec, 1.24, 1.25 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200507151213.j6FCD1ja007603@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bittorrent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7582 Modified Files: bittorrent.spec .cvsignore sources Log Message: * Fri Jul 15 2005 Paul Howarth 4.1.3-1 - update to 4.1.3 Index: bittorrent.spec =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/bittorrent.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bittorrent.spec 15 Jul 2005 10:21:56 -0000 1.24 +++ bittorrent.spec 15 Jul 2005 12:12:58 -0000 1.25 @@ -3,8 +3,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bittorrent -Version: 4.1.2 -Release: 6%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: BitTorrent swarming network file transfer tool Group: Applications/Internet @@ -202,6 +202,9 @@ %{_datadir}/icons/hicolor/48x48/apps/bittorrent.png %changelog +* Fri Jul 15 2005 Paul Howarth 4.1.3-1 +- update to 4.1.3 + * Fri Jul 15 2005 Paul Howarth 4.1.2-6 - provides should be version-release tagged too Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 13 Jun 2005 13:01:12 -0000 1.8 +++ .cvsignore 15 Jul 2005 12:12:58 -0000 1.9 @@ -1 +1 @@ -BitTorrent-4.1.2.tar.gz +BitTorrent-4.1.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/bittorrent/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 13 Jun 2005 13:01:12 -0000 1.8 +++ sources 15 Jul 2005 12:12:58 -0000 1.9 @@ -1 +1 @@ -e2a4d97bbfef1e105be5a128732ed3f8 BitTorrent-4.1.2.tar.gz +cd4dff145b5dea3789fa384bb94a4de9 BitTorrent-4.1.3.tar.gz From oliver at linux-kernel.at Fri Jul 15 13:11:39 2005 From: oliver at linux-kernel.at (Oliver Falk) Date: Fri, 15 Jul 2005 15:11:39 +0200 Subject: APPROVED: pam_abl Message-ID: <42D7B60B.8010508@linux-kernel.at> pam_abl: Pluggable Authentication Module (PAM) for auto blacklisting Provides auto blacklisting of hosts and users responsible for repeated failed authentication attempts. Generally configured so that blacklisted users still see normal login prompts but are guaranteed to fail to authenticate. A command line tool allows to query or purge the databases used by the pam_abl module. Maintainer: Alexander Dalloz Reviewer: Oliver Falk -of From fedora-extras-commits at redhat.com Fri Jul 15 14:20:30 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 15 Jul 2005 10:20:30 -0400 Subject: rpms/gkrellm-freq/devel gkfreq-0.1.1-rmasm.patch, NONE, 1.1 gkrellm-freq.spec, 1.1, 1.2 Message-ID: <200507151420.j6FEKUX1010167@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10147 Modified Files: gkrellm-freq.spec Added Files: gkfreq-0.1.1-rmasm.patch Log Message: Fix build on PPC. gkfreq-0.1.1-rmasm.patch: --- NEW FILE gkfreq-0.1.1-rmasm.patch --- diff -Naupr gkfreq-0.1.1.orig/gkfreq.c gkfreq-0.1.1/gkfreq.c --- gkfreq-0.1.1.orig/gkfreq.c 2005-06-07 18:42:00.000000000 +0200 +++ gkfreq-0.1.1/gkfreq.c 2005-07-15 17:51:51.000000000 +0200 @@ -19,13 +19,6 @@ static GkrellmDecal *decal_text1; static gint style_id; -__inline__ unsigned long long int rdtsc() -{ - unsigned long long int x; - __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x)); - return x; -} - /* FIXED : whatdoineed2do at yahoo.co.uk */ static Index: gkrellm-freq.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gkrellm-freq.spec 13 Jul 2005 07:57:03 -0000 1.1 +++ gkrellm-freq.spec 15 Jul 2005 14:20:27 -0000 1.2 @@ -3,11 +3,12 @@ Summary: CPU frequency display plugin for GKrellM Name: gkrellm-freq Version: 0.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.peakunix.net/gkfreq/ Source: http://www.peakunix.net/downloads/gkfreq-%{version}.tar.gz +Patch: gkfreq-0.1.1-rmasm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: gkrellm >= 2.2.0 BuildRequires: gkrellm-devel >= 2.2.0 @@ -19,6 +20,7 @@ %prep %setup -n gkfreq-%{version} +%patch -p1 -b .noasm %build @@ -44,6 +46,10 @@ %changelog +* Fri Jul 15 2005 Matthias Saou 0.1.1-2 +- Include patch to remove unused function containing an asm call that made + build fail on PPC. + * Tue Jul 12 2005 Matthias Saou 0.1.1-1 - Initial RPM release, split out from my old gkrellm-plugins package. From fedora-extras-commits at redhat.com Fri Jul 15 14:21:07 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 15 Jul 2005 10:21:07 -0400 Subject: common tobuild,1.1923,1.1924 Message-ID: <200507151421.j6FEL7es010229@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10212 Modified Files: tobuild Log Message: request build of rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1923 retrieving revision 1.1924 diff -u -r1.1923 -r1.1924 --- tobuild 15 Jul 2005 07:21:36 -0000 1.1923 +++ tobuild 15 Jul 2005 14:21:05 -0000 1.1924 @@ -66,3 +66,4 @@ jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-1_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel +thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 14:39:47 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 10:39:47 -0400 Subject: rpms/freeciv/devel freeciv.spec,1.10,1.11 Message-ID: <200507151439.j6FEdlii010258@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241 Modified Files: freeciv.spec Log Message: * Fri Jul 15 2005 Brian Pepple - 2.0.3-2 - Bump release. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- freeciv.spec 14 Jul 2005 16:56:29 -0000 1.10 +++ freeciv.spec 15 Jul 2005 14:39:45 -0000 1.11 @@ -1,6 +1,6 @@ Name: freeciv Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -87,7 +87,10 @@ %{_mandir}/man6/civclient.6.gz %changelog -* Thu Jul 14 2005 Brian Pepple - 2.0.3 +* Fri Jul 15 2005 Brian Pepple - 2.0.3-2 +- Bump release. + +* Thu Jul 14 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 From fedora-extras-commits at redhat.com Fri Jul 15 14:42:21 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 10:42:21 -0400 Subject: rpms/freeciv/FC-4 freeciv.spec,1.10,1.11 Message-ID: <200507151442.j6FEgLPS010315@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10298 Modified Files: freeciv.spec Log Message: Add release to change log. Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- freeciv.spec 14 Jul 2005 17:00:13 -0000 1.10 +++ freeciv.spec 15 Jul 2005 14:42:18 -0000 1.11 @@ -87,7 +87,7 @@ %{_mandir}/man6/civclient.6.gz %changelog -* Thu Jul 14 2005 Brian Pepple - 2.0.3 +* Thu Jul 14 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. * Tue Jun 14 2005 Brian Pepple - 2.0.2-1 From fedora-extras-commits at redhat.com Fri Jul 15 16:07:24 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 12:07:24 -0400 Subject: common tobuild,1.1924,1.1925 Message-ID: <200507151607.j6FG7sej012759@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12731 Modified Files: tobuild Log Message: request build of rpms/freeciv/devel freeciv-2_0_3-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1924 retrieving revision 1.1925 diff -u -r1.1924 -r1.1925 --- tobuild 15 Jul 2005 14:21:05 -0000 1.1924 +++ tobuild 15 Jul 2005 16:07:22 -0000 1.1925 @@ -67,3 +67,4 @@ jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-1_fc3 fc3 mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel +bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 16:08:15 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 15 Jul 2005 12:08:15 -0400 Subject: common tobuild,1.1925,1.1926 Message-ID: <200507151608.j6FG8FMe012792@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12775 Modified Files: tobuild Log Message: request build of rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1925 retrieving revision 1.1926 diff -u -r1.1925 -r1.1926 --- tobuild 15 Jul 2005 16:07:22 -0000 1.1925 +++ tobuild 15 Jul 2005 16:08:12 -0000 1.1926 @@ -68,3 +68,4 @@ mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel +bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 From jpo at di.uminho.pt Fri Jul 15 17:08:55 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Fri, 15 Jul 2005 18:08:55 +0100 Subject: APPROVED: libdnet Message-ID: <42D7EDA7.5030802@di.uminho.pt> Name : libdnet URL : http://libdnet.sf.net/ Summary : Simple portable interface to lowlevel networking routines Description : libdnet provides a simplified, portable interface to several low-level networking routines, including network address manipulation, kernel arp(4) cache and route(4) table lookup and manipulation, network firewalling (IP filter, ipfw, ipchains, pf, ...), network interface lookup and manipulation, raw IP packet and Ethernet frame, and data transmission. Maintainer: Oliver Falk Reviewer: Jos? pedro Oliveira 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 Fri Jul 15 17:35:01 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 15 Jul 2005 13:35:01 -0400 Subject: devel/sylpheed .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 sylpheed.spec, 1.19, 1.20 Message-ID: <200507151735.j6FHZ1vg014027@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/sylpheed In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Fri Jul 15 2005 Michael Schwendt - 2.0.0-0.4.beta6 - Update to 2.0.0beta6 (feature freeze). Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 10 Jul 2005 22:05:30 -0000 1.9 +++ .cvsignore 15 Jul 2005 17:34:59 -0000 1.10 @@ -1 +1 @@ -sylpheed-2.0.0beta5.tar.bz2 +sylpheed-2.0.0beta6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/devel/sylpheed/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 10 Jul 2005 22:05:30 -0000 1.9 +++ sources 15 Jul 2005 17:34:59 -0000 1.10 @@ -1 +1 @@ -4f022a15bda3d01b025d02e3875bf09a sylpheed-2.0.0beta5.tar.bz2 +d1b992d0acf14a40e940ad3c59f20cb8 sylpheed-2.0.0beta6.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sylpheed.spec 10 Jul 2005 22:05:31 -0000 1.19 +++ sylpheed.spec 15 Jul 2005 17:34:59 -0000 1.20 @@ -5,7 +5,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed Version: 2.0.0 -Release: 0.4.beta5 +Release: 0.4.beta6 License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,7 +16,7 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta5.tar.bz2 +Source0: http://sylpheed.good-day.net/sylpheed/%{name}-2.0.0beta6.tar.bz2 Source1: sylpheed.1 Patch2: sylpheed-default-browser.patch @@ -38,7 +38,7 @@ See /usr/share/doc/sylpheed*/README for more information. %prep -%setup -q -n %{name}-2.0.0beta5 +%setup -q -n %{name}-2.0.0beta6 %patch2 -p1 -b .default-browser %patch3 -p1 -b .desktop @@ -81,6 +81,9 @@ %{_mandir}/man1 %changelog +* Fri Jul 15 2005 Michael Schwendt - 2.0.0-0.4.beta6 +- Update to 2.0.0beta6 (feature freeze). + * Sun Jul 10 2005 Michael Schwendt - 2.0.0-0.4.beta5 - Update to 2.0.0beta5. From fedora-extras-commits at redhat.com Fri Jul 15 17:35:41 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 15 Jul 2005 13:35:41 -0400 Subject: common tobuild,1.1926,1.1927 Message-ID: <200507151735.j6FHZfhr014086@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14069 Modified Files: tobuild Log Message: request build of devel/sylpheed sylpheed-2_0_0-0_4_beta6 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1926 retrieving revision 1.1927 diff -u -r1.1926 -r1.1927 --- tobuild 15 Jul 2005 16:08:12 -0000 1.1926 +++ tobuild 15 Jul 2005 17:35:39 -0000 1.1927 @@ -69,3 +69,4 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 +mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel From fedora-extras-commits at redhat.com Fri Jul 15 18:07:38 2005 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Fri, 15 Jul 2005 14:07:38 -0400 Subject: web/html/projects/artwork index.php,1.2,1.3 Message-ID: <200507151807.j6FI7cAM015247@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/fedora/web/html/projects/artwork In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15230 Modified Files: index.php Log Message: Fix typo Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/projects/artwork/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 24 Jun 2005 16:02:16 -0000 1.2 +++ index.php 15 Jul 2005 18:07:36 -0000 1.3 @@ -43,7 +43,7 @@ $project->addMaintainer("Diana Fong","dfong at redhat.com","Artist & Designer"); $project->addMaintainer("John Palmeri","johnp at redhat.com", "Package Maintainer"); $project->addContributor("Owen Taylor","otaylor at redhat.com", "Rendering System Lead"); -$project->addContributor("Brian Clark","bclark at redhat.com", "UI Hitman"); +$project->addContributor("Bryan Clark","bclark at redhat.com", "UI Hitman"); $project->addContributor("Alex Larsson","alexl at redhat.com", "Widgeteer"); /* Screenshots */ From fedora-extras-commits at redhat.com Fri Jul 15 18:16:21 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:16:21 -0400 Subject: rpms/gaim-meanwhile/FC-4 sources,1.4,1.5 Message-ID: <200507151816.j6FIGLG5015329@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-serv15307 Modified Files: sources Log Message: Trying correct sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 15 Jul 2005 03:59:15 -0000 1.4 +++ sources 15 Jul 2005 18:16:19 -0000 1.5 @@ -1 +1 @@ -7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz +548fda06471ecaa0a93aabab7c1d6aee gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 18:17:42 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:17:42 -0400 Subject: rpms/gaim-meanwhile/FC-3 .cvsignore,1.4,1.5 sources,1.5,1.6 Message-ID: <200507151817.j6FIHgeS015365@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-serv15346 Modified Files: .cvsignore sources Log Message: Update to correct sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Jul 2005 04:00:01 -0000 1.4 +++ .cvsignore 15 Jul 2005 18:17:40 -0000 1.5 @@ -1 +1 @@ -gaim-meanwhile.spec +gaim-meanwhile-1.2.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Jul 2005 04:07:49 -0000 1.5 +++ sources 15 Jul 2005 18:17:40 -0000 1.6 @@ -1 +1 @@ -7dfe70ec2b0a04bba145703b4cf562c9 gaim-meanwhile-1.2.4.tar.gz +548fda06471ecaa0a93aabab7c1d6aee gaim-meanwhile-1.2.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 18:21:09 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 15 Jul 2005 14:21:09 -0400 Subject: common tobuild,1.1927,1.1928 Message-ID: <200507151821.j6FIL9r9015413@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15396 Modified Files: tobuild Log Message: request build of rpms/moodss/FC-3 moodss-20_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1927 retrieving revision 1.1928 diff -u -r1.1927 -r1.1928 --- tobuild 15 Jul 2005 17:35:39 -0000 1.1927 +++ tobuild 15 Jul 2005 18:21:07 -0000 1.1928 @@ -70,3 +70,4 @@ bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel +jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 18:24:39 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:24:39 -0400 Subject: rpms/gaim-meanwhile/FC-3 gaim-meanwhile.spec,1.3,1.4 Message-ID: <200507151824.j6FIOdG4015498@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-serv15454/FC-3 Modified Files: gaim-meanwhile.spec Log Message: Bump release for new build Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-3/gaim-meanwhile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-meanwhile.spec 15 Jul 2005 04:00:01 -0000 1.3 +++ gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 @@ -7,7 +7,7 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?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) @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 +- Bump release for rebuild + * Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 - Update to latest upstream release - Fixes bug 159942 From fedora-extras-commits at redhat.com Fri Jul 15 18:24:40 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:24:40 -0400 Subject: rpms/gaim-meanwhile/devel gaim-meanwhile.spec,1.3,1.4 Message-ID: <200507151824.j6FIOeZu015508@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/gaim-meanwhile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15454/devel Modified Files: gaim-meanwhile.spec Log Message: Bump release for new build Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-meanwhile.spec 15 Jul 2005 03:57:25 -0000 1.3 +++ gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 @@ -7,7 +7,7 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?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) @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 +- Bump release for rebuild + * Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 - Update to latest upstream release - Fixes bug 159942 From fedora-extras-commits at redhat.com Fri Jul 15 18:24:39 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:24:39 -0400 Subject: rpms/gaim-meanwhile/FC-4 gaim-meanwhile.spec,1.3,1.4 Message-ID: <200507151824.j6FIOdOg015504@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-serv15454/FC-4 Modified Files: gaim-meanwhile.spec Log Message: Bump release for new build Index: gaim-meanwhile.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gaim-meanwhile.spec 15 Jul 2005 03:59:15 -0000 1.3 +++ gaim-meanwhile.spec 15 Jul 2005 18:24:37 -0000 1.4 @@ -7,7 +7,7 @@ License: GPL Group: Applications/Internet Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?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) @@ -39,6 +39,9 @@ %{_datadir}/pixmaps/gaim/ %changelog +* Fri Jul 15 2005 - jwboyer at jdub.homelinux.org 1.2.4-2 +- Bump release for rebuild + * Thu Jul 14 2005 - jwboyer at jdub.homelinux.org 1.2.4-1 - Update to latest upstream release - Fixes bug 159942 From fedora-extras-commits at redhat.com Fri Jul 15 18:25:36 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:25:36 -0400 Subject: common tobuild,1.1928,1.1929 Message-ID: <200507151825.j6FIPaqB015572@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15555 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1928 retrieving revision 1.1929 diff -u -r1.1928 -r1.1929 --- tobuild 15 Jul 2005 18:21:07 -0000 1.1928 +++ tobuild 15 Jul 2005 18:25:34 -0000 1.1929 @@ -71,3 +71,4 @@ bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 +jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 18:26:27 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:26:27 -0400 Subject: common tobuild,1.1929,1.1930 Message-ID: <200507151826.j6FIQR8R015644@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15627 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1929 retrieving revision 1.1930 diff -u -r1.1929 -r1.1930 --- tobuild 15 Jul 2005 18:25:34 -0000 1.1929 +++ tobuild 15 Jul 2005 18:26:25 -0000 1.1930 @@ -72,3 +72,4 @@ mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel +jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 15 18:26:55 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 15 Jul 2005 14:26:55 -0400 Subject: common tobuild,1.1930,1.1931 Message-ID: <200507151826.j6FIQtdY015706@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15689 Modified Files: tobuild Log Message: request build of rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1930 retrieving revision 1.1931 diff -u -r1.1930 -r1.1931 --- tobuild 15 Jul 2005 18:26:25 -0000 1.1930 +++ tobuild 15 Jul 2005 18:26:53 -0000 1.1931 @@ -73,3 +73,4 @@ jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 +jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 18:40:23 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:40:23 -0400 Subject: rpms/barcode/devel barcode.spec,1.3,1.4 Message-ID: <200507151840.j6FIeNoD015827@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15767 Modified Files: barcode.spec Log Message: Switched off threaded make, as it's causing problems when rebuilding the documentation Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 +++ barcode.spec 15 Jul 2005 18:40:21 -0000 1.4 @@ -36,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %install rm -rf %{buildroot} @@ -67,6 +67,10 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 15 2005 Andreas Thienemann 0.98-7 +- Switched off threaded make, as it's causing problems when rebuilding + the documentation + * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 - Added missing BuildRequires for ghostscript and tetex-dvips From fedora-extras-commits at redhat.com Fri Jul 15 18:41:10 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:41:10 -0400 Subject: rpms/barcode/devel barcode.spec,1.4,1.5 Message-ID: <200507151841.j6FIfAhL015882@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15865 Modified Files: barcode.spec Log Message: bumped releasever Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- barcode.spec 15 Jul 2005 18:40:21 -0000 1.4 +++ barcode.spec 15 Jul 2005 18:41:07 -0000 1.5 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 18:41:33 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:41:33 -0400 Subject: common tobuild,1.1931,1.1932 Message-ID: <200507151841.j6FIfXPn015944@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15927 Modified Files: tobuild Log Message: request build of rpms/barcode/devel barcode-0_98-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1931 retrieving revision 1.1932 diff -u -r1.1931 -r1.1932 --- tobuild 15 Jul 2005 18:26:53 -0000 1.1931 +++ tobuild 15 Jul 2005 18:41:31 -0000 1.1932 @@ -74,3 +74,4 @@ jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 +ixs rpms/barcode/devel barcode-0_98-7_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 15 18:41:55 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:41:55 -0400 Subject: rpms/barcode/FC-4 barcode.spec,1.3,1.4 Message-ID: <200507151841.j6FIftMB015970@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15950 Modified Files: barcode.spec Log Message: Switched off threaded make, as it's causing problems when rebuilding the documentation Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/FC-4/barcode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 +++ barcode.spec 15 Jul 2005 18:41:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -36,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %install rm -rf %{buildroot} @@ -67,6 +67,10 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 15 2005 Andreas Thienemann 0.98-7 +- Switched off threaded make, as it's causing problems when rebuilding + the documentation + * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 - Added missing BuildRequires for ghostscript and tetex-dvips From fedora-extras-commits at redhat.com Fri Jul 15 18:42:18 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:42:18 -0400 Subject: common tobuild,1.1932,1.1933 Message-ID: <200507151842.j6FIgI3O016033@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016 Modified Files: tobuild Log Message: request build of rpms/barcode/FC-4 barcode-0_98-7_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1932 retrieving revision 1.1933 diff -u -r1.1932 -r1.1933 --- tobuild 15 Jul 2005 18:41:31 -0000 1.1932 +++ tobuild 15 Jul 2005 18:42:16 -0000 1.1933 @@ -75,3 +75,4 @@ jwboyer rpms/gaim-meanwhile/FC-4 gaim-meanwhile-1_2_4-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-7_fc5 devel +ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 15 18:42:55 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:42:55 -0400 Subject: rpms/barcode/FC-3 barcode.spec,1.3,1.4 Message-ID: <200507151842.j6FIgtEH016058@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16039 Modified Files: barcode.spec Log Message: Switched off threaded make, as it's causing problems when rebuilding the documentation Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/FC-3/barcode.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- barcode.spec 7 Jul 2005 21:45:58 -0000 1.3 +++ barcode.spec 15 Jul 2005 18:42:53 -0000 1.4 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -36,7 +36,7 @@ %build %configure -make %{?_smp_mflags} +make %install rm -rf %{buildroot} @@ -67,6 +67,10 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Thu Jul 15 2005 Andreas Thienemann 0.98-7 +- Switched off threaded make, as it's causing problems when rebuilding + the documentation + * Thu Jul 07 2005 Andreas Thienemann 0.98-6 - Added configure patch to pick up correct libdir for x86_64 - Added missing BuildRequires for ghostscript and tetex-dvips From fedora-extras-commits at redhat.com Fri Jul 15 18:43:19 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Fri, 15 Jul 2005 14:43:19 -0400 Subject: common tobuild,1.1933,1.1934 Message-ID: <200507151843.j6FIhJOp016120@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16103 Modified Files: tobuild Log Message: request build of rpms/barcode/FC-3 barcode-0_98-7_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1933 retrieving revision 1.1934 diff -u -r1.1933 -r1.1934 --- tobuild 15 Jul 2005 18:42:16 -0000 1.1933 +++ tobuild 15 Jul 2005 18:43:17 -0000 1.1934 @@ -76,3 +76,4 @@ jwboyer rpms/gaim-meanwhile/FC-3 gaim-meanwhile-1_2_4-2_fc3 fc3 ixs rpms/barcode/devel barcode-0_98-7_fc5 devel ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 +ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 15 18:56:57 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 15 Jul 2005 14:56:57 -0400 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.3, 1.4 perl-Test-MockObject.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200507151856.j6FIuv3E016183@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16162 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.00 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Jan 2005 13:17:37 -0000 1.3 +++ .cvsignore 15 Jul 2005 18:56:54 -0000 1.4 @@ -1 +1 @@ -Test-MockObject-0.15.tar.gz +Test-MockObject-1.00.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Test-MockObject.spec 6 Apr 2005 22:13:08 -0000 1.7 +++ perl-Test-MockObject.spec 15 Jul 2005 18:56:54 -0000 1.8 @@ -1,20 +1,17 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-Test-MockObject -Version: 0.15 -Release: 3 - +Version: 1.00 +Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockObject/ -Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-0.15.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Scalar::Util), perl(Test::Simple) >= 0.44 +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage), perl(Test::Warn) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -59,7 +56,10 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Fri Jul 15 2005 Jose Pedro Oliveira - 1.00-1 +- Update to 1.00. + +* Fri Apr 7 2005 Michael Schwendt - 0:0.15-3 - rebuilt * Tue Dec 28 2004 Jose Pedro Oliveira - 0:0.15-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Jan 2005 13:17:37 -0000 1.3 +++ sources 15 Jul 2005 18:56:54 -0000 1.4 @@ -1 +1 @@ -22f92c6e0797cc3e752293f1f26118ea Test-MockObject-0.15.tar.gz +48eb805d465c561de05a758e1b9a1eaa Test-MockObject-1.00.tar.gz From fedora-extras-commits at redhat.com Fri Jul 15 21:34:37 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 15 Jul 2005 17:34:37 -0400 Subject: rpms/libifp/devel 10-libifp.rules,1.1,1.2 Message-ID: <200507152134.j6FLYbDv020269@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libifp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20252 Modified Files: 10-libifp.rules Log Message: Fixes for the new udev Index: 10-libifp.rules =================================================================== RCS file: /cvs/extras/rpms/libifp/devel/10-libifp.rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 10-libifp.rules 14 Jul 2005 07:24:19 -0000 1.1 +++ 10-libifp.rules 15 Jul 2005 21:34:35 -0000 1.2 @@ -1,2 +1,2 @@ -BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x100[135789]", RUN+="/sbin/libifp-hotplug" -BUS=="usb", SYSFS{idVendor}=="0x4102", SYSFS{idProduct}=="0x101[01]", RUN+="/sbin/libifp-hotplug" +ACTION=="add", SUBSYSTEM=="usb", SYSFS{idVendor}=="4102", SYSFS{idProduct}=="100[135789]", RUN+="/sbin/libifp-hotplug" +ACTION=="add", SUBSYSTEM=="usb", SYSFS{idVendor}=="4102", SYSFS{idProduct}=="101[01]", RUN+="/sbin/libifp-hotplug" From fedora-extras-commits at redhat.com Sat Jul 16 03:47:01 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Fri, 15 Jul 2005 23:47:01 -0400 Subject: common tobuild,1.1934,1.1935 Message-ID: <200507160347.j6G3l19j027477@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27460 Modified Files: tobuild Log Message: request build of rpms/proj/devel proj-4_4_9-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1934 retrieving revision 1.1935 diff -u -r1.1934 -r1.1935 --- tobuild 15 Jul 2005 18:43:17 -0000 1.1934 +++ tobuild 16 Jul 2005 03:46:58 -0000 1.1935 @@ -77,3 +77,4 @@ ixs rpms/barcode/devel barcode-0_98-7_fc5 devel ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 +smccann rpms/proj/devel proj-4_4_9-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 05:08:28 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 16 Jul 2005 01:08:28 -0400 Subject: rpms/fish/devel .cvsignore, 1.2, 1.3 fish.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507160508.j6G58SQx029790@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29769 Modified Files: .cvsignore fish.spec sources Log Message: * fish update - Doin' this for Axel as he has no CVS account yet (he asked me to do this). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 +++ .cvsignore 16 Jul 2005 05:08:26 -0000 1.3 @@ -1 +1 @@ -fish-1.11.1.tar.bz2 +fish-1.12.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fish.spec 1 Jul 2005 11:11:11 -0000 1.3 +++ fish.spec 16 Jul 2005 05:08:26 -0000 1.4 @@ -1,17 +1,17 @@ -Summary: A friendly interactive shell -Name: fish +Summary: A friendly interactive shell +Name: fish -Version: 1.11.1 -Release: 10%{?dist} +Version: 1.12.0 +Release: 1%{?dist} -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -65,20 +65,23 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 +* 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 +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way -* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 11:03:18 -0000 1.2 +++ sources 16 Jul 2005 05:08:26 -0000 1.3 @@ -1 +1 @@ -b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 +8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Jul 16 05:08:53 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sat, 16 Jul 2005 01:08:53 -0400 Subject: common tobuild,1.1935,1.1936 Message-ID: <200507160508.j6G58r5N029852@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29835 Modified Files: tobuild Log Message: request build of rpms/fish/devel fish-1_12_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1935 retrieving revision 1.1936 diff -u -r1.1935 -r1.1936 --- tobuild 16 Jul 2005 03:46:58 -0000 1.1935 +++ tobuild 16 Jul 2005 05:08:51 -0000 1.1936 @@ -78,3 +78,4 @@ ixs rpms/barcode/FC-4 barcode-0_98-7_fc4 fc4 ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 smccann rpms/proj/devel proj-4_4_9-1_fc5 devel +oliver rpms/fish/devel fish-1_12_0-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 09:13:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:13:07 -0400 Subject: rpms/util-vserver/devel util-vserver.spec,1.6,1.7 Message-ID: <200507160913.j6G9D7qq002626@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2609 Modified Files: util-vserver.spec Log Message: - version 0.30.208 - require the -lib subpackage by -devel - copy GPG keys from /etc/pki/rpm-gpg/ - updated URLs Index: util-vserver.spec =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- util-vserver.spec 19 May 2005 17:03:28 -0000 1.6 +++ util-vserver.spec 16 Jul 2005 09:13:05 -0000 1.7 @@ -22,13 +22,13 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.206 -Release: %release_func 2 +Version: 0.30.208 +Release: %release_func 1 License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2 -Source1: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%name-%version.tar.bz2.asc +Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2 +Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -37,7 +37,7 @@ Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables -BuildRequires: gcc-c++ wget +BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel BuildRequires: doxygen tetex-latex Requires(post): %__chattr @@ -58,11 +58,15 @@ %package build Summary: Tools which can be used to build vservers Group: Applications/System -Requires: rpm apt wget binutils tar e2fsprogs +Requires: rpm wget binutils tar e2fsprogs Requires: %name = %version-%release Requires(pre): %confdir Requires(postun): %confdir +%ifarch %ix86 +Requires: apt +%endif + %package sysv Summary: SysV-initscripts for vserver Group: System Environment/Base @@ -88,6 +92,7 @@ Summary: Header-files and libraries needed to develop vserver based applications Group: Development/Libraries Requires: pkgconfig +Requires: %name-lib = %version-%release %description @@ -239,6 +244,7 @@ done } copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-* +copy fedora /etc/pki/rpm-gpg/RPM-GPG-* %preun build @@ -330,8 +336,11 @@ %changelog -* Thu May 19 2005 Enrico Scholz - 0.30.206-2 -- use %%dist instead of %%disttag +* Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 +- version 0.30.208 +- require the -lib subpackage by -devel +- copy GPG keys from /etc/pki/rpm-gpg/ +- updated URLs * Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 - added patches to make yum work in chroot environments From fedora-extras-commits at redhat.com Sat Jul 16 09:13:25 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:13:25 -0400 Subject: rpms/util-vserver/devel sources,1.5,1.6 .cvsignore,1.4,1.5 Message-ID: <200507160913.j6G9DPu6002651@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2632 Modified Files: sources .cvsignore Log Message: version 0.30.208 Index: sources =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 15 Apr 2005 10:17:46 -0000 1.5 +++ sources 16 Jul 2005 09:13:23 -0000 1.6 @@ -1,2 +1,2 @@ -af8b7b8120f736959e144971bd4883d7 util-vserver-0.30.206.tar.bz2 -1794255b5a32d018555786efc23102de util-vserver-0.30.206.tar.bz2.asc +4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 +1a1c1d282e1396d42e4ddb374b7d05e1 util-vserver-0.30.208.tar.bz2.asc Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Mar 2005 15:16:17 -0000 1.4 +++ .cvsignore 16 Jul 2005 09:13:23 -0000 1.5 @@ -1,4 +1 @@ -util-vserver*.tar.bz2 -util-vserver*.tar.bz2.asc -i386 -util-vserver*.src.rpm +util-vserver-*.tar.bz2* From fedora-extras-commits at redhat.com Sat Jul 16 09:14:37 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:14:37 -0400 Subject: common tobuild,1.1936,1.1937 Message-ID: <200507160914.j6G9EbjE002718@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2701 Modified Files: tobuild Log Message: request build of rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1936 retrieving revision 1.1937 diff -u -r1.1936 -r1.1937 --- tobuild 16 Jul 2005 05:08:51 -0000 1.1936 +++ tobuild 16 Jul 2005 09:14:35 -0000 1.1937 @@ -79,3 +79,4 @@ ixs rpms/barcode/FC-3 barcode-0_98-7_fc3 fc3 smccann rpms/proj/devel proj-4_4_9-1_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel +ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 09:31:40 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sat, 16 Jul 2005 05:31:40 -0400 Subject: rpms/util-vserver/devel util-vserver.spec,1.7,1.8 Message-ID: <200507160931.j6G9VexB002762@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/util-vserver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2745 Modified Files: util-vserver.spec Log Message: fixed typo in URLs Index: util-vserver.spec =================================================================== RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- util-vserver.spec 16 Jul 2005 09:13:05 -0000 1.7 +++ util-vserver.spec 16 Jul 2005 09:31:38 -0000 1.8 @@ -27,8 +27,8 @@ License: GPL Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2 -Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%version/%name-%version.tar.bz2.asc +Source0: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2 +Source1: http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core = %version-%release @@ -336,11 +336,13 @@ %changelog +* Sat Jul 16 2005 Enrico Scholz - 0:0.30.208-2 +- updated URLs + * Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 - version 0.30.208 - require the -lib subpackage by -devel - copy GPG keys from /etc/pki/rpm-gpg/ -- updated URLs * Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 - added patches to make yum work in chroot environments From fedora-extras-commits at redhat.com Sat Jul 16 11:05:56 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sat, 16 Jul 2005 07:05:56 -0400 Subject: common tobuild,1.1937,1.1938 Message-ID: <200507161106.j6GB6cHf005159@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5132 Modified Files: tobuild Log Message: request build of rpms/nexuiz-data/devel nexuiz-data-1_1-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1937 retrieving revision 1.1938 diff -u -r1.1937 -r1.1938 --- tobuild 16 Jul 2005 09:14:35 -0000 1.1937 +++ tobuild 16 Jul 2005 11:05:54 -0000 1.1938 @@ -80,3 +80,4 @@ smccann rpms/proj/devel proj-4_4_9-1_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel +adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel From fedora-extras-commits at redhat.com Sat Jul 16 11:08:24 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:08:24 -0400 Subject: rpms/id3lib/FC-3 id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.6, 1.7 Message-ID: <200507161108.j6GB8tWG005268@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/FC-3 Modified Files: id3lib.spec Added Files: id3lib-3.8.3-io_helpers-163101.patch Log Message: * Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 - Fix UTF-16 writing bug (bug #163101, upstream #1016290). id3lib-3.8.3-io_helpers-163101.patch: --- NEW FILE id3lib-3.8.3-io_helpers-163101.patch --- diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp --- id3lib-3.8.3-orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 +++ id3lib-3.8.3/src/io_helpers.cpp 2005-07-16 12:47:11.000000000 +0200 @@ -363,9 +363,10 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; writer.writeChars((const unsigned char*) &BOM, 2); + const unsigned char* pdata = (const unsigned char*)data.c_str(); for (size_t i = 0; i < size; i += 2) { - unicode_t ch = (data[i] << 8) | data[i+1]; + unicode_t ch = (pdata[i] << 8) | pdata[i+1]; writer.writeChars((const unsigned char*) &ch, 2); } } Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-3/id3lib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- id3lib.spec 1 Jul 2005 13:48:09 -0000 1.6 +++ id3lib.spec 16 Jul 2005 11:08:22 -0000 1.7 @@ -1,13 +1,14 @@ Summary: Library for manipulating ID3v1 and ID3v2 tags Name: id3lib Version: 3.8.3 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL Group: System Environment/Libraries URL: http://id3lib.sourceforge.net/ Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +Patch2: id3lib-3.8.3-io_helpers-163101.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen @@ -35,6 +36,7 @@ %setup -q %patch0 -p0 %patch1 -p1 -b .libtool-autofoo +%patch2 -p1 -b .io_helpers-163101 %build @@ -75,6 +77,9 @@ %{_libdir}/libid3.so %changelog +* Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 +- Fix UTF-16 writing bug (bug #163101, upstream #1016290). + * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). From fedora-extras-commits at redhat.com Sat Jul 16 11:08:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:08:25 -0400 Subject: rpms/id3lib/FC-4 id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.9, 1.10 Message-ID: <200507161108.j6GB8tqv005271@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/FC-4 Modified Files: id3lib.spec Added Files: id3lib-3.8.3-io_helpers-163101.patch Log Message: * Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 - Fix UTF-16 writing bug (bug #163101, upstream #1016290). id3lib-3.8.3-io_helpers-163101.patch: --- NEW FILE id3lib-3.8.3-io_helpers-163101.patch --- diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp --- id3lib-3.8.3-orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 +++ id3lib-3.8.3/src/io_helpers.cpp 2005-07-16 12:47:11.000000000 +0200 @@ -363,9 +363,10 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; writer.writeChars((const unsigned char*) &BOM, 2); + const unsigned char* pdata = (const unsigned char*)data.c_str(); for (size_t i = 0; i < size; i += 2) { - unicode_t ch = (data[i] << 8) | data[i+1]; + unicode_t ch = (pdata[i] << 8) | pdata[i+1]; writer.writeChars((const unsigned char*) &ch, 2); } } Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/FC-4/id3lib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- id3lib.spec 30 Jun 2005 15:17:39 -0000 1.9 +++ id3lib.spec 16 Jul 2005 11:08:23 -0000 1.10 @@ -1,13 +1,14 @@ Summary: Library for manipulating ID3v1 and ID3v2 tags Name: id3lib Version: 3.8.3 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL Group: System Environment/Libraries URL: http://id3lib.sourceforge.net/ Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +Patch2: id3lib-3.8.3-io_helpers-163101.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen @@ -35,6 +36,7 @@ %setup -q %patch0 -p0 %patch1 -p1 -b .libtool-autofoo +%patch2 -p1 -b .io_helpers-163101 %build @@ -75,6 +77,9 @@ %{_libdir}/libid3.so %changelog +* Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 +- Fix UTF-16 writing bug (bug #163101, upstream #1016290). + * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). From fedora-extras-commits at redhat.com Sat Jul 16 11:08:25 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:08:25 -0400 Subject: rpms/id3lib/devel id3lib-3.8.3-io_helpers-163101.patch, NONE, 1.1 id3lib.spec, 1.9, 1.10 Message-ID: <200507161108.j6GB8tI8005274@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/id3lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5209/devel Modified Files: id3lib.spec Added Files: id3lib-3.8.3-io_helpers-163101.patch Log Message: * Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 - Fix UTF-16 writing bug (bug #163101, upstream #1016290). id3lib-3.8.3-io_helpers-163101.patch: --- NEW FILE id3lib-3.8.3-io_helpers-163101.patch --- diff -Nur id3lib-3.8.3-orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp --- id3lib-3.8.3-orig/src/io_helpers.cpp 2003-03-02 01:23:00.000000000 +0100 +++ id3lib-3.8.3/src/io_helpers.cpp 2005-07-16 12:47:11.000000000 +0200 @@ -363,9 +363,10 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; writer.writeChars((const unsigned char*) &BOM, 2); + const unsigned char* pdata = (const unsigned char*)data.c_str(); for (size_t i = 0; i < size; i += 2) { - unicode_t ch = (data[i] << 8) | data[i+1]; + unicode_t ch = (pdata[i] << 8) | pdata[i+1]; writer.writeChars((const unsigned char*) &ch, 2); } } Index: id3lib.spec =================================================================== RCS file: /cvs/extras/rpms/id3lib/devel/id3lib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- id3lib.spec 30 Jun 2005 15:16:27 -0000 1.9 +++ id3lib.spec 16 Jul 2005 11:08:23 -0000 1.10 @@ -1,13 +1,14 @@ Summary: Library for manipulating ID3v1 and ID3v2 tags Name: id3lib Version: 3.8.3 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPL Group: System Environment/Libraries URL: http://id3lib.sourceforge.net/ Source0: http://download.sf.net/id3lib/%{name}-%{version}.tar.gz Patch0: id3lib-dox.patch Patch1: id3lib-3.8.3-libtool-autofoo.patch.bz2 +Patch2: id3lib-3.8.3-io_helpers-163101.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: zlib-devel doxygen @@ -35,6 +36,7 @@ %setup -q %patch0 -p0 %patch1 -p1 -b .libtool-autofoo +%patch2 -p1 -b .io_helpers-163101 %build @@ -75,6 +77,9 @@ %{_libdir}/libid3.so %changelog +* Sat Jul 16 2005 Michael Schwendt - 3.8.3-12 +- Fix UTF-16 writing bug (bug #163101, upstream #1016290). + * Thu Jun 30 2005 Michael Schwendt - 3.8.3-11 - Make libtool link against libstdc++ (bug #162127). From fedora-extras-commits at redhat.com Sat Jul 16 11:10:29 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:10:29 -0400 Subject: common tobuild,1.1938,1.1939 Message-ID: <200507161110.j6GBAVUx005395@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5378 Modified Files: tobuild Log Message: request build of rpms/id3lib/devel id3lib-3_8_3-12_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1938 retrieving revision 1.1939 diff -u -r1.1938 -r1.1939 --- tobuild 16 Jul 2005 11:05:54 -0000 1.1938 +++ tobuild 16 Jul 2005 11:10:27 -0000 1.1939 @@ -81,3 +81,4 @@ oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel +mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 16 11:11:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:11:03 -0400 Subject: common tobuild,1.1939,1.1940 Message-ID: <200507161111.j6GBB3ME005428@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5411 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1939 retrieving revision 1.1940 diff -u -r1.1939 -r1.1940 --- tobuild 16 Jul 2005 11:10:27 -0000 1.1939 +++ tobuild 16 Jul 2005 11:11:01 -0000 1.1940 @@ -82,3 +82,4 @@ ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel +mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 16 11:11:29 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 16 Jul 2005 07:11:29 -0400 Subject: common tobuild,1.1940,1.1941 Message-ID: <200507161111.j6GBBT7v005461@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5444 Modified Files: tobuild Log Message: request build of rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1940 retrieving revision 1.1941 diff -u -r1.1940 -r1.1941 --- tobuild 16 Jul 2005 11:11:01 -0000 1.1940 +++ tobuild 16 Jul 2005 11:11:27 -0000 1.1941 @@ -83,3 +83,4 @@ adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 +mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 16 14:57:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 10:57:38 -0400 Subject: extras-buildsys ChangeLog,1.58,1.59 Message-ID: <200507161457.j6GEvcRD009016@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8987 Modified Files: ChangeLog Log Message: 2005-07-16 Dan Williams * server/PackageJob.py - Include last 20 lines of relevant log file for failed build jobs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- ChangeLog 14 Jul 2005 21:13:20 -0000 1.58 +++ ChangeLog 16 Jul 2005 14:57:36 -0000 1.59 @@ -1,3 +1,8 @@ +2005-07-16 Dan Williams + + * server/PackageJob.py + - Include last 20 lines of relevant log file for failed build jobs + 2005-07-14 Dan Williams * etc/plague-builder.init From fedora-extras-commits at redhat.com Sat Jul 16 14:57:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 10:57:39 -0400 Subject: extras-buildsys/server PackageJob.py,1.8,1.9 Message-ID: <200507161457.j6GEvd5n009022@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8987/server Modified Files: PackageJob.py Log Message: 2005-07-16 Dan Williams * server/PackageJob.py - Include last 20 lines of relevant log file for failed build jobs Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PackageJob.py 14 Jul 2005 19:25:22 -0000 1.8 +++ PackageJob.py 16 Jul 2005 14:57:37 -0000 1.9 @@ -58,11 +58,12 @@ return self.args class BuildError(exceptions.Exception): - def __init__(self, args=None): + def __init__(self, msg, arch): exceptions.Exception.__init__(self) - self.args = args + self.msg = msg + self.arch = arch def __str__(self): - return self.args + return self.msg class PackageJobController(threading.Thread): @@ -464,7 +465,9 @@ self._failed() except BuildError, e: subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target) - msg = "%s\n\n Build logs may be found at %s" % (e.args, self._make_log_url()) + msg = "%s\n\n Build logs may be found at %s\n\n" % (e.msg, self._make_log_url()) + logtail = self._get_log_tail(e.arch) + msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail) self.email_result(resultstring=msg, subject=subj) # Kill remaining jobs on other arches self._archjobs_lock.acquire() @@ -493,7 +496,7 @@ if job.builder_failed(): msg = "Job failed on arch %s\n" % (job.arch) self._archjobs_lock.release() - raise BuildError(msg) + raise BuildError(msg, job.arch) else: completed_jobs = completed_jobs + 1 self._archjobs_lock.release() @@ -542,9 +545,6 @@ self._set_cur_stage('repodone') self.wake() - def _make_log_url(self, arch=None): - return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release) - def _succeeded(self): self._set_cur_stage('needsign') resultstring = """ %s (%s): Build on target %s succeeded. @@ -554,6 +554,53 @@ self.email_result(resultstring) self.bm.notify_job_done(self) + def _make_log_url(self, arch=None): + return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release) + + def _get_log_tail(self, arch): + """ Returns the last 20 lines of the most relevant log file """ + + pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release) + log_dir = os.path.join(config_opts['server_work_dir'], self.target, pkg_dir, arch) + final_log = None + build_log = "%s/%s" % (log_dir, "build.log") + root_log = "%s/%s" % (log_dir, "root.log") + builder_log = "%s/%s" % (log_dir, "builder.log") + + # Try the most relevant log file first + if os.path.exists(build_log) and os.path.getsize(build_log) > 0: + final_log = build_log + elif os.path.exists(root_log) and os.path.getsize(root_log) > 0: + final_log = root_log + elif os.path.exists(builder_log) and os.path.getsize(builder_log) > 0: + final_log = builder_log + + if not final_log: + return "" + + seek_pos = os.path.getsize(final_log) - 4096 + f = open(final_log, "r", 4096); + if seek_pos > 0: + f.seek(seek_pos) + try: + # throw away the rest of the line + t = f.next() + except: + pass + lines = [] + # Grab the last 20 lines from the file + while True: + try: + line = f.next() + except StopIteration: + break + lines.append(line) + if len(lines) > 20: # only want last 20 lines + del lines[0] + + f.close() + return "".join(lines) + def email_result(self, resultstring, subject=None): """send 'resultstring' to self.email from self.email_from""" From fedora-extras-commits at redhat.com Sat Jul 16 15:47:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 11:47:44 -0400 Subject: extras-buildsys ChangeLog,1.59,1.60 Message-ID: <200507161548.j6GFmE1I010230@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10181 Modified Files: ChangeLog Log Message: 2005-07-16 Dan Williams * builder/builder.py server/Builder.py server/BuilderManager.py - Make the builder aware of what mock targets & arches it can actually build, and expose that information to the build server - On the server, make sure that we ask the builder to only build for arches that it supports for the target we request (This makes noarch jobs work correctly everywhere) Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ChangeLog 16 Jul 2005 14:57:36 -0000 1.59 +++ ChangeLog 16 Jul 2005 15:47:42 -0000 1.60 @@ -1,5 +1,16 @@ 2005-07-16 Dan Williams + * builder/builder.py + server/Builder.py + server/BuilderManager.py + - Make the builder aware of what mock targets & arches it can actually + build, and expose that information to the build server + - On the server, make sure that we ask the builder to only build for + arches that it supports for the target we request + (This makes noarch jobs work correctly everywhere) + +2005-07-16 Dan Williams + * server/PackageJob.py - Include last 20 lines of relevant log file for failed build jobs From fedora-extras-commits at redhat.com Sat Jul 16 15:47:44 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 11:47:44 -0400 Subject: extras-buildsys/builder builder.py,1.16,1.17 Message-ID: <200507161548.j6GFmFdY010233@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10181/builder Modified Files: builder.py Log Message: 2005-07-16 Dan Williams * builder/builder.py server/Builder.py server/BuilderManager.py - Make the builder aware of what mock targets & arches it can actually build, and expose that information to the build server - On the server, make sure that we ask the builder to only build for arches that it supports for the target we request (This makes noarch jobs work correctly everywhere) Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- builder.py 14 Jul 2005 21:13:20 -0000 1.16 +++ builder.py 16 Jul 2005 15:47:42 -0000 1.17 @@ -452,25 +452,25 @@ def getArchBuilder(uniqid, target, buildarch, srpm_url, localarches): """hand it an arch it hands you back the builder instance you need""" - if not builder_dict.has_key(buildarch): - # raise an exception here bitching about no place to build for that arch - pass + if buildarch != 'noarch' and not builder_dict.has_key(buildarch): + return None - if buildarch == 'noarch': - if len(localarches) > 0: - builder = builder_dict[localarches[0]] + builder = None + if buildarch == 'noarch' and len(localarches) > 0: + builder = builder_dict[localarches[0]] else: if buildarch in localarches: builder = builder_dict[buildarch] - - bcp = builder(uniqid, target, buildarch, srpm_url) - return bcp + + if builder: + return builder(uniqid, target, buildarch, srpm_url) + return None class XMLRPCBuilderServer: - def __init__(self, localarches): + def __init__(self, target_arch_dict): self.ids = {} # unique id => awclass instance - self.localarches = localarches + self.target_arch_dict = target_arch_dict self.cur_job = 0 def log(self, string): @@ -486,19 +486,26 @@ jobid = uniqid self.cur_job = jobid # Update current job + def _get_uniqid(self, target, arch, srpm_url): + check = '%d %s %s %s' % (time.time(), target, arch, srpm_url) + sum = sha.new() + sum.update(check) + return sum.hexdigest() + def start(self, target, arch, srpm_url): + # Sanity check the request if self.cur_job != 0: self.log("Tried to build '%s' when already buiding something" % srpm_url) return 0 + if not self.target_arch_dict.has_key(target) or len(self.target_arch_dict[target]) == 0: + self.log("Tried to build '%s' on target %s which isn't supported" % (srpm_url, target)) + return 0 + if arch != 'noarch' and not arch in self.target_arch_dict[target]: + self.log("Tried to build '%s' on target %s which doesn't support arch %s" % (srpm_url, target, arch)) + return 0 - cur_time = time.time() - check = '%d %s %s %s' % (cur_time, target, arch, srpm_url) - sum = sha.new() - sum.update(check) - uniqid = sum.hexdigest() - if target == 'devel': - target = 'development' - job = getArchBuilder(uniqid, target, arch, srpm_url, self.localarches) + uniqid = self._get_uniqid(target, arch, srpm_url) + job = getArchBuilder(uniqid, target, arch, srpm_url, self.target_arch_dict[target]) if job != None: self.ids[uniqid] = job job.start() @@ -537,8 +544,8 @@ status = 'idle' return (self.cur_job, status) - def supported_arches(self): - return self.localarches + def supported_target_arches(self): + return self.target_arch_dict def drop_privs(): @@ -595,6 +602,31 @@ return 0 +def read_mock_configs(allowed_arches): + MOCK_CONFIG_DIR = "/etc/mock/" + tmp_list = os.listdir(MOCK_CONFIG_DIR) + target_arches = {} + for f in tmp_list: + if not f.endswith(".cfg"): + continue + try: + t = f.index("-") + except ValueError: + continue + cfg_name = f[:len(f)-4] + try: + (distro, target, arch, repo) = cfg_name.split('-') + except ValueError: + print "Unrecognized config %s, ignoring." % cfg_name + continue + if distro == config_opts['distro_name'] and repo == config_opts['repo_name']: + if arch in allowed_arches: + if not target_arches.has_key(target): + target_arches[target] = [] + target_arches[target].append(arch) + return target_arches + + if __name__ == '__main__': state={'opts': True, 'host': None, 'archs': [], 'daemon': False, 'pidfile': None, 'logfile': None} @@ -619,14 +651,9 @@ help="location of the builder config file") (opts, args) = parser.parse_args() - if not opts.configfile: - print "Must specify the config file." + if not opts.configfile or not os.path.exists(opts.configfile): + print "Must specify a valid config file." sys.exit(1) - - if not os.path.exists(opts.configfile): - print "Could not find the config file %s" % opts.configfile - sys.exit(1) - if not os.access(opts.configfile, os.R_OK): print "Could not read the config file %s" % opts.configfile sys.exit(1) @@ -642,6 +669,16 @@ print "Arch '%s' must be one of [ %s ]" % (arch, archlist) sys.exit(1) + for arch in config_opts['arches']: + if not arch in builder_dict.keys(): + print "Arch '%s' specified in the config file is not supported." % arch + sys.exit(1) + + target_arch_dict = read_mock_configs(config_opts['arches']) + if len(target_arch_dict) == 0: + print "No mock configuration files were found. Exiting." + sys.exit(1) + if opts.daemon: ret=daemonize.createDaemon() if ret: @@ -702,7 +739,7 @@ print "Error: couldn't bind to address '%s:%s'. Is the builder already running?" % (config_opts['hostname'], xmlrpc_port) os._exit(1) - bcs = XMLRPCBuilderServer(config_opts['arches']) + bcs = XMLRPCBuilderServer(target_arch_dict) xmlserver.register_instance(bcs) last_time = time.time() From fedora-extras-commits at redhat.com Sat Jul 16 15:47:45 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 11:47:45 -0400 Subject: extras-buildsys/server Builder.py, 1.6, 1.7 BuilderManager.py, 1.4, 1.5 CONFIG.py, 1.18, 1.19 Message-ID: <200507161548.j6GFmFYo010235@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10181/server Modified Files: Builder.py BuilderManager.py CONFIG.py Log Message: 2005-07-16 Dan Williams * builder/builder.py server/Builder.py server/BuilderManager.py - Make the builder aware of what mock targets & arches it can actually build, and expose that information to the build server - On the server, make sure that we ask the builder to only build for arches that it supports for the target we request (This makes noarch jobs work correctly everywhere) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Builder.py 14 Jul 2005 19:12:04 -0000 1.6 +++ Builder.py 16 Jul 2005 15:47:43 -0000 1.7 @@ -56,16 +56,18 @@ self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, None) self._server_lock = threading.Lock() self._unavail_count = 0 - self._arches = [] + self._target_arches = [] builder_xmlrpc_lock.acquire() try: - self._arches = self._server.supported_arches() + self._target_arches = self._server.supported_target_arches() + for target in self._target_arches.keys(): + self._target_arches[target].append('noarch') except socket.error: builder_xmlrpc_lock.release() raise RuntimeError builder_xmlrpc_lock.release() + self._alive = True - self._arches.append('noarch') self._stop = False self._prepping_jobs = False @@ -87,12 +89,18 @@ def xmlrpc_lock_release(self): builder_xmlrpc_lock.release() - def arches(self): - return self._arches - - def can_build_arch(self, arch): - if arch in self._arches: - return True + def arches(self, target): + arches = None + try: + arches = self._target_arches[target] + except: + pass + return arches + + def can_build_arch_on_target(self, arch, target): + if self._target_arches.has_key(target) and len(self._target_arches[target]) > 0: + if arch in self._target_arches[target]: + return True return False def address(self): @@ -105,14 +113,18 @@ return self._alive def start_job(self, par_job, target, arch, srpm_url): - if not arch in self._arches or not self.available(): + if not self.available(): + raise RuntimeError + if not self._target_arches.has_key(target) or len(self._target_arches[target]) == 0: + raise RuntimeError + if not arch in self._target_arches[target]: raise RuntimeError builder_xmlrpc_lock.acquire() self._server_lock.acquire() try: jobid = self._server.start(target, arch, srpm_url) - except (socket.error, xmlrpclib.ProtocolError): + except (socket.error, OpenSSL.SSL.SysCallError, xmlrpclib.ProtocolError): jobid = 0 self._server_lock.release() builder_xmlrpc_lock.release() @@ -200,7 +212,12 @@ def to_dict(self): client_dict = {} client_dict['address'] = self._address - client_dict['arches'] = self._arches + arches = [] + for target in self._target_arches.keys(): + for arch in self._target_arches[target]: + if not arch in arches: + arches.append(arch) + client_dict['arches'] = arches if self._cur_jobid: client_dict['status'] = 'building' else: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BuilderManager.py 11 Jul 2005 20:13:37 -0000 1.4 +++ BuilderManager.py 16 Jul 2005 15:47:43 -0000 1.5 @@ -146,7 +146,7 @@ continue # Find a free builder for this request for builder in self.running_builders: - if builder.available() and builder.can_build_arch(req['arch']): + if builder.available() and builder.can_build_arch_on_target(req['arch'], req['target']): try: job = builder.start_job(parent, req['target'], req['arch'], req['srpm_url']) except RuntimeError: Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- CONFIG.py 12 Jul 2005 20:12:32 -0000 1.18 +++ CONFIG.py 16 Jul 2005 15:47:43 -0000 1.19 @@ -55,7 +55,7 @@ # Further architectures on a per-package basis are configured in each target's # package file. See the config option 'addl_package_arches_dir'. # -config_opts['targets'] = { 'devel' : ['i386'] } +config_opts['targets'] = { 'development' : ['i386'] } # If you're using CVS building, sometimes the CVS directory layout won't match From fedora-extras-commits at redhat.com Sat Jul 16 16:42:17 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 12:42:17 -0400 Subject: extras-buildsys/builder builder.py,1.17,1.18 Message-ID: <200507161642.j6GGgH4O011445@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11425/builder Modified Files: builder.py Log Message: Pass the buildarch to mock so we actually build non-standard arches like i586/sparcv9/etc Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- builder.py 16 Jul 2005 15:47:42 -0000 1.17 +++ builder.py 16 Jul 2005 16:42:15 -0000 1.18 @@ -154,9 +154,9 @@ os.makedirs(self._result_dir) if not os.path.exists(self._result_dir): os.makedirs(self._result_dir) - cmd = '%s %s -r %s --resultdir=%s --statedir=%s --uniqueext=%s %s' % (self.arch_command, - config_opts['builder_cmd'], self.buildroot, - self._result_dir, self._state_dir, self._uniqid, self._srpm_path) + mock_args = "-r %s --arch %s --resultdir=%s --statedir=%s --uniqueext=%s %s" % (self.buildroot, + self.buildarch, self._result_dir, self._state_dir, self._uniqid, self._srpm_path) + cmd = '%s %s %s' % (self.arch_command, config_opts['builder_cmd'], mock_args) self.log(" %s\n" % cmd) self._pobj = popen2.Popen4(cmd=cmd, bufsize=1024) fcntl.fcntl(self._pobj.fromchild.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) From fedora-extras-commits at redhat.com Sat Jul 16 16:47:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 12:47:39 -0400 Subject: extras-buildsys pyOpenSSL-threadsafe.patch,NONE,1.1 Message-ID: <200507161647.j6GGldhD011501@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11483 Added Files: pyOpenSSL-threadsafe.patch Log Message: Add pyOpenSSL patch for threadsafety, pretty much required for plague pyOpenSSL-threadsafe.patch: --- NEW FILE pyOpenSSL-threadsafe.patch --- --- pyOpenSSL-0.6/src/ssl/context.c.threadsafe 2004-08-06 06:24:38.000000000 -0400 +++ pyOpenSSL-0.6/src/ssl/context.c 2005-07-12 22:30:02.000000000 -0400 @@ -53,39 +53,33 @@ static int global_passphrase_callback(char *buf, int maxlen, int verify, void *arg) { - int len; + int len = 0; char *str; PyObject *argv, *ret = NULL; ssl_ContextObj *ctx = (ssl_ContextObj *)arg; + if (!ctx->tstate) + fprintf (stderr, "ERROR: ctx->tstate == NULL!\n"); + MY_END_ALLOW_THREADS(ctx->tstate); + /* The Python callback is called with a (maxlen,verify,userdata) tuple */ argv = Py_BuildValue("(iiO)", maxlen, verify, ctx->passphrase_userdata); - if (ctx->tstate != NULL) - { - /* We need to get back our thread state before calling the callback */ - MY_END_ALLOW_THREADS(ctx->tstate); - ret = PyEval_CallObject(ctx->passphrase_callback, argv); - MY_BEGIN_ALLOW_THREADS(ctx->tstate); - } - else - { - ret = PyEval_CallObject(ctx->passphrase_callback, argv); - } + ret = PyEval_CallObject(ctx->passphrase_callback, argv); Py_DECREF(argv); if (ret == NULL) - return 0; + goto out; if (!PyObject_IsTrue(ret)) { Py_DECREF(ret); - return 0; + goto out; } if (!PyString_Check(ret)) { Py_DECREF(ret); - return 0; + goto out; } len = PyString_Size(ret); @@ -96,6 +90,8 @@ strncpy(buf, str, len); Py_XDECREF(ret); +out: + MY_BEGIN_ALLOW_THREADS(ctx->tstate); return len; } @@ -115,43 +111,39 @@ SSL *ssl; ssl_ConnectionObj *conn; crypto_X509Obj *cert; - int errnum, errdepth, c_ret; + int errnum, errdepth, c_ret = 0; - cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0); errnum = X509_STORE_CTX_get_error(x509_ctx); errdepth = X509_STORE_CTX_get_error_depth(x509_ctx); ssl = (SSL *)X509_STORE_CTX_get_app_data(x509_ctx); conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl); + if (!conn->tstate) + fprintf (stderr, "ERROR: ctx->tstate == NULL!\n"); + MY_END_ALLOW_THREADS(conn->tstate); + + cert = crypto_X509_New(X509_STORE_CTX_get_current_cert(x509_ctx), 0); + argv = Py_BuildValue("(OOiii)", (PyObject *)conn, (PyObject *)cert, errnum, errdepth, ok); Py_DECREF(cert); - if (conn->tstate != NULL) - { - /* We need to get back our thread state before calling the callback */ - MY_END_ALLOW_THREADS(conn->tstate); - ret = PyEval_CallObject(conn->context->verify_callback, argv); - MY_BEGIN_ALLOW_THREADS(conn->tstate); - } - else - { - ret = PyEval_CallObject(conn->context->verify_callback, argv); - } + ret = PyEval_CallObject(conn->context->verify_callback, argv); Py_DECREF(argv); - if (ret == NULL) - return 0; - - if (PyObject_IsTrue(ret)) + if (ret != NULL) { - X509_STORE_CTX_set_error(x509_ctx, X509_V_OK); - c_ret = 1; - } - else - c_ret = 0; + if (PyObject_IsTrue(ret)) + { + X509_STORE_CTX_set_error(x509_ctx, X509_V_OK); + c_ret = 1; + } + else + c_ret = 0; - Py_DECREF(ret); + Py_DECREF(ret); + } + MY_BEGIN_ALLOW_THREADS(conn->tstate); return c_ret; } @@ -169,28 +161,19 @@ ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl); PyObject *argv, *ret; + if (!conn->tstate) + fprintf (stderr, "ERROR: ctx->tstate == NULL!\n"); + MY_END_ALLOW_THREADS(conn->tstate); + argv = Py_BuildValue("(Oii)", (PyObject *)conn, where, _ret); - if (conn->tstate != NULL) - { - /* We need to get back our thread state before calling the callback */ - MY_END_ALLOW_THREADS(conn->tstate); - ret = PyEval_CallObject(conn->context->info_callback, argv); - if (ret == NULL) - PyErr_Clear(); - else - Py_DECREF(ret); - MY_BEGIN_ALLOW_THREADS(conn->tstate); - } + ret = PyEval_CallObject(conn->context->info_callback, argv); + if (ret == NULL) + PyErr_Clear(); else - { - ret = PyEval_CallObject(conn->context->info_callback, argv); - if (ret == NULL) - PyErr_Clear(); - else - Py_DECREF(ret); - } + Py_DECREF(ret); Py_DECREF(argv); + MY_BEGIN_ALLOW_THREADS(conn->tstate); return; } @@ -393,6 +376,8 @@ if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype)) return NULL; + if (self->tstate) + fprintf (stderr, "ERROR: ctx->tstate != NULL!\n"); MY_BEGIN_ALLOW_THREADS(self->tstate); ret = SSL_CTX_use_PrivateKey_file(self->ctx, keyfile, filetype); MY_END_ALLOW_THREADS(self->tstate); --- pyOpenSSL-0.6/src/crypto/crypto.c.threadsafe 2004-08-09 10:56:05.000000000 -0400 +++ pyOpenSSL-0.6/src/crypto/crypto.c 2005-07-12 22:29:32.000000000 -0400 @@ -668,6 +668,72 @@ { NULL, NULL } }; + +#ifdef WITH_THREAD + +#define MUTEX_TYPE pthread_mutex_t +#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL) +#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x)) +#define MUTEX_LOCK(x) pthread_mutex_lock(&(x)) +#define MUTEX_UNLOCK(x) pthread_mutex_unlock(&(x)) +#define THREAD_ID pthread_self() + +void handle_error(const char *file, int lineno, const char *msg) +{ + fprintf(stderr, "** %s:%i %s\n", file, lineno, msg); + ERR_print_errors_fp(stderr); +} + + +/* This array will store all of the mutexes available to OpenSSL. */ +static MUTEX_TYPE *mutex_buf = NULL; + + +static void locking_function(int mode, int n, const char * file, int line) +{ + if (mode & CRYPTO_LOCK) + MUTEX_LOCK(mutex_buf[n]); + else + MUTEX_UNLOCK(mutex_buf[n]); +} + +static unsigned long id_function(void) +{ + return ((unsigned long)THREAD_ID); +} + +int init_openssl_threads(void) +{ + int i; + + mutex_buf = (MUTEX_TYPE *)malloc(CRYPTO_num_locks() * sizeof(MUTEX_TYPE)); + if (!mutex_buf) + return 0; + for (i = 0; i < CRYPTO_num_locks(); i++) + MUTEX_SETUP(mutex_buf[i]); + CRYPTO_set_id_callback(id_function); + CRYPTO_set_locking_callback(locking_function); + return 1; +} + +int deinit_openssl_threads(void) +{ + int i; + + if (!mutex_buf) + return 0; + CRYPTO_set_id_callback(NULL); + CRYPTO_set_locking_callback(NULL); + for (i = 0; i < CRYPTO_num_locks(); i++) + MUTEX_CLEANUP(mutex_buf[i]); + free(mutex_buf); + mutex_buf = NULL; + return 1; +} + +#endif + + /* * Initialize crypto sub module * @@ -713,6 +779,10 @@ PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA); dict = PyModule_GetDict(module); +#ifdef WITH_THREAD + if (!init_openssl_threads()) + goto error; +#endif if (!init_crypto_x509(dict)) goto error; if (!init_crypto_x509name(dict)) From fedora-extras-commits at redhat.com Sat Jul 16 16:48:07 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sat, 16 Jul 2005 12:48:07 -0400 Subject: extras-buildsys plague.spec,1.17,1.18 Message-ID: <200507161648.j6GGm7BS011524@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11507 Modified Files: plague.spec Log Message: Fix up specfile, new version Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- plague.spec 14 Jul 2005 21:49:47 -0000 1.17 +++ plague.spec 16 Jul 2005 16:48:05 -0000 1.18 @@ -2,7 +2,7 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.1 +Version: 0.2 Release: 1 License: GPL Group: Development/Tools @@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-sqlite, pyOpenSSL, createrepo Requires: %{name}-common = %{version}-%{release} -Requires: lighttpd Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -32,7 +31,7 @@ %package builder -Summary: Build client daemon for Plague builder slaves +Summary: Builder daemon for Plague builder slaves Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: yum >= 2.2.1 @@ -43,15 +42,13 @@ Requires(preun): /sbin/service %description builder -The Plague build client does the actual RPM package building on slave -machines. +The Plague builder does the actual RPM package building on slave machines. %package client Summary: Package queueing client for the Plague build system Group: Development/Tools Requires: %{name}-common = %{version}-%{release} Requires: pyOpenSSL -Requires: lighttpd %description client Client program for enqueueing package builds and interrogating the build system. @@ -124,7 +121,7 @@ %files common %defattr(-, root, root) -%{_libdir}/python?.?/site-packages/plague/*.py* +/usr/lib/python?.?/site-packages/plague/*.py* %files builder %defattr(-, root, root) @@ -145,5 +142,10 @@ %changelog +* Sat Jul 16 2005 Dan Williams +- Bump version to 0.2 +- Grab python files from /usr/lib, not %{_libdir} until the + multiarch issues get worked out + * Sun Jun 26 2005 Dan Williams - first version/packaging From fedora-extras-commits at redhat.com Sat Jul 16 16:49:53 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 16 Jul 2005 12:49:53 -0400 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.10,1.11 Message-ID: <200507161649.j6GGnrDw011552@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11535 Modified Files: xemacs-sumo.spec Log Message: Reformat specfile. Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xemacs-sumo.spec 13 Jul 2005 20:03:28 -0000 1.10 +++ xemacs-sumo.spec 16 Jul 2005 16:49:51 -0000 1.11 @@ -1,83 +1,82 @@ -%define sumo_ver 2005-05-05 +%define sumo 2005-05-05 +%define pkgdir %{_datadir}/xemacs -Summary: XEmacs Lisp packages -Name: xemacs-sumo -Version: %(echo %{sumo_ver} | tr -d -) -Release: 7 -License: GPL -Group: Applications/Editors -Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2 -Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2 -Source2: %{name}-w3.css -Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz -Source10: Emacs.ad.ja_JP.eucJP -Source11: Emacs.ad.ko_KR.eucKR -Source12: Emacs.ad.zh_CN.GB2312 -Source13: Emacs.ad.zh_TW.Big5 -Source14: Emacs.ad.ja_JP.UTF-8 -Source15: Emacs.ad.ko_KR.UTF-8 -Source16: Emacs.ad.zh_CN.UTF-8 -Source17: Emacs.ad.zh_TW.UTF-8 -URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: xemacs-nox perl /sbin/install-info -Requires: xemacs-common -Conflicts: xemacs < 21.4.12-12 -BuildArch: noarch -Provides: ruby-mode-xemacs -Obsoletes: ruby-mode-xemacs tm -# Provides/Obsoletes for upgradeability from the latest FC version, needed -# until (if?) there will be a separate apel package for XEmacs again. -Provides: apel-xemacs = 10.2 -Obsoletes: apel-xemacs < 10.6-6 -Patch0: %{name}-jde-equal.patch -Patch1: %{name}-sql-abbrev.patch -Patch6: auctex-texsite-jlatex-detect-69129.patch -Patch7: auctex-texjp-platex.patch -Patch8: egg-wnn-host-unix-79826.patch -Patch11: browse-url-htmlview-84262.patch -Patch12: psgml-browsers-84262.patch -Patch13: jde-ug-rel-links.patch -Patch14: jde-ug-section-links-89499.patch -Patch15: avoid-catch-error-65346.patch +Name: xemacs-sumo +Version: %(echo %{sumo} | tr -d -) +Release: 7 +Summary: XEmacs lisp packages + +Group: Applications/Editors +License: GPL +URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball +Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2 +Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2 +Source2: %{name}-w3.css +Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz +Source10: Emacs.ad.ja_JP.eucJP +Source11: Emacs.ad.ko_KR.eucKR +Source12: Emacs.ad.zh_CN.GB2312 +Source13: Emacs.ad.zh_TW.Big5 +Source14: Emacs.ad.ja_JP.UTF-8 +Source15: Emacs.ad.ko_KR.UTF-8 +Source16: Emacs.ad.zh_CN.UTF-8 +Source17: Emacs.ad.zh_TW.UTF-8 +Patch0: %{name}-jde-equal.patch +Patch1: %{name}-sql-abbrev.patch +Patch6: auctex-texsite-jlatex-detect-69129.patch +Patch7: auctex-texjp-platex.patch +Patch8: egg-wnn-host-unix-79826.patch +Patch11: browse-url-htmlview-84262.patch +Patch12: psgml-browsers-84262.patch +Patch13: jde-ug-rel-links.patch +Patch14: jde-ug-section-links-89499.patch +Patch15: avoid-catch-error-65346.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: xemacs-nox +BuildRequires: perl +BuildRequires: /sbin/install-info +Requires: xemacs-common +Provides: apel-xemacs = 10.2 +Provides: ruby-mode-xemacs +Obsoletes: apel-xemacs < 10.6-6 +Obsoletes: ruby-mode-xemacs +Obsoletes: tm +Conflicts: xemacs < 21.4.12-12 %description -XEmacs (like GNU Emacs) is a self-documenting, customizable, -extensible, real-time display editor. XEmacs is self-documenting -because at any time you can type control-h to find out what your -options are or find out what a command does. XEmacs is customizable -because you can change the definitions of XEmacs commands. XEmacs is -extensible because you can write entirely new commands-programs in the -Lisp language to be run by Emacs' own Lisp interpreter. XEmacs -includes a real-time display, which means that the text being edited -is visible on the screen and is updated very frequently (usually after -every character or pair of characters) as you type. - -The XEmacs Sumo packages contain a large collection of useful -Lisp packages for XEmacs including mailreaders, programming modes -and utilities, and mule related packages. - -%package el -Summary: The .el source files for the XEmacs Sumo packages. -Group: Applications/Editors -Requires: xemacs-sumo = %{version} -Conflicts: xemacs-el < 21.4.12-12 - -%description el -xemacs-sumo-el is not needed to run XEmacs. You only need to install it if -you are planning to incorporate some Lisp programming into your XEmacs -experience. - -%package info -Summary: Information files for XEmacs. -Group: Applications/Editors -Conflicts: xemacs-info < 21.4.12-12 - -%description info -This package contains optional info files that are distributed -with the XEmacs Sumo packages. +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +The XEmacs Sumo packages contain a large collection of useful lisp +packages for XEmacs including mailreaders, programming modes and +utilities, and packages related to using XEmacs in multi-lingual +environments. + +%package el +Summary: Emacs lisp source files for the XEmacs Sumo packages +Group: Development/Libraries +Requires: xemacs-sumo = %{version} +Conflicts: xemacs-el < 21.4.12-12 + +%description el +This package is not needed to run XEmacs; it contains the lisp source +files for the XEmacs Sumo packages, mainly of interest when developing +or debugging the packages. + +%package info +Summary: XEmacs packages documentation in GNU texinfo format +Group: Documentation +Conflicts: xemacs-info < 21.4.12-12 + +%description info +This package contains optional documentation for the XEmacs Sumo +packages in GNU texinfo format -%define pkgdir %{_datadir}/xemacs %prep %setup -q -c -a1 @@ -120,78 +119,84 @@ %build -%define _xemacs_batch xemacs-nox -batch -vanilla +export xemacs_batch="xemacs-nox -batch -vanilla" # mew is provided by mew-xemacs, and skk by ddskk-xemacs -%_xemacs_batch -l package-admin -eval \ +$xemacs_batch -l package-admin -eval \ "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" rmdir xemacs-packages/{etc,lisp,man}/mew -%_xemacs_batch -l package-admin -eval \ +$xemacs_batch -l package-admin -eval \ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk export EMACSPACKAGEPATH=`pwd` -%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ +$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* -%_xemacs_batch -f batch-byte-recompile-directory \ +$xemacs_batch -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp %install -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT -# install packages in buildroot -mkdir -p %buildroot%{pkgdir} -cp -rp xemacs-packages mule-packages %buildroot%{pkgdir} - -( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults - mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5 - iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs - iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs - iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs - mv de de_DE - mv fr fr_FR - mv ro ro_RO - install -m 644 %SOURCE10 ja_JP.eucJP/Emacs - install -m 644 %SOURCE11 ko_KR.eucKR/Emacs - install -m 644 %SOURCE12 zh_CN.GB2312/Emacs - install -m 644 %SOURCE13 zh_TW.Big5/Emacs - install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs - install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs - install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs - install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs -## don't seem to appear in manifest -# ln -s ja_JP.eucJP ja_JP -# ln -s ko_KR.eucKR ko_KR -# ln -s zh_CN.GB2312 zh_CN -# ln -s zh_TW.Big5 zh_TW -) +mkdir -p $RPM_BUILD_ROOT%{pkgdir} +cp -rp xemacs-packages mule-packages $RPM_BUILD_ROOT%{pkgdir} -# Make sure nothing is 0400 -chmod -R a+rX %buildroot/usr +cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults +mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \ + ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5 +iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs +iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs +iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs +mv de de_DE +mv fr fr_FR +mv ro ro_RO +install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs +install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs +install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs +install -pm 644 %{SOURCE13} zh_TW.Big5/Emacs +install -pm 644 %{SOURCE14} ja_JP.UTF-8/Emacs +install -pm 644 %{SOURCE15} ko_KR.UTF-8/Emacs +install -pm 644 %{SOURCE16} zh_CN.UTF-8/Emacs +install -pm 644 %{SOURCE17} zh_TW.UTF-8/Emacs +# these don't seem to appear in manifest +#ln -s ja_JP.eucJP ja_JP +#ln -s ko_KR.eucKR ko_KR +#ln -s zh_CN.GB2312 zh_CN +#ln -s zh_TW.Big5 zh_TW +cd - + +# make sure nothing is 0400 +chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} # info docs: pre-generate "dir"s and compress files -for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do +for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do /sbin/install-info $file `dirname $file`/dir done -find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9 +find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9 # separate files rm -f *.files base-files el-files info-files -echo "%defattr(-,root,root)" > base-files -echo "%defattr(-,root,root)" > el-files -echo "%defattr(-,root,root)" > info-files - -find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \) +echo "%%defattr(-,root,root,-)" > base-files +echo "%%defattr(-,root,root,-)" > el-files +echo "%%defattr(-,root,root,-)" > info-files + +find $RPM_BUILD_ROOT%{pkgdir}/* \ + \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \ + \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ + \( -type d -name info -fprint info.files -prune \) -o \ + \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \ + \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ + -fprint base-el-not-bytecomped.files \) \) -perl -pi -e "s|%buildroot||" *.files +perl -pi -e "s|$RPM_BUILD_ROOT||" *.files cat base-*.files dir.files >> base-files -cat el-*.files dir.files >> el-files -cat info.files >> info-files +cat el-*.files dir.files >> el-files +cat info.files >> info-files %clean -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT %files -f base-files @@ -204,6 +209,7 @@ %changelog * Wed Jul 13 2005 Ville Skytt?? - 20050505-7 - Remove mew and skk, they're in separate packages again (#162952). +- Reformat specfile. * Thu Jun 2 2005 Ville Skytt?? - 20050505-6 - Make sure we're using files included in this package From fedora-extras-commits at redhat.com Sun Jul 17 11:45:06 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:06 -0400 Subject: rpms/libdnet - New directory Message-ID: <200507171145.j6HBj6eI005648@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5624/libdnet Log Message: Directory /cvs/extras/rpms/libdnet added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 11:45:06 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:06 -0400 Subject: rpms/libdnet/devel - New directory Message-ID: <200507171145.j6HBj60W005653@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5624/libdnet/devel Log Message: Directory /cvs/extras/rpms/libdnet/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 11:45:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:20 -0400 Subject: rpms/libdnet Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507171145.j6HBjKCB005696@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5669 Added Files: Makefile import.log Log Message: Setup of module libdnet --- NEW FILE Makefile --- # Top level Makefile for module libdnet all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 17 11:45:20 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:20 -0400 Subject: rpms/libdnet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507171145.j6HBjKW5005701@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5669/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libdnet --- NEW 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 Jul 17 11:45:52 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:52 -0400 Subject: rpms/libdnet import.log,1.1,1.2 Message-ID: <200507171145.j6HBjq4l005764@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5733 Modified Files: import.log Log Message: auto-import libdnet-1.10-2 on branch devel from libdnet-1.10-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libdnet/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jul 2005 11:45:18 -0000 1.1 +++ import.log 17 Jul 2005 11:45:50 -0000 1.2 @@ -0,0 +1 @@ +libdnet-1_10-2:HEAD:libdnet-1.10-2.src.rpm:1121600742 From fedora-extras-commits at redhat.com Sun Jul 17 11:45:52 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:45:52 -0400 Subject: rpms/libdnet/devel libdnet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507171145.j6HBjqvC005771@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/libdnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5733/devel Modified Files: .cvsignore sources Added Files: libdnet.spec Log Message: auto-import libdnet-1.10-2 on branch devel from libdnet-1.10-2.src.rpm --- NEW FILE libdnet.spec --- Summary: Simple portable interface to lowlevel networking routines Name: libdnet Version: 1.10 Release: 2%{?dist} License: BSD-like Group: System Environment/Libraries URL: http://libdnet.sf.net/ Source: http://dl.sf.net/libdnet/libdnet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description libdnet provides a simplified, portable interface to several low-level networking routines, including network address manipulation, kernel arp(4) cache and route(4) table lookup and manipulation, network firewalling (IP filter, ipfw, ipchains, pf, ...), network interface lookup and manipulation, raw IP packet and Ethernet frame, and data transmission. %package devel Summary: Header files for libdnet library Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary}. %package progs Summary: Sample applications to use with libdnet Group: Applications/Internet Requires: %{name} = %{version}-%{release} %description progs %{summary}. %prep %setup -q %build %configure %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} make install DESTDIR=%{buildroot} %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE README THANKS TODO %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/*.so %{_libdir}/*.a %exclude %{_libdir}/*.la %{_includedir}/* %{_mandir}/man3/*.3* %files progs %defattr(-,root,root,-) %{_sbindir}/* %{_mandir}/man8/*.8* %changelog * Thu Jul 14 2005 Oliver Falk - 1.10-2 - Integrate Jos?'s patch after reviewing the pkg. * Fri Jul 08 2005 Oliver Falk - 1.10-1 - Build for FE Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdnet/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2005 11:45:18 -0000 1.1 +++ .cvsignore 17 Jul 2005 11:45:50 -0000 1.2 @@ -0,0 +1 @@ +libdnet-1.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdnet/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2005 11:45:18 -0000 1.1 +++ sources 17 Jul 2005 11:45:50 -0000 1.2 @@ -0,0 +1 @@ +416b765e9d9961501ac85e9a366fd219 libdnet-1.10.tar.gz From fedora-extras-commits at redhat.com Sun Jul 17 11:48:36 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:48:36 -0400 Subject: owners owners.list,1.19,1.20 Message-ID: <200507171148.j6HBmaQI005840@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5823 Modified Files: owners.list Log Message: * Add libdnet Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- owners.list 15 Jul 2005 08:30:04 -0000 1.19 +++ owners.list 17 Jul 2005 11:48:34 -0000 1.20 @@ -337,6 +337,7 @@ Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|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|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org| Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Jul 17 11:49:37 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:49:37 -0400 Subject: common tobuild,1.1941,1.1942 Message-ID: <200507171149.j6HBnbNc005902@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5885 Modified Files: tobuild Log Message: request build of rpms/libdnet/devel libdnet-1_10-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1941 retrieving revision 1.1942 diff -u -r1.1941 -r1.1942 --- tobuild 16 Jul 2005 11:11:27 -0000 1.1941 +++ tobuild 17 Jul 2005 11:49:35 -0000 1.1942 @@ -84,3 +84,4 @@ mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 +oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 17 11:50:45 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:50:45 -0400 Subject: common tobuild,1.1942,1.1943 Message-ID: <200507171150.j6HBojba005969@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5952 Modified Files: tobuild Log Message: request build of rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1942 retrieving revision 1.1943 diff -u -r1.1942 -r1.1943 --- tobuild 17 Jul 2005 11:49:35 -0000 1.1942 +++ tobuild 17 Jul 2005 11:50:43 -0000 1.1943 @@ -85,3 +85,4 @@ mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel +oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 17 11:51:07 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Sun, 17 Jul 2005 07:51:07 -0400 Subject: common tobuild,1.1943,1.1944 Message-ID: <200507171151.j6HBp7Pg006031@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014 Modified Files: tobuild Log Message: request build of rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1943 retrieving revision 1.1944 diff -u -r1.1943 -r1.1944 --- tobuild 17 Jul 2005 11:50:43 -0000 1.1943 +++ tobuild 17 Jul 2005 11:51:05 -0000 1.1944 @@ -86,3 +86,4 @@ mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 +oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 17 13:11:36 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:11:36 -0400 Subject: rpms/nautilus-open-terminal - New directory Message-ID: <200507171311.j6HDBaxq008424@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/nautilus-open-terminal Log Message: Directory /cvs/extras/rpms/nautilus-open-terminal added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 13:11:37 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:11:37 -0400 Subject: rpms/nautilus-open-terminal/devel - New directory Message-ID: <200507171311.j6HDBb6J008429@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/nautilus-open-terminal/devel Log Message: Directory /cvs/extras/rpms/nautilus-open-terminal/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 13:12:03 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:03 -0400 Subject: rpms/nautilus-open-terminal Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507171312.j6HDC3IB008478@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8445 Added Files: Makefile import.log Log Message: Setup of module nautilus-open-terminal --- NEW FILE Makefile --- # Top level Makefile for module nautilus-open-terminal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 17 13:12:04 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:04 -0400 Subject: rpms/nautilus-open-terminal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507171312.j6HDC4u7008483@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8445/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nautilus-open-terminal --- NEW 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 Jul 17 13:12:31 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:31 -0400 Subject: rpms/nautilus-open-terminal import.log,1.1,1.2 Message-ID: <200507171312.j6HDCVhK008545@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8514 Modified Files: import.log Log Message: auto-import nautilus-open-terminal-0.4-4 on branch devel from nautilus-open-terminal-0.4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jul 2005 13:12:01 -0000 1.1 +++ import.log 17 Jul 2005 13:12:29 -0000 1.2 @@ -0,0 +1 @@ +nautilus-open-terminal-0_4-4:HEAD:nautilus-open-terminal-0.4-4.src.rpm:1121605967 From fedora-extras-commits at redhat.com Sun Jul 17 13:12:31 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:12:31 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507171312.j6HDCVaq008552@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8514/devel Modified Files: .cvsignore sources Added Files: nautilus-open-terminal.spec Log Message: auto-import nautilus-open-terminal-0.4-4 on branch devel from nautilus-open-terminal-0.4-4.src.rpm --- NEW FILE nautilus-open-terminal.spec --- Name: nautilus-open-terminal Version: 0.4 Release: 4%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops License: GPL URL: http://manny.cluecoder.org/packages/nautilus-open-terminal/ Source0: http://manny.cluecoder.org/packages/nautilus-open-terminal/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel # need extensions BuildRequires: nautilus >= 2.5.4 %description The nautilus-open-terminal extension provides a right-click "Open Terminal" option for nautilus users who prefer that option. %prep %setup -q %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0/*.{l,}a %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO #%{_datadir}/locale/*/*/* %{_libdir}/nautilus/extensions-1.0/*.so* %changelog * Fri Jul 15 2005 Paul W. Frields - 0.4-4 - Use find_lang and scriptlets per official guidelines * Thu Jul 14 2005 Paul W. Frields - 0.4-3 - Remove .a and .la devel files from build * Thu Jul 14 2005 Paul W. Frields - 0.4-2 - Use dist tag and update BuildRequires * Wed Jul 13 2005 Paul W. Frields - 0.4-1 - Initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2005 13:12:02 -0000 1.1 +++ .cvsignore 17 Jul 2005 13:12:29 -0000 1.2 @@ -0,0 +1 @@ +nautilus-open-terminal-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2005 13:12:02 -0000 1.1 +++ sources 17 Jul 2005 13:12:29 -0000 1.2 @@ -0,0 +1 @@ +931a50e602f60340a5ed369f50146f36 nautilus-open-terminal-0.4.tar.gz From fedora-extras-commits at redhat.com Sun Jul 17 13:27:30 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 09:27:30 -0400 Subject: owners owners.list,1.20,1.21 Message-ID: <200507171327.j6HDRU90008661@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644 Modified Files: owners.list Log Message: Add nautilus-open-terminal Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- owners.list 17 Jul 2005 11:48:34 -0000 1.20 +++ owners.list 17 Jul 2005 13:27:28 -0000 1.21 @@ -438,6 +438,7 @@ Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com 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|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|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org| From stickster at gmail.com Sun Jul 17 13:43:14 2005 From: stickster at gmail.com (Paul W. Frields) Date: Sun, 17 Jul 2005 09:43:14 -0400 Subject: APPROVED: nautilus-open-terminal Message-ID: <1121607794.5038.15.camel@localhost.localdomain> The nautilus-open-terminal extension provides a right-click "Open Terminal" option for nautilus users who prefer that option. Reviewer: Tom "spot" Callaway Maintainer: Paul W. Frields -- Paul W. Frields, RHCE http://paul.frields.org/ gpg fingerprint: 3DA6 A0AC 6D58 FEC4 0233 5906 ACDB C937 BD11 3717 Fedora Documentation Project: http://fedora.redhat.com/projects/docs/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Sun Jul 17 14:24:02 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 10:24:02 -0400 Subject: common tobuild,1.1944,1.1945 Message-ID: <200507171424.j6HEO2lk009923@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9906 Modified Files: tobuild Log Message: request build of rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1944 retrieving revision 1.1945 diff -u -r1.1944 -r1.1945 --- tobuild 17 Jul 2005 11:51:05 -0000 1.1944 +++ tobuild 17 Jul 2005 14:24:00 -0000 1.1945 @@ -87,3 +87,4 @@ oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development From tcallawa at redhat.com Sun Jul 17 15:48:30 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Sun, 17 Jul 2005 10:48:30 -0500 Subject: APPROVED: dvb-apps Message-ID: <1121615310.2755.147.camel@localhost.localdomain> Name: dvb-apps Summary: Utility, demo and test applications using the Linux DVB API Reviewer: Tom 'spot' Callaway Maintainer: Ville Skytt? ~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 Sun Jul 17 16:15:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:24 -0400 Subject: rpms/dvb-apps - New directory Message-ID: <200507171615.j6HGFOmB012422@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402/dvb-apps Log Message: Directory /cvs/extras/rpms/dvb-apps added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 16:15:24 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:24 -0400 Subject: rpms/dvb-apps/devel - New directory Message-ID: <200507171615.j6HGFO9H012427@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402/dvb-apps/devel Log Message: Directory /cvs/extras/rpms/dvb-apps/devel added to the repository From fedora-extras-commits at redhat.com Sun Jul 17 16:15:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:48 -0400 Subject: rpms/dvb-apps Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507171615.j6HGFmBA012474@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447 Added Files: Makefile import.log Log Message: Setup of module dvb-apps --- NEW FILE Makefile --- # Top level Makefile for module dvb-apps all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 17 16:15:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:15:49 -0400 Subject: rpms/dvb-apps/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507171615.j6HGFnZp012479@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dvb-apps --- NEW 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 Jul 17 16:16:43 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:16:43 -0400 Subject: rpms/dvb-apps import.log,1.1,1.2 Message-ID: <200507171616.j6HGGhKm012560@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526 Modified Files: import.log Log Message: auto-import dvb-apps-1.1.0-0.4 on branch devel from dvb-apps-1.1.0-0.4.src.rpm Initial import. Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Jul 2005 16:15:46 -0000 1.1 +++ import.log 17 Jul 2005 16:16:41 -0000 1.2 @@ -0,0 +1 @@ +dvb-apps-1_1_0-0_4:HEAD:dvb-apps-1.1.0-0.4.src.rpm:1121616991 From fedora-extras-commits at redhat.com Sun Jul 17 16:16:44 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:16:44 -0400 Subject: rpms/dvb-apps/devel dvb-apps-fi-htv-scan, NONE, 1.1 dvb-apps-optflags.patch, NONE, 1.1 dvb-apps-paths.patch, NONE, 1.1 dvb-apps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507171616.j6HGGiC5012568@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12526/devel Modified Files: .cvsignore sources Added Files: dvb-apps-fi-htv-scan dvb-apps-optflags.patch dvb-apps-paths.patch dvb-apps.spec Log Message: auto-import dvb-apps-1.1.0-0.4 on branch devel from dvb-apps-1.1.0-0.4.src.rpm Initial import. --- NEW FILE dvb-apps-fi-htv-scan --- # HTV (Finland / Helsinki) # freq sr fec mod C 283000000 5900000 NONE QAM128 dvb-apps-optflags.patch: --- NEW FILE dvb-apps-optflags.patch --- diff -Naru linuxtv-dvb-apps-1.1.0.orig/test/Makefile linuxtv-dvb-apps-1.1.0/test/Makefile --- linuxtv-dvb-apps-1.1.0.orig/test/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/test/Makefile 2004-10-04 23:32:18.377000638 +0300 @@ -1,7 +1,7 @@ # Makefile for Linux DVB API Version 3 test programs CC = gcc -CFLAGS = -g -O2 -W -Wall -I../include +CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -I../include TARGETS = \ diseqc \ diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile 2004-10-04 23:32:10.787375858 +0300 @@ -1,5 +1,5 @@ CC = gcc -CFLAGS = -g -Wall -O2 +CFLAGS = $(RPM_OPT_FLAGS) -Wall all: av7110_loadkeys evtest diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile 2004-10-04 23:31:58.835116342 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -g -O2 -MD -Wall -I. -I../../include +CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include LFLAGS = OBJS = dvbdate.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile 2004-10-04 23:31:48.830247341 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -g -O2 -MD -Wall -I. -I../../include +CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include LFLAGS = OBJS = dvbnet.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile 2004-01-19 19:10:16.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile 2004-10-04 23:31:37.418818469 +0300 @@ -1,6 +1,6 @@ dvbtraffic: dvbtraffic.c - gcc -MD -g -O2 -Wall -I../../include $< -o $@ + $(CC) -MD -Wall $(RPM_OPT_FLAGS) -I../../include $< -o $@ clean: rm -f *.o *.d dvbtraffic diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile linuxtv-dvb-apps-1.1.0/util/lib/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/lib/Makefile 2004-10-04 23:31:08.152976759 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -MD -g -Wall -O2 -I../../include -I. +CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I. LFLAGS = -g -Wall OBJS = lnb.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile linuxtv-dvb-apps-1.1.0/util/scan/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/scan/Makefile 2004-10-04 23:30:50.443518484 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib +CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib LFLAGS = -g -Wall OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o ../lib/lnb.o diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile linuxtv-dvb-apps-1.1.0/util/szap/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/szap/Makefile 2004-10-04 23:32:41.668711208 +0300 @@ -1,6 +1,6 @@ CC = gcc -CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib -LFLAGS = -Wall -g -O2 +CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib +LFLAGS = -Wall $(RPM_OPT_FLAGS) RM = rm -f TARGETS = szap tzap czap femon diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile --- linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile 2004-01-22 00:13:45.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile 2004-10-04 23:30:34.373547057 +0300 @@ -1,6 +1,6 @@ CC = gcc RM = rm -f -CFLAGS = -g -Wall -O2 +CFLAGS = -Wall $(RPM_OPT_FLAGS) LFLAGS = -g -Wall LDFLAGS = -lusb dvb-apps-paths.patch: --- NEW FILE dvb-apps-paths.patch --- diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README --- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README 2004-10-05 00:12:40.031659603 +0300 @@ -7,3 +7,3 @@ - # ./av7110_loadkeys [-i|--invert] [-a|--address ] keymapname.(rc5|rcmm) > /proc/av7110_ir + # av7110_loadkeys [-i|--invert] [-a|--address ] keymapname.(rc5|rcmm) > /proc/av7110_ir @@ -17,6 +17,6 @@ Listen to *any* IR transmitter with uses the RC5 protocol: -# ./av7110_loadkeys hauppauge.rc5 > /proc/av7110_ir +# av7110_loadkeys /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir Listen to RC5 transmitter with address 2: -# ./av7110_loadkeys -a 2 hauppauge.rc5 > /proc/av7110_ir +# av7110_loadkeys -a 2 /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir @@ -25,5 +25,5 @@ -Now you can test your hardware setup using evtest +Now you can test your hardware setup using av7110_evtest - # ./evtest /dev/input/eventX + # av7110_evtest /dev/input/eventX diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl --- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl 2004-10-05 00:12:32.412917780 +0300 @@ -14,3 +14,3 @@ - $DEV_NAME = `./dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`; + $DEV_NAME = `dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`; chop($DEV_NAME); diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh --- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh 2004-10-05 00:13:40.047815421 +0300 @@ -6,3 +6,3 @@ -./dvbnet -p $PID +dvbnet -p $PID diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/scan/README linuxtv-dvb-apps-1.1.0/util/scan/README --- linuxtv-dvb-apps-1.1.0.orig/util/scan/README 2004-01-17 18:59:46.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/scan/README 2004-10-05 00:12:40.032659359 +0300 @@ -9,8 +9,9 @@ -Basic usage: ./scan dvb-s/Astra-19.2E | tee mychannels.conf +Basic usage: +scandvb /usr/share/dvb-apps/dvb-s/Astra-19.2E | tee mychannels.conf If you want it to check a specific frequency, tune to that frequency -(e.g. using szap/tzap/czap) and then use './scan -c'. +(e.g. using szap/tzap/czap) and then use 'scandvb -c'. -For more scan options see ./scan -h. +For more scandvb options see 'scandvb -h'. diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/szap/README linuxtv-dvb-apps-1.1.0/util/szap/README --- linuxtv-dvb-apps-1.1.0.orig/util/szap/README 2004-01-25 21:23:39.000000000 +0200 +++ linuxtv-dvb-apps-1.1.0/util/szap/README 2004-10-05 00:12:40.033659116 +0300 @@ -7,3 +7,3 @@ -$ ./szap -c channels.conf-dvbs-astra n24 +$ szap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbs-astra n24 @@ -11,3 +11,3 @@ -$ ./czap -c channels.conf-dvbc-berlin Arte +$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbc-berlin Arte @@ -15,3 +15,3 @@ -$ ./czap -c channels.conf-dvbt-berlin phoenix +$ tzap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix @@ -21,3 +21,3 @@ -$ ./czap -c channels.conf-dvbt-berlin phoenix -r +$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix -r [keep it running in one console] --- NEW FILE dvb-apps.spec --- Name: dvb-apps Version: 1.1.0 Release: 0.4 Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia License: GPL URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2 Source1: %{name}-fi-htv-scan Patch0: %{name}-optflags.patch Patch1: %{name}-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel BuildRequires: glibc-kernheaders >= 2.4-9.1.94 %description %{summary}. %prep %setup -q -n linuxtv-%{name}-%{version} %patch0 -p1 %patch1 -p1 cd util install -pm 644 %{SOURCE1} scan/dvb-c/fi-htv install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys install -pm 644 scan/README ../README.scandvb install -pm 644 szap/README ../README.szap install -pm 644 ttusb_dec_reset/README ../README.ttusb_dec_reset chmod 644 dvbnet/net_start.* cd .. rm -rf include %build make CC="%{__cc}" # %{?_smp_mflags} make %{?_smp_mflags} CC="%{__cc}" -C util/ttusb_dec_reset %install rm -rf $RPM_BUILD_ROOT cd util install -dm 755 $RPM_BUILD_ROOT%{_bindir} install -pm 755 av7110_loadkeys/av7110_loadkeys $RPM_BUILD_ROOT%{_bindir} install -pm 755 av7110_loadkeys/evtest $RPM_BUILD_ROOT%{_bindir}/av7110_evtest install -pm 755 dvbdate/dvbdate $RPM_BUILD_ROOT%{_bindir} install -pm 755 dvbnet/dvbnet $RPM_BUILD_ROOT%{_bindir} install -pm 755 dvbtraffic/dvbtraffic $RPM_BUILD_ROOT%{_bindir} install -pm 755 scan/scan $RPM_BUILD_ROOT%{_bindir}/scandvb install -pm 755 szap/?zap $RPM_BUILD_ROOT%{_bindir} install -pm 755 szap/femon $RPM_BUILD_ROOT%{_bindir} install -pm 755 ttusb_dec_reset/ttusb_dec_reset $RPM_BUILD_ROOT%{_bindir} install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pR scan/dvb-? $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 av7110_loadkeys/*.rc5 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 av7110_loadkeys/*.rcmm $RPM_BUILD_ROOT%{_datadir}/%{name} cd .. %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb* %{_bindir}/* %{_datadir}/dvb-apps/ %changelog * Thu Jun 30 2005 Ville Skytt?? - 1.1.0-0.4 - Update URL. * Sun May 29 2005 Ville Skytt?? - 1.1.0-0.3 - Rebuild for FC4. * Wed Apr 20 2005 Ville Skytt?? - 1.1.0-0.2 - Switch to recent glibc-kernheaders which includes userspace DVB headers. * Sun Dec 26 2004 Ville Skytt?? - 0:1.1.0-0.1 - Remove unnecessary Epochs. * Mon Oct 4 2004 Ville Skytt?? - 0:1.1.0-0.scop.1 - First build, loosely based on Mandrake's 1.1.0-4mdk. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Jul 2005 16:15:46 -0000 1.1 +++ .cvsignore 17 Jul 2005 16:16:42 -0000 1.2 @@ -0,0 +1 @@ +linuxtv-dvb-apps-1.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Jul 2005 16:15:46 -0000 1.1 +++ sources 17 Jul 2005 16:16:42 -0000 1.2 @@ -0,0 +1 @@ +987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 17 16:24:45 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:24:45 -0400 Subject: rpms/dvb-apps/devel .cvsignore, 1.2, 1.3 dvb-apps.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507171624.j6HGOj91012653@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/dvb-apps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12632 Modified Files: .cvsignore dvb-apps.spec sources Log Message: Include a copy of the GPL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Jul 2005 16:16:42 -0000 1.2 +++ .cvsignore 17 Jul 2005 16:24:42 -0000 1.3 @@ -1 +1,2 @@ linuxtv-dvb-apps-1.1.0.tar.bz2 +COPYING Index: dvb-apps.spec =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/dvb-apps.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvb-apps.spec 17 Jul 2005 16:16:42 -0000 1.1 +++ dvb-apps.spec 17 Jul 2005 16:24:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: dvb-apps Version: 1.1.0 -Release: 0.4 +Release: 1%{?dist} Summary: Utility, demo and test applications using the Linux DVB API Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2 Source1: %{name}-fi-htv-scan +Source2: http://www.gnu.org/licenses/COPYING Patch0: %{name}-optflags.patch Patch1: %{name}-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +33,7 @@ chmod 644 dvbnet/net_start.* cd .. rm -rf include +install -pm 644 %{SOURCE2} COPYING %build @@ -65,12 +67,15 @@ %files %defattr(-,root,root,-) -%doc README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb* +%doc COPYING README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb* %{_bindir}/* %{_datadir}/dvb-apps/ %changelog +* Sun Jul 17 2005 Ville Skytt?? - 1.1.0-1 +- Include a copy of the GPL. + * Thu Jun 30 2005 Ville Skytt?? - 1.1.0-0.4 - Update URL. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvb-apps/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Jul 2005 16:16:42 -0000 1.2 +++ sources 17 Jul 2005 16:24:42 -0000 1.3 @@ -1 +1,2 @@ 987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 +eb723b61539feef013de476e68b5c50a COPYING From fedora-extras-commits at redhat.com Sun Jul 17 16:29:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:29:04 -0400 Subject: owners owners.list,1.21,1.22 Message-ID: <200507171629.j6HGT4u7012715@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12698 Modified Files: owners.list Log Message: Add dvb-apps. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- owners.list 17 Jul 2005 13:27:28 -0000 1.21 +++ owners.list 17 Jul 2005 16:29:02 -0000 1.22 @@ -122,6 +122,7 @@ Fedora Extras|drivel|A journal or "blog" client|katzj at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|duplicity|Untrusted/encrypted backup using rsync algorithm|bescoto at stanford.edu|extras-qa at fedoraproject.org| +Fedora Extras|dvb-apps|Utility, demo and test applications using the Linux DVB API|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|dxpc|A Differential X Protocol Compressor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Jul 17 16:37:59 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 17 Jul 2005 12:37:59 -0400 Subject: rpms/xemacs-sumo/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs-sumo.spec, 1.11, 1.12 xemacs-sumo-jde-equal.patch, 1.1, NONE xemacs-sumo-sql-abbrev.patch, 1.1, NONE xemacs-sumo-w3.css, 1.1, NONE Message-ID: <200507171637.j6HGbxZe012752@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12731 Modified Files: .cvsignore sources xemacs-sumo.spec Removed Files: xemacs-sumo-jde-equal.patch xemacs-sumo-sql-abbrev.patch xemacs-sumo-w3.css Log Message: * Sat Jul 16 2005 Ville Skytt?? - 20050715-1 - 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file permissions fixed upstream. - Use sed instead of perl for in-place edits during build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Jun 2005 21:00:01 -0000 1.5 +++ .cvsignore 17 Jul 2005 16:37:57 -0000 1.6 @@ -1,3 +1,2 @@ -xemacs-mule-sumo-2005-05-05.tar.bz2 -xemacs-sumo-2005-05-05.tar.bz2 -cc-mode-1.45-pkg.tar.gz +xemacs-mule-sumo-2005-07-15.tar.bz2 +xemacs-sumo-2005-07-15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Jun 2005 21:00:01 -0000 1.5 +++ sources 17 Jul 2005 16:37:57 -0000 1.6 @@ -1,3 +1,2 @@ -561bac71479bc400173c21c854c37beb xemacs-mule-sumo-2005-05-05.tar.bz2 -f98700b3db3ce279fe2c4234806f7dfa xemacs-sumo-2005-05-05.tar.bz2 -e1a2e251e57f29ce6e082181c13c7f04 cc-mode-1.45-pkg.tar.gz +016362256e4de4b150d6c2f8d686dd3f xemacs-mule-sumo-2005-07-15.tar.bz2 +28b92fa2e0bcd0c8e81fd6286d37af30 xemacs-sumo-2005-07-15.tar.bz2 Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xemacs-sumo.spec 16 Jul 2005 16:49:51 -0000 1.11 +++ xemacs-sumo.spec 17 Jul 2005 16:37:57 -0000 1.12 @@ -1,9 +1,9 @@ -%define sumo 2005-05-05 +%define sumo 2005-07-15 %define pkgdir %{_datadir}/xemacs Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 7 +Release: 1 Summary: XEmacs lisp packages Group: Applications/Editors @@ -11,8 +11,6 @@ URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2 Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2 -Source2: %{name}-w3.css -Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -21,8 +19,6 @@ Source15: Emacs.ad.ko_KR.UTF-8 Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 -Patch0: %{name}-jde-equal.patch -Patch1: %{name}-sql-abbrev.patch Patch6: auctex-texsite-jlatex-detect-69129.patch Patch7: auctex-texjp-platex.patch Patch8: egg-wnn-host-unix-79826.patch @@ -35,7 +31,7 @@ BuildArch: noarch BuildRequires: xemacs-nox -BuildRequires: perl +BuildRequires: sed >= 3.95 BuildRequires: /sbin/install-info Requires: xemacs-common Provides: apel-xemacs = 10.2 @@ -80,11 +76,6 @@ %prep %setup -q -c -a1 -%{__tar} zx -C xemacs-packages -f %{SOURCE3} -# fix font-lock warnings in JDE -%patch0 -p0 -# fix abbrev error when loading sql-mode -%patch1 -p0 # fix jlatex autodetection %patch6 -p0 # use ptex rather jtex by default for Japanese @@ -102,18 +93,9 @@ # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 -rm xemacs-packages/etc/w3/stylesheet -install -pm 644 %{SOURCE2} xemacs-packages/etc/w3/stylesheet - -perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \ +sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \ xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl} -chmod +x \ - xemacs-packages/etc/bbdb/*.pl \ - xemacs-packages/etc/erc/servers.pl \ - xemacs-packages/etc/ess/config.guess \ - xemacs-packages/etc/idlwave/idlwave_catalog - # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* @@ -166,9 +148,6 @@ #ln -s zh_TW.Big5 zh_TW cd - -# make sure nothing is 0400 -chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} - # info docs: pre-generate "dir"s and compress files for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do /sbin/install-info $file `dirname $file`/dir @@ -189,7 +168,7 @@ \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ -fprint base-el-not-bytecomped.files \) \) -perl -pi -e "s|$RPM_BUILD_ROOT||" *.files +sed -i -e "s|$RPM_BUILD_ROOT||" *.files cat base-*.files dir.files >> base-files cat el-*.files dir.files >> el-files cat info.files >> info-files @@ -207,6 +186,11 @@ %changelog +* Sat Jul 16 2005 Ville Skytt?? - 20050715-1 +- 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file + permissions fixed upstream. +- Use sed instead of perl for in-place edits during build. + * Wed Jul 13 2005 Ville Skytt?? - 20050505-7 - Remove mew and skk, they're in separate packages again (#162952). - Reformat specfile. --- xemacs-sumo-jde-equal.patch DELETED --- --- xemacs-sumo-sql-abbrev.patch DELETED --- --- xemacs-sumo-w3.css DELETED --- From fedora-extras-commits at redhat.com Sun Jul 17 18:00:58 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Sun, 17 Jul 2005 14:00:58 -0400 Subject: rpms/nautilus-open-terminal/devel nautilus-open-terminal.spec, 1.1, 1.2 Message-ID: <200507171800.j6HI0wMH014033@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/rpms/nautilus-open-terminal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14016 Modified Files: nautilus-open-terminal.spec Log Message: Add libtoolize to fix multilib problem (#163463) Index: nautilus-open-terminal.spec =================================================================== RCS file: /cvs/extras/rpms/nautilus-open-terminal/devel/nautilus-open-terminal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nautilus-open-terminal.spec 17 Jul 2005 13:12:29 -0000 1.1 +++ nautilus-open-terminal.spec 17 Jul 2005 18:00:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: nautilus-open-terminal Version: 0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Nautilus extension for an open terminal shortcut Group: User Interface/Desktops @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-desktop-devel +BuildRequires: libtool automake autoconf # need extensions BuildRequires: nautilus >= 2.5.4 @@ -23,6 +24,7 @@ %build +libtoolize --force --copy && aclocal && autoconf %configure make %{?_smp_mflags} @@ -42,10 +44,12 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO -#%{_datadir}/locale/*/*/* %{_libdir}/nautilus/extensions-1.0/*.so* %changelog +* Sun Jul 17 2005 Paul W. Frields - 0.4-5 +- Add libtoolize to fix multilib problem (#163463) + * Fri Jul 15 2005 Paul W. Frields - 0.4-4 - Use find_lang and scriptlets per official guidelines From fedora-extras-commits at redhat.com Sun Jul 17 20:30:32 2005 From: fedora-extras-commits at redhat.com (Colin Charles (byte)) Date: Sun, 17 Jul 2005 16:30:32 -0400 Subject: common tobuild,1.1945,1.1946 Message-ID: <200507172030.j6HKUWAS017625@cvs-int.fedora.redhat.com> Author: byte Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17608 Modified Files: tobuild Log Message: request build of rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1945 retrieving revision 1.1946 diff -u -r1.1945 -r1.1946 --- tobuild 17 Jul 2005 14:24:00 -0000 1.1945 +++ tobuild 17 Jul 2005 20:30:30 -0000 1.1946 @@ -88,3 +88,4 @@ oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development +byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 From fedora-extras-commits at redhat.com Mon Jul 18 08:13:24 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 18 Jul 2005 04:13:24 -0400 Subject: fedora-security/audit fc4,1.23,1.24 Message-ID: <200507180813.j6I8DsoR000799@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv782 Modified Files: fc4 Log Message: Deal with the updates from this weekend Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fc4 14 Jul 2005 09:13:59 -0000 1.23 +++ fc4 18 Jul 2005 08:13:10 -0000 1.24 @@ -34,7 +34,7 @@ 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] 2005-1768 version (kernel, fixed 2.6.6) -2005-1765 ** kernel +2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] 2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] @@ -48,7 +48,7 @@ 2005-1937 VULNERABLE (mozilla) 2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411] 2005-1831 ignore (sudo) unsubstantiated report -2005-1763 ** probably vulnerable kernel +2005-1763 version (kernel) [since FEDORA-2005-510] 2005-1769 ** squirrelmail 2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483] 2005-1760 ** probably vulnerable sysreport @@ -333,6 +333,9 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) +2004-2228 version (firefox, fixed 1.0) +2004-2227 version (firefox, fixed 1.0) +2004-2225 version (firefox, fixed 0.10.1) 2004-2154 version (cups, fixed 1.2.21rc1) 2004-2149 version (mysql, fixed 4.1.5) 2004-2136 ignore (dm-crypt) design From fedora-extras-commits at redhat.com Mon Jul 18 09:18:39 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:18:39 -0400 Subject: rpms/lighttpd/FC-4 .cvsignore, 1.3, 1.4 lighttpd.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507180918.j6I9IdXj002087@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2030/FC-4 Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.3.15 (mostly bugfix release). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2005 09:15:23 -0000 1.3 +++ .cvsignore 18 Jul 2005 09:18:37 -0000 1.4 @@ -1 +1 @@ -lighttpd-1.3.13.tar.gz +lighttpd-1.3.15.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-4/lighttpd.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lighttpd.spec 22 May 2005 23:50:13 -0000 1.6 +++ lighttpd.spec 18 Jul 2005 09:18:37 -0000 1.7 @@ -2,8 +2,8 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.3.13 -Release: 5 +Version: 1.3.15 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ %{?_with_ldap:BuildRequires: openldap-devel} %description @@ -78,26 +78,26 @@ libdir="%{buildroot}%{_libdir}/lighttpd" # Install included init script and sysconfig entry -%{__install} -D -m 0755 doc/rc.lighttpd.redhat \ +%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd -%{__install} -D -m 0644 doc/sysconfig.lighttpd \ +%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \ %{buildroot}%{_sysconfdir}/sysconfig/lighttpd # Install (*patched above*) sample config file -%{__install} -D -m 0640 doc/lighttpd.conf \ +%{__install} -D -p -m 0640 doc/lighttpd.conf \ %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf # Install our own logrotate entry -%{__install} -D -m 0644 %{SOURCE1} \ +%{__install} -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd # Install our own php.d ini file -%{__install} -D -m 0644 %{SOURCE2} \ +%{__install} -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini # Install our own default web page and images %{__mkdir_p} %{buildroot}%{webroot} -%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ +%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{buildroot}%{webroot}/ # Install empty log directory to include @@ -162,6 +162,12 @@ %changelog +* Mon Jul 18 2005 Matthias Saou 1.3.15-1 +- Update to 1.3.15. + +* Mon Jun 20 2005 Matthias Saou 1.3.14-1 +- Update to 1.3.14. + * Sun May 22 2005 Jeremy Katz - 1.3.13-5 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2005 09:15:23 -0000 1.3 +++ sources 18 Jul 2005 09:18:37 -0000 1.4 @@ -1 +1 @@ -2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz +e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 09:18:33 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:18:33 -0400 Subject: rpms/lighttpd/devel .cvsignore, 1.4, 1.5 lighttpd.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200507180919.j6I9J3RL002095@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2030/devel Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.3.15 (mostly bugfix release). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Jun 2005 13:15:51 -0000 1.4 +++ .cvsignore 18 Jul 2005 09:18:31 -0000 1.5 @@ -1 +1 @@ -lighttpd-1.3.14.tar.gz +lighttpd-1.3.15.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lighttpd.spec 20 Jun 2005 13:15:51 -0000 1.7 +++ lighttpd.spec 18 Jul 2005 09:18:31 -0000 1.8 @@ -2,7 +2,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.3.14 +Version: 1.3.15 Release: 1%{?dist} License: BSD Group: System Environment/Daemons @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ %{?_with_ldap:BuildRequires: openldap-devel} %description @@ -78,26 +78,26 @@ libdir="%{buildroot}%{_libdir}/lighttpd" # Install included init script and sysconfig entry -%{__install} -D -m 0755 doc/rc.lighttpd.redhat \ +%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd -%{__install} -D -m 0644 doc/sysconfig.lighttpd \ +%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \ %{buildroot}%{_sysconfdir}/sysconfig/lighttpd # Install (*patched above*) sample config file -%{__install} -D -m 0640 doc/lighttpd.conf \ +%{__install} -D -p -m 0640 doc/lighttpd.conf \ %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf # Install our own logrotate entry -%{__install} -D -m 0644 %{SOURCE1} \ +%{__install} -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd # Install our own php.d ini file -%{__install} -D -m 0644 %{SOURCE2} \ +%{__install} -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini # Install our own default web page and images %{__mkdir_p} %{buildroot}%{webroot} -%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ +%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{buildroot}%{webroot}/ # Install empty log directory to include @@ -162,6 +162,9 @@ %changelog +* Mon Jul 18 2005 Matthias Saou 1.3.15-1 +- Update to 1.3.15. + * Mon Jun 20 2005 Matthias Saou 1.3.14-1 - Update to 1.3.14. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Jun 2005 13:15:51 -0000 1.4 +++ sources 18 Jul 2005 09:18:31 -0000 1.5 @@ -1 +1 @@ -16d9f8c40bcb5638ee452fa23b21e346 lighttpd-1.3.14.tar.gz +e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 09:18:33 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:18:33 -0400 Subject: rpms/lighttpd/FC-3 .cvsignore, 1.3, 1.4 lighttpd.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507180919.j6I9J4Cm002100@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2030/FC-3 Modified Files: .cvsignore lighttpd.spec sources Log Message: Update to 1.3.15 (mostly bugfix release). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2005 09:15:23 -0000 1.3 +++ .cvsignore 18 Jul 2005 09:18:31 -0000 1.4 @@ -1 +1 @@ -lighttpd-1.3.13.tar.gz +lighttpd-1.3.15.tar.gz Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-3/lighttpd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lighttpd.spec 4 Apr 2005 19:31:33 -0000 1.4 +++ lighttpd.spec 18 Jul 2005 09:18:31 -0000 1.5 @@ -2,8 +2,8 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.3.13 -Release: 3 +Version: 1.3.15 +Release: 1%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -19,7 +19,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service -BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel +BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, gcc-c++ %{?_with_ldap:BuildRequires: openldap-devel} %description @@ -78,26 +78,26 @@ libdir="%{buildroot}%{_libdir}/lighttpd" # Install included init script and sysconfig entry -%{__install} -D -m 0755 doc/rc.lighttpd.redhat \ +%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \ %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd -%{__install} -D -m 0644 doc/sysconfig.lighttpd \ +%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \ %{buildroot}%{_sysconfdir}/sysconfig/lighttpd # Install (*patched above*) sample config file -%{__install} -D -m 0640 doc/lighttpd.conf \ +%{__install} -D -p -m 0640 doc/lighttpd.conf \ %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf # Install our own logrotate entry -%{__install} -D -m 0644 %{SOURCE1} \ +%{__install} -D -p -m 0644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd # Install our own php.d ini file -%{__install} -D -m 0644 %{SOURCE2} \ +%{__install} -D -p -m 0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini # Install our own default web page and images %{__mkdir_p} %{buildroot}%{webroot} -%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ +%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{buildroot}%{webroot}/ # Install empty log directory to include @@ -162,10 +162,22 @@ %changelog -* Mon Apr 4 2005 Matthias Saou 1.3.13-3 +* Mon Jul 18 2005 Matthias Saou 1.3.15-1 +- Update to 1.3.15. + +* Mon Jun 20 2005 Matthias Saou 1.3.14-1 +- Update to 1.3.14. + +* Sun May 22 2005 Jeremy Katz - 1.3.13-5 +- rebuild on all arches + +* Mon Apr 4 2005 Matthias Saou 1.3.13-4 - Change signal sent from the logrotate script from USR1 to HUP, as that's the correct one. +* Fri Apr 1 2005 Michael Schwendt 1.3.13-2 +- Include /etc/lighttpd directory. + * Sun Mar 6 2005 Matthias Saou 1.3.13-1 - Update to 1.3.13. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lighttpd/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2005 09:15:23 -0000 1.3 +++ sources 18 Jul 2005 09:18:31 -0000 1.4 @@ -1 +1 @@ -2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz +e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 09:20:38 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:20:38 -0400 Subject: common tobuild,1.1946,1.1947 Message-ID: <200507180920.j6I9Kc05002220@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2203 Modified Files: tobuild Log Message: request build of rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1946 retrieving revision 1.1947 diff -u -r1.1946 -r1.1947 --- tobuild 17 Jul 2005 20:30:30 -0000 1.1946 +++ tobuild 18 Jul 2005 09:20:36 -0000 1.1947 @@ -89,3 +89,4 @@ oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 +thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 18 09:21:01 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:21:01 -0400 Subject: common tobuild,1.1947,1.1948 Message-ID: <200507180921.j6I9L1hW002254@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2237 Modified Files: tobuild Log Message: request build of rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1947 retrieving revision 1.1948 diff -u -r1.1947 -r1.1948 --- tobuild 18 Jul 2005 09:20:36 -0000 1.1947 +++ tobuild 18 Jul 2005 09:20:59 -0000 1.1948 @@ -90,3 +90,4 @@ pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel +thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 From fedora-extras-commits at redhat.com Mon Jul 18 09:22:27 2005 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 18 Jul 2005 05:22:27 -0400 Subject: common tobuild,1.1948,1.1949 Message-ID: <200507180922.j6I9MRAf002287@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2270 Modified Files: tobuild Log Message: request build of rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1948 retrieving revision 1.1949 diff -u -r1.1948 -r1.1949 --- tobuild 18 Jul 2005 09:20:59 -0000 1.1948 +++ tobuild 18 Jul 2005 09:22:25 -0000 1.1949 @@ -91,3 +91,4 @@ byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 +thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 From fedora-extras-commits at redhat.com Mon Jul 18 12:00:16 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Mon, 18 Jul 2005 08:00:16 -0400 Subject: common tobuild,1.1949,1.1950 Message-ID: <200507181200.j6IC0G8f005362@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5341 Modified Files: tobuild Log Message: request build of rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1949 retrieving revision 1.1950 diff -u -r1.1949 -r1.1950 --- tobuild 18 Jul 2005 09:22:25 -0000 1.1949 +++ tobuild 18 Jul 2005 12:00:14 -0000 1.1950 @@ -92,3 +92,4 @@ thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 development From fedora-extras-commits at redhat.com Mon Jul 18 12:09:55 2005 From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields)) Date: Mon, 18 Jul 2005 08:09:55 -0400 Subject: common tobuild,1.1950,1.1951 Message-ID: <200507181209.j6IC9t7u006570@cvs-int.fedora.redhat.com> Author: pfrields Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6553 Modified Files: tobuild Log Message: Remove superfluous request and fix status Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1950 retrieving revision 1.1951 diff -u -r1.1950 -r1.1951 --- tobuild 18 Jul 2005 12:00:14 -0000 1.1950 +++ tobuild 18 Jul 2005 12:09:53 -0000 1.1951 @@ -87,9 +87,8 @@ oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 -pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-4_fc5 development byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 -pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 development +pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel From fedora-extras-commits at redhat.com Mon Jul 18 15:31:24 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Mon, 18 Jul 2005 11:31:24 -0400 Subject: web/html/download/mirrors fedora-core-4, 1.2, 1.3 fedora-core-4.yu, 1.1, 1.2 updates-released-fc4, 1.2, 1.3 updates-released-fc4.yu, 1.1, 1.2 updates-testing-fc4, 1.2, 1.3 updates-testing-fc4.yu, 1.1, 1.2 Message-ID: <200507181531.j6IFVO56010384@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download/mirrors In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10357 Modified Files: fedora-core-4 fedora-core-4.yu updates-released-fc4 updates-released-fc4.yu updates-testing-fc4 updates-testing-fc4.yu Log Message: Updated link to mirror2.etf.bg.ac.yu content (typo) Index: fedora-core-4 =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/fedora-core-4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-core-4 13 Jun 2005 06:23:47 -0000 1.2 +++ fedora-core-4 18 Jul 2005 15:31:21 -0000 1.3 @@ -52,7 +52,7 @@ http://ftp.lug.ro/fedora/linux/core/4/$ARCH/os/ http://ftp.chg.ru/pub/Linux/fedora/core/4/$ARCH/os/ http://mirror.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ -http://mirror2etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ http://ftp.upjs.sk/pub/linux/fedora/linux/core/4/$ARCH/os/ http://mirrors.bevc.net/fedora/4/$ARCH/os/ http://ftp.udl.es/pub/fedora/linux/core/4/$ARCH/os/ Index: fedora-core-4.yu =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/fedora-core-4.yu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-core-4.yu 13 Jun 2005 06:23:47 -0000 1.1 +++ fedora-core-4.yu 18 Jul 2005 15:31:21 -0000 1.2 @@ -1,2 +1,2 @@ http://mirror.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ -http://mirror2etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/4/$ARCH/os/ Index: updates-released-fc4 =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-released-fc4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- updates-released-fc4 13 Jun 2005 06:23:47 -0000 1.2 +++ updates-released-fc4 18 Jul 2005 15:31:21 -0000 1.3 @@ -52,7 +52,7 @@ http://ftp.lug.ro/fedora/linux/core/updates/4/$ARCH/ http://ftp.chg.ru/pub/Linux/fedora/core/updates/4/$ARCH/ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ http://ftp.upjs.sk/pub/linux/fedora/linux/core/updates/4/$ARCH/ http://mirrors.bevc.net/fedora/updates/4/$ARCH/ http://ftp.udl.es/pub/fedora/linux/core/updates/4/$ARCH/ Index: updates-released-fc4.yu =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-released-fc4.yu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- updates-released-fc4.yu 13 Jun 2005 06:23:47 -0000 1.1 +++ updates-released-fc4.yu 18 Jul 2005 15:31:21 -0000 1.2 @@ -1,2 +1,2 @@ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/4/$ARCH/ Index: updates-testing-fc4 =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-testing-fc4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- updates-testing-fc4 13 Jun 2005 06:23:47 -0000 1.2 +++ updates-testing-fc4 18 Jul 2005 15:31:21 -0000 1.3 @@ -52,7 +52,7 @@ http://ftp.lug.ro/fedora/linux/core/updates/testing/4/$ARCH/ http://ftp.chg.ru/pub/Linux/fedora/core/updates/testing/4/$ARCH/ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ http://ftp.upjs.sk/pub/linux/fedora/linux/core/updates/testing/4/$ARCH/ http://mirrors.bevc.net/fedora/updates/testing/4/$ARCH/ http://ftp.udl.es/pub/fedora/linux/core/updates/testing/4/$ARCH/ Index: updates-testing-fc4.yu =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors/updates-testing-fc4.yu,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- updates-testing-fc4.yu 13 Jun 2005 06:23:47 -0000 1.1 +++ updates-testing-fc4.yu 18 Jul 2005 15:31:21 -0000 1.2 @@ -1,2 +1,2 @@ http://mirror.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ -http://mirror2etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ +http://mirror2.etf.bg.ac.yu/distributions/fedora/updates/testing/4/$ARCH/ From fedora-extras-commits at redhat.com Mon Jul 18 15:37:09 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Mon, 18 Jul 2005 11:37:09 -0400 Subject: web/html/download mirrors.php,1.24,1.25 Message-ID: <200507181537.j6IFb9mB010419@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10402 Modified Files: mirrors.php Log Message: Added new mirror mirror.imagi.net Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mirrors.php 14 Jul 2005 20:54:34 -0000 1.24 +++ mirrors.php 18 Jul 2005 15:37:07 -0000 1.25 @@ -121,6 +121,7 @@
  • ftp://mirrors.csumb.edu/fedora/updates/ (Updates only)
  • ftp://ftp.applios.net/pub/fedora/linux/core
  • ftp://calserv.unl.edu/pub/linux/fedora/linux/core/
    • +
  • ftp://mirrors.imagi.net/fedora/core/
  • Canada From fedora-extras-commits at redhat.com Mon Jul 18 17:24:41 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:41 -0400 Subject: extras-buildsys/server ArchJob.py,1.5,1.6 Message-ID: <200507181724.j6IHOfS6013196@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131/server Modified Files: ArchJob.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ArchJob.py 11 Jul 2005 00:30:36 -0000 1.5 +++ ArchJob.py 18 Jul 2005 17:24:39 -0000 1.6 @@ -221,9 +221,15 @@ """ Return a list of base filenames we got from the builder """ files = [] for url in self.downloads.keys(): - fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) - if fname and self.downloads[url] == 3: - files.append(fname) + try: + fname = FileDownloader.get_base_filename_from_url(url, ['.rpm', '.log']) + if self.downloads[url] == 3: + files.append(fname) + except FileDownloader.FileNameError, 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.arch, e, url) + pass return files def set_download_status(self, url, status): From fedora-extras-commits at redhat.com Mon Jul 18 17:24:41 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:41 -0400 Subject: extras-buildsys/common FileDownloader.py,1.11,1.12 Message-ID: <200507181724.j6IHOfww013190@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131/common Modified Files: FileDownloader.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- FileDownloader.py 6 Jul 2005 21:20:55 -0000 1.11 +++ FileDownloader.py 18 Jul 2005 17:24:38 -0000 1.12 @@ -22,6 +22,15 @@ import HTTPSURLopener import OpenSSL import CommonErrors +import exceptions + + +class FileNameError(exceptions.Exception): + def __init__(self, args=None): + exceptions.Exception.__init__(self) + self.args = args + def __str__(self): + return self.args def get_base_filename_from_url(url, legal_exts): @@ -42,12 +51,12 @@ # If after 5 iterations of unquoting, the strings still aren't the same, # something is wrong. if (count == 0) and (unquoted != last_unquoted): - return None + raise FileNameError("URL quoting level too deep.") # Try to grab the filename off the end of the URL index = url.rfind('/') if index is -1: - return None + raise FileNameError("No separator in URL.") filename = url[index+1:] # Only accept certain file extensions @@ -58,15 +67,15 @@ break if not ext_ok: - return None + raise FileNameError("Extension was not allowed.") # FIXME: what other validation can we do here? for c in filename: # For now, legal characters are '_-.' plus alphanumeric - if (c == '_') or (c == '-') or (c == '.') or c.isalnum(): + if (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): pass else: - return None + raise FileNameError("Illegal character '%s' encountered." % c) return filename @@ -78,9 +87,11 @@ self._cb_data = cb_data self._url = url self._target_dir = target_dir - self._filename = get_base_filename_from_url(self._url, legal_exts) - if not self._filename: - print "Couldn't get base filename from url!! target_dir=%s, url=%s" % (target_dir, url) + 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) + if certs and len(certs) > 0: self._opener = HTTPSURLopener.HTTPSURLopener(certs) else: From fedora-extras-commits at redhat.com Mon Jul 18 17:24:25 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:25 -0400 Subject: extras-buildsys ChangeLog,1.60,1.61 Message-ID: <200507181724.j6IHOvBg013199@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 16 Jul 2005 15:47:42 -0000 1.60 +++ ChangeLog 18 Jul 2005 17:24:23 -0000 1.61 @@ -1,3 +1,11 @@ +2005-07-18 Dan Williams + + * builder/builder.py + common/FileDownloader.py + server/ArchJob.py + - Allow '+' character in RPM names + - Clean up file name handling in URLs + 2005-07-16 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Mon Jul 18 17:24:30 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 13:24:30 -0400 Subject: extras-buildsys/builder builder.py,1.18,1.19 Message-ID: <200507181725.j6IHP0Lc013200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13131/builder Modified Files: builder.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/FileDownloader.py server/ArchJob.py - Allow '+' character in RPM names - Clean up file name handling in URLs Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- builder.py 16 Jul 2005 16:42:15 -0000 1.18 +++ builder.py 18 Jul 2005 17:24:28 -0000 1.19 @@ -93,11 +93,12 @@ Architecture: %s SRPM: %s\n\n""" % (time.asctime(time.gmtime()), self._target, self._uniqid, self.buildarch, srpm_url)) - srpm_filename = FileDownloader.get_base_filename_from_url(srpm_url, ['.src.rpm']) - if not srpm_filename: + 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 in __init__, couldn't extract SRPM filename.\n") + self.log("Failed to extract SRPM filename. Error: '%s' URL: %s\n" % (e, srpm_url)) else: self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename) From fedora-extras-commits at redhat.com Mon Jul 18 17:31:55 2005 From: fedora-extras-commits at redhat.com (Robert Theisen (trobert)) Date: Mon, 18 Jul 2005 13:31:55 -0400 Subject: web/html/download mirrors.php,1.25,1.26 Message-ID: <200507181731.j6IHVtbq013232@cvs-int.fedora.redhat.com> Author: trobert Update of /cvs/fedora/web/html/download In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13215 Modified Files: mirrors.php Log Message: Added new mirror link for ftp.uib.no Index: mirrors.php =================================================================== RCS file: /cvs/fedora/web/html/download/mirrors.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mirrors.php 18 Jul 2005 15:37:07 -0000 1.25 +++ mirrors.php 18 Jul 2005 17:31:53 -0000 1.26 @@ -333,6 +333,7 @@
  • Norway
  • Portugal From fedora-extras-commits at redhat.com Mon Jul 18 19:07:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 15:07:49 -0400 Subject: extras-buildsys ChangeLog,1.61,1.62 Message-ID: <200507181907.j6IJ7npN015719@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15689 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * server/PackageJob.py server/BuilderManager.py - Restart orphaned archjobs immediately rather than sticking them at the back of the build queue Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ChangeLog 18 Jul 2005 17:24:23 -0000 1.61 +++ ChangeLog 18 Jul 2005 19:07:47 -0000 1.62 @@ -1,5 +1,12 @@ 2005-07-18 Dan Williams + * server/PackageJob.py + server/BuilderManager.py + - Restart orphaned archjobs immediately rather than + sticking them at the back of the build queue + +2005-07-18 Dan Williams + * builder/builder.py common/FileDownloader.py server/ArchJob.py From fedora-extras-commits at redhat.com Mon Jul 18 19:07:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 15:07:50 -0400 Subject: extras-buildsys/server BuilderManager.py, 1.5, 1.6 PackageJob.py, 1.9, 1.10 Message-ID: <200507181907.j6IJ7owD015726@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15689/server Modified Files: BuilderManager.py PackageJob.py Log Message: 2005-07-18 Dan Williams * server/PackageJob.py server/BuilderManager.py - Restart orphaned archjobs immediately rather than sticking them at the back of the build queue Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BuilderManager.py 16 Jul 2005 15:47:43 -0000 1.5 +++ BuilderManager.py 18 Jul 2005 19:07:48 -0000 1.6 @@ -168,7 +168,7 @@ if len(self._queue) > 0: time.sleep(0.25) - def request_arch_job(self, par_job, target, arch, srpm_url): + def request_arch_job(self, par_job, target, arch, srpm_url, orphaned): req = {} req['parent'] = par_job req['target'] = target @@ -176,7 +176,11 @@ req['srpm_url'] = srpm_url self._queue_lock.acquire() - self._queue.append(req) + if orphaned: + # insert orphaned requests at the front of the queue + self._queue.insert(0, req) + else: + self._queue.append(req) self._queue_lock.release() def any_prepping_builders(self): Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- PackageJob.py 16 Jul 2005 14:57:37 -0000 1.9 +++ PackageJob.py 18 Jul 2005 19:07:48 -0000 1.10 @@ -372,7 +372,7 @@ self._request_arch_jobs() - def _request_one_arch_job(self, arch): + def _request_one_arch_job(self, arch, orphaned): # Construct SPRM URL srpm_http_base = self.srpm_http_path[len(self.http_dir):] if config_opts['ssl_builders'] == True: @@ -380,7 +380,7 @@ else: method = "http://" srpm_url = method + self.hostname + ":8886/" + srpm_http_base - self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url) + self.bm.builder_manager.request_arch_job(self, self.target, arch, srpm_url, orphaned) def _request_arch_jobs(self): # Queue requests for build jobs @@ -388,7 +388,7 @@ for arch in self.archjobs.keys(): if self.archjobs[arch]: continue - self._request_one_arch_job(arch) + self._request_one_arch_job(arch, False) self._archjobs_lock.release() def add_arch_job(self, job): @@ -412,7 +412,7 @@ self._archjobs_lock.acquire() print "%s (%s/%s): Builder disappeared. Requeuing arch..." % (self.uid, self.package, job.arch) self.archjobs[job.arch] = None - self._request_one_arch_job(job.arch) + self._request_one_arch_job(job.arch, True) self._archjobs_lock.release() def is_done(self): From fedora-extras-commits at redhat.com Mon Jul 18 19:58:48 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 18 Jul 2005 15:58:48 -0400 Subject: rpms/bash-completion/FC-4 bash-completion-documents.patch, NONE, 1.1 bash-completion-players.patch, NONE, 1.1 bash-completion-tarballs.patch, NONE, 1.1 bash-completion.spec, 1.8, 1.9 Message-ID: <200507181958.j6IJwmhr015895@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15858/FC-4 Modified Files: bash-completion.spec Added Files: bash-completion-documents.patch bash-completion-players.patch bash-completion-tarballs.patch Log Message: - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). - Add/fix support for some multimedia formats and players. - Fix tarball completion. bash-completion-documents.patch: --- NEW FILE bash-completion-documents.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-18 18:53:12.000000000 +0300 @@ -89,3 +89,3 @@ complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype -complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf +complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf evince complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf @@ -108,5 +108,8 @@ complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya -complete -f -X '!*.@(sxw|stw|sxg|doc|dot|rtf|txt|htm|html|odt|ott)' oowriter +complete -f -X '!*.@(sxw|stw|sxg|sgl|doc|dot|rtf|txt|htm|html|odt|ott|odm)' oowriter complete -f -X '!*.@(sxi|sti|pps|ppt|pot|odp|otp)' ooimpress complete -f -X '!*.@(sxc|stc|xls|xlw|xlt|csv|ods|ots)' oocalc +complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw +complete -f -X '!*.@(sxm|smf|mml|odf)' oomath +complete -f -X '!*.odb' oobase complete -f -X '!*.rpm' rpm2cpio bash-completion-players.patch: --- NEW FILE bash-completion-players.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -91,8 +91,8 @@ complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf complete -f -X '!*.texi*' makeinfo texi2html complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi -complete -f -X '!*.@(mp3|MP3|m3u)' mpg123 mpg321 -complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine +complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay +complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine aaxine fbxine kaffeine complete -f -X '!*.@(avi|asf|wmv)' aviplay complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim @@ -5687,7 +5687,7 @@ return 0 } -complete $filenames -F _mplayer mplayer mencoder gmplayer +complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer } # KDE dcop completion bash-completion-tarballs.patch: --- NEW FILE bash-completion-tarballs.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -77,7 +77,7 @@ # Do NOT break these over multiple lines. # # START exclude -- do NOT remove this line -complete -f -X '!*.?(t)bz2' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep +complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw)' unzip zipinfo complete -f -X '*.Z' compress znew complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcmp zdiff zcat zegrep zfgrep zgrep zless zmore @@ -101,7 +101,7 @@ complete -f -X '!*.fig' xfig complete -f -X '!*.@(mid?(i))' playmidi complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity -complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview +complete -f -X '*.@(o|so|so.!(conf)|a|t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme @@ -2791,16 +2791,16 @@ return 0 ;; +([^IZzjy])f) - ext='t?(ar?(.))@(gz|Z|bz?(2))' - regex='t\(ar?(\.)\)\(gz\|Z\|bz2\?\)' + ext='t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))' + regex='t\(ar\(\.\(Z\|gz\|bz2\?\)\)\?\|gz\|bz2\?\)' ;; *[Zz]*f) ext='t?(ar.)@(gz|Z)' - regex='t\(ar\.\)\(gz\|Z\)' + regex='t\(ar\.\)\?\(gz\|Z\)' ;; *[Ijy]*f) ext='t?(ar.)bz?(2)' - regex='t\(ar\.\)bz2\?' + regex='t\(ar\.\)\?bz2\?' ;; *) _filedir @@ -2814,7 +2814,7 @@ # # get name of tar file from command line tar=$( echo "$COMP_LINE" | \ - sed -e 's|^.* \([^ ]*'$regex'\) .*$|\1|' ) + sed -e 's/^.* \([^ ]*'$regex'\) .*$/\1/' ) # devise how to untar and list it untar=t${COMP_WORDS[1]//[^Izjyf]/} Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 +++ bash-completion.spec 18 Jul 2005 19:58:46 -0000 1.9 @@ -1,6 +1,6 @@ Name: bash-completion Version: 20050712 -Release: 1%{?dist} +Release: 1 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -8,10 +8,13 @@ URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile +Patch0: %{name}-tarballs.patch +Patch1: %{name}-players.patch +Patch2: %{name}-documents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: bash >= 0:2.05-12 +Requires: bash >= 2.05-12 %description bash-completion is a collection of shell functions that take advantage @@ -20,6 +23,9 @@ %prep %setup -q -n bash_completion +%patch0 +%patch1 +%patch2 %build @@ -127,8 +133,11 @@ %changelog -* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +* Mon Jul 18 2005 Ville Skytt?? - 20050712-1 - 20050712. +- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). +- Add/fix support for some multimedia formats and players. +- Fix tarball completion. * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. From fedora-extras-commits at redhat.com Mon Jul 18 19:58:49 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 18 Jul 2005 15:58:49 -0400 Subject: rpms/bash-completion/devel bash-completion-documents.patch, NONE, 1.1 bash-completion-players.patch, NONE, 1.1 bash-completion-tarballs.patch, NONE, 1.1 bash-completion.spec, 1.8, 1.9 Message-ID: <200507181958.j6IJwn5D015905@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15858/devel Modified Files: bash-completion.spec Added Files: bash-completion-documents.patch bash-completion-players.patch bash-completion-tarballs.patch Log Message: - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). - Add/fix support for some multimedia formats and players. - Fix tarball completion. bash-completion-documents.patch: --- NEW FILE bash-completion-documents.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-18 18:53:12.000000000 +0300 @@ -89,3 +89,3 @@ complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype -complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf +complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf evince complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf @@ -108,5 +108,8 @@ complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya -complete -f -X '!*.@(sxw|stw|sxg|doc|dot|rtf|txt|htm|html|odt|ott)' oowriter +complete -f -X '!*.@(sxw|stw|sxg|sgl|doc|dot|rtf|txt|htm|html|odt|ott|odm)' oowriter complete -f -X '!*.@(sxi|sti|pps|ppt|pot|odp|otp)' ooimpress complete -f -X '!*.@(sxc|stc|xls|xlw|xlt|csv|ods|ots)' oocalc +complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw +complete -f -X '!*.@(sxm|smf|mml|odf)' oomath +complete -f -X '!*.odb' oobase complete -f -X '!*.rpm' rpm2cpio bash-completion-players.patch: --- NEW FILE bash-completion-players.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -91,8 +91,8 @@ complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf complete -f -X '!*.texi*' makeinfo texi2html complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi -complete -f -X '!*.@(mp3|MP3|m3u)' mpg123 mpg321 -complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine +complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay +complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine aaxine fbxine kaffeine complete -f -X '!*.@(avi|asf|wmv)' aviplay complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim @@ -5687,7 +5687,7 @@ return 0 } -complete $filenames -F _mplayer mplayer mencoder gmplayer +complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer } # KDE dcop completion bash-completion-tarballs.patch: --- NEW FILE bash-completion-tarballs.patch --- --- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 +++ bash_completion 2005-07-16 23:55:54.000000000 +0300 @@ -77,7 +77,7 @@ # Do NOT break these over multiple lines. # # START exclude -- do NOT remove this line -complete -f -X '!*.?(t)bz2' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep +complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw)' unzip zipinfo complete -f -X '*.Z' compress znew complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcmp zdiff zcat zegrep zfgrep zgrep zless zmore @@ -101,7 +101,7 @@ complete -f -X '!*.fig' xfig complete -f -X '!*.@(mid?(i))' playmidi complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity -complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview +complete -f -X '*.@(o|so|so.!(conf)|a|t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme @@ -2791,16 +2791,16 @@ return 0 ;; +([^IZzjy])f) - ext='t?(ar?(.))@(gz|Z|bz?(2))' - regex='t\(ar?(\.)\)\(gz\|Z\|bz2\?\)' + ext='t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))' + regex='t\(ar\(\.\(Z\|gz\|bz2\?\)\)\?\|gz\|bz2\?\)' ;; *[Zz]*f) ext='t?(ar.)@(gz|Z)' - regex='t\(ar\.\)\(gz\|Z\)' + regex='t\(ar\.\)\?\(gz\|Z\)' ;; *[Ijy]*f) ext='t?(ar.)bz?(2)' - regex='t\(ar\.\)bz2\?' + regex='t\(ar\.\)\?bz2\?' ;; *) _filedir @@ -2814,7 +2814,7 @@ # # get name of tar file from command line tar=$( echo "$COMP_LINE" | \ - sed -e 's|^.* \([^ ]*'$regex'\) .*$|\1|' ) + sed -e 's/^.* \([^ ]*'$regex'\) .*$/\1/' ) # devise how to untar and list it untar=t${COMP_WORDS[1]//[^Izjyf]/} Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bash-completion.spec 12 Jul 2005 19:59:19 -0000 1.8 +++ bash-completion.spec 18 Jul 2005 19:58:47 -0000 1.9 @@ -1,6 +1,6 @@ Name: bash-completion Version: 20050712 -Release: 1%{?dist} +Release: 1 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -8,10 +8,13 @@ URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile +Patch0: %{name}-tarballs.patch +Patch1: %{name}-players.patch +Patch2: %{name}-documents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: bash >= 0:2.05-12 +Requires: bash >= 2.05-12 %description bash-completion is a collection of shell functions that take advantage @@ -20,6 +23,9 @@ %prep %setup -q -n bash_completion +%patch0 +%patch1 +%patch2 %build @@ -127,8 +133,11 @@ %changelog -* Tue Jul 12 2005 Ville Skytt?? - 20050712-1 +* Mon Jul 18 2005 Ville Skytt?? - 20050712-1 - 20050712. +- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). +- Add/fix support for some multimedia formats and players. +- Fix tarball completion. * Sat Jan 22 2005 Ville Skytt?? - 0:20050121-2 - Update to 20050121. From fedora-extras-commits at redhat.com Mon Jul 18 21:11:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:11:28 -0400 Subject: extras-buildsys ChangeLog,1.62,1.63 Message-ID: <200507182111.j6ILBS2q018476@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18434 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job * server/BuildMaster.py server/Repo.py - Clear repo additions array after each repo update, fixes problem where jobs would switch back from 'needsign' -> 'repodone' after the job was already complete Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ChangeLog 18 Jul 2005 19:07:47 -0000 1.62 +++ ChangeLog 18 Jul 2005 21:11:26 -0000 1.63 @@ -1,5 +1,17 @@ 2005-07-18 Dan Williams + * builder/builder.py + - Don't start a cleanup over top of another cleanup + when we're told to kill the job + + * server/BuildMaster.py + server/Repo.py + - Clear repo additions array after each repo update, fixes problem + where jobs would switch back from 'needsign' -> 'repodone' after + the job was already complete + +2005-07-18 Dan Williams + * server/PackageJob.py server/BuilderManager.py - Restart orphaned archjobs immediately rather than From fedora-extras-commits at redhat.com Mon Jul 18 21:11:29 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:11:29 -0400 Subject: extras-buildsys/server BuildMaster.py,1.16,1.17 Repo.py,1.10,1.11 Message-ID: <200507182111.j6ILBTe8018487@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18434/server Modified Files: BuildMaster.py Repo.py Log Message: 2005-07-18 Dan Williams * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job * server/BuildMaster.py server/Repo.py - Clear repo additions array after each repo update, fixes problem where jobs would switch back from 'needsign' -> 'repodone' after the job was already complete Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- BuildMaster.py 14 Jul 2005 19:12:04 -0000 1.16 +++ BuildMaster.py 18 Jul 2005 21:11:27 -0000 1.17 @@ -212,8 +212,16 @@ for job in self._done_queue: curstage = job.get_cur_stage() - self._write_job_status_to_db(job.get_uid(), curstage) - print "%s (%s): Job finished." % (job.get_uid(), job.package) + uid = job.get_uid() + self._write_job_status_to_db(uid, curstage) + + # If there are any status updates in the queue for this job, remove them + self._status_updates_lock.acquire() + if self._status_updates.has_key(uid): + del self._status_updates[uid] + self._status_updates_lock.release() + + print "%s (%s): Job finished." % (uid, job.package) self._building_jobs_lock.acquire() self._building_jobs.remove(job) self._building_jobs_lock.release() Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Repo.py 11 Jul 2005 20:13:37 -0000 1.10 +++ Repo.py 18 Jul 2005 21:11:27 -0000 1.11 @@ -85,9 +85,11 @@ # Notify the build job that we've copied its files to the repo buildjob.repo_add_callback() + self._repo_additions = [] + (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir)) if s != 0: - print "Error: createrepo failed with exit status %d!" % s + print "Error: createrepo failed with exit status %d! Output: '%s'" % (s, o) def run(self): From fedora-extras-commits at redhat.com Mon Jul 18 21:11:28 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:11:28 -0400 Subject: extras-buildsys/builder builder.py,1.19,1.20 Message-ID: <200507182111.j6ILBSLb018482@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18434/builder Modified Files: builder.py Log Message: 2005-07-18 Dan Williams * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job * server/BuildMaster.py server/Repo.py - Clear repo additions array after each repo update, fixes problem where jobs would switch back from 'needsign' -> 'repodone' after the job was already complete Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- builder.py 18 Jul 2005 17:24:28 -0000 1.19 +++ builder.py 18 Jul 2005 21:11:26 -0000 1.20 @@ -103,16 +103,25 @@ self._srpm_path = os.path.join(config_opts['builder_work_dir'], self._uniqid, "source", srpm_filename) def die(self, sig=15): - if self._pobj and self._pobj.pid: # Can't kill the package download from build server + # Do nothing if we've already been killed + if self._done_status == 'killed': + return + + self.log("Killing build process...\n") + # Don't try to kill a running cleanup process + if self._status != 'cleanup' and self._pobj and self._pobj.pid: try: - self.log("Killing build process...\n") os.kill(self._pobj.pid, sig) except OSError, e: self.log("Couldn't kill process %d: %s\n" % (self._pobj.pid, e)) self.log("Killed.\n"); self._done_status = 'killed' - self._cleanup() + + # Don't start cleanup over top of an existing cleanup process + if self._status != 'cleanup': + self._cleanup() + return True def log(self, string): @@ -344,7 +353,6 @@ elif self._status == 'cleanup': exit_status = self._pobj.poll() if exit_status >= 0: - print "mock clean done" # We ignore mock errors when cleaning the buildroot self._status = self._done_status # FIXME: remove the last dir off the end of 'rootdir' here to get From fedora-extras-commits at redhat.com Mon Jul 18 21:26:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:26 -0400 Subject: extras-buildsys ChangeLog,1.63,1.64 Message-ID: <200507182126.j6ILQuAb018597@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ChangeLog 18 Jul 2005 21:11:26 -0000 1.63 +++ ChangeLog 18 Jul 2005 21:26:24 -0000 1.64 @@ -1,5 +1,14 @@ 2005-07-18 Dan Williams + * builder/builder.py + common/ArchUtils.py + server/PackageJob.py + - Allow the server and builder to actually build "sub" arches + like i486/sparcv9/etc, which broke after the the builder + changes on 2005-07-16 + +2005-07-18 Dan Williams + * builder/builder.py - Don't start a cleanup over top of another cleanup when we're told to kill the job From fedora-extras-commits at redhat.com Mon Jul 18 21:26:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:26 -0400 Subject: extras-buildsys/builder builder.py,1.20,1.21 Message-ID: <200507182127.j6ILQvlA018600@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535/builder Modified Files: builder.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- builder.py 18 Jul 2005 21:11:26 -0000 1.20 +++ builder.py 18 Jul 2005 21:26:24 -0000 1.21 @@ -30,6 +30,7 @@ import fcntl import urllib import errno +from plague import ArchUtils from plague import FileDownloader from plague import AuthedXMLRPCServer from plague import lighttpdManager @@ -629,10 +630,21 @@ print "Unrecognized config %s, ignoring." % cfg_name continue if distro == config_opts['distro_name'] and repo == config_opts['repo_name']: + # 'arch' is by definition the "master" arch, ie i386 or x86_64, + # not i486/i586/ia32e/etc. We want to add on the "sub" arches + # that this builder supports to its list of arches it can build + # for this target if arch in allowed_arches: if not target_arches.has_key(target): target_arches[target] = [] target_arches[target].append(arch) + + # Add applicable "sub" arches, like i486, sparcv9, etc + for sub_arch in allowed_arches: + if ArchUtils.sub_arches.has_key(sub_arch) and ArchUtils.sub_arches[sub_arch] == arch: + if not sub_arch in target_arches[target]: + target_arches[target].append(sub_arch) + return target_arches From fedora-extras-commits at redhat.com Mon Jul 18 21:26:32 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:32 -0400 Subject: extras-buildsys/common Makefile,1.6,1.7 Message-ID: <200507182127.j6ILR2ln018603@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535/common Modified Files: Makefile Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: Makefile =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 10 Jul 2005 06:30:16 -0000 1.6 +++ Makefile 18 Jul 2005 21:26:30 -0000 1.7 @@ -8,13 +8,14 @@ PYMODULEDIR=$(DESTDIR)$(LIBDIR)/python$(PYVERSION)/site-packages/$(PKGNAME) FILES = \ + ArchUtils.py \ CommonErrors.py \ FileDownloader.py \ HTTPSURLopener.py \ HTTPServer.py \ AuthedXMLRPCServer.py \ SSLCommon.py \ - SSLConnection.py \ + SSLConnection.py \ XMLRPCServerProxy.py \ lighttpdManager.py \ daemonize.py \ From fedora-extras-commits at redhat.com Mon Jul 18 21:26:32 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 17:26:32 -0400 Subject: extras-buildsys/server PackageJob.py,1.10,1.11 Message-ID: <200507182127.j6ILR220018606@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18535/server Modified Files: PackageJob.py Log Message: 2005-07-18 Dan Williams * builder/builder.py common/ArchUtils.py server/PackageJob.py - Allow the server and builder to actually build "sub" arches like i486/sparcv9/etc, which broke after the the builder changes on 2005-07-16 Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PackageJob.py 18 Jul 2005 19:07:48 -0000 1.10 +++ PackageJob.py 18 Jul 2005 21:26:30 -0000 1.11 @@ -1,4 +1,4 @@ - # This program is free software; you can redistribute it and/or modify +# 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. @@ -34,6 +34,7 @@ import socket import BuilderManager import ArchJob +from plague import ArchUtils # Load in the config execfile("/etc/plague/server/CONFIG.py") @@ -147,23 +148,6 @@ return self.uid def arch_handling(self, hdr): - # Associate sub-architectures with their "master" architecture. - # This is only used to determine which arches to build on by default, - # so that if we have an Additional Package Arches file that specifies - # 'sparcv9' for a package that we don't try to build sparcv9 for that - # package unless 'sparc' is listed in our 'targets' config option. - sub_arches = { - 'athlon' : 'i386', - 'i686' : 'i386', - 'i586' : 'i386', - 'i486' : 'i386', - 'amd64' : 'x86_64', - 'ia32e' : 'x86_64', - 'ppc32' : 'ppc', - 'sparcv8' : 'sparc', - 'sparcv9' : 'sparc' - } - # Grab additional build arches out of the Additional Package # Arches file apa_file_name = self.target + "addl-arches" @@ -195,8 +179,12 @@ # Remove arches we don't support from addl_arches for arch in addl_arches: - if sub_arches.has_key(arch): - master_addl_arch = sub_arches[arch] + # arch_utils is only used to determine which arches to build on by default, + # so that if we have an Additional Package Arches file that specifies + # 'sparcv9' for a package that we don't try to build sparcv9 for that + # package unless 'sparc' is also listed in our 'targets' config option. + if ArchUtils.sub_arches.has_key(arch): + master_addl_arch = ArchUtils.sub_arches[arch] if master_addl_arch not in buildable_arches: if master_addl_arch not in opt_arches: addl_arches.remove(arch) From fedora-extras-commits at redhat.com Mon Jul 18 23:40:34 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 19:40:34 -0400 Subject: extras-buildsys/common ArchUtils.py,NONE,1.1 Message-ID: <200507182340.j6INeYaB021144@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21128/common Added Files: ArchUtils.py Log Message: Oops, add missing file --- NEW FILE ArchUtils.py --- # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Library General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # Copyright 2005 Dan Williams and Red Hat, Inc. # Associate sub-architectures with their "master" architecture. sub_arches = { 'athlon' : 'i386', 'i686' : 'i386', 'i586' : 'i386', 'i486' : 'i386', 'amd64' : 'x86_64', 'ia32e' : 'x86_64', 'ppc32' : 'ppc', 'sparcv8' : 'sparc', 'sparcv9' : 'sparc' } From tcallawa at redhat.com Mon Jul 18 23:46:10 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 18 Jul 2005 18:46:10 -0500 Subject: APPROVED: monotone Message-ID: <1121730370.32518.53.camel@localhost.localdomain> Name: monotone Summary: A free, distributed version control system Description: monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping branches and extensible metadata, exchanges work over plain network protocols, performs history-sensitive merging, and delegates trust functions to client-side RSA certificates. Maintainer: Roland McGrath Reviewer: Tom 'spot' Callaway ~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 Mon Jul 18 23:50:38 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:38 -0400 Subject: rpms/monotone - New directory Message-ID: <200507182350.j6INoc0h021218@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198/monotone Log Message: Directory /cvs/extras/rpms/monotone added to the repository From fedora-extras-commits at redhat.com Mon Jul 18 23:50:38 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:38 -0400 Subject: rpms/monotone/devel - New directory Message-ID: <200507182350.j6INocCp021223@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198/monotone/devel Log Message: Directory /cvs/extras/rpms/monotone/devel added to the repository From fedora-extras-commits at redhat.com Mon Jul 18 23:50:57 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:57 -0400 Subject: rpms/monotone Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507182350.j6INov92021270@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21243 Added Files: Makefile import.log Log Message: Setup of module monotone --- NEW FILE Makefile --- # Top level Makefile for module monotone all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 18 23:50:58 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:50:58 -0400 Subject: rpms/monotone/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507182350.j6INow2o021275@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21243/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module monotone --- NEW 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 Jul 18 23:53:11 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:53:11 -0400 Subject: rpms/monotone import.log,1.1,1.2 Message-ID: <200507182353.j6INrBDK021338@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21307 Modified Files: import.log Log Message: auto-import monotone-0.21-1.fc5 on branch devel from monotone-0.21-1.fc5.src.rpm New package monotone, starting with upstream version 0.21 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/monotone/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Jul 2005 23:50:55 -0000 1.1 +++ import.log 18 Jul 2005 23:53:09 -0000 1.2 @@ -0,0 +1 @@ +monotone-0_21-1_fc5:HEAD:monotone-0.21-1.fc5.src.rpm:1121730782 From fedora-extras-commits at redhat.com Mon Jul 18 23:53:11 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:53:11 -0400 Subject: rpms/monotone/devel monotone.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507182353.j6INrB6o021345@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21307/devel Modified Files: .cvsignore sources Added Files: monotone.spec Log Message: auto-import monotone-0.21-1.fc5 on branch devel from monotone-0.21-1.fc5.src.rpm New package monotone, starting with upstream version 0.21 --- NEW FILE monotone.spec --- Name: monotone Version: 0.21 Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools License: GPL URL: http://www.venge.net/monotone/ Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel >= 1.32.0 BuildRequires: lua %if 1 %define bundled_sqlite yes %else # in fact, monotone has a locally-hacked 3.2.2, so we can't replace it BuildRequires: sqlite-devel >= 3.2.2 %define bundled_sqlite no %endif BuildRequires: emacs Requires(post): /sbin/install-info Requires(postun): /sbin/install-info %description monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping branches and extensible metadata, exchanges work over plain network protocols, performs history-sensitive merging, and delegates trust functions to client-side RSA certificates. %prep %setup -q %build %configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite} make %{?_smp_mflags} %check make %{?_smp_mflags} check %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -f %{buildroot}/%{_infodir}/dir lispdir=%{buildroot}/%{_datadir}/emacs/site-lisp mkdir -p ${lispdir} %{__install} -c -m 0444 contrib/monotone.el ${lispdir}/monotone.el emacs -batch -f batch-byte-compile ${lispdir}/monotone.el %clean rm -rf %{buildroot} %post if [ $1 -eq 1 ] then /sbin/install-info %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %postun if [ $1 -eq 0 ] then /sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE %doc monotone.html %{_bindir}/monotone %{_infodir}/monotone.info* %{_mandir}/man1/monotone.1* %{_datadir}/emacs/site-lisp/monotone.el* %changelog * Mon Jul 18 2005 Roland McGrath - 0.21-1 - Updated for 0.21 release. - Install Emacs support. * Thu Jul 7 2005 Roland McGrath - 0.20-0.1 - Updated for 0.20 release. - Added %%check section. - Cannot use FC4 native sqlite3, need newer bundled one. * Mon Apr 18 2005 Jeffrey C. Ollie - 0.18-0.4 - Modified summary so that it doesn't contain the name * Thu Apr 14 2005 Jeffrey C. Ollie - 0.18-0.3 - Modified install-info commands to prevent errors in case of --excludedocs * Wed Apr 13 2005 Jeffrey C. Ollie - 0.18-0.2 - Added post and postun scripts to take care of .info file - Added parallel make flags * Wed Apr 13 2005 Jeffrey C. Ollie - 0.18-0.1 - First version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Jul 2005 23:50:55 -0000 1.1 +++ .cvsignore 18 Jul 2005 23:53:09 -0000 1.2 @@ -0,0 +1 @@ +monotone-0.21.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Jul 2005 23:50:55 -0000 1.1 +++ sources 18 Jul 2005 23:53:09 -0000 1.2 @@ -0,0 +1 @@ +c30c96b97ae56268cac567bd8837b991 monotone-0.21.tar.gz From fedora-extras-commits at redhat.com Mon Jul 18 23:58:22 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Mon, 18 Jul 2005 19:58:22 -0400 Subject: common tobuild,1.1951,1.1952 Message-ID: <200507182358.j6INwMuT021412@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21395 Modified Files: tobuild Log Message: request build of rpms/monotone/devel monotone-0_21-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1951 retrieving revision 1.1952 diff -u -r1.1951 -r1.1952 --- tobuild 18 Jul 2005 12:09:53 -0000 1.1951 +++ tobuild 18 Jul 2005 23:58:20 -0000 1.1952 @@ -92,3 +92,4 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel +roland rpms/monotone/devel monotone-0_21-1_fc5 devel From tcallawa at redhat.com Tue Jul 19 00:13:18 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 18 Jul 2005 19:13:18 -0500 Subject: APPROVED: pyxdg & smeg Message-ID: <1121731998.32518.73.camel@localhost.localdomain> Name: pyxdg Summary: PyXDG is a python library to access freedesktop.org standards Name: smeg Summary: Simple menu editor for GNOME Description: Smeg is a menu editor for GNOME that lets you get things done, simply and quickly. Just click and type to edit, add, and delete any menu entry. Maintainer: Sindre Pedersen Bjordal Reviewer: Tom 'spot' Callaway ~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 tcallawa at redhat.com Tue Jul 19 00:28:10 2005 From: tcallawa at redhat.com (Tom 'spot' Callaway) Date: Mon, 18 Jul 2005 19:28:10 -0500 Subject: APPROVED: nco Message-ID: <1121732890.32518.91.camel@localhost.localdomain> Name: nco Summary: A suite of command line programs for manipulating NetCDF/HDF4 files Description: The netCDF Operators, NCO, are a suite of command line programs known as operators. The operators facilitate manipulation and analysis of self-describing data stored in the freely available netCDF and HDF formats (http://www.unidata.ucar.edu/packages/netcdf and http://hdf.ncsa.uiuc.edu, respectively). Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), performs an operation (e.g., averaging, hyperslabbing, or renaming), and outputs a processed netCDF file. Although most users of netCDF and HDF data are involved in scientific research, these data formats, and thus NCO, are generic and are equally useful in fields from agriculture to zoology. The NCO User's Guide illustrates NCO use with examples from the field of climate modeling and analysis. The NCO homepage is http://nco.sourceforge.net/. Maintainer: Ed Hill Reviewer: Tom "spot" Callaway ~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 Tue Jul 19 02:29:49 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 22:29:49 -0400 Subject: extras-buildsys ChangeLog,1.64,1.65 Message-ID: <200507190230.j6J2UJOT025105@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25058 Modified Files: ChangeLog Log Message: 2005-07-18 Dan Williams * server/UserInterface.py client/client.py - Rework argument handling and passing so that listing jobs is more flexible. Can now list jobs by UID as well. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ChangeLog 18 Jul 2005 21:26:24 -0000 1.64 +++ ChangeLog 19 Jul 2005 02:29:47 -0000 1.65 @@ -1,5 +1,12 @@ 2005-07-18 Dan Williams + * server/UserInterface.py + client/client.py + - Rework argument handling and passing so that listing jobs + is more flexible. Can now list jobs by UID as well. + +2005-07-18 Dan Williams + * builder/builder.py common/ArchUtils.py server/PackageJob.py From fedora-extras-commits at redhat.com Tue Jul 19 02:29:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 22:29:50 -0400 Subject: extras-buildsys/server UserInterface.py,1.19,1.20 Message-ID: <200507190230.j6J2UKF6025111@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25058/server Modified Files: UserInterface.py Log Message: 2005-07-18 Dan Williams * server/UserInterface.py client/client.py - Rework argument handling and passing so that listing jobs is more flexible. Can now list jobs by UID as well. Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- UserInterface.py 14 Jul 2005 19:12:04 -0000 1.19 +++ UserInterface.py 19 Jul 2005 02:29:48 -0000 1.20 @@ -63,6 +63,15 @@ return False return True +def validate_uid(uid_in): + try: + uid = int(uid_in) + except ValueError: + return None + if uid < 0: + return None + return uid + class UserInterface: """ @@ -140,38 +149,54 @@ return (0, "Success: job %s killed." % job.get_uid()) def list_jobs(self, args_dict): - sql = 'SELECT uid, username, package, cvs_tag, target, status FROM jobs' - search = '' - first = True + """ Query job information and return it to the user """ + + sql = 'SELECT uid, username, package, cvs_tag, target, status FROM jobs WHERE ' + sql_args = [] if args_dict.has_key('email') and args_dict['email']: if validate_email(args_dict['email']): - if first: - search = search + " WHERE " - first = False - else: - search = search + " AND " - search = search + 'username LIKE "%%%s%%"' % args_dict['email'] + sql_args.append('username LIKE "%%%s%%"' % args_dict['email']) else: - return (-1, "Error: Invalid query.", [], []) + return (-1, "Error: Invalid email address.", [], []) if args_dict.has_key('status') and args_dict['status']: status = args_dict['status'] if PackageJob.is_package_job_stage_valid(status): - if first: - search = search + " WHERE " - first = False - else: - search = search + " AND " - search = search + 'status = "%s"' % status + sql_args.append('status="%s"' % status) else: - return (-1, "Error: Invalid query.", [], []) + return (-1, "Error: Invalid job status.", [], []) - if len(search): - sql = sql + search - if not len(sql): + if args_dict.has_key('uid') and args_dict['uid']: + uid = validate_uid(args_dict['uid']) + if not uid: + return (-1, "Error: Invalid job UID.", [], []) + sql_args.append('uid=%d' % uid) + + if args_dict.has_key('uid_gt') and args_dict['uid_gt']: + uid = validate_uid(args_dict['uid_gt']) + if not uid: + return (-1, "Error: Invalid job UID.", [], []) + sql_args.append('uid>%d' % uid) + + if args_dict.has_key('uid_lt') and args_dict['uid_lt']: + uid = validate_uid(args_dict['uid_lt']) + if not uid: + return (-1, "Error: Invalid job UID.", [], []) + sql_args.append('uid<%d' % uid) + + if not len(sql_args): return (-1, "Error: Invalid query.", [], []) + # Assemble the final SQL statement + i = 1 + for arg in sql_args: + sql = sql + arg + if i < len(sql_args): + sql = sql + " AND " + i = i + 1 + + # Run the query for the job try: dbcx, curs = get_dbcx() except sqlite.DatabaseError, e: @@ -184,6 +209,7 @@ results.append(tempX) jobs = copy.deepcopy(results) + # Mash all returned job UIDs into an SQL query to get all their archjobs uids = '' for result in jobs: if len(uids) == 0: @@ -191,6 +217,7 @@ else: uids = uids + " OR parent_uid=%d" % result[0] + # Get all archjobs for this job archjobs = [] if len(uids) > 0: sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids From fedora-extras-commits at redhat.com Tue Jul 19 02:29:50 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 18 Jul 2005 22:29:50 -0400 Subject: extras-buildsys/client client.py,1.11,1.12 Message-ID: <200507190230.j6J2UKRL025108@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25058/client Modified Files: client.py Log Message: 2005-07-18 Dan Williams * server/UserInterface.py client/client.py - Rework argument handling and passing so that listing jobs is more flexible. Can now list jobs by UID as well. Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- client.py 10 Jul 2005 04:33:25 -0000 1.11 +++ client.py 19 Jul 2005 02:29:47 -0000 1.12 @@ -89,17 +89,42 @@ print "Package %s enqueued." % package -def list_jobs(server, email, status=None): +def validate_arg(arg): + if arg == 'email' or arg == 'status' or arg == 'uid' or arg == 'uid_gt' or arg == 'uid_lt': + return True + return False + +def list_jobs(server, args): """ - List jobs by email, status, or both. + List jobs by criteria """ - args = {} + # Have to have an even number of options + if int(len(args) / 2.0) != (len(args) / 2.0): + print "Error: invalid options." + return + + query_args = {} + cmd = '' + for arg in args: + if not len(cmd): + if validate_arg(arg): + cmd = arg + else: + print "Error: invalid option '%s'" % arg + return + else: + query_args[cmd] = arg + cmd = '' + + if len(query_args) == 0: + # List all jobs + query_args['uid_gt'] = "0" + + print query_args + try: - args['email'] = email - if status: - args['status'] = status - (e, msg, jobs, archjobs) = server.list_jobs(args) + (e, msg, jobs, archjobs) = server.list_jobs(query_args) except socket.error, e: print "Error connecting to build server: '%s'" % e return @@ -270,18 +295,7 @@ except CommandException, e: print e.message elif cmd == 'list': - status = None - if len(sys.argv) == 2: - pass - elif len(sys.argv) == 3: - status = sys.argv[2] - elif len(sys.argv) == 4: - email_addr = sys.argv[2] - status = sys.argv[3] - else: - print "Error: invalid command format" - sys.exit(1) - list_jobs(server, email, status) + list_jobs(server, sys.argv[2:]) elif cmd == 'kill': if len(sys.argv) < 3: print "Error: need a job UID to kill" From fedora-extras-commits at redhat.com Tue Jul 19 03:42:39 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:42:39 -0400 Subject: rpms/apel - New directory Message-ID: <200507190342.j6J3gdLv026410@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26390/apel Log Message: Directory /cvs/extras/rpms/apel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 03:42:40 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:42:40 -0400 Subject: rpms/apel/devel - New directory Message-ID: <200507190342.j6J3geRc026415@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26390/apel/devel Log Message: Directory /cvs/extras/rpms/apel/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 03:43:08 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:43:08 -0400 Subject: rpms/apel Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507190343.j6J3h8i2026462@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26435 Added Files: Makefile import.log Log Message: Setup of module apel --- NEW FILE Makefile --- # Top level Makefile for module apel all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 19 03:43:08 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:43:08 -0400 Subject: rpms/apel/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507190343.j6J3h86t026467@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26435/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module apel --- NEW 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 Jul 19 03:44:16 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:44:16 -0400 Subject: rpms/apel import.log,1.1,1.2 Message-ID: <200507190344.j6J3iks8026550@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26509 Modified Files: import.log Log Message: auto-import apel-10.6-6 on branch devel from apel-10.6-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/apel/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jul 2005 03:43:06 -0000 1.1 +++ import.log 19 Jul 2005 03:44:14 -0000 1.2 @@ -0,0 +1 @@ +apel-10_6-6:HEAD:apel-10.6-6.src.rpm:1121744640 From fedora-extras-commits at redhat.com Tue Jul 19 03:44:16 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Mon, 18 Jul 2005 23:44:16 -0400 Subject: rpms/apel/devel APEL-CFG.patch, NONE, 1.1 apel-10.4-missing-el.patch, NONE, 1.1 apel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507190344.j6J3iGpV026545@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26509/devel Modified Files: .cvsignore sources Added Files: APEL-CFG.patch apel-10.4-missing-el.patch apel.spec Log Message: auto-import apel-10.6-6 on branch devel from apel-10.6-6.src.rpm APEL-CFG.patch: --- NEW FILE APEL-CFG.patch --- --- apel-10.3/APEL-CFG.org Sat Jun 23 19:25:54 2001 +++ apel-10.3/APEL-CFG Sat Jun 23 19:26:09 2001 @@ -74,8 +74,8 @@ ;; XEmacs 21.0 and later. ;; (setq PACKAGEDIR "/usr/local/lib/xemacs/xemacs-packages") -;; (setq APEL_PREFIX "apel") -;; (setq EMU_PREFIX "emu") +(setq APEL_PREFIX "apel") +(setq EMU_PREFIX "apel") ;; If you want to install all of APEL modules to VERSION_SPECIFIC_LISPDIR, ;; uncomment and edit this. apel-10.4-missing-el.patch: --- NEW FILE apel-10.4-missing-el.patch --- diff -ruN apel-10.4.orig/APEL-ELS apel-10.4/APEL-ELS --- apel-10.4.orig/APEL-ELS 2003-05-14 16:36:24.000000000 +0900 +++ apel-10.4/APEL-ELS 2003-05-14 16:36:53.000000000 +0900 @@ -13,7 +13,7 @@ ;; [obsoleted modules] If you would like to ;; install following, please activate them. - ;; atype file-detect + atype file-detect )) ;;; APEL-ELS ends here --- NEW FILE apel.spec --- %define emacsver 20.7 %define xemacsver 21.4.10-6 %define lispdir %{_datadir}/emacs/site-lisp %define pkgdir %{_datadir}/xemacs/xemacs-packages Name: apel Version: 10.6 Release: 6 License: GPL URL: ftp://ftp.m17n.org/pub/mule/apel/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildArch: noarch Source0: apel-%{version}.tar.gz Patch0: APEL-CFG.patch Patch1: apel-10.4-missing-el.patch Summary: A Portable Emacs Library Group: Applications/Editors Buildrequires: emacs Requires: emacs-common #package xemacs #Summary: A Portable [X]Emacs Library #Group: Applications/Editors #Buildrequires: xemacs #Requires: xemacs-common #Conflicts: xemacs < %{xemacsver} %description APEL stands for "A Portable Emacs Library". It consists of following modules: poe.el - This is an emulation module mainly for basic functions and special forms/macros of latest emacsen. poem.el - This module provides basic functions to write portable MULE programs. pces.el - This module provides portable character encoding scheme (coding-system) features. invisible.el - This modules provides features about invisible region. mcharset.el - This modules provides MIME charset related features. and other some utility modules #description xemacs #APEL stands for "A Portable Emacs Library". This is the #XEmacs version of APEL. You may install apel instead of #this if you use GNU Emacs. %prep %setup -q %patch -p1 -b .cfg %patch1 -p1 -b .missing %build %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT make PREFIX=$RPM_BUILD_ROOT%{_prefix} \ LISPDIR=$RPM_BUILD_ROOT%{lispdir} install ## VERSION_SPECIFIC_LISPDIR=$RPM_BUILD_ROOT%{lispdir} \ make clean #make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README.ja README.en ChangeLog %{lispdir}/apel #files xemacs #defattr(-,root,root) #doc README.ja README.en ChangeLog #{pkgdir}/lisp/apel %changelog * Tue Feb 22 2005 Elliot Lee 10.6-6 - Remove xemacs * Wed Oct 6 2004 Akira TAGOH - 10.6-5 - require emacs-common instead of emacs. * Wed Oct 6 2004 Akira TAGOH - 10.6-4 - require xemacs-common instead of xemacs. (#134479) * Mon Sep 27 2004 Akira TAGOH - 10.6-3 - rebuilt * Fri Feb 13 2004 Elliot Lee - rebuilt * Mon Jul 07 2003 Akira TAGOH 10.6-1 - New upstream release. * Wed May 14 2003 Akira TAGOH 10.4-4 - apel-10.4-missing-el.patch: contains atype.el and file-detect.el (#90604) * Wed Jan 22 2003 Tim Powers - rebuilt * Fri Jan 3 2003 Jens Petersen 10.4-2 - rebuild * Wed Jan 1 2003 Jens Petersen 10.4-1 - update to 10.4 - resurrect -xemacs subpackage, required by latest xemacs package - install xemacs package under datadir - own xemacs package lisp dir * Wed Dec 11 2002 Tim Powers 10.3-8 - rebuild * Thu Jul 18 2002 Akira TAGOH 10.3-7 - s/Copyright/License/ - add the owned directory. * Fri Jun 21 2002 Tim Powers - automated rebuild * Thu May 23 2002 Tim Powers - automated rebuild * Sun Feb 24 2002 Tim Powers - rebuilt in new environment * Wed Jan 09 2002 Tim Powers - automated rebuild * Sat Jun 23 2001 SATO Satoru - apel-xemacs removed because XEmacs already includes it. - made "emu" modules installed in apel/ subdirectory * Wed Jun 20 2001 SATO Satoru - initial release (separated from semi) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apel/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2005 03:43:06 -0000 1.1 +++ .cvsignore 19 Jul 2005 03:44:14 -0000 1.2 @@ -0,0 +1 @@ +apel-10.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/apel/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2005 03:43:06 -0000 1.1 +++ sources 19 Jul 2005 03:44:14 -0000 1.2 @@ -0,0 +1 @@ +a770333c50a4bb79c0923dee78d5e358 apel-10.6.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 04:54:06 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 19 Jul 2005 00:54:06 -0400 Subject: rpms/apel/devel .cvsignore,1.2,1.3 apel.spec,1.1,1.2 Message-ID: <200507190454.j6J4s6u6027927@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/apel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27908 Modified Files: .cvsignore apel.spec Log Message: * Tue Jul 19 2005 Akira TAGOH - 10.6-7.fc5 - Import into Extras. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apel/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Jul 2005 03:44:14 -0000 1.2 +++ .cvsignore 19 Jul 2005 04:54:04 -0000 1.3 @@ -1 +1,4 @@ +*.bz2 +*.gz +*.rpm apel-10.6.tar.gz Index: apel.spec =================================================================== RCS file: /cvs/extras/rpms/apel/devel/apel.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apel.spec 19 Jul 2005 03:44:14 -0000 1.1 +++ apel.spec 19 Jul 2005 04:54:04 -0000 1.2 @@ -6,7 +6,7 @@ Name: apel Version: 10.6 -Release: 6 +Release: 7%{?dist} License: GPL URL: ftp://ftp.m17n.org/pub/mule/apel/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -20,12 +20,12 @@ Buildrequires: emacs Requires: emacs-common -#package xemacs -#Summary: A Portable [X]Emacs Library -#Group: Applications/Editors -#Buildrequires: xemacs -#Requires: xemacs-common -#Conflicts: xemacs < %{xemacsver} +%package xemacs +Summary: A Portable [X]Emacs Library +Group: Applications/Editors +Buildrequires: xemacs +Requires: xemacs-common +Conflicts: xemacs < %{xemacsver} %description APEL stands for "A Portable Emacs Library". It consists of @@ -45,10 +45,10 @@ and other some utility modules -#description xemacs -#APEL stands for "A Portable Emacs Library". This is the -#XEmacs version of APEL. You may install apel instead of -#this if you use GNU Emacs. +%description xemacs +APEL stands for "A Portable Emacs Library". This is the +XEmacs version of APEL. You may install apel instead of +this if you use GNU Emacs. %prep @@ -68,7 +68,7 @@ make clean -#make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package +make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package %clean @@ -81,13 +81,16 @@ %{lispdir}/apel -#files xemacs -#defattr(-,root,root) -#doc README.ja README.en ChangeLog -#{pkgdir}/lisp/apel +%files xemacs +%defattr(-,root,root) +%doc README.ja README.en ChangeLog +%{pkgdir}/lisp/apel %changelog +* Tue Jul 19 2005 Akira TAGOH - 10.6-7.fc5 +- Import into Extras. + * Tue Feb 22 2005 Elliot Lee 10.6-6 - Remove xemacs From fedora-extras-commits at redhat.com Tue Jul 19 04:55:03 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 19 Jul 2005 00:55:03 -0400 Subject: common tobuild,1.1952,1.1953 Message-ID: <200507190455.j6J4t33t027994@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27977 Modified Files: tobuild Log Message: request build of rpms/apel/devel apel-10_6-7_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1952 retrieving revision 1.1953 diff -u -r1.1952 -r1.1953 --- tobuild 18 Jul 2005 23:58:20 -0000 1.1952 +++ tobuild 19 Jul 2005 04:55:01 -0000 1.1953 @@ -93,3 +93,4 @@ thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel roland rpms/monotone/devel monotone-0_21-1_fc5 devel +tagoh rpms/apel/devel apel-10_6-7_fc5 devel From roland at redhat.com Mon Jul 18 23:58:31 2005 From: roland at redhat.com (Roland McGrath) Date: Mon, 18 Jul 2005 16:58:31 -0700 (PDT) Subject: APPROVED: monotone In-Reply-To: Tom 'spot' Callaway's message of Monday, 18 July 2005 18:44:45 -0500 <1121730285.32518.50.camel@localhost.localdomain> Message-ID: <20050718235831.251DD2207D3@magilla.sf.frob.com> Tom Callaway approved the package. I'll be the maintainer. monotone is a free, distributed version control system. It provides fully disconnected operation, manages complete tree versions, keeps its state in a local transactional database, supports overlapping branches and extensible metadata, exchanges work over plain network protocols, performs history-sensitive merging, and delegates trust functions to client-side RSA certificates. From fedora-extras-commits at redhat.com Tue Jul 19 10:14:26 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 19 Jul 2005 06:14:26 -0400 Subject: rpms/liboggz/devel .cvsignore, 1.2, 1.3 liboggz.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507191014.j6JAEQ8X003270@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboggz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3249 Modified Files: .cvsignore liboggz.spec sources Log Message: new upstream release; fix spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboggz/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 17:30:07 -0000 1.2 +++ .cvsignore 19 Jul 2005 10:14:24 -0000 1.3 @@ -1 +1 @@ -liboggz-0.9.1.tar.gz +liboggz-0.9.2.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/rpms/liboggz/devel/liboggz.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- liboggz.spec 16 Jun 2005 19:04:15 -0000 1.2 +++ liboggz.spec 19 Jul 2005 10:14:24 -0000 1.3 @@ -1,16 +1,12 @@ Name: liboggz -Version: 0.9.1 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -# fixed in upstream CVS -Patch: liboggz.autotools.patch -# fixed in upstream CVS -Patch1: liboggz.corruption.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -19,12 +15,6 @@ # libtool BuildRequires: gcc-c++ -# since we patch Makefile.am -BuildRequires: libtool -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: pkgconfig - %description Oggz provides a simple programming interface for reading and writing Ogg files and streams. Ogg is an interleaving data container developed by Monty at @@ -47,11 +37,6 @@ %prep %setup -q -n %{name}-%{version} -%patch -p1 -%patch1 -p0 -aclocal -autoconf -automake %build %configure @@ -59,17 +44,17 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall docdir=`pwd`/doxygen +%makeinstall docdir=$RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version} # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -# remove doxygen build stamp; fixed in upstream CVS -rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}/doxygen-build.stamp +# not particularly interested in the tex docs, the html version has everything +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-devel-%{version}/latex %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -81,19 +66,22 @@ %files devel %defattr(-,root,root) -%doc doxygen/html +%{_includedir}/oggz %{_libdir}/liboggz.so %{_libdir}/liboggz.a %{_libdir}/pkgconfig/oggz.pc -%{_includedir}/oggz +%doc %{_docdir}/%{name}-devel-%{version} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog -* Thu Jun 16 2005 Thomas Vander Stichele -- 0.9.1-3: update for Ville's comments +* Mon Jul 18 2005 Thomas Vander Stichele +- 0.9.2-1 +- new upstream version +- removed patches +- moved devel docs to versioned location * Mon Jun 13 2005 Thomas Vander Stichele - 0.9.1-2: rpmlint cleanup Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboggz/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 17:30:07 -0000 1.2 +++ sources 19 Jul 2005 10:14:24 -0000 1.3 @@ -1 +1 @@ -476ce0b2eb000a0b0e2102d2e8d79580 liboggz-0.9.1.tar.gz +53a0217f4c3d0de1d187e5079c087b22 liboggz-0.9.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 10:15:18 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 19 Jul 2005 06:15:18 -0400 Subject: common tobuild,1.1953,1.1954 Message-ID: <200507191015.j6JAFI8f003334@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3317 Modified Files: tobuild Log Message: request build of rpms/liboggz/devel liboggz-0_9_2-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1953 retrieving revision 1.1954 diff -u -r1.1953 -r1.1954 --- tobuild 19 Jul 2005 04:55:01 -0000 1.1953 +++ tobuild 19 Jul 2005 10:15:16 -0000 1.1954 @@ -94,3 +94,4 @@ pfrields rpms/nautilus-open-terminal/devel nautilus-open-terminal-0_4-5_fc5 devel roland rpms/monotone/devel monotone-0_21-1_fc5 devel tagoh rpms/apel/devel apel-10_6-7_fc5 devel +thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 11:20:46 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Tue, 19 Jul 2005 07:20:46 -0400 Subject: devel/directfb .cvsignore, 1.2, 1.3 directfb.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507191120.j6JBKk2n004574@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/directfb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4553 Modified Files: .cvsignore directfb.spec sources Log Message: update to new release; put in changes from ville Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/directfb/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 Dec 2004 17:36:32 -0000 1.2 +++ .cvsignore 19 Jul 2005 11:20:44 -0000 1.3 @@ -1 +1 @@ -DirectFB-0.9.21.tar.gz +DirectFB-0.9.22.tar.gz Index: directfb.spec =================================================================== RCS file: /cvs/extras/devel/directfb/directfb.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- directfb.spec 5 Mar 2005 21:10:21 -0000 1.2 +++ directfb.spec 19 Jul 2005 11:20:44 -0000 1.3 @@ -1,10 +1,10 @@ Name: directfb -Version: 0.9.21 -Release: 1 +Version: 0.9.22 +Release: 1%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System/Libraries -License: GPL +License: LGPL URL: http://www.directfb.org/ Source: http://www.directfb.org/download/DirectFB/DirectFB-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,6 +14,7 @@ BuildRequires: libjpeg-devel BuildRequires: freetype-devel BuildRequires: SDL-devel +BuildRequires: sysfsutils-devel # libtool BuildRequires: gcc-c++ @@ -34,6 +35,8 @@ Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: zlib-devel %description devel The %{name}-devel package contains the static libraries and header files @@ -44,24 +47,15 @@ %build %configure \ - --with-gfxdrivers=ati128,cle266,i810,mach64,matrox,nsc,nvidia,radeon,tdfx \ - --disable-sse \ -%ifarch athlon i686 - --enable-mmx \ -%else - --disable-mmx \ -%endif - --disable-maintainer-mode \ - --enable-shared \ - --enable-static \ - --enable-fast-install \ - --disable-avifile \ - --disable-debug \ + --disable-maintainer-mode \ + --enable-shared \ + --enable-static \ + --disable-avifile \ + --enable-video4linux2 \ --with-gfxdrivers=\ -ati128,cle266,cyber5k,i810,mach64,matrox,\ +ati128,cle266,cyber5k,i810,i830,mach64,matrox,\ neomagic,nsc,nvidia,radeon,savage,\ tdfx,unichrome -# no kernel support: radeon, i810, neomagic, savage # build errors: sis315 make %{?_smp_mflags} @@ -89,8 +83,12 @@ %{_libdir}/libdirectfb-*.so.* %{_libdir}/libdirect-*.so.* %{_libdir}/libfusion-*.so.* -%{_libdir}/directfb-%{version} +%dir %{_libdir}/directfb-%{version} +%{_libdir}/directfb-%{version}/*/*.so +%{_libdir}/directfb-%{version}/*/*/*.so + %{_datadir}/%{name}-%{version} + %{_bindir}/dfbg %{_bindir}/dfbdump %{_bindir}/dfbinfo @@ -102,7 +100,7 @@ %files devel %defattr(-,root,root,-) -%doc docs/html/* +%doc docs/html/*.html docs/html/*.png %{_bindir}/directfb-config %{_bindir}/directfb-csource %{_includedir}/directfb @@ -113,11 +111,22 @@ %{_libdir}/pkgconfig/directfb-internal.pc %{_libdir}/pkgconfig/fusion.pc %{_libdir}/libdirectfb.so +%{_libdir}/libdirect.so +%{_libdir}/libfusion.so %{_libdir}/libdirectfb.a %{_libdir}/libdirect.a %{_libdir}/libfusion.a +%{_libdir}/directfb-%{version}/*/*.a +%{_libdir}/directfb-%{version}/*/*/*.a +%{_libdir}/directfb-%{version}/*/*.o +%{_libdir}/directfb-%{version}/*/*/*.o %changelog +* Tue Jul 19 2005 Thomas Vander Stichele +- 0.9.22-1 +- incorporate changes from Ville +- update to new upstream release + * Fri Dec 31 2004 Thomas Vander Stichele - 0.9.21-0.fdr.1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/directfb/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 31 Dec 2004 17:36:32 -0000 1.2 +++ sources 19 Jul 2005 11:20:44 -0000 1.3 @@ -1 +1 @@ -22699a04f2f618b287aa0ae1b06045b5 DirectFB-0.9.21.tar.gz +f52e23f4bb56db0d284d2a78ebc4a586 DirectFB-0.9.22.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:17:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:17:26 -0400 Subject: rpms/perl-GD/FC-3 .cvsignore, 1.4, 1.5 perl-GD.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200507191217.j6JCHQ0U005902@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5853/FC-3 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.25. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2005 15:19:20 -0000 1.4 +++ .cvsignore 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -GD-2.23.tar.gz +GD-2.25.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/perl-GD.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-GD.spec 10 Mar 2005 15:19:20 -0000 1.4 +++ perl-GD.spec 19 Jul 2005 12:17:24 -0000 1.5 @@ -1,14 +1,12 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-GD -Version: 2.23 -Release: 1 +Version: 2.25 +Release: 1%{?dist} Summary: Perl interface to the GD graphics library Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/GD/ -Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz +Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -29,6 +27,7 @@ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* +chmod 755 qd.pl %build @@ -39,8 +38,8 @@ %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 f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -55,15 +54,19 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/ +%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/ %{_bindir}/* %{perl_vendorarch}/auto/GD %{perl_vendorarch}/GD* +%{perl_vendorarch}/qd.pl %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog +* Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 +- Update to 2.25. + * Wed Mar 9 2005 Jose Pedro Oliveira - 2.23-1 - Update to 2.23. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2005 15:19:20 -0000 1.4 +++ sources 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -131a84d37921a18c87e7d994d72165b2 GD-2.23.tar.gz +aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:17:27 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:17:27 -0400 Subject: rpms/perl-GD/devel .cvsignore, 1.4, 1.5 perl-GD.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200507191217.j6JCHRGP005916@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5853/devel Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.25. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2005 15:19:20 -0000 1.4 +++ .cvsignore 19 Jul 2005 12:17:25 -0000 1.5 @@ -1 +1 @@ -GD-2.23.tar.gz +GD-2.25.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GD.spec 6 Apr 2005 22:12:45 -0000 1.6 +++ perl-GD.spec 19 Jul 2005 12:17:25 -0000 1.7 @@ -1,15 +1,12 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-GD -Version: 2.23 -Release: 2 - +Version: 2.25 +Release: 1%{?dist} Summary: Perl interface to the GD graphics library Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/GD/ -Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz +Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -30,6 +27,7 @@ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* +chmod 755 qd.pl %build @@ -40,8 +38,8 @@ %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 f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -56,16 +54,20 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/ +%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/ %{_bindir}/* %{perl_vendorarch}/auto/GD %{perl_vendorarch}/GD* +%{perl_vendorarch}/qd.pl %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 +- Update to 2.25. + +* Fri Apr 7 2005 Michael Schwendt - 2.23-2 - rebuilt * Wed Mar 9 2005 Jose Pedro Oliveira - 2.23-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2005 15:19:20 -0000 1.4 +++ sources 19 Jul 2005 12:17:25 -0000 1.5 @@ -1 +1 @@ -131a84d37921a18c87e7d994d72165b2 GD-2.23.tar.gz +aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:17:26 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:17:26 -0400 Subject: rpms/perl-GD/FC-4 .cvsignore, 1.4, 1.5 perl-GD.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200507191217.j6JCHQ8e005910@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5853/FC-4 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.25. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Mar 2005 15:19:20 -0000 1.4 +++ .cvsignore 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -GD-2.23.tar.gz +GD-2.25.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-GD.spec 6 Apr 2005 22:12:45 -0000 1.6 +++ perl-GD.spec 19 Jul 2005 12:17:24 -0000 1.7 @@ -1,15 +1,12 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} - Name: perl-GD -Version: 2.23 -Release: 2 - +Version: 2.25 +Release: 1%{?dist} Summary: Perl interface to the GD graphics library Group: Development/Libraries License: Artistic URL: http://search.cpan.org/dist/GD/ -Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-2.23.tar.gz +Source0: http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 1:5.6.1 @@ -30,6 +27,7 @@ %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ qd.pl bdf_scripts/cvtbdf.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* +chmod 755 qd.pl %build @@ -40,8 +38,8 @@ %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 f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -56,16 +54,20 @@ %files %defattr(-,root,root,-) -%doc ChangeLog README README.QUICKDRAW qd.pl demos/ bdf_scripts/ +%doc ChangeLog README README.QUICKDRAW demos/ bdf_scripts/ %{_bindir}/* %{perl_vendorarch}/auto/GD %{perl_vendorarch}/GD* +%{perl_vendorarch}/qd.pl %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Tue Jul 19 2005 Jose Pedro Oliveira - 2.25-1 +- Update to 2.25. + +* Fri Apr 7 2005 Michael Schwendt - 2.23-2 - rebuilt * Wed Mar 9 2005 Jose Pedro Oliveira - 2.23-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Mar 2005 15:19:20 -0000 1.4 +++ sources 19 Jul 2005 12:17:24 -0000 1.5 @@ -1 +1 @@ -131a84d37921a18c87e7d994d72165b2 GD-2.23.tar.gz +aab3f7730ebc54eb6a2a485bc2aa4864 GD-2.25.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 12:18:13 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:18:13 -0400 Subject: common tobuild,1.1954,1.1955 Message-ID: <200507191218.j6JCIDCV005980@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5963 Modified Files: tobuild Log Message: request build of rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1954 retrieving revision 1.1955 diff -u -r1.1954 -r1.1955 --- tobuild 19 Jul 2005 10:15:16 -0000 1.1954 +++ tobuild 19 Jul 2005 12:18:10 -0000 1.1955 @@ -95,3 +95,4 @@ roland rpms/monotone/devel monotone-0_21-1_fc5 devel tagoh rpms/apel/devel apel-10_6-7_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel +jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 19 12:18:47 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:18:47 -0400 Subject: common tobuild,1.1955,1.1956 Message-ID: <200507191218.j6JCIlGQ006042@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6025 Modified Files: tobuild Log Message: request build of rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1955 retrieving revision 1.1956 diff -u -r1.1955 -r1.1956 --- tobuild 19 Jul 2005 12:18:10 -0000 1.1955 +++ tobuild 19 Jul 2005 12:18:44 -0000 1.1956 @@ -96,3 +96,4 @@ tagoh rpms/apel/devel apel-10_6-7_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 +jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 19 12:19:21 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 19 Jul 2005 08:19:21 -0400 Subject: common tobuild,1.1956,1.1957 Message-ID: <200507191219.j6JCJLFS006107@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6090 Modified Files: tobuild Log Message: request build of rpms/perl-GD/devel perl-GD-2_25-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1956 retrieving revision 1.1957 diff -u -r1.1956 -r1.1957 --- tobuild 19 Jul 2005 12:18:44 -0000 1.1956 +++ tobuild 19 Jul 2005 12:19:18 -0000 1.1957 @@ -97,3 +97,4 @@ thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 +jpo rpms/perl-GD/devel perl-GD-2_25-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 16:10:03 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 19 Jul 2005 12:10:03 -0400 Subject: rpms/perl-IO-Socket-SSL/FC-4 .cvsignore, 1.2, 1.3 perl-IO-Socket-SSL.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507191610.j6JGA3LQ011016@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10981/FC-4 Modified Files: .cvsignore perl-IO-Socket-SSL.spec sources Log Message: * Mon Jul 18 2005 Ville Skytt?? - 0.97-1 - 0.97. - Convert docs to UTF-8, drop some unuseful ones. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2005 11:59:30 -0000 1.2 +++ .cvsignore 19 Jul 2005 16:10:00 -0000 1.3 @@ -1 +1 @@ -IO-Socket-SSL-0.96.tar.gz +IO-Socket-SSL-0.97.tar.gz Index: perl-IO-Socket-SSL.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4/perl-IO-Socket-SSL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Socket-SSL.spec 6 Apr 2005 22:12:45 -0000 1.3 +++ perl-IO-Socket-SSL.spec 19 Jul 2005 16:10:00 -0000 1.4 @@ -1,19 +1,16 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-IO-Socket-SSL -Version: 0.96 -Release: 4 - +Version: 0.97 +Release: 1%{?dist} Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-Socket-SSL/ -Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.96.tar.gz +Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Net::SSLeay) +BuildRequires: perl(Net::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -28,6 +25,9 @@ %prep %setup -q -n IO-Socket-SSL-%{version} +for f in README SSL.pm ; do + iconv -f iso-8859-1 -t utf-8 -o $f{.utf8,} ; mv $f{.utf8,} +done # Avoid running the session tests (spawns servers, requires 3 free ports # and possibly manual configuration). mv t/sessions.t t/sessions.t.not @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -56,13 +56,17 @@ %files %defattr(-,root,root,-) -%doc BUGS Changes README certs docs example patches util -%{perl_vendorlib}/IO +%doc BUGS Changes README docs/ certs/ example/ util/ +%{perl_vendorlib}/IO/ %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Jul 18 2005 Ville Skytt?? - 0.97-1 +- 0.97. +- Convert docs to UTF-8, drop some unuseful ones. + +* Fri Apr 7 2005 Michael Schwendt - 0.96-4 - rebuilt * Tue Oct 12 2004 Ville Skytt?? - 0:0.96-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2005 11:59:30 -0000 1.2 +++ sources 19 Jul 2005 16:10:00 -0000 1.3 @@ -1 +1 @@ -85f84c0810851eb4f540b118c9902b03 IO-Socket-SSL-0.96.tar.gz +34562e9475de132faa0f14ca2be053a5 IO-Socket-SSL-0.97.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 16:10:04 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Tue, 19 Jul 2005 12:10:04 -0400 Subject: rpms/perl-IO-Socket-SSL/devel .cvsignore, 1.2, 1.3 perl-IO-Socket-SSL.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507191610.j6JGA4EW011024@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-IO-Socket-SSL/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10981/devel Modified Files: .cvsignore perl-IO-Socket-SSL.spec sources Log Message: * Mon Jul 18 2005 Ville Skytt?? - 0.97-1 - 0.97. - Convert docs to UTF-8, drop some unuseful ones. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2005 11:59:30 -0000 1.2 +++ .cvsignore 19 Jul 2005 16:10:02 -0000 1.3 @@ -1 +1 @@ -IO-Socket-SSL-0.96.tar.gz +IO-Socket-SSL-0.97.tar.gz Index: perl-IO-Socket-SSL.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/perl-IO-Socket-SSL.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-IO-Socket-SSL.spec 6 Apr 2005 22:12:45 -0000 1.3 +++ perl-IO-Socket-SSL.spec 19 Jul 2005 16:10:02 -0000 1.4 @@ -1,19 +1,16 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-IO-Socket-SSL -Version: 0.96 -Release: 4 - +Version: 0.97 +Release: 1%{?dist} Summary: Perl library for transparent SSL Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/IO-Socket-SSL/ -Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-0.96.tar.gz +Source0: http://www.cpan.org/authors/id/B/BE/BEHROOZI/IO-Socket-SSL-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Net::SSLeay) +BuildRequires: perl(Net::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -28,6 +25,9 @@ %prep %setup -q -n IO-Socket-SSL-%{version} +for f in README SSL.pm ; do + iconv -f iso-8859-1 -t utf-8 -o $f{.utf8,} ; mv $f{.utf8,} +done # Avoid running the session tests (spawns servers, requires 3 free ports # and possibly manual configuration). mv t/sessions.t t/sessions.t.not @@ -46,7 +46,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -56,13 +56,17 @@ %files %defattr(-,root,root,-) -%doc BUGS Changes README certs docs example patches util -%{perl_vendorlib}/IO +%doc BUGS Changes README docs/ certs/ example/ util/ +%{perl_vendorlib}/IO/ %{_mandir}/man3/*.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Jul 18 2005 Ville Skytt?? - 0.97-1 +- 0.97. +- Convert docs to UTF-8, drop some unuseful ones. + +* Fri Apr 7 2005 Michael Schwendt - 0.96-4 - rebuilt * Tue Oct 12 2004 Ville Skytt?? - 0:0.96-3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-Socket-SSL/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2005 11:59:30 -0000 1.2 +++ sources 19 Jul 2005 16:10:02 -0000 1.3 @@ -1 +1 @@ -85f84c0810851eb4f540b118c9902b03 IO-Socket-SSL-0.96.tar.gz +34562e9475de132faa0f14ca2be053a5 IO-Socket-SSL-0.97.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 16:32:19 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 19 Jul 2005 12:32:19 -0400 Subject: common tobuild,1.1957,1.1958 Message-ID: <200507191632.j6JGWJ7t011111@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11094 Modified Files: tobuild Log Message: request build of rpms/libcdio/devel libcdio-0_75-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1957 retrieving revision 1.1958 diff -u -r1.1957 -r1.1958 --- tobuild 19 Jul 2005 12:19:18 -0000 1.1957 +++ tobuild 19 Jul 2005 16:32:17 -0000 1.1958 @@ -98,3 +98,4 @@ jpo rpms/perl-GD/FC-3 perl-GD-2_25-1_fc3 fc3 jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 jpo rpms/perl-GD/devel perl-GD-2_25-1_fc5 devel +adrian rpms/libcdio/devel libcdio-0_75-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 17:00:54 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:00:54 -0400 Subject: rpms/pam_abl - New directory Message-ID: <200507191700.j6JH0sNM011218@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198/pam_abl Log Message: Directory /cvs/extras/rpms/pam_abl added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:00:55 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:00:55 -0400 Subject: rpms/pam_abl/devel - New directory Message-ID: <200507191700.j6JH0tpU011223@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198/pam_abl/devel Log Message: Directory /cvs/extras/rpms/pam_abl/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:01:39 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:01:39 -0400 Subject: rpms/pam_abl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507191701.j6JH1dk3012338@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324 Added Files: Makefile import.log Log Message: Setup of module pam_abl --- NEW FILE Makefile --- # Top level Makefile for module pam_abl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 19 17:02:09 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:02:09 -0400 Subject: rpms/pam_abl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507191702.j6JH29FC012353@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pam_abl --- NEW 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 Jul 19 17:05:12 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:05:12 -0400 Subject: rpms/pam_abl/devel README.Fedora, NONE, 1.1 pam_abl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507191705.j6JH5CXS012431@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12395/devel Modified Files: .cvsignore sources Added Files: README.Fedora pam_abl.spec Log Message: auto-import pam_abl-0.2.2-2 on branch devel from pam_abl-0.2.2-2.src.rpm --- NEW FILE README.Fedora --- README.Fedora - pam_abl ------------------------------------------------------------------------ Any time changes to the PAM configuration are done by hand, they have to be done with great care to avoid disabling system access by accident. ------------------------------------------------------------------------ To activate the use of pam_abl.so you need to add a PAM rule like auth required /lib/security/$ISA/pam_abl.so config=/etc/security/pam_abl.conf i.e. in /etc/pam.d/system-auth. Doing so please be aware that /etc/pam.d/system-auth is auto-generated and that user changes will be destroyed the next time authconfig is run, thus this step to be redone. You are able to customize the pam_abl.so behaviour by editing /etc/security/pam_abl.conf. For detailed instructions please see index.html and pam_abl.html or the application's page online at http://www.hexten.net/sw/pam_abl/doc/index.html --- NEW FILE pam_abl.spec --- %define reldate 20050110 Name: pam_abl Summary: A Pluggable Authentication Module (PAM) for auto blacklisting Version: 0.2.2 Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.hexten.net/sw/pam_abl/ Source0: http://www.hexten.net/sw/pam_abl/pam_abl-%{reldate}-%{version}.tar.gz Source1: README.Fedora BuildRequires: db4-devel, pam-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Provides auto blacklisting of hosts and users responsible for repeated failed authentication attempts. Generally configured so that blacklisted users still see normal login prompts but are guaranteed to fail to authenticate. A command line tool allows to query or purge the databases used by the pam_abl module. %prep %setup -q -n %{name}-%{reldate}-%{version} # temporary fix for an outdated document instruction sed -i -e '/pam_abl.so$/d' conf/system-auth %build make %{?_smp_mflags} all %install rm -rf %{buildroot} install -D -m 755 pam_abl.so %{buildroot}/%{_lib}/security/pam_abl.so install -D -m 644 conf/pam_abl.conf %{buildroot}%{_sysconfdir}/security/pam_abl.conf install -D -m 755 tools/pam_abl %{buildroot}%{_sbindir}/pam_abl install -d -m 755 %{buildroot}%{_localstatedir}/lib/abl install -m 644 %{SOURCE1} README.Fedora rm -f doc/._pam_abl.html %clean rm -rf %{buildroot} %files %defattr(644,root,root,755) %doc README.Fedora Copyright doc conf %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/security/pam_abl.conf /%{_lib}/security/pam_abl.so %{_sbindir}/pam_abl %{_localstatedir}/lib/abl/ %changelog * Fri Jul 15 2005 Alexander Dalloz - 0.2.2-2 - Defined %{reldate} and made macro usage consistent - pam_abl moved to /usr/sbin. * Wed Jul 13 2005 Alexander Dalloz - 0.2.2-1 - Changes following review: - added %{?dist} tag - set Group to System Environment/Base - set Source0 to be an absolute URL - changed BuildPrereq to be BuildRequires - moved instructions into README.Fedora - dropped release date in tarball name as release number flag - removed outdated instruction in example system-auth doc file. * Sun Jul 11 2005 Alexander Dalloz - 0.2.2-20050110 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pam_abl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2005 17:02:06 -0000 1.1 +++ .cvsignore 19 Jul 2005 17:05:09 -0000 1.2 @@ -0,0 +1 @@ +pam_abl-20050110-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pam_abl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2005 17:02:06 -0000 1.1 +++ sources 19 Jul 2005 17:05:09 -0000 1.2 @@ -0,0 +1 @@ +5c51d8339682e1ebde3c2c7d120e769b pam_abl-20050110-0.2.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 17:04:59 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Tue, 19 Jul 2005 13:04:59 -0400 Subject: rpms/pam_abl import.log,1.1,1.2 Message-ID: <200507191705.j6JH5ei2012434@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/rpms/pam_abl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12395 Modified Files: import.log Log Message: auto-import pam_abl-0.2.2-2 on branch devel from pam_abl-0.2.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pam_abl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jul 2005 17:01:37 -0000 1.1 +++ import.log 19 Jul 2005 17:04:57 -0000 1.2 @@ -0,0 +1 @@ +pam_abl-0_2_2-2:HEAD:pam_abl-0.2.2-2.src.rpm:1121792665 From fedora-extras-commits at redhat.com Tue Jul 19 17:52:49 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:52:49 -0400 Subject: rpms/nethack - New directory Message-ID: <200507191752.j6JHqnwl012657@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12633/nethack Log Message: Directory /cvs/extras/rpms/nethack added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:52:50 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:52:50 -0400 Subject: rpms/nethack/devel - New directory Message-ID: <200507191752.j6JHqoWF012662@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12633/nethack/devel Log Message: Directory /cvs/extras/rpms/nethack/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 19 17:53:06 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:06 -0400 Subject: rpms/nethack Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507191753.j6JHr6vq012705@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678 Added Files: Makefile import.log Log Message: Setup of module nethack --- NEW FILE Makefile --- # Top level Makefile for module nethack all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 19 17:53:06 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:06 -0400 Subject: rpms/nethack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507191753.j6JHr6Jc012710@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12678/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nethack --- NEW 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 Jul 19 17:53:55 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:55 -0400 Subject: rpms/nethack import.log,1.1,1.2 Message-ID: <200507191754.j6JHsQcb012800@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757 Modified Files: import.log Log Message: auto-import nethack-3.4.3-1 on branch devel from nethack-3.4.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nethack/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Jul 2005 17:53:04 -0000 1.1 +++ import.log 19 Jul 2005 17:53:53 -0000 1.2 @@ -0,0 +1 @@ +nethack-3_4_3-1:HEAD:nethack-3.4.3-1.src.rpm:1121795674 From fedora-extras-commits at redhat.com Tue Jul 19 17:53:56 2005 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Tue, 19 Jul 2005 13:53:56 -0400 Subject: rpms/nethack/devel nethack-3.4.3-config.patch, NONE, 1.1 nethack-3.4.3-makefile.patch, NONE, 1.1 nethack.desktop, NONE, 1.1 nethack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507191753.j6JHruV7012792@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/nethack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757/devel Modified Files: .cvsignore sources Added Files: nethack-3.4.3-config.patch nethack-3.4.3-makefile.patch nethack.desktop nethack.spec Log Message: auto-import nethack-3.4.3-1 on branch devel from nethack-3.4.3-1.src.rpm nethack-3.4.3-config.patch: --- NEW FILE nethack-3.4.3-config.patch --- --- include/config.h.orig 2003-12-07 18:39:13.000000000 -0500 +++ include/config.h 2005-06-25 20:21:41.000000000 -0400 @@ -143,10 +143,10 @@ #ifndef WIZARD /* allow for compile-time or Makefile changes */ # ifndef KR1ED -# define WIZARD "wizard" /* the person allowed to use the -D option */ +# define WIZARD "games" /* the person allowed to use the -D option */ # else # define WIZARD -# define WIZARD_NAME "wizard" +# define WIZARD_NAME "games" # endif #endif @@ -169,8 +169,8 @@ #ifdef UNIX /* path and file name extension for compression program */ -#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ -#define COMPRESS_EXTENSION ".Z" /* compress's extension */ +#define COMPRESS "/usr/bin/bzip2" /* Lempel-Ziv compression */ +#define COMPRESS_EXTENSION ".bz2" /* compress's extension */ /* An example of one alternative you might want to use: */ /* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ /* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ @@ -185,7 +185,7 @@ * a tar-like file, thus making a neater installation. See *conf.h * for detailed configuration. */ -/* #define DLB */ /* not supported on all platforms */ +#define DLB /* not supported on all platforms */ /* * Defining INSURANCE slows down level changes, but allows games that @@ -204,7 +204,7 @@ * otherwise it will be the current directory. */ # ifndef HACKDIR -# define HACKDIR "/usr/games/lib/nethackdir" +# define HACKDIR "FEDORA_HACKDIR" # endif /* @@ -214,7 +214,7 @@ * since the user might create files in a directory of his choice. * Of course SECURE is meaningful only if HACKDIR is defined. */ -/* #define SECURE */ /* do setuid(getuid()) after chdir() */ +#define SECURE /* do setuid(getuid()) after chdir() */ /* * If it is desirable to limit the number of people that can play Hack @@ -300,7 +300,7 @@ * functions that have been macroized. */ -/* #define VISION_TABLES */ /* use vision tables generated at compile time */ +#define VISION_TABLES /* use vision tables generated at compile time */ #ifndef VISION_TABLES # ifndef NO_MACRO_CPATH # define MACRO_CPATH /* use clear_path macros instead of functions */ @@ -338,7 +338,7 @@ #endif #define EXP_ON_BOTL /* Show experience on bottom line */ -/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson at ucivax) */ +#define SCORE_ON_BOTL /* added by Gary Erickson (erickson at ucivax) */ /* * Section 5: EXPERIMENTAL STUFF --- include/unixconf.h.orig 2003-12-07 18:39:13.000000000 -0500 +++ include/unixconf.h 2005-06-25 20:23:26.000000000 -0400 @@ -37,7 +37,7 @@ #define NETWORK /* if running on a networked system */ /* e.g. Suns sharing a playground through NFS */ /* #define SUNOS4 */ /* SunOS 4.x */ -/* #define LINUX */ /* Another Unix clone */ +#define LINUX /* Another Unix clone */ /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ /* #define GENIX */ /* Yet Another Unix Clone */ /* #define HISX */ /* Bull Unix for XPS Machines */ @@ -96,13 +96,13 @@ */ /* #define NO_FILE_LINKS */ /* if no hard links */ -/* #define LOCKDIR "/usr/games/lib/nethackdir" */ /* where to put locks */ +#define LOCKDIR "FEDORA_STATEDIR" /* where to put locks */ /* * If you want the static parts of your playground on a read-only file * system, define VAR_PLAYGROUND to be where the variable parts are kept. */ -/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */ +#define VAR_PLAYGROUND "FEDORA_STATEDIR" /* @@ -132,7 +132,7 @@ * "extra output" method is used, but not all systems provide access to * a fine-grained timer. */ -/* #define TIMED_DELAY */ /* usleep() */ +#define TIMED_DELAY /* usleep() */ #endif /* @@ -204,7 +204,7 @@ * You can also include any other strange options your compress needs. * If you have a normal compress, just leave it commented out. */ -/* #define COMPRESS_OPTIONS "-q" */ +#define COMPRESS_OPTIONS "-q9" #endif #define FCMASK 0660 /* file creation mask */ nethack-3.4.3-makefile.patch: --- NEW FILE nethack-3.4.3-makefile.patch --- --- sys/unix/Makefile.src.orig 2005-06-23 14:57:08.000000000 -0400 +++ sys/unix/Makefile.src 2005-06-23 15:03:21.000000000 -0400 @@ -124,8 +124,8 @@ # flags for Linux # compile normally -# CFLAGS = -O2 -fomit-frame-pointer -I../include -# LFLAGS = -L/usr/X11R6/lib +CFLAGS = $(RPM_OPT_FLAGS) -I../include +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 @@ -151,8 +151,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +#CFLAGS = -O -I../include +#LFLAGS = # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LINK line here to get @@ -230,8 +230,8 @@ # WINTTYLIB = -ltermcap # WINTTYLIB = -lcurses # WINTTYLIB = -lcurses16 -# WINTTYLIB = -lncurses -WINTTYLIB = -ltermlib +WINTTYLIB = -lncurses +#WINTTYLIB = -ltermlib # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. --- sys/unix/Makefile.utl.orig 2005-06-24 19:48:16.000000000 -0400 +++ sys/unix/Makefile.utl 2005-06-24 19:49:07.000000000 -0400 @@ -15,7 +15,7 @@ # if you are using gcc as your compiler, # uncomment the CC definition below if it's not in your environment -# CC = gcc +CC = gcc # # For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following: # @@ -72,8 +72,8 @@ # flags for Linux # compile normally -# CFLAGS = -O2 -fomit-frame-pointer -I../include -# LFLAGS = -L/usr/X11R6/lib +CFLAGS = $(RPM_OPT_FLAGS) -I../include +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 @@ -89,8 +89,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +#CFLAGS = -O -I../include +#LFLAGS = LIBS = @@ -101,11 +101,11 @@ # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c. # if, instead of yacc/lex you have bison/flex, comment/uncomment the following. -YACC = yacc -LEX = lex -# YACC = bison -y +#YACC = yacc +#LEX = lex +YACC = bison -y # YACC = byacc -# LEX = flex +LEX = flex # these are the names of the output files from YACC/LEX. Under MS-DOS # and similar systems, they may differ --- NEW FILE nethack.desktop --- [Desktop Entry] Name=NetHack Comment=Nethack is a single player dungeon exploration game Exec=nethack Icon=nethack.xpm Terminal=true Type=Application Encoding=UTF-8 Categories=Application;Game;Strategy;X-Fedora; --- NEW FILE nethack.spec --- %define nhgamedir /usr/games/nethack %define nhdatadir /var/games/nethack Name: nethack Version: 3.4.3 Release: 1 Summary: A rouge-like single player dungeon exploration game Group: Amusements/Games License: NetHack General Public License URL: http://nethack.org Source0: http://dl.sf.net/%{name}/%{name}-343-src.tgz Source2: %{name}.desktop Patch0: %{name}-%{version}-makefile.patch Patch1: %{name}-%{version}-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, bison, flex, desktop-file-utils Obsoletes: nethack-falconseye <= 1.9.4-6.a %description NetHack is a single player dungeon exploration game that runs on a wide variety of computer systems, with a variety of graphical and text interfaces all using the same game engine. Unlike many other Dungeons & Dragons-inspired games, the emphasis in NetHack is on discovering the detail of the dungeon and not simply killing everything in sight - in fact, killing everything in sight is a good way to die quickly. Each game presents a different landscape - the random number generator provides an essentially unlimited number of variations of the dungeon and its denizens to be discovered by the player in one of a number of characters: you can pick your race, your role, and your gender. %prep %setup -q %patch0 -b .makefile %patch1 -b .config (source sys/unix/setup.sh) # Set our paths %{__sed} -i -e "s:^\(HACKDIR=\).*:\1%{nhgamedir}:" sys/unix/nethack.sh %{__sed} -i -e "s:FEDORA_CONFDIR:%{nhgamedir}:" sys/unix/nethack.sh %{__sed} -i -e "s:FEDORA_STATEDIR:%{nhdatadir}:" include/unixconf.h %{__sed} -i -e "s:FEDORA_HACKDIR:%{nhgamedir}:" include/config.h %{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \ doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt %build make all %install rm -rf $RPM_BUILD_ROOT %makeinstall \ GAMEDIR=$RPM_BUILD_ROOT%{nhgamedir} \ VARDIR=$RPM_BUILD_ROOT%{nhdatadir} \ SHELLDIR=$RPM_BUILD_ROOT%{_bindir} \ CHOWN=/bin/true \ CHGRP=/bin/true rm -rf $RPM_BUILD_ROOT%{nhgamedir}/save mv $RPM_BUILD_ROOT%{nhgamedir}/recover $RPM_BUILD_ROOT%{_bindir}/nethack-recover chmod +x $RPM_BUILD_ROOT%{nhgamedir}/nethack install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man6 make -C doc MANDIR=$RPM_BUILD_ROOT%{_mandir}/man6 manpages install -D -p -m 0644 win/X11/nh_icon.xpm \ $RPM_BUILD_ROOT%{_datadir}/pixmaps/nethack.xpm desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ --add-category Application \ --add-category Game \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc doc/*.txt README dat/license dat/history %doc dat/opthelp dat/wizhelp %{_mandir}/man6/* %{_datadir}/pixmaps/nethack.xpm %{_datadir}/applications/fedora-nethack.desktop %{nhgamedir}/license %{nhgamedir}/nhdat %{_bindir}/nethack %{_bindir}/nethack-recover %defattr(0664,root,games) %config(noreplace) %{nhdatadir}/record %config(noreplace) %{nhdatadir}/perm %config(noreplace) %{nhdatadir}/logfile %attr(0775,root,games) %dir %{nhdatadir} %attr(0775,root,games) %dir %{nhdatadir}/save %attr(2755,root,games) %{nhgamedir}/nethack %changelog * Sun Jul 10 2005 Luke Macken 3.4.3-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nethack/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Jul 2005 17:53:04 -0000 1.1 +++ .cvsignore 19 Jul 2005 17:53:54 -0000 1.2 @@ -0,0 +1 @@ +nethack-343-src.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nethack/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Jul 2005 17:53:04 -0000 1.1 +++ sources 19 Jul 2005 17:53:54 -0000 1.2 @@ -0,0 +1 @@ +21479c95990eefe7650df582426457f9 nethack-343-src.tgz From fedora-extras-commits at redhat.com Tue Jul 19 18:07:58 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Tue, 19 Jul 2005 14:07:58 -0400 Subject: rpms/kyum/devel .cvsignore, 1.3, 1.4 kyum.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507191807.j6JI7wAS013991@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13960 Modified Files: .cvsignore kyum.spec sources Log Message: Description: New upstream release 0.7.3. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Jul 2005 15:26:10 -0000 1.3 +++ .cvsignore 19 Jul 2005 18:07:56 -0000 1.4 @@ -1 +1 @@ -kyum-0.7.2.tar.gz +kyum-0.7.3.tar.gz Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kyum.spec 14 Jul 2005 14:57:33 -0000 1.6 +++ kyum.spec 19 Jul 2005 18:07:56 -0000 1.7 @@ -1,6 +1,6 @@ Name: kyum -Version: 0.7.2 -Release: 3 +Version: 0.7.3 +Release: 1 Summary: Graphical User Frontend (GUI) for yum @@ -9,7 +9,6 @@ URL: http://kde-apps.org/content/show.php?content=22185 Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch -Patch2: kyum-0.7.2-DlgInfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,7 +28,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -69,6 +67,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Tue Jul 19 2005 Jochen Schmitt 0.7.3-1 +- New upstream release + * Thu Jul 14 2005 Jochen Schmitt 0.7.2-3 - Patch DlgInfo.h to generate proper Makefiles (calling of moc) Index: sources =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Jul 2005 15:26:10 -0000 1.3 +++ sources 19 Jul 2005 18:07:56 -0000 1.4 @@ -1 +1 @@ -0c2eb29c22a4a23d3971eb0ce8d79f99 kyum-0.7.2.tar.gz +8f3436ec802306c2d68b8d574af748be kyum-0.7.3.tar.gz From fedora-extras-commits at redhat.com Tue Jul 19 18:45:27 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Tue, 19 Jul 2005 14:45:27 -0400 Subject: common tobuild,1.1958,1.1959 Message-ID: <200507191845.j6JIjRPi014179@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14160 Modified Files: tobuild Log Message: request build of rpms/splint/devel splint-3_1_1-9_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.1958 retrieving revision 1.1959 diff -u -r1.1958 -r1.1959 --- tobuild 19 Jul 2005 16:32:17 -0000 1.1958 +++ tobuild 19 Jul 2005 18:45:25 -0000 1.1959 @@ -99,3 +99,4 @@ jpo rpms/perl-GD/FC-4 perl-GD-2_25-1_fc4 fc4 jpo rpms/perl-GD/devel perl-GD-2_25-1_fc5 devel adrian rpms/libcdio/devel libcdio-0_75-1_fc5 devel +pnasrat rpms/splint/devel splint-3_1_1-9_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 19 21:48:47 2005 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 19 Jul 2005 17:48:47 -0400 Subject: fedora-security/audit fc4,1.24,1.25 Message-ID: <200507192148.j6JLmlr9018197@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18180 Modified Files: fc4 Log Message: Add new vsftpd CVE id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fc4 18 Jul 2005 08:13:10 -0000 1.24 +++ fc4 19 Jul 2005 21:48:45 -0000 1.25 @@ -333,6 +333,7 @@ 2005-0004 version (mysql, fixed 4.1.10) 2005-0003 version (kernel, fixed 2.6.10) 2005-0001 version (kernel, fixed 2.6.10) +2004-2259 version (vsftpd, fixed 1.2.2) 2004-2228 version (firefox, fixed 1.0) 2004-2227 version (firefox, fixed 1.0) 2004-2225 version (firefox, fixed 0.10.1) From fedora-extras-commits at redhat.com Tue Jul 19 22:59:57 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 19 Jul 2005 18:59:57 -0400 Subject: web/config HOWTO-DOCS,1.1.1.1,1.2 Message-ID: <200507192259.j6JMxvOH019467@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/config In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19450 Modified Files: HOWTO-DOCS Log Message: A little tip that catches me now and then. Index: HOWTO-DOCS =================================================================== RCS file: /cvs/fedora/web/config/HOWTO-DOCS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- HOWTO-DOCS 30 Mar 2005 17:47:22 -0000 1.1.1.1 +++ HOWTO-DOCS 19 Jul 2005 22:59:55 -0000 1.2 @@ -9,6 +9,9 @@ cp fedora-docs/documentation-guide/documentation-guide-en/*.html \ project-web/html/participate/documentation-guide/ + You may need to rename the top level file to 'index.html' in order + to generate a properly linked index.php. + 3. Copy any images and stylesheet images over as well. 4. Run the docbookhtml2php.py script to convert the DocBook From fedora-extras-commits at redhat.com Tue Jul 19 23:10:41 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 19 Jul 2005 19:10:41 -0400 Subject: web/html/docs/release-notes/fc4/errata index.php, 1.3, 1.4 ld-txt-fedora-desktop-screenshot.php, 1.2, 1.3 RELEASE-NOTES-ru.php, 1.1, 1.2 Message-ID: <200507192310.j6JNAfSf020864@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/errata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20845 Modified Files: index.php ld-txt-fedora-desktop-screenshot.php RELEASE-NOTES-ru.php Log Message: Moving of legalnotice is an important part of this commit, fixed bz #162475, bz #162219, bz #160369, style and spelling fixes throughout. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/fc4/errata/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.php 14 Jun 2005 16:04:48 -0000 1.3 +++ index.php 19 Jul 2005 23:10:39 -0000 1.4 @@ -10,10 +10,11 @@

    -Fedora Core 4 Release Notes

    +Fedora Core 4 Release Notes (updated) +

    Copyright ?? 2005 Red Hat, Inc.

    This document is released under the terms of the GNU Free Documentation - License. For more details, read the full legalnotice in Appendix??A, Legalnotice. + License. For more details, read the full legalnotice in Section??2, ???Legalnotice???.

    @@ -22,62 +23,62 @@
    1. Welcome to Fedora Core 4
    1.1. New in Fedora Core 4
    -
    2. Introduction and Technical Release Notes
    -
    3. Hardware Requirements
    +
    2. Legalnotice
    +
    3. Introduction and Technical Release Notes
    +
    4. Hardware Requirements
    -
    3.1. CPU Requirements
    -
    3.2. Hard Disk Space Requirements
    -
    3.3. Memory Requirements
    -
    3.4. PPC Hardware Requirements
    +
    4.1. CPU Requirements
    +
    4.2. Hard Disk Space Requirements
    +
    4.3. Memory Requirements
    +
    4.4. PPC Hardware Requirements
    -
    4. Overview of This Release
    -
    5. Installation-Related Notes
    +
    5. Overview of This Release
    +
    6. Installation-Related Notes
    -
    5.1. PPC Installation Notes
    -
    5.2. Anaconda Notes
    -
    5.3. Installation-Related Issues
    +
    6.1. PPC Installation Notes
    +
    6.2. Anaconda Notes
    +
    6.3. Installation-Related Issues
    -
    6. Package-Specific Notes
    +
    7. Package-Specific Notes
    -
    6.1. Basic Components
    +
    7.1. Basic Components
    -
    6.1.1. Fedora Extras Repository
    -
    6.1.2. Audit Daemon auditd and Log +
    7.1.1. Fedora Extras Repository
    +
    7.1.2. Audit Daemon auditd and Log Files
    -
    6.1.3. LinuxThreads versus NPTL
    -
    6.1.4. Enabling the slocate Database
    -
    6.1.5. Stricter Controls in openssh
    -
    6.1.6. Perl Binary Compat Symlinks
    -
    6.1.7. Server and System Configuration Tools
    -
    6.1.8. Java Package Recommendations
    +
    7.1.3. LinuxThreads versus NPTL
    +
    7.1.4. Enabling the slocate Database
    +
    7.1.5. Stricter Controls in openssh
    +
    7.1.6. Perl Binary Compat Symlinks
    +
    7.1.7. Server and System Configuration Tools
    +
    7.1.8. Java Package Recommendations
    -
    6.2. Core
    +
    7.2. Core
    -
    6.2.1. yum
    -
    6.2.2. +
    7.2.1. yum
    +
    7.2.2. Linux Kernel
    -
    6.2.3. Security
    +
    7.2.3. Security
    -
    6.3. +
    7.3. Development Tools
    -
    6.3.1. GCC Compiler Collection
    -
    6.4. Language Support
    -
    6.4.1. The IIIMF Input System
    -
    6.5. Web Servers
    +
    7.3.1. GCC Compiler Collection
    +
    7.4. Language Support
    +
    7.4.1. The IIIMF Input System
    +
    7.5. Web Servers
    -
    6.5.1. mod_perl
    -
    6.5.2. php
    +
    7.5.1. mod_perl
    +
    7.5.2. php
    -
    6.6. Samba (Windows File System Compatibility)
    -
    6.7. X Window System (Graphics)
    -
    6.7.1. xorg-x11
    +
    7.6. Samba (Windows File System Compatibility)
    +
    7.7. X Window System (Graphics)
    +
    7.7.1. xorg-x11
    -
    7. Packages Movement
    -
    7.1. Packages Moved to Fedora Extras
    -
    8. An Overview of the Fedora Project
    -
    A. Legalnotice
    +
    8. Packages Movement
    +
    8.1. Packages Moved to Fedora Extras
    +
    9. An Overview of the Fedora Project
    @@ -115,7 +116,7 @@ Section??1.1, ???New in Fedora Core 4???

  • - Section??2, ???Introduction and Technical Release Notes??? ??? Technical release notes + Section??3, ???Introduction and Technical Release Notes??? ??? Technical release notes

  • Help and Support (http://fedora.redhat.com/participate/communicate/) @@ -150,8 +151,8 @@

    -
    -
    [D] +
    +
    [D]

    Example??1.??New desktop featuring Clearlooks and Evince

    @@ -187,7 +188,7 @@

  • - Support for PowerPC (PPC) Architecture ??? Refer to Section??3.4, ???PPC Hardware Requirements??? and Section??5.1, ???PPC Installation Notes???. + Support for PowerPC (PPC) Architecture ??? Refer to Section??4.4, ???PPC Hardware Requirements??? and Section??6.1, ???PPC Installation Notes???.

  • Improved Security ??? SELinux is a security architecture @@ -195,7 +196,7 @@ mandatory security controls. The default targeted policy has been improved to cover 80 additional daemons. You can read more in the technical release notes - Section??4, ???Overview of This Release???. + Section??5, ???Overview of This Release???.

  • Integrated Clustering Technology ??? Global File System @@ -226,7 +227,71 @@

    -2.??Introduction and Technical Release Notes

    +2.??Legalnotice
    +
    + +

    + 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. +

    +

    + RELEASE-NOTES-FC4 (2005-07-19-T16:20-0700) +

    +

    + 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. +

    + +
    +
    +

    +3.??Introduction and Technical Release Notes

    @@ -251,7 +316,7 @@

    • + <%=aj['arch']%>:  <%=aj['builder_addr']%> > + Status:  <%=aj['status']%>/<%=aj['builder_status']%> <% - if aj['endtime'] != 0: + # Only show build times for successful jobs + if aj['endtime'] != 0 and aj['builder_status'] == 'done': aj_time = (int(aj['endtime']) - int(aj['starttime'])) / 60 %> - Build Time:  <%=aj_time%> minutes -
    @@ -85,6 +86,7 @@

    - For more information, refer to Section??4, ???Overview of This Release???. + For more information, refer to Section??5, ???Overview of This Release???.

    Additional important information about this release may be made @@ -271,7 +336,7 @@

    -3.??Hardware Requirements

    +4.??Hardware Requirements

    @@ -292,7 +357,7 @@

    -3.1.??CPU Requirements

    +4.1.??CPU Requirements

    This section lists the CPU specifications required by Fedora Core @@ -336,7 +401,7 @@

    -3.2.??Hard Disk Space Requirements

    +4.2.??Hard Disk Space Requirements

    This section lists the disk space required to install Fedora Core @@ -399,7 +464,7 @@

    -3.3.??Memory Requirements

    +4.3.??Memory Requirements

    This section lists the memory required to install Fedora Core @@ -430,7 +495,7 @@

    -3.4.??PPC Hardware Requirements

    +4.4.??PPC Hardware Requirements

    @@ -466,7 +531,7 @@

    -4.??Overview of This Release

    +5.??Overview of This Release

    @@ -805,7 +870,7 @@

    -5.??Installation-Related Notes

    +6.??Installation-Related Notes

    @@ -844,7 +909,7 @@

    -5.1.??PPC Installation Notes

    +6.1.??PPC Installation Notes

    @@ -882,7 +947,7 @@

    -5.2.??Anaconda Notes

    +6.2.??Anaconda Notes
      @@ -945,7 +1010,7 @@

      -5.3.??Installation-Related Issues

      +6.3.??Installation-Related Issues
      @@ -1045,7 +1110,7 @@

      -6.??Package-Specific Notes

      +7.??Package-Specific Notes

    @@ -1057,7 +1122,7 @@

    -6.1.??Basic Components

    +7.1.??Basic Components

    @@ -1067,7 +1132,7 @@

    -6.1.1.??Fedora Extras Repository

    +7.1.1.??Fedora Extras Repository

    @@ -1100,7 +1165,7 @@

    -6.1.2.??Audit Daemon auditd and Log +7.1.2.??Audit Daemon auditd and Log Files

    @@ -1138,7 +1203,7 @@

    -6.1.3.??LinuxThreads versus NPTL

    +7.1.3.??LinuxThreads versus NPTL

    @@ -1209,7 +1274,7 @@

    -6.1.4.??Enabling the slocate Database

    +7.1.4.??Enabling the slocate Database

    @@ -1223,7 +1288,7 @@

    -6.1.5.??Stricter Controls in openssh

    +7.1.5.??Stricter Controls in openssh

    @@ -1272,7 +1337,7 @@

    -6.1.6.??Perl Binary Compat Symlinks

    +7.1.6.??Perl Binary Compat Symlinks

    @@ -1287,7 +1352,7 @@

    -6.1.7.??Server and System Configuration Tools

    +7.1.7.??Server and System Configuration Tools

    @@ -1297,7 +1362,7 @@

    -6.1.7.1.??system-config-lvm
    +7.1.7.1.??system-config-lvm

    @@ -1309,7 +1374,7 @@

    -6.1.8.??Java Package Recommendations

    +7.1.8.??Java Package Recommendations

    @@ -1330,7 +1395,7 @@

    -6.2.??Core

    +7.2.??Core

    @@ -1340,7 +1405,7 @@

    -6.2.1.??yum

    +7.2.1.??yum

    @@ -1354,7 +1419,7 @@

    -6.2.2.?? +7.2.2.?? Linux Kernel

    @@ -1362,7 +1427,7 @@
    -6.2.2.1.??Version
    +7.2.2.1.??Version

    @@ -1370,7 +1435,7 @@ additional patches for improvements, bug fixes, or additional features. For this reason, the Fedora Core kernel may not be line-for-line equivalent to the so-called vanilla kernel from the - kernel.org + kernel.org web site.

    @@ -1383,7 +1448,7 @@

    -6.2.2.2.??Kernel Flavors
    +7.2.2.2.??Kernel Flavors

    @@ -1393,12 +1458,12 @@

  • Native kernel, in both uniprocessor and SMP - varieties. + varieties.

    Configured sources are available in the - kernel-devel-<version>.<arch>.rpm - package. + kernel-devel-<version>.<arch>.rpm + package.

  • @@ -1407,19 +1472,19 @@

    Configured sources are available in the - kernel-xen0-devel-<version>.<arch>.rpm - package. + kernel-xen0-devel-<version>.<arch>.rpm + package.

    • Sources for both kernel flavors may be installed at the same time. The files will be installed into the - /usr/src/kernels/<version>[-xen0]-<arch>/ + /usr/src/kernels/<version>[-xen0]-<arch>/ tree. Use the command: 

    -rpm -Uvh kernel-devel[-xen0]-<version>.<arch>.rpm 
+rpm -Uvh kernel-devel[-xen0]-<version>.<arch>.rpm

    as appropriate. @@ -1432,11 +1497,11 @@

    Many of the tutorials, examples, and textbooks about Linux - kernel development assume the kernel sources are installed under - the /usr/src/linux directory. If you make a - symbolic link, as shown below, you should be able to use those - learning materials with the Fedora Core packages. Install the - appropriate kernel sources, as shown earlier, and then: + kernel development assume the kernel sources are installed under + the /usr/src/linux directory. If you make a + symbolic link, as shown below, you should be able to use those + learning materials with the Fedora Core packages. Install the + appropriate kernel sources, as shown earlier, and then: 

     ln -s /usr/src/kernels/kernel-<all-the-rest> /usr/src/linux
@@ -1447,7 +1512,7 @@
 
    
 
    
 
    
-6.2.2.3.??
+7.2.2.3.??
       Preparing for Kernel Development
     
    
 
    
@@ -1456,7 +1521,7 @@
       Fedora Core 4 does not include the
       kernel-source package provided by older
       versions. Instead, configured sources are available as described
-      in Section??6.2.2.2, ???Kernel Flavors???. Users that require access to Fedora Core
+      in Section??7.2.2.2, ???Kernel Flavors???. Users that require access to Fedora Core
       original kernel sources can find them in the
       kernel .src.rpm package.
       To create an exploded source tree from this file, perform the
@@ -1469,12 +1534,12 @@
 
 
 
    
-	To simplify the following directions, we have assumed that you
-	want to configure the kernel sources to match your
-	currently-running kernel. In the steps below, you must
-	understand that the phrase
-	<version> refers to the kernel
-	version shown by this command:
+  To simplify the following directions, we have assumed that you
+  want to configure the kernel sources to match your
+  currently-running kernel. In the steps below, you must
+  understand that the phrase
+  <version> refers to the kernel
+  version shown by this command:
       
    
 
     uname -r
@@ -1486,14 +1551,14 @@
 
  • 
 
    
           Obtain the
-	  kernel-<version>.src.rpm 
-	  file from one of the following sources:
+    kernel-<version>.src.rpm
+    file from one of the following sources:
         
    
 
      
 
    • 
-	      The SRPMS directory on the
-	      appropriate SRPMS
-	      CD iso image.
+        The SRPMS directory on the
+        appropriate SRPMS
+        CD iso image.
               
      • 
 
    • 
               The FTP site where you got the kernel package.
@@ -1511,16 +1576,16 @@
 
    • 
 
      
           Install
-	  kernel-<version>.src.rpm 
-	  using the command:
+    kernel-<version>.src.rpm
+    using the command:
         
      
 
       rpm -Uvh kernel-<version>.src.rpm
 
      
 
      
           This writes the RPM contents into
-	  /usr/src/redhat/SOURCES and
-	  /usr/src/redhat/SPECS.
+    /usr/src/redhat/SOURCES and
+    /usr/src/redhat/SPECS.
         
      
 
      • 
 
    • 
@@ -1529,16 +1594,16 @@
         
      
 
       cd /usr/src/redhat/SPECS
-rpmbuild -bp --target $(arch) kernel.spec
+rpmbuild -bp --target $(arch) kernel-2.6.spec
 
      
 
      
           The kernel source tree will be located in the
-	  /usr/src/redhat/BUILD/kernel-<version> 
-	  directory. It is common practice to move the resulting
-	  linux-<version> 
-	  directory to the /usr/src tree; while not
-	  strictly necessary, we suggest that you do this to match the
-	  generally-available documentation.
+    /usr/src/redhat/BUILD/kernel-<version>
+    directory. It is common practice to move the resulting
+    linux-<version>
+    directory to the /usr/src tree; while not
+    strictly necessary, we suggest that you do this to match the
+    generally-available documentation.
         
      
 
       cd /usr/src/redhat/BUILD/kernel-<version> /usr/src/
@@ -1551,16 +1616,39 @@
 
    • 
 
      
           The configurations for the specific kernels shipped in
-	  Fedora Core 4 are in the configs/
-	  directory. For example, the i686 SMP configuration file is
-	  named
-	  configs/kernel-<version>-i686-smp.config. 
-	  Issue the following command to place the desired configuration
-	  file in the proper place for building:
+    Fedora Core 4 are in the configs/
+    directory. For example, the i686 SMP configuration file is
+    named
+    configs/kernel-<version>-i686-smp.config.
+    Issue the following command to place the desired configuration
+    file in the proper place for building:
         
      
 
       cp configs/<desired-config-file> .config
 
      
+
      
+          You can also find the .config file that matches your current kernel configuration in the /lib/modules/<version>/build/.config file.
+        
      
+
      • 
+
    • 
+
      
+          Every kernel gets a name based on its version number.
+          This is the value the uname -r command displays.
+          The kernel name is defined by the first four lines of the kernel Makefile.
+          To protect the innocent, the Makefile has been changed to generate a kernel with a different name from that of the running kernel.
+          Before a module can be accepted by the running kernel, that
+          module must have been compiled for a kernel with the correct
+          name.  To do this, you must edit the kernel Makefile
+        
      
+
      
+          For example, if the uname -r returns the string 2.6.11-1.234_FC4, change the EXTRAVERSION definition from this:
+        
      
+
      EXTRAVERSION = -prep
      
+
      to this:
      
+
      EXTRAVERSION = -1.234_FC4
      
+
      
+          that is, substitute everything from the final dash onward.
+        
      
 
      • 
 
    • 
 
      
@@ -1579,7 +1667,7 @@
 
      
 
      
 
      
-6.2.2.4.??Building Only Kernel Modules
      
+7.2.2.4.??Building Only Kernel Modules
      
 
      
 
    
 
    
@@ -1609,7 +1697,7 @@
 
    
 
    
 
    
-6.2.2.5.??Userspace Dependancies on the Kernel
    
+7.2.2.5.??User Space Dependencies on the Kernel
    
 
    
 
    • 
 
    
@@ -1618,22 +1706,22 @@
       utilities, such as management daemons. Consequently, to remove
       such a kernel, perhaps after an update, you
       cannot simply use the rpm -e
-	kernel-<version>
-      command as in earlier distributions because these userspace
+  kernel-<version>
+      command as in earlier distributions because these user space
       packages depend on the kernel package. You may either list both
-      the kernel package and its userspace dependant packages on the
+      the kernel package and its user space dependent packages on the
       rpm -e command, or you may wish to use the
       yum remove
-	kernel-<version>
+  kernel-<version>
       command instead since yum automatically removes
-      dependant packages if necesssary.
+      dependent packages if necessary.
     
    
 
    
 
 
    
 
    
 
    
-6.2.3.??Security
    
+7.2.3.??Security
    
 
    
 
 
    
@@ -1642,7 +1730,7 @@
 
    
 
    
 
    
-6.2.3.1.??Digital Certificates Consolidated
    
+7.2.3.1.??Digital Certificates Consolidated
    
 
    
 
 
    
@@ -1660,7 +1748,7 @@
       automatically installed in /etc/pki/dovecot/.
     
    
 
    
-      For information about SELinux, refer to Section??4, ???Overview of This Release???.
+      For information about SELinux, refer to Section??5, ???Overview of This Release???.
     
    
 
 
@@ -1668,7 +1756,7 @@
 
    
 
    
 
    
-6.3.??
+7.3.??
     Development Tools
   
    
 
    
@@ -1676,7 +1764,7 @@
 
    
 
    
 
    
-6.3.1.??GCC Compiler Collection
    
+7.3.1.??GCC Compiler Collection
    
 
    
 
    
 
    
@@ -1811,7 +1899,7 @@
 
    
 
    
 
    
-6.4.??Language Support
    
+7.4.??Language Support
    
 
    
 
    
 
    
@@ -1821,7 +1909,7 @@
 
    
 
    
 
    
-6.4.1.??The IIIMF Input System
    
+7.4.1.??The IIIMF Input System
    
 
    
 
 
    
@@ -1912,7 +2000,7 @@
 
    
 
    
 
    
-6.5.??Web Servers
    
+7.5.??Web Servers
    
 
    
 
 
    
@@ -1922,7 +2010,7 @@
 
    
 
    
 
    
-6.5.1.??mod_perl
    
+7.5.1.??mod_perl
    
 
    
 
 
    
@@ -1938,7 +2026,7 @@
 
    
 
    
 
    
-6.5.2.??php
    
+7.5.2.??php
    
 
    
 
 
    
@@ -1989,7 +2077,7 @@
 
    
 
    
 
    
-6.6.??Samba (Windows File System Compatibility)
    
+7.6.??Samba (Windows File System Compatibility)
    
 
    
 
 
    
@@ -2036,7 +2124,7 @@
 
    
 
    
 
    
-6.7.??X Window System (Graphics)
    
+7.7.??X Window System (Graphics)
    
 
    
 
 
    
@@ -2046,7 +2134,7 @@
 
    
 
    
 
    
-6.7.1.??xorg-x11
    
+7.7.1.??xorg-x11
    
 
    
 
 
    
@@ -2112,7 +2200,7 @@
       the core X font subsystem.  At the present time, applications
       using the Qt 3 or GTK 2 toolkits (which would include KDE and
       GNOME applications) use the fontconfig and Xft font subsystem;
-      most everything else uses the core X fonts.
+      almost everything else uses the core X fonts.
     
    
 
    
       In the future, Fedora Core may support only fontconfig/Xft in
@@ -2130,10 +2218,9 @@
       
    
 
 
    
-      If you wish to add new fonts to your Fedora Core 4
-      system, you must be aware that the steps necessary depend on which
-      font subsystem is to use the new fonts.  For the core X font
-      subsystem, you must:
+      The steps to add new fonts to Fedora Core 4 depend on the
+      fonts subsystem this is going to use the new fonts.  For the core X
+      font subsystem:
     
    
 
      
 
    1. 
@@ -2236,13 +2323,13 @@
 
      
 
      
 
      
-7.??Packages Movement
      
+8.??Packages Movement
      
 
      
 
    
 
    
 
    
 
    
-7.1.??Packages Moved to Fedora Extras
    
+8.1.??Packages Moved to Fedora Extras
    
 
    
 
 
    
@@ -2407,7 +2494,7 @@
 
    
 
    
 
    
-8.??An Overview of the Fedora Project
    
+9.??An Overview of the Fedora Project
    
 
    
 
 
    
@@ -2502,67 +2589,6 @@
       
    
 
 
-
    
-
    
-A.??Legalnotice
    
-
    
-    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.
-    
    
-
    
-    RELEASE-NOTES-FC4 (2005-05-30-T16:20-0700)
-  
    
-
    
-    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.
-  
    
-
    
 
 
 
 
    
 
    
-
    
+
    
 
    
-[D]
    
+[D]
    
 
    
 
    ?????? 1. ????? ??????? ????, ?????????????? Clearlooks ? Evince
    
 
    
@@ -149,7 +149,7 @@
 	      Evince (http://www.gnome.org/projects/evince/) — ???????? ????????? ??????????, ?????????????? ????????? ????????, ? ??? ????? pdf, postscript ? ?????? ??????.  Evince ???????? ????? ????????? ??????? ????????? ?????????? ????? ??????? ???????????.
 	    
    
 
  • 
-	      OpenOffice.org 2.0 (http://www.openoffice.org/product2/index.html) — ????? ??????? ??????????.  ? ????????? ?????? ???????? ????????? ??????????????????, ??? ? ?????????? ????????????? ? Microsoft Office, ? ????????? ?????????????? ????????? ???????? ??????????? Impress, ? ?????????? ????????? ??????? OpenDocument. ??? ?????? ????? ???????? Base — ????????? ??????????????? ??????? ?????????? ?????? ??????. ????????????? ?????? ????? ???????????? ????? ????? ?? ???????? http://marketing.openoffice.org/2.0/featureguide.html.
    • 
+	      OpenOffice.org 2.0 (http://www.openoffice.org/product2/index.php) — ????? ??????? ??????????.  ? ????????? ?????? ???????? ????????? ??????????????????, ??? ? ?????????? ????????????? ? Microsoft Office, ? ????????? ?????????????? ????????? ???????? ??????????? Impress, ? ?????????? ????????? ??????? OpenDocument. ??? ?????? ????? ???????? Base — ????????? ??????????????? ??????? ?????????? ?????? ??????. ????????????? ?????? ????? ???????????? ????? ????? ?? ???????? http://marketing.openoffice.org/2.0/featureguide.html.
    
 
  • 
 	      Eclipse 3.1 — ???????? ? ??????????? ????????? ?????????? ??, ?????????????? ????? ??????????????? ????? ?????????? (is an Integrated Development Environment, IDE), ??????? ??? ???????????????? ?? ????? ?????. 
 	    
    • 



From fedora-extras-commits at redhat.com  Wed Jul 20 00:44:04 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 19 Jul 2005 20:44:04 -0400
Subject: rpms/apel/devel apel.spec,1.2,1.3
Message-ID: <200507200044.j6K0i4X0022428@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	apel.spec 
Log Message:
* Wed Jul 20 2005 Akira TAGOH  - 10.6-8.fc5
- Disabled apel-xemacs package to avoid a chicken-egg problem.


Index: apel.spec
===================================================================
RCS file: /cvs/extras/rpms/apel/devel/apel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apel.spec	19 Jul 2005 04:54:04 -0000	1.2
+++ apel.spec	20 Jul 2005 00:44:02 -0000	1.3
@@ -1,12 +1,10 @@
 %define emacsver	20.7
-%define xemacsver	21.4.10-6
 
 %define	lispdir	%{_datadir}/emacs/site-lisp
-%define	pkgdir	%{_datadir}/xemacs/xemacs-packages
 
 Name:		apel
 Version:	10.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License:	GPL
 URL:		ftp://ftp.m17n.org/pub/mule/apel/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -20,13 +18,6 @@
 Buildrequires:  emacs
 Requires:	emacs-common
 
-%package xemacs
-Summary: A Portable [X]Emacs Library
-Group:  Applications/Editors
-Buildrequires: xemacs
-Requires: xemacs-common
-Conflicts: xemacs < %{xemacsver}
-
 %description
 APEL stands for "A Portable Emacs Library". It consists of
 following modules:
@@ -45,12 +36,6 @@
 and other some utility modules
 
 
-%description xemacs
-APEL stands for "A Portable Emacs Library". This is the 
-XEmacs version of APEL. You may install apel instead of 
-this if you use GNU Emacs.
-
-
 %prep
 %setup -q
 %patch -p1 -b .cfg
@@ -68,8 +53,6 @@
 
 make clean
 
-make XEMACS=xemacs PACKAGEDIR=$RPM_BUILD_ROOT%{pkgdir} install-package
-
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -81,13 +64,10 @@
 %{lispdir}/apel
 
 
-%files xemacs
-%defattr(-,root,root)
-%doc README.ja README.en ChangeLog
-%{pkgdir}/lisp/apel
-
- 
 %changelog
+* Wed Jul 20 2005 Akira TAGOH  - 10.6-8.fc5
+- Disabled apel-xemacs package to avoid a chicken-egg problem.
+
 * Tue Jul 19 2005 Akira TAGOH  - 10.6-7.fc5
 - Import into Extras.
 



From fedora-extras-commits at redhat.com  Wed Jul 20 00:47:58 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 19 Jul 2005 20:47:58 -0400
Subject: common tobuild,1.1959,1.1960
Message-ID: <200507200047.j6K0lwdY022492@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22475

Modified Files:
	tobuild 
Log Message:
request build of rpms/apel/devel apel-10_6-8_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -r1.1959 -r1.1960
--- tobuild	19 Jul 2005 18:45:25 -0000	1.1959
+++ tobuild	20 Jul 2005 00:47:56 -0000	1.1960
@@ -100,3 +100,4 @@
 jpo	rpms/perl-GD/devel	perl-GD-2_25-1_fc5	devel
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
+tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel



From fedora-extras-commits at redhat.com  Wed Jul 20 08:28:13 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 20 Jul 2005 04:28:13 -0400
Subject: fedora-security/audit fc4,1.25,1.26
Message-ID: <200507200828.j6K8SD87000387@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv370

Modified Files:
	fc4 
Log Message:
Add Kate issue CAN-2005-1920



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fc4	19 Jul 2005 21:48:45 -0000	1.25
+++ fc4	20 Jul 2005 08:28:11 -0000	1.26
@@ -32,6 +32,7 @@
 2005-1937 VULNERABLE (firefox, fixed 1.0.5)
 2005-1937 VULNERABLE (mozilla, fixed 1.7.9)
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
+2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
 2005-1768 version (kernel, fixed 2.6.6)
 2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]



From fedora-extras-commits at redhat.com  Wed Jul 20 09:18:31 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:31 -0400
Subject: rpms/koffice - New directory
Message-ID: <200507200918.j6K9IV2r001660@cvs-int.fedora.redhat.com>

Author: than

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 09:18:31 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:31 -0400
Subject: rpms/koffice/devel - New directory
Message-ID: <200507200918.j6K9IVWh001665@cvs-int.fedora.redhat.com>

Author: than

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 09:18:48 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:48 -0400
Subject: rpms/koffice Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507200918.j6K9ImDe001708@cvs-int.fedora.redhat.com>

Author: than

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 20 09:18:48 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:18:48 -0400
Subject: rpms/koffice/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507200918.j6K9ImKH001713@cvs-int.fedora.redhat.com>

Author: than

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

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


--- NEW 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 Jul 20 09:21:52 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:21:52 -0400
Subject: rpms/koffice import.log,1.1,1.2
Message-ID: <200507200922.j6K9MMLG001844@cvs-int.fedora.redhat.com>

Author: than

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/koffice/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Jul 2005 09:18:46 -0000	1.1
+++ import.log	20 Jul 2005 09:21:50 -0000	1.2
@@ -0,0 +1 @@
+koffice-1_3_5-3:HEAD:koffice-1.3.5-3.src.rpm:1121851302



From fedora-extras-commits at redhat.com  Wed Jul 20 09:21:52 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 05:21:52 -0400
Subject: rpms/koffice/devel kde-libtool.patch, NONE,
	1.1 koffice-1.2.94-fPIC.patch, NONE,
	1.1 koffice-1.3-menu.patch, NONE,
	1.1 koffice-1.3.1-rpath.patch, NONE,
	1.1 koffice-1.3.5-immodule.patch, NONE, 1.1 koffice.spec, NONE,
	1.1 koshell.png, NONE, 1.1 post-1.3.5-koffice.diff, NONE,
	1.1 subdirs-koffice, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200507200921.j6K9Lqr9001833@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	.cvsignore sources 
Added Files:
	kde-libtool.patch koffice-1.2.94-fPIC.patch 
	koffice-1.3-menu.patch koffice-1.3.1-rpath.patch 
	koffice-1.3.5-immodule.patch koffice.spec koshell.png 
	post-1.3.5-koffice.diff subdirs-koffice 
Log Message:
auto-import koffice-1.3.5-3 on branch devel from koffice-1.3.5-3.src.rpm

kde-libtool.patch:

--- NEW FILE kde-libtool.patch ---
--- kdelibs-3.1/admin/ltmain.sh.orig	2003-02-20 17:52:07.000000000 -0500
+++ kdelibs-3.1/admin/ltmain.sh	2003-02-20 18:30:32.000000000 -0500
@@ -4459,6 +4459,14 @@
 	  case $host,$output,$installed,$module,$dlname in
 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
+	  newdeplib=""
+	  for j in $dependency_libs ; do
+	    if echo $j | grep "gcc-lib" >& /dev/null ; then
+	       continue
+	    fi
+	    newdeplib="$newdeplib $j"
+	  done
+	  dependency_libs="$newdeplib"
 	  $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP

koffice-1.2.94-fPIC.patch:

--- NEW FILE koffice-1.2.94-fPIC.patch ---
--- koffice-1.2.94/lib/kotext/kohyphen/Makefile.am.orig	2003-11-26 08:35:33.000000000 -0500
+++ koffice-1.2.94/lib/kotext/kohyphen/Makefile.am	2003-11-26 09:39:42.000000000 -0500
@@ -1,5 +1,6 @@
 INCLUDES = $(KOFFICECORE_INCLUDES) $(KOFFICEUI_INCLUDES) $(all_includes)
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+DEFS = -DHAVE_CONFIG_H -fPIC
 
 METASOURCES = AUTO
 
--- koffice-1.2.94/filters/kword/pdf/xpdf/goo/Makefile.am.orig	2003-11-26 11:29:36.000000000 -0500
+++ koffice-1.2.94/filters/kword/pdf/xpdf/goo/Makefile.am	2003-11-26 11:31:19.000000000 -0500
@@ -1,6 +1,8 @@
 
 INCLUDES= -I$(srcdir)
 
+DEFS = -DHAVE_CONFIG_H -fPIC
+
 noinst_LTLIBRARIES = libgoo.la
 
 libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gmempp.cc gfile.cc \
--- koffice-1.2.94/karbon/render/xrgbrender/Makefile.am.orig	2003-11-26 10:44:03.000000000 -0500
+++ koffice-1.2.94/karbon/render/xrgbrender/Makefile.am	2003-11-26 10:45:40.000000000 -0500
@@ -1,5 +1,7 @@
 INCLUDES = $(all_includes)
 
+DEFS = -DHAVE_CONFIG_H -fPIC
+
 noinst_LTLIBRARIES = libkarbonxrgbrender.la
 
 libkarbonxrgbrender_la_SOURCES = gdk-pixbuf-xlib.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlibrgb.c
--- koffice-1.2.94/karbon/render/Makefile.am.orig	2003-11-26 10:29:42.000000000 -0500
+++ koffice-1.2.94/karbon/render/Makefile.am	2003-11-26 10:29:59.000000000 -0500
@@ -1,5 +1,7 @@
 SUBDIRS = xrgbrender
 
+DEFS = -DHAVE_CONFIG_H -fPIC
+
 INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/xrgbrender \

koffice-1.3-menu.patch:

--- NEW FILE koffice-1.3-menu.patch ---
--- koffice-1.3/kformula/kformula.desktop.orig	2004-05-03 16:32:04.976158569 +0200
+++ koffice-1.3/kformula/kformula.desktop	2004-05-03 16:31:46.370430290 +0200
@@ -73,4 +73,4 @@
 X-KDE-NativeMimeType=application/x-kformula
 X-DCOP-ServiceType=Multi
 DocPath=kformula/index.html
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kword/kword.desktop.orig	2004-05-03 16:46:47.181776614 +0200
+++ koffice-1.3/kword/kword.desktop	2004-05-03 16:46:55.406212995 +0200
@@ -69,4 +69,4 @@
 DocPath=kword/index.html
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kivio/kiviopart/kivio.desktop.orig	2004-05-03 16:32:53.579836094 +0200
+++ koffice-1.3/kivio/kiviopart/kivio.desktop	2004-05-03 16:33:15.257354087 +0200
@@ -50,4 +50,4 @@
 X-KDE-NativeMimeType=application/x-kivio
 DocPath=kivio/index.html
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/koshell/koshell.desktop.orig	2004-05-03 16:33:25.095681446 +0200
+++ koffice-1.3/koshell/koshell.desktop	2004-05-03 16:33:36.724886332 +0200
@@ -107,4 +107,4 @@
 Icon=koshell
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kchart/kchart.desktop.orig	2004-05-03 16:31:05.656212886 +0200
+++ koffice-1.3/kchart/kchart.desktop	2004-05-03 16:31:31.039478120 +0200
@@ -65,4 +65,4 @@
 X-KDE-NativeMimeType=application/x-kchart
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kpresenter/kpresenter.desktop.orig	2004-05-03 16:33:56.384542092 +0200
+++ koffice-1.3/kpresenter/kpresenter.desktop	2004-05-03 16:34:04.554983410 +0200
@@ -72,4 +72,4 @@
 X-DCOP-ServiceType=multi
 DocPath=kpresenter/index.html
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kugar/kudesigner/kudesigner.desktop.orig	2004-05-03 16:35:59.449125628 +0200
+++ koffice-1.3/kugar/kudesigner/kudesigner.desktop	2004-05-03 16:45:51.727576563 +0200
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Type=Application
 Exec=kudesigner %u
-Icon=kudesigner
+Icon=kugar
 DocPath=kugar/index.html
 Terminal=0
 Name=Kugar Designer
@@ -117,5 +117,4 @@
 X-KDE-NativeMimeType=application/x-kudesigner
 X-KDE-Library=libkudesignerpart
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kugar/part/kugar.desktop.orig	2004-05-03 16:46:26.080222642 +0200
+++ koffice-1.3/kugar/part/kugar.desktop	2004-05-03 16:46:35.746560246 +0200
@@ -62,4 +62,4 @@
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,Browser/View
 X-KDE-Library=libkugarpart
 X-KDE-NativeMimeType=application/x-vnd.kde.kugar.mixed
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/kspread/kspread.desktop.orig	2004-05-03 16:34:13.401378491 +0200
+++ koffice-1.3/kspread/kspread.desktop	2004-05-03 16:34:20.582887406 +0200
@@ -67,4 +67,4 @@
 X-DCOP-ServiceType=multi
 DocPath=kspread/index.html
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3/karbon/data/karbon.desktop.orig	2004-05-03 16:30:25.152980683 +0200
+++ koffice-1.3/karbon/data/karbon.desktop	2004-05-03 16:30:46.361531438 +0200
@@ -57,4 +57,4 @@
 Icon=karbon
 ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
 X-KDE-NativeMimeType=application/x-karbon
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
--- koffice-1.3.1/tools/kthesaurus/KThesaurus.desktop.menu	2004-05-01 13:10:32.000000000 +0200
+++ koffice-1.3.1/tools/kthesaurus/KThesaurus.desktop	2004-05-13 16:14:49.935630742 +0200
@@ -51,4 +51,6 @@
 GenericName[zh_CN]=????????????
 GenericName[zh_TW]=????????????
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Office
+Categories=Qt;KDE;Office;X-KDE-More;
+NoDisplay=true
+OnlyShowIn=KDE;

koffice-1.3.1-rpath.patch:

--- NEW FILE koffice-1.3.1-rpath.patch ---
--- koffice-1.3.1/filters/xsltfilter/configure.in.in.orig	2004-05-13 15:56:37.102877830 +0200
+++ koffice-1.3.1/filters/xsltfilter/configure.in.in	2004-05-13 16:08:01.800868541 +0200
@@ -55,7 +55,7 @@
 fi
 
 if test ! "$USE_RPATH" = "yes"; then
-    LIBXLST_RPATH=
+    LIBXSLT_RPATH=
     LIBXML_RPATH=
 fi
 

koffice-1.3.5-immodule.patch:

--- NEW FILE koffice-1.3.5-immodule.patch ---
--- koffice-1.3.5/kword/kwtextframeset.cc.orig	2005-02-12 12:31:57.000000000 +0100
+++ koffice-1.3.5/kword/kwtextframeset.cc	2005-02-12 12:59:47.814137014 +0100
@@ -3225,6 +3225,21 @@
     textView()->handleKeyReleaseEvent( e );
 }
 
+void KWTextFrameSetEdit::imStartEvent( QIMEvent* e )
+{
+    textView()->handleImStartEvent( e );
+}
+
+void KWTextFrameSetEdit::imComposeEvent( QIMEvent* e )
+{
+    textView()->handleImComposeEvent( e );
+}
+
+void KWTextFrameSetEdit::imEndEvent( QIMEvent* e )
+{
+    textView()->handleImEndEvent( e );
+}
+
 void KWTextFrameSetEdit::mousePressEvent( QMouseEvent *e, const QPoint &, const KoPoint & dPoint )
 {
     if ( dPoint.x() < 0 || dPoint.y() < 0 )
--- koffice-1.3.5/kword/kwtextframeset.h.orig	2005-02-12 12:32:08.000000000 +0100
+++ koffice-1.3.5/kword/kwtextframeset.h	2005-02-11 17:37:05.000000000 +0100
@@ -360,6 +360,9 @@
     // Events forwarded by the canvas (when being in "edit" mode)
     virtual void keyPressEvent( QKeyEvent * );
     virtual void keyReleaseEvent( QKeyEvent * );
+    virtual void imStartEvent( QIMEvent * );
+    virtual void imComposeEvent( QIMEvent * );
+    virtual void imEndEvent( QIMEvent * );
     virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & );
     virtual void mouseMoveEvent( QMouseEvent *, const QPoint &, const KoPoint & ); // only called if button is pressed
     virtual void mouseReleaseEvent( QMouseEvent *, const QPoint &, const KoPoint & );
--- koffice-1.3.5/kword/kwcanvas.cc.orig	2005-02-12 12:32:28.000000000 +0100
+++ koffice-1.3.5/kword/kwcanvas.cc	2005-02-11 23:27:42.000000000 +0100
@@ -101,6 +101,7 @@
     viewport()->setFocusProxy( this );
     viewport()->setFocusPolicy( WheelFocus );
     setFocus();
+    setInputMethodEnabled( true );
     viewport()->installEventFilter( this );
     installEventFilter( this );
     KCursor::setAutoHideCursor( this, true, true );
@@ -2573,6 +2574,24 @@
                 }
             }
             break;
+        case QEvent::IMStart:
+        {
+            QIMEvent * imev = static_cast(e);
+            m_currentFrameSetEdit->imStartEvent( imev );
+        }
+        break;
+        case QEvent::IMCompose:
+        {
+            QIMEvent * imev = static_cast(e);
+            m_currentFrameSetEdit->imComposeEvent( imev );
+        }
+        break;
+        case QEvent::IMEnd:
+        {
+            QIMEvent * imev = static_cast(e);
+            m_currentFrameSetEdit->imEndEvent( imev );
+        }
+        break;
         default:
             break;
         }
--- koffice-1.3.5/kword/kwframe.h.orig	2005-02-12 12:32:45.000000000 +0100
+++ koffice-1.3.5/kword/kwframe.h	2005-02-11 23:09:46.000000000 +0100
@@ -369,6 +369,9 @@
     // Events forwarded by the canvas (when being in "edit" mode)
     virtual void keyPressEvent( QKeyEvent * ) {}
     virtual void keyReleaseEvent( QKeyEvent * ) {}
+    virtual void imStartEvent( QIMEvent * ) {}
+    virtual void imComposeEvent( QIMEvent * ) {}
+    virtual void imEndEvent( QIMEvent * ) {}
     virtual void mousePressEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {}
     virtual void mouseMoveEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {} // only called if button is pressed
     virtual void mouseReleaseEvent( QMouseEvent *, const QPoint &, const KoPoint & ) {}
--- koffice-1.3.5/kspread/kspread_canvas.h.orig	2005-02-12 12:33:03.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_canvas.h	2005-02-11 18:48:17.000000000 +0100
@@ -512,6 +512,8 @@
   void processOtherKey(QKeyEvent *event);
   bool processControlArrowKey(QKeyEvent *event);
 
+  void processIMEvent( QIMEvent * event );
+
   void updateChooseRect(const QPoint &newMarker, const QPoint &newAnchor);
 
   /**
--- koffice-1.3.5/kspread/kspread_canvas.cc.orig	2005-02-12 12:33:18.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_canvas.cc	2005-02-12 14:49:49.950569130 +0100
@@ -338,6 +338,7 @@
   installEventFilter( this );
   (void)new KSpreadToolTip( this );
   setAcceptDrops( true );
+  setInputMethodEnabled( true ); // ensure using the InputMethod
 }
 
 KSpreadCanvas::~KSpreadCanvas()
@@ -363,6 +364,15 @@
       keyPressEvent ( keyev );
       return true;
     }
+    break;
+  }
+  case QEvent::IMStart:
+  case QEvent::IMCompose:
+  case QEvent::IMEnd:
+  {
+      QIMEvent * imev = static_cast(e);
+      processIMEvent( imev );
+      break;
   }
   default:
     break;
@@ -2423,6 +2433,31 @@
   cell->setCellText( util_dateFormat(m_pDoc->locale(), date, KSpreadCell::ShortDate) );
 }
 
+void KSpreadCanvas::processIMEvent( QIMEvent * event )
+{
+  m_pDoc->emitBeginOperation( false );
+  if ( !m_pEditor && !m_bChoose )
+  {
+    // Switch to editing mode
+    createEditor( CellEditor );
+    m_pEditor->handleIMEvent( event );
+  }
+  
+  QPoint cursor;
+  
+  if ( m_bChoose )
+  {
+    cursor = selectionInfo()->getChooseCursor();
+    /* if the cursor is unset, pretend we're starting at the regular cursor */
+    if (cursor.x() == 0 || cursor.y() == 0)
+      cursor = selectionInfo()->cursorPosition();
+  }
+  else
+    cursor = selectionInfo()->cursorPosition();
+ 
+  m_pDoc->emitEndOperation( QRect( cursor, cursor ) );
+}
+
 bool KSpreadCanvas::formatKeyPress( QKeyEvent * _ev )
 {
   if (!(_ev->state() & ControlButton ))
--- koffice-1.3.5/kspread/kspread_editors.cc.orig	2005-02-12 12:33:32.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_editors.cc	2005-02-11 18:48:17.000000000 +0100
@@ -249,7 +249,13 @@
     return;
   }
 
-  // Send the key event to the QLineEdit
+  // Send the key event to the KLineEdit
+  QApplication::sendEvent( m_pEdit, _ev );
+}
+
+void KSpreadTextEditor::handleIMEvent( QIMEvent * _ev )
+{
+    // send the IM event to the KLineEdit
   QApplication::sendEvent( m_pEdit, _ev );
 }
 
@@ -288,7 +294,7 @@
 
 bool KSpreadTextEditor::eventFilter( QObject* o, QEvent* e )
 {
-    // Only interested in QLineEdit
+    // Only interested in KLineEdit
     if ( o != m_pEdit )
         return FALSE;
     if ( e->type() == QEvent::FocusOut )
--- koffice-1.3.5/kspread/kspread_editors.h.orig	2005-02-12 12:34:13.000000000 +0100
+++ koffice-1.3.5/kspread/kspread_editors.h	2005-02-11 18:48:17.000000000 +0100
@@ -19,6 +19,7 @@
     KSpreadCell* cell()const { return m_pCell; }
 
     virtual void handleKeyPressEvent( QKeyEvent* _ev ) = 0;
+    virtual void handleIMEvent( QIMEvent * _ev ) = 0;
     virtual void setEditorFont(QFont const & font, bool updateSize) = 0;
     virtual QString text() const = 0;
     virtual void setText(QString text) = 0;
@@ -44,6 +45,7 @@
     ~KSpreadTextEditor();
 
     virtual void handleKeyPressEvent( QKeyEvent* _ev );
+    virtual void handleIMEvent( QIMEvent * _ev );
     virtual void setEditorFont(QFont const & font, bool updateSize);
     virtual QString text() const;
     virtual void setText(QString text);
--- koffice-1.3.5/lib/kotext/kotextview.h.orig	2005-02-12 12:34:27.043854371 +0100
+++ koffice-1.3.5/lib/kotext/kotextview.h	2005-02-11 18:48:17.000000000 +0100
@@ -109,6 +109,9 @@
     void focusOutEvent();
     void handleKeyPressEvent( QKeyEvent * e );
     void handleKeyReleaseEvent( QKeyEvent * e );
+    void handleImStartEvent( QIMEvent * e );
+    void handleImComposeEvent( QIMEvent * e );
+    void handleImEndEvent( QIMEvent * e );
     // iPoint is in Layout Unit pixels
     // return true if we add new parag with "insert direct cursor"
     bool handleMousePressEvent( QMouseEvent* e, const QPoint& iPoint, bool canStartDrag = true, bool insertDirectCursor = false );
--- koffice-1.3.5/lib/kotext/korichtext.cpp.orig	2005-02-12 12:34:40.760827475 +0100
+++ koffice-1.3.5/lib/kotext/korichtext.cpp	2005-02-11 22:31:15.000000000 +0100
@@ -1339,7 +1339,7 @@
     m_pageBreakEnabled = false;
     //minw = 0;
     align = Qt::AlignAuto;
-    nSelections = 1;
+    nSelections = 2;
     addMargs = FALSE;
 
 #if 0
@@ -1380,6 +1380,7 @@
 
     selectionColors[ Standard ] = QApplication::palette().color( QPalette::Active, QColorGroup::Highlight );
     selectionText[ Standard ] = TRUE;
+    selectionText[ InputMethodPreedit ] = FALSE;
     commandHistory = new KoTextDocCommandHistory( 100 );
     tStopWidth = formatCollection()->defaultFormat()->width( 'x' ) * 8;
 }
--- koffice-1.3.5/lib/kotext/kotextdocument.h.orig	2005-02-12 12:34:55.299679135 +0100
+++ koffice-1.3.5/lib/kotext/kotextdocument.h	2005-02-11 18:48:17.000000000 +0100
@@ -49,6 +49,7 @@
 public:
     enum SelectionIds {
 	Standard = 0,
+        InputMethodPreedit = 1,
 	Temp = 32000 // This selection must not be drawn, it's used e.g. by undo/redo to
 	// remove multiple lines with removeSelectedText()
     };
--- koffice-1.3.5/lib/kotext/kotextobject.cc.orig	2005-02-12 12:35:12.340161140 +0100
+++ koffice-1.3.5/lib/kotext/kotextobject.cc	2005-02-11 18:48:17.000000000 +0100
@@ -635,6 +635,7 @@
     textdoc->setSelectionEnd( KoTextDocument::Temp, cursor );
     //kdDebug(32500) << "KoTextObject::insert setting format " << currentFormat << endl;
     textdoc->setFormat( KoTextDocument::Temp, currentFormat, KoTextFormat::Format );
+    textdoc->setFormat( KoTextDocument::InputMethodPreedit, currentFormat, KoTextFormat::Format );
     textdoc->removeSelection( KoTextDocument::Temp );
 
     // Speed optimization: if we only type a char, and it doesn't
@@ -1396,7 +1397,7 @@
     emit ensureCursorVisible();
     emit updateUI( true );
     emit showCursor();
-    if(selectionId==KoTextDocument::Standard)
+    if(selectionId==KoTextDocument::Standard || selectionId==KoTextDocument::InputMethodPreedit)
         selectionChangedNotify();
     if ( createUndoRedo)
         undoRedoInfo.clear();
--- koffice-1.3.5/lib/kotext/kotextparag.cc.orig	2005-02-12 12:35:21.975737334 +0100
+++ koffice-1.3.5/lib/kotext/kotextparag.cc	2005-02-11 18:48:17.000000000 +0100
@@ -772,17 +772,38 @@
 	for ( int j = 0; j < nSels; ++j ) {
 	    if ( start >= selectionStarts[ j ] && start < selectionEnds[ j ] ) {
                 inSelection = true;
-		if ( j == KoTextDocument::Standard )
-		    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, cg.color( QColorGroup::Highlight ) );
-		else
-		    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
-                break;
+                switch (j) {
+                case KoTextDocument::Standard:
+                    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, cg.color( QColorGroup::Highlight ) );
+                    break;
+                case KoTextDocument::InputMethodPreedit:
+                    // no highlight
+                    break;
+                default:
+                    painter.fillRect( startX_pix, lastY_pix, bw_pix, h_pix, doc ? doc->selectionColor( j ) : cg.color( QColorGroup::Highlight ) );
+                    break;
+                }
 	    }
 	}
         if ( !inSelection )
             drawSelections = false; // save time in drawParagStringInternal
     }
 
+    // Draw InputMethod Preedit Underline
+    const int nSels = doc ? doc->numSelections() : 1;
+    for ( int j = 0; j < nSels; j++ ) {
+        if ( start >= selectionStarts[ j ] && start < selectionEnds[ j ] ) {
+            if ( j == KoTextDocument::InputMethodPreedit ) {
+                QColor textColor( format->color() );
+                painter.setPen( QPen( textColor ) );
+
+                QPoint p1( startX_pix, lastY_pix + h_pix - 1 );
+                QPoint p2( startX_pix + bw_pix, lastY_pix + h_pix - 1 );
+                painter.drawLine( p1, p2 );
+            }
+        }
+    }
+
     if ( draw_len > 0 )
     {
         int draw_startX_pix = zh->layoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
--- koffice-1.3.5/lib/kotext/kotextview.cc.orig	2005-02-12 12:35:35.814692414 +0100
+++ koffice-1.3.5/lib/kotext/kotextview.cc	2005-02-12 12:54:56.637162921 +0100
@@ -391,6 +391,60 @@
     }
 }
 
+void KoTextView::handleImStartEvent( QIMEvent * e )
+{
+    // nothing to do
+    ;
+}
+
+void KoTextView::handleImComposeEvent( QIMEvent * e )
+{
+    // remove old preedit
+    if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
+        textDocument()->removeSelection( KoTextDocument::Standard );
+    if ( textDocument()->hasSelection( KoTextDocument::InputMethodPreedit ) )
+        textDocument()->removeSelectedText( KoTextDocument::InputMethodPreedit, m_cursor );
+
+    // insert preedit
+    int preeditStartIdx = m_cursor->index();
+    textDocument()->setSelectionStart( KoTextDocument::InputMethodPreedit, m_cursor );
+    textObject()->insert( m_cursor, m_currentFormat, e->text(), false, true, i18n("Insert Text"),
+								  CustomItemsMap(),
+								  KoTextDocument::Standard,
+								  false /* NOT REPAINT CURSOR! */);
+    textDocument()->setSelectionEnd( KoTextDocument::InputMethodPreedit, m_cursor );
+
+    // selection
+    int preeditSelStart = preeditStartIdx + e->cursorPos();
+    int preeditSelEnd   = preeditSelStart + e->selectionLength();
+    m_cursor->setIndex( preeditSelStart );
+    textDocument()->setSelectionStart( KoTextDocument::Standard, m_cursor );
+    m_cursor->setIndex( preeditSelEnd );
+    textDocument()->setSelectionEnd( KoTextDocument::Standard, m_cursor );
+
+    // set cursor pos
+    m_cursor->setIndex( preeditSelStart );
+
+    textObject()->emitUpdateUI( true );
+    textObject()->emitShowCursor();
+    textObject()->selectionChangedNotify();
+}
+
+void KoTextView::handleImEndEvent( QIMEvent * e )
+{
+    // remove old preedit
+    if ( textDocument()->hasSelection( KoTextDocument::Standard ) )
+        textDocument()->removeSelection( KoTextDocument::Standard  );
+    if ( textDocument()->hasSelection( KoTextDocument::InputMethodPreedit ) )
+        textDocument()->removeSelectedText( KoTextDocument::InputMethodPreedit, m_cursor );
+
+    insertText( e->text() );
+
+    textObject()->emitUpdateUI( true );
+    textObject()->emitShowCursor();
+    textObject()->selectionChangedNotify();
+}
+
 void KoTextView::completion()
 {
     doCompletion(m_cursor, m_cursor->parag(),
--- koffice-1.3.5/kpresenter/kprcanvas.cc.orig	2005-02-12 12:35:50.000000000 +0100
+++ koffice-1.3.5/kpresenter/kprcanvas.cc	2005-02-12 14:48:38.848075625 +0100
@@ -151,6 +151,7 @@
     setFocusPolicy( QWidget::StrongFocus );
     setFocus();
     setKeyCompression( true );
+    setInputMethodEnabled( true ); // ensure using the InputMethod
     installEventFilter( this );
     KCursor::setAutoHideCursor( this, true, true );
     m_zoomBeforePresentation=100;
@@ -2381,6 +2382,35 @@
     }
 }
 
+void KPrCanvas::imStartEvent( QIMEvent * e )
+{
+    if ( editNum && m_currentTextObjectView )
+    {
+        if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+            m_currentTextObjectView->imStartEvent( e );
+        else
+            KMessageBox::information(this, i18n("Read-only content cannot be changed. No modifications will be accepted."));
+    }
+}
+
+void KPrCanvas::imComposeEvent( QIMEvent * e )
+{
+    if ( editNum && m_currentTextObjectView )
+    {
+        if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+            m_currentTextObjectView->imComposeEvent( e );
+    }
+}
+
+void KPrCanvas::imEndEvent( QIMEvent * e )
+{
+    if ( editNum && m_currentTextObjectView )
+    {
+        if ( !m_currentTextObjectView->kpTextObject()->isProtectContent() )
+            m_currentTextObjectView->imEndEvent( e );
+    }
+}
+
 void KPrCanvas::resizeEvent( QResizeEvent *e )
 {
     if ( editMode )
--- koffice-1.3.5/kpresenter/kprcanvas.h.orig	2005-02-12 12:36:04.000000000 +0100
+++ koffice-1.3.5/kpresenter/kprcanvas.h	2005-02-11 18:48:17.000000000 +0100
@@ -455,6 +455,9 @@
     virtual void dropEvent( QDropEvent *e );
     virtual void keyPressEvent( QKeyEvent *e );
     virtual void keyReleaseEvent( QKeyEvent *e );
+    virtual void imStartEvent( QIMEvent * e );
+    virtual void imComposeEvent( QIMEvent * e );
+    virtual void imEndEvent( QIMEvent * e );
 
     void eraseEmptySpace( QPainter * painter, const QRegion & emptySpaceRegion, const QBrush & brush ) const;
 
--- koffice-1.3.5/kpresenter/kptextobject.h.orig	2005-02-12 12:36:19.000000000 +0100
+++ koffice-1.3.5/kpresenter/kptextobject.h	2005-02-11 18:48:17.000000000 +0100
@@ -223,8 +223,10 @@
 
     void keyPressEvent( QKeyEvent * );
     void keyReleaseEvent( QKeyEvent * );
+    void imStartEvent( QIMEvent * );
+    void imComposeEvent( QIMEvent * );
+    void imEndEvent( QIMEvent * );
     void mousePressEvent( QMouseEvent *, const QPoint &);
-
     void mouseMoveEvent( QMouseEvent *, const QPoint & );
     void mouseReleaseEvent( QMouseEvent *, const QPoint & );
     void mouseDoubleClickEvent( QMouseEvent *, const QPoint &);
--- koffice-1.3.5/kpresenter/kptextobject.cc.orig	2005-02-12 12:36:32.000000000 +0100
+++ koffice-1.3.5/kpresenter/kptextobject.cc	2005-02-11 18:48:17.000000000 +0100
@@ -1919,6 +1919,21 @@
     handleKeyReleaseEvent(e);
 }
 
+void KPTextView::imStartEvent( QIMEvent *e )
+{
+    handleImStartEvent(e);
+}
+
+void KPTextView::imComposeEvent( QIMEvent *e )
+{
+    handleImComposeEvent(e);
+}
+
+void KPTextView::imEndEvent( QIMEvent *e )
+{
+    handleImEndEvent(e);
+}
+
 void KPTextView::clearSelection()
 {
     if ( textDocument()->hasSelection( KoTextDocument::Standard ) )


--- NEW FILE koffice.spec ---
%define debug 0
%define final 0

%define qt_version 3.3.3
%define kde_version 3.3.0

%define redhatify 1

%define libtool 1

%define buildall 0

Name: koffice
Version: 1.3.5
Release: 3
Epoch: 4
URL: http://koffice.kde.org/
Summary: A set of office applications for KDE.
Group: User Interface/Desktops
License: GPL
BuildRoot: %{_tmppath}/%{name}-buildroot

Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-i18n-%{version}.tar.bz2
Source2: koshell.png
Source3: subdirs-koffice

Patch0: kde-libtool.patch
Patch1: koffice-1.2.94-fPIC.patch
Patch2: koffice-1.3-menu.patch 
Patch3: koffice-1.3.1-rpath.patch
Patch4: koffice-1.3.5-immodule.patch

# security fixes
# kpdf Buffer Overflow Vulnerability, CAN-2005-0064
Patch100: post-1.3.5-koffice.diff

Prereq: kdelibs >= 6:%{kde_version}

Obsoletes: killustrator
Obsoletes: kivio

Requires(post,postun): /sbin/ldconfig
Requires: kdelibs >= 6:%{kde_version}
Requires: kdebase >= 6:%{kde_version}

BuildRequires: kdelibs-devel >= %{kde_version}
BuildRequires: kdebase-devel >= %{kde_version}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: glibc-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: qt-devel >= %{qt_version}
BuildRequires: perl

%package devel
Summary: Development files for KOffice
Group: Development/Libraries
Requires: qt-devel >= 1:%{qt_version}
Requires: %{name} = %{epoch}:%{version}-%{release}

%package i18n
Summary: Internationalization support for koffice
Group: User Interface/Desktops
Requires: %{name} = %{epoch}:%{version}-%{release}

%description
The koffice package contains the KOffice office-type applications for
the K Desktop Environment (KDE) GUI desktop. KOffice contains KWord, a
word processor; KSpread, a spreadsheet; KPresenter, for presentations;
and KChart, a diagram generator.

%description devel
Development files for KOffice. Install koffice-devel if you want to develop
or compile plugins for KOffice.

%description i18n
Koffice is an Open Source, community-developed, multi-platform office
productivity suite.  This package provides Internationalization support
for Koffice.


%prep
%setup -q
%patch0 -p1 -b .libtool
%patch1 -p1 -b .fPIC
%patch2 -p1 -b .menu
%patch3 -p1 -b .rpath
%patch4 -p1 -b .im
%patch100 -p1 -b .CAN-2005-0064

# Workaround for legacy auto* tools
%if %{libtool}
  make -f admin/Makefile.common cvs
%endif

%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNO_DEBUG -DNDEBUG"
export KDEDIR=%{_prefix}
export CFLAGS="$FLAGS"
export CXXFLAGS="$FLAGS"

# koffice
%configure \
%if %{final}
   --enable-final \
%endif
   --disable-rpath \
   --with-qt-libraries=$QTDIR/lib \
   --with-extra-libs=%{_libdir} \
   --includedir=%{_includedir}/kde

make %{?_smp_mflags}

# koffice-i18n
tar jxf %{SOURCE1}
pushd %{name}-i18n-%{version}
%if ! %{buildall}
  rm -rf ar bg bs eo eu fa lt ms mt se sr sq ta th ven vi xh zu
  cp %{SOURCE3} subdirs
%endif
%if %{libtool}
  make -f admin/Makefile.common cvs
%endif
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT -C %{name}-i18n-%{version} install

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/

# Replace absolute symlinks with relative ones
pushd $RPM_BUILD_ROOT%{_docdir}/HTML
for lang in *; do
  if [ -d $lang ]; then
    pushd $lang
    for i in *; do
      if [ -d $i -a -L $i/common ]; then
        rm -f $i/common
        ln -sf ../common $i
      fi
    done
    popd
  fi
done
popd

# conflict with kde-i18n
rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/kdgantt*

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root)
%doc %{_docdir}/HTML/en/*
%{_bindir}/*
%{_libdir}/*.so.??*
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/kde3/*
%{_datadir}/applnk/Office
%{_datadir}/apps/*
%{_datadir}/icons/*/*/*/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/templates

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

%files i18n
%defattr(-,root,root)
%{_datadir}/apps/koffice/autocorrect

%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*

%if %{buildall}
%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
%endif

%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
%lang(da) %doc %{_docdir}/HTML/da/*
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
%lang(de) %doc %{_docdir}/HTML/de/*
%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
%lang(en_GB) %doc %{_docdir}/HTML/en_GB/*

%if %{buildall}
%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
%endif

%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
%lang(es) %doc %{_docdir}/HTML/es/*
%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
%lang(et) %doc %{_docdir}/HTML/et/*

%if %{buildall}
%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
%endif

%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
%lang(fr) %doc %{_docdir}/HTML/fr/*
%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
%lang(it) %doc %{_docdir}/HTML/it/*
%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*

%if %{buildall}
%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
%endif

%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
%lang(pl) %doc %{_docdir}/HTML/pl/*
%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
%lang(pt) %doc %{_docdir}/HTML/pt/*
%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
%lang(ru) %doc %{_docdir}/HTML/ru/*

%if %{buildall}
%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
%endif

%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
%lang(sk) %doc %{_docdir}/HTML/sk/*
%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
%lang(sl) %doc %{_docdir}/HTML/sl/*

%if %{buildall}
%lang(sq) %{_datadir}/locale/sq/LC_MESSAGES/*
%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
%endif

%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
%lang(sv) %doc %{_docdir}/HTML/sv/*

%if %{buildall}
%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
%endif

%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*

%if %{buildall}
%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
%endif

%if %{buildall}
%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
%endif

%if %{buildall}
%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
%lang(xh) %doc %{_docdir}/HTML/xh/*
%endif

%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*

%if %{buildall}
%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/*
%endif

%changelog
* Sat Feb 12 2005 Than Ngo  4:1.3.5-3
- backport from CVS for working with qt-immodule

* Sat Jan 22 2005 Than Ngo  4:1.3.5-2
- Apply patch to fix CAN-2005-0064

* Wed Nov 24 2004 Than Ngo  4:1.3.5-1
- 1.3.5

* Thu Nov 11 2004 Than Ngo  4:1.3.4-3
- rebuilt

* Sun Oct 31 2004 Than Ngo  4:1.3.4-2
- apply better pdf fix

* Wed Oct 27 2004 Than Ngo  4:1.3.4-1
- update to 1.3.4

* Wed Sep 15 2004 Than Ngo  4:1.3.3-1
- update to 1.3.3

* Tue Jul 13 2004 Than Ngo  4:1.3.2-2
- rebuild

* Thu Jul 01 2004 Than Ngo  4:1.3.2-1
- update to 1.3.2

* Mon Jun 21 2004 Than Ngo  4:1.3.1-5
- fix build problem with gcc-3.4

* Fri Jun 18 2004 Than Ngo  4:1.3.1-4
- rebuilt

* Tue Jun 15 2004 Elliot Lee 
- rebuilt

* Thu May 13 2004 Than Ngo  1.3.1-2
- get rid of rpath

* Tue May 04 2004 Than Ngo  1.3.1-1
- update to 1.3.1

* Mon May 03 2004 Than Ngo  1.3-6
- cleanup GNOME/KDE menu, add X-KDE-More in Categories
- add some fixes from CVS stable branch

* Tue Mar 02 2004 Elliot Lee 
- rebuilt

* Wed Feb 25 2004 Than Ngo  4:1.3-5
- add patch files from CVS

* Sat Feb 14 2004 Than Ngo  4:1.3-4
- rebuilt against qt 3.3.0

* Fri Feb 13 2004 Elliot Lee 
- rebuilt

* Mon Jan 26 2004 Tim Powers  4:1.3-2
- rebuild to pick up new ImageMagick deps

* Mon Jan 19 2004 Than Ngo  4:1.3-1
- 1.3 release

* Tue Jan 13 2004 Than Ngo  4:1.2.95-3
- fixed conflict problem with kde-i18n

* Fri Jan 09 2004 Than Ngo  4:1.2.95-2
- add missing zh_CN

* Thu Jan 08 2004 Than Ngo  4:1.2.95-1
- 1.3 rc2

* Wed Nov 26 2003 Than Ngo  4:1.2.94-0.3
- koffice-i18n as subpackage
- fixed fPIC problem on x86_64

* Sat Nov 15 2003 Than Ngo  4:1.2.94-0.2
- get rid of koffice-i18n, make koffice-i18n as separate rpm

* Thu Nov 13 2003 Than Ngo  4:1.2.94-0.1
- 1.3 rc1
- cleanup

* Tue Oct 21 2003 Than Ngo  4:1.2.1-15
- rebuild

* Fri Aug 29 2003 Than Ngo  4:1.2.1-14
- fix build problem with gcc 3.3

* Tue Jul  8 2003 Than Ngo  1.2.1-13
- fixed a bug, which caused koffices apps crash
  in Gnome Desktop (bug #76232,#84678,#86479,#80926,#92044)

* Thu Jun 26 2003 Than Ngo  1.2.1-12
- add patch for checking vsnprintf (Sysoltsev Slawa), bug #89142

* Wed Jun 25 2003 Than Ngo  1.2.1-11
- rebuilt

* Wed Jun 04 2003 Elliot Lee 
- rebuilt

* Wed Jun  4 2003 Than Ngo  1.2.1-9
- fix build with gcc 3.3

* Mon Mar 24 2003 Than Ngo  1.2.1-8
- rebuild against kde 3.1.1

* Mon Feb 24 2003 Elliot Lee 
- rebuilt

* Mon Feb 24 2003 Elliot Lee 
- rebuilt

* Mon Feb 24 2003 Elliot Lee 
- rebuilt

* Thu Feb 20 2003 Than Ngo  1.2.1-4
- get rid of gcc path from dependency_libs
- add requires kdebase, #84678

* Thu Feb 13 2003 Than Ngo  1.2.1-3
- rebuild against new arts

* Mon Jan 27 2003 Than Ngo  1.2.1-2
- fix #81300
- add a patch file, it fixes a crash when closing the "Insert Special Character" dialog,
  and a crash when updating the Table Of Contents
- cleanup specfile

* Wed Jan 22 2003 Tim Powers 
- rebuilt

* Wed Dec 11 2002 Than Ngo  1.2.1-1
- cleanup specfile
- remove a patch file, which is in upstream
- dangling symlinks (bug #78089)
- fPIC issue

* Sun Nov 10 2002 Than Ngo  1.2-2
- fix some build problem

* Mon Oct 14 2002 Than Ngo  1.2-1
- 1.2

* Mon Aug 12 2002 Than Ngo  1.2-0.rc1.3
- Add missing desktop files for servicetype

* Fri Aug  9 2002 Than Ngo  1.2-0.rc1.2
- add desktopfix patch file from Harald Hoyer
- desktop file issues

* Tue Aug  7 2002 Bernhard Rosenkraenzer  1.2-0.rc1.1
- rc1

* Tue Jul 23 2002 Tim Powers  1.2-0.beta2.3
- build using gcc-3.2-0.1

* Tue Jul 09 2002 Than Ngo  1.2-0.beta2.2
- use desktop-file-install

* Tue Apr 16 2002 Bernhard Rosenkraenzer  1.1.1-5
- Change sonames

* Thu Mar 28 2002 Than Ngo  1.1.1-4
- fix conflicts with kdelibs and kde-i18n

* Wed Mar 27 2002 Bernhard Rosenkraenzer  1.1.1-3
- Revert to 1.1.1 branch, 1.2/2.0 won't be out in time.

* Wed Jan  9 2002 Bernhard Rosenkraenzer  1.1.1-2
- Rename kra*** to kopaint

* Fri Dec 14 2001 Bernhard Rosenkraenzer  1.1.1-1
- 1.1.1

* Wed Aug 29 2001 Bernhard Rosenkraenzer  1.1-5
- Rebuild with new kdelibs

* Mon Aug 27 2001 Bernhard Rosenkraenzer  1.1-4
- Merge koffice-i18n into the package

* Thu Aug 23 2001 Bernhard Rosenkraenzer  1.1-3
- Add missing defattr to -devel (#52292)
- Remove dupes from kdeartwork-locolor (Part of #51589)

* Tue Aug 21 2001 Bernhard Rosenkraenzer  1.1-2
- Replace koshell icon (#51439)
- Move include files to the correct directory (/usr/include/kde rather than
  /usr/include)
- restore -devel package (it was lost in 1.1-1 for some reason)
- Don't own standard directories

* Tue Aug 14 2001 Bernhard Rosenkraenzer  1.1-1
- 1.1 final
- Add icon for koshell (#51439)

* Wed Jul 25 2001 Bernhard Rosenkraenzer  1.1-0.cvs20010725.1
- Increase Epoch

* Tue Jul 24 2001 Bernhard Rosenkraenzer  1.1-0.cvs20010724.1
- Don't build kivio on ia64 ATM (compiler bug)

* Tue Feb 20 2001 Than Ngo 
- update 2.1
- fix dangling symlinks

* Fri Feb  2 2001 Bernhard Rosenkraenzer 
- Add ldconfig in %%post and %%postun, replace absolute symlinks
  with relative symlinks (#24878)

* Mon Jan 22 2001 Bernhard Rosenkraenzer 
- Update

* Thu Jan 11 2001 Bernhard Rosenkraenzer 
- Update
- Don't build on sparc and ia64 (Bug #23809)

* Sun Dec  3 2000 Bernhard Rosenkraenzer 
- 2.0.1

* Fri Nov  3 2000 Bernhard Rosenkraenzer 
- Update to KDE_2_0_BRANCH

* Mon Oct 16 2000 Bernhard Rosenkraenzer 
- 2.0 final

* Tue Oct  3 2000 Bernhard Rosenkraenzer 
- 2.0

* Mon Oct  2 2000 Bernhard Rosenkraenzer 
- new CVS
- fix compilation

* Thu Aug 24 2000 Bernhard Rosenkraenzer 
- kill dupes from kdelibs

* Thu Aug 24 2000 Bernhard Rosenkraenzer 
- 1.93

* Sun Aug  6 2000 Bernhard Rosenkraenzer 
- update (fixed compilation with gcc 2.96 in CVS)
- work around compiler bugs on alpha

* Fri Aug  4 2000 Bernhard Rosenkraenzer 
- new snapshot
- move to /usr/lib/kde2

* Thu Jul 27 2000 Bernhard Rosenkraenzer 
- rebuild

* Tue Jul 25 2000 Bernhard Rosenkraenzer 
- new snapshot

* Sun Jul 23 2000 Bernhard Rosenkraenzer 
- new snapshot, new Qt

* Thu Jul 13 2000 Bernhard Rosenkraenzer 
- Don't hardcode Qt version
- obsolete killustrator (powertools 6.x)
- SMPify

* Tue Jul 11 2000 Bernhard Rosenkraenzer 
- use gcc 2.96
- new snapshot

* Mon Jul  3 2000 Bernhard Rosenkraenzer 
- use kernelcc
- new snapshot

* Tue Jun 20 2000 Bernhard Rosenkraenzer 
- new snapshot
- ExcludeArch ia64

* Sat Mar 18 2000 Bernhard Rosenkraenzer 
- new snapshot
- move it to /usr, where it belongs

* Sat Oct 23 1999 Bernhard Rosenkraenzer 
- Initial RPM

post-1.3.5-koffice.diff:

--- NEW FILE post-1.3.5-koffice.diff ---
Index: koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc
===================================================================
RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc	30 Oct 2004 16:35:33 -0000	1.6
+++ koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc	20 Jan 2005 17:36:38 -0000	1.8
@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
 	} else {
 	  keyLength = 5;
 	}
+	if (keyLength < 1) {
+	  keyLength = 1;
+	}
+	if (keyLength > 16) {
+	  keyLength = 16;
+	}
 	permFlags = permissions.getInt();
 	if (encVersion >= 1 && encVersion <= 2 &&
 	    encRevision >= 2 && encRevision <= 3) {


--- NEW FILE subdirs-koffice ---
af
ca
cs
da
de
el
en_GB
es
et
fr
he
hu
it
ja
nl
nb
nn
pl
pt
pt_BR
ru
sk
sl
sv
tr
zh_CN
zh_TW


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jul 2005 09:18:46 -0000	1.1
+++ .cvsignore	20 Jul 2005 09:21:50 -0000	1.2
@@ -0,0 +1,2 @@
+koffice-1.3.5.tar.bz2
+koffice-i18n-1.3.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jul 2005 09:18:46 -0000	1.1
+++ sources	20 Jul 2005 09:21:50 -0000	1.2
@@ -0,0 +1,2 @@
+dbc7e76c86647709a3e74f57c0fcf7f5  koffice-1.3.5.tar.bz2
+7a4af78be2a9e09a148717079f44a7a7  koffice-i18n-1.3.5.tar.bz2



From andreas.bierfert at lowlatency.de  Wed Jul 20 09:39:13 2005
From: andreas.bierfert at lowlatency.de (Andreas Bierfert)
Date: Wed, 20 Jul 2005 11:39:13 +0200
Subject: rpms/koffice - New directory
In-Reply-To: <200507200918.j6K9IV2r001660@cvs-int.fedora.redhat.com>
References: <200507200918.j6K9IV2r001660@cvs-int.fedora.redhat.com>
Message-ID: <42DE1BC1.8060901@lowlatency.de>

Did I miss something about koffice? See
https://www.redhat.com/archives/fedora-extras-list/2005-June/msg01367.html
and the following mails...

- Andreas

Than Ngo" (than) wrote:
> Author: than
> 
> Update of /cvs/extras/rpms/koffice
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1636/koffice
> 
> Log Message:
> Directory /cvs/extras/rpms/koffice added to the repository



From fedora-extras-commits at redhat.com  Wed Jul 20 09:45:56 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 20 Jul 2005 05:45:56 -0400
Subject: fedora-security/audit fc4,1.26,1.27
Message-ID: <200507200945.j6K9ju93001943@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1924

Modified Files:
	fc4 
Log Message:
Get around to dealing with some issues that needed attention.  The only
significant issue left is a Mozilla issue where I can't yet find out what
release fixed the flaw.  Josh opened a bug in bugzilla.mozilla.org for this
but it was dupe'd to a private bug I can't access, so we'll need to wait
to finish this one off.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fc4	20 Jul 2005 08:28:11 -0000	1.26
+++ fc4	20 Jul 2005 09:45:53 -0000	1.27
@@ -24,7 +24,7 @@
 2005-2260 VULNERABLE (firefox, fixed 1.0.5)
 2005-2260 VULNERABLE (mozilla, fixed 1.7.9)
 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
-2005-2114 ** mozilla
+2005-2114 ** mozilla, can't find out when this was fixed upstream
 2005-2096 backport (zlib) [since FEDORA-2005-523]
 2005-2096 backport (rpm) [since FEDORA-2005-565]
 2005-2095 VULNERABLE (squirrelmail)
@@ -40,8 +40,7 @@
 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1761 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
-2005-2069 ** openldap
-2005-2069 ** pam_ldap
+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]
@@ -50,20 +49,21 @@
 2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
 2005-1831 ignore (sudo) unsubstantiated report
 2005-1763 version (kernel) [since FEDORA-2005-510]
-2005-1769 ** squirrelmail
+2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
 2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483]
-2005-1760 ** probably vulnerable sysreport
+2005-1760 VULNERABLE (sysreport)
 2005-1759 VULNERABLE (nmap)
 2005-1759 VULNERABLE (openldap)
 2005-1759 VULNERABLE (php)
-2005-1751 ** nmap
-2005-1751 ** openldap
+2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
+2005-1751 VULNERABLE (openldap, fixed shtool 2.0.2)
+2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
 2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 2005-1740 backport (net-snmp, not fixed)
 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1]
 2005-1705 version (gdb, fixed 6.3)
 2005-1704 version (gdb, fixed 6.3)
-2005-1704 ** (binutils) [since FEDORA-2005-498]
+2005-1704 backport (binutils) ...eadelf-overflows.patch [since FEDORA-2005-498]
 2005-1689 backport (krb5) [since FEDORA-2005-553]
 2005-1686 ignore (gedit, not a vulnerability)
 2005-1636 VULNERABLE (mysql, fixed 4.1.12) minor issue
@@ -975,13 +975,12 @@
 
 older, happened to deal with at same time:
 
-2002-1963 ** kernel
-2002-1976 ** kernel
+2002-1963 version (kernel, not 2.6)
+2002-1976 ignore (ifconfig) "use ip"
 2002-1914 version (dump, fixed 0.4b29)
-2002-1890 ** rhmask
-2002-1850 ** mod_cgi
-2002-1827 ** sendmail
-2002-1814 ** bonobo
+2002-1850 version (mod_cgi, fixed 2.0.41)
+2002-1827 version (sendmail, fixed after 8.12.3)
+2002-1814 ignore (bonobo) not shipped setuid
 2002-1793 version (mod_ssl), also only hp
 2002-1783 version (php, fixed after 4.2.3)
 2002-1765 version (evolution, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Wed Jul 20 12:02:38 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:02:38 -0400
Subject: devel/x3270 x3270.spec,1.5,1.6
Message-ID: <200507201203.j6KC3VPg008417@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8398

Modified Files:
	x3270.spec 
Log Message:
buildrequire xorg-x11-font-utils (160737)


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x3270.spec	27 Apr 2005 13:52:38 -0000	1.5
+++ x3270.spec	20 Jul 2005 12:02:36 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 3
+Release: 4
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -31,7 +31,7 @@
 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
 Group: Applications/Internet
-BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-devel xorg-x11-font-utils
 Requires: %{name} = %{version}
 Prereq: gtk2 >= 2.6
 
@@ -197,6 +197,9 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Wed Jul 20 2005 Karsten Hopp  3.3.4-4
+- buildrequires xorg-x11-font-utils (#160737)
+
 * Wed Apr 27 2005 Jeremy Katz 
 - silence gtk-update-icon-cache in %%post
 



From fedora-extras-commits at redhat.com  Wed Jul 20 12:09:14 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:09:14 -0400
Subject: devel/x3270 x3270.spec,1.6,1.7
Message-ID: <200507201209.j6KC9Enr008481@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/devel/x3270
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8464

Modified Files:
	x3270.spec 
Log Message:
add disttag


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/devel/x3270/x3270.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- x3270.spec	20 Jul 2005 12:02:36 -0000	1.6
+++ x3270.spec	20 Jul 2005 12:09:12 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 4
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -199,6 +199,7 @@
 %changelog
 * Wed Jul 20 2005 Karsten Hopp  3.3.4-4
 - buildrequires xorg-x11-font-utils (#160737)
+- add disttag
 
 * Wed Apr 27 2005 Jeremy Katz 
 - silence gtk-update-icon-cache in %%post



From fedora-extras-commits at redhat.com  Wed Jul 20 12:11:14 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:11:14 -0400
Subject: rpms/x3270/FC-4 x3270.spec,1.5,1.6
Message-ID: <200507201211.j6KCBEN9008516@cvs-int.fedora.redhat.com>

Author: karsten

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

Modified Files:
	x3270.spec 
Log Message:
build fixed FC4 package


Index: x3270.spec
===================================================================
RCS file: /cvs/extras/rpms/x3270/FC-4/x3270.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x3270.spec	27 Apr 2005 13:52:38 -0000	1.5
+++ x3270.spec	20 Jul 2005 12:11:12 -0000	1.6
@@ -5,7 +5,7 @@
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
 Version: 3.3.4
-Release: 3
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
@@ -31,7 +31,7 @@
 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
 Group: Applications/Internet
-BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-devel xorg-x11-font-utils
 Requires: %{name} = %{version}
 Prereq: gtk2 >= 2.6
 
@@ -197,6 +197,10 @@
 %{_mandir}/man1/c3270*
 
 %changelog
+* Wed Jul 20 2005 Karsten Hopp  3.3.4-4
+- buildrequires xorg-x11-font-utils (#160737)
+- add disttag
+
 * Wed Apr 27 2005 Jeremy Katz 
 - silence gtk-update-icon-cache in %%post
 



From fedora-extras-commits at redhat.com  Wed Jul 20 12:11:39 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:11:39 -0400
Subject: common tobuild,1.1960,1.1961
Message-ID: <200507201211.j6KCBdUx008578@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8561

Modified Files:
	tobuild 
Log Message:
request build of rpms/x3270/FC-4 x3270-3_3_4-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1960
retrieving revision 1.1961
diff -u -r1.1960 -r1.1961
--- tobuild	20 Jul 2005 00:47:56 -0000	1.1960
+++ tobuild	20 Jul 2005 12:11:37 -0000	1.1961
@@ -101,3 +101,4 @@
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
+karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4



From fedora-extras-commits at redhat.com  Wed Jul 20 12:12:11 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Wed, 20 Jul 2005 08:12:11 -0400
Subject: common tobuild,1.1961,1.1962
Message-ID: <200507201212.j6KCCBJi008641@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8624

Modified Files:
	tobuild 
Log Message:
request build of rpms/x3270/devel x3270-3_3_4-4_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1961
retrieving revision 1.1962
diff -u -r1.1961 -r1.1962
--- tobuild	20 Jul 2005 12:11:37 -0000	1.1961
+++ tobuild	20 Jul 2005 12:12:08 -0000	1.1962
@@ -102,3 +102,4 @@
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
+karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:56 -0400
Subject: extras-buildsys/server UserInterface.py,1.20,1.21 main.py,1.9,1.10
Message-ID: <200507201451.j6KEpuRQ011659@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/server

Modified Files:
	UserInterface.py main.py 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- UserInterface.py	19 Jul 2005 02:29:48 -0000	1.20
+++ UserInterface.py	20 Jul 2005 14:51:53 -0000	1.21
@@ -151,42 +151,42 @@
     def list_jobs(self, args_dict):
         """ Query job information and return it to the user """
 
-        sql = 'SELECT uid, username, package, cvs_tag, target, status FROM jobs WHERE '
+        sql = 'SELECT uid, username, package, cvs_tag, target, time_submitted, status 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'])
             else:
-                return (-1, "Error: Invalid email address.", [], [])
+                return (-1, "Error: Invalid email address.", [])
 
         if args_dict.has_key('status') and args_dict['status']:
             status = args_dict['status']
             if PackageJob.is_package_job_stage_valid(status):
                 sql_args.append('status="%s"' % status)
             else:
-                return (-1, "Error: Invalid job status.", [], [])
+                return (-1, "Error: Invalid job status.", [])
 
         if args_dict.has_key('uid') and args_dict['uid']:
             uid = validate_uid(args_dict['uid'])
-            if not uid:
-                return (-1, "Error: Invalid job UID.", [], [])
+            if uid == None:
+                return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid=%d' % uid)
 
         if args_dict.has_key('uid_gt') and args_dict['uid_gt']:
             uid = validate_uid(args_dict['uid_gt'])
-            if not uid:
-                return (-1, "Error: Invalid job UID.", [], [])
+            if uid == None:
+                return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid>%d' % uid)
 
         if args_dict.has_key('uid_lt') and args_dict['uid_lt']:
             uid = validate_uid(args_dict['uid_lt'])
-            if not uid:
-                return (-1, "Error: Invalid job UID.", [], [])
+            if uid == None:
+                return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid<%d' % uid)
 
         if not len(sql_args):
-            return (-1, "Error: Invalid query.", [], [])
+            return (-1, "Error: Invalid query.", [])
 
         # Assemble the final SQL statement
         i = 1
@@ -200,39 +200,56 @@
         try:
             dbcx, curs = get_dbcx()
         except sqlite.DatabaseError, e:
-            return (-1, "Unable to access job database.", [], [])
+            return (-1, "Unable to access job database.", [])
         curs.execute(sql)
         data = curs.fetchall()
-        results = []
+        jobs = []
         for row in data:
-            tempX = [ item for item in row ]
-            results.append(tempX)
-        jobs = copy.deepcopy(results)
+            jobrec = {}
+            jobrec['uid'] = row[0]
+            jobrec['username'] = row[1]
+            jobrec['package'] = row[2]
+            jobrec['source'] = row[3]
+            jobrec['target'] = row[4]
+            jobrec['submit_time'] = row[5]
+            jobrec['status'] = row[6]
+            jobrec['archjobs'] = []
+            jobs.append(copy.deepcopy(jobrec))
+
+        print len(jobs)
 
         # Mash all returned job UIDs into an SQL query to get all their archjobs
         uids = ''
-        for result in jobs:
+        for job in jobs:
             if len(uids) == 0:
-                uids = uids + "parent_uid=%d" % result[0]
+                uids = uids + "parent_uid=%d" % job['uid']
             else:
-                uids = uids + " OR parent_uid=%d" % result[0]
+                uids = uids + " OR parent_uid=%d" % job['uid']
 
         # Get all archjobs for this job
-        archjobs = []
         if len(uids) > 0:
             sql = "SELECT jobid, parent_uid, starttime, endtime, arch, builder_addr, status, builder_status FROM archjobs WHERE " + uids
             curs.execute(sql)
             data = curs.fetchall()
-            aj_results = []
             for row in data:
-                tempX = [ item for item in row ]
-                aj_results.append(tempX)
-            archjobs = copy.deepcopy(aj_results)
+                ajrec = {}
+                ajrec['jobid'] = row[0]
+                ajrec['parent_uid'] = row[1]
+                ajrec['starttime'] = row[2]
+                ajrec['endtime'] = row[3]
+                ajrec['arch'] = row[4]
+                ajrec['builder_addr'] = row[5]
+                ajrec['status'] = row[6]
+                ajrec['builder_status'] = row[7]
+                for job in jobs:
+                    if job['uid'] == ajrec['parent_uid']:
+                        print "appending"
+                        job['archjobs'].append(copy.deepcopy(ajrec))
 
         del curs
         del dbcx
 
-        return (0, "Success.", jobs, archjobs)
+        return (0, "Success.", jobs)
 
 
     def update_builders(self):


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- main.py	12 Jul 2005 20:12:32 -0000	1.9
+++ main.py	20 Jul 2005 14:51:53 -0000	1.10
@@ -20,7 +20,6 @@
 import os
 import socket
 from plague import AuthedXMLRPCServer
-from plague import lighttpdManager
 from plague import HTTPServer
 from plague import daemonize
 import SimpleXMLRPCServer
@@ -38,8 +37,6 @@
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")
 
-use_lighttpd = False
-
 
 class AuthenticatedSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer):
     """
@@ -123,22 +120,12 @@
     # SRPM fileserver
     SRPM_SERVER_PORT = 8886
     http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir")
-    if use_lighttpd:
-        http_cnf_file = "/var/tmp/plague-server.conf"
-        if config_opts['ssl_builders']:
-            key_and_cert = config_opts['server_key_and_cert']
-        else:
-            key_and_cert = None
-        srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, SRPM_SERVER_PORT, http_dir, False, key_and_cert)
-    else:
-        if config_opts['ssl_builders']:
-            srpm_server_certs = {}
-            srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert']
-            srpm_server_certs['ca_cert'] = config_opts['ca_cert']
-            srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
-            srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
-        else:
-            srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, None)
+    srpm_server_certs = {}
+    if config_opts['ssl_builders']:
+        srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert']
+        srpm_server_certs['ca_cert'] = config_opts['ca_cert']
+        srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
+    srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
     srpm_server.start()
 
     print "Build Server accepting requests on %s:%d.\n" % (hostname, UI_PORT)



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:49 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:49 -0400
Subject: extras-buildsys ChangeLog,1.65,1.66
Message-ID: <200507201452.j6KEqKZR011671@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592

Modified Files:
	ChangeLog 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ChangeLog	19 Jul 2005 02:29:47 -0000	1.65
+++ ChangeLog	20 Jul 2005 14:51:47 -0000	1.66
@@ -1,3 +1,15 @@
+2005-07-20  Dan Williams 
+
+    * builder/builder.py
+      server/main.py
+        - Don't use lighttpd any more
+        - Fix some issues with non-SSL build systems (Oliver Falk)
+
+    * client/client.py
+      server/UserInterface.py
+        - Return job lists as dicts for easier use
+        - Return archjobs embedded in the job list rather than a separate array
+
 2005-07-18  Dan Williams 
 
     * server/UserInterface.py



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:50 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:50 -0400
Subject: extras-buildsys/client client.py,1.12,1.13
Message-ID: <200507201452.j6KEqKtr011675@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/client

Modified Files:
	client.py 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- client.py	19 Jul 2005 02:29:47 -0000	1.12
+++ client.py	20 Jul 2005 14:51:48 -0000	1.13
@@ -124,7 +124,7 @@
     print query_args
 
     try:
-        (e, msg, jobs, archjobs) = server.list_jobs(query_args)
+        (e, msg, jobs) = server.list_jobs(query_args)
     except socket.error, e:
         print "Error connecting to build server: '%s'" % e
         return
@@ -136,10 +136,9 @@
     else:
         for job in jobs:
             try:
-                print job
-                for archjob in archjobs:
-                    if archjob[1] == job[0]:
-                        print "\t%s(%s): %s %s/%s" % (archjob[5], archjob[4], archjob[0], archjob[6], archjob[7])
+                print "%d: %s (%s)  %s   %s" % (job['uid'], job['package'], job['source'], job['username'], job['status'])    
+                for archjob in job['archjobs']:
+                    print "\t%s(%s): %s %s/%s" % (archjob['builder_addr'], archjob['arch'], archjob['jobid'], archjob['status'], archjob['builder_status'])
                 print ''
             except IOError:
                 pass



From fedora-extras-commits at redhat.com  Wed Jul 20 14:51:50 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 10:51:50 -0400
Subject: extras-buildsys/builder builder.py,1.21,1.22
Message-ID: <200507201452.j6KEqK1M011672@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/builder

Modified Files:
	builder.py 
Log Message:
2005-07-20  Dan Williams 

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- builder.py	18 Jul 2005 21:26:24 -0000	1.21
+++ builder.py	20 Jul 2005 14:51:48 -0000	1.22
@@ -33,14 +33,11 @@
 from plague import ArchUtils
 from plague import FileDownloader
 from plague import AuthedXMLRPCServer
-from plague import lighttpdManager
 from plague import HTTPServer
 from plague import daemonize
 from optparse import OptionParser
 
 
-use_lighttpd = False
-
 certs = {}
 
 def get_url_for_file(file_path):
@@ -681,9 +678,10 @@
 
     # Load in the config
     execfile(opts.configfile)
-    certs['key_and_cert'] = config_opts['builder_key_and_cert']
-    certs['ca_cert'] = config_opts['ca_cert']
-    certs['peer_ca_cert'] = config_opts['ca_cert']
+    if config_opts['ssl_buildserver']:
+        certs['key_and_cert'] = config_opts['builder_key_and_cert']
+        certs['ca_cert'] = config_opts['ca_cert']
+        certs['peer_ca_cert'] = config_opts['ca_cert']
 
     for arch in config_opts['arches']:
         if arch not in archlist:
@@ -725,18 +723,7 @@
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
     port = config_opts['fileserver_port']
-    if use_lighttpd:
-        http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid()
-        if config_opts['ssl_buildserver']:
-            key_and_cert = config_opts['builder_key_and_cert']
-        else:
-            key_and_cert = None
-        http_server = lighttpdManager.lighttpdManager(http_cnf_file, config_opts['hostname'], port, work_dir, True, key_and_cert)
-    else:
-        if config_opts['ssl_buildserver']:
-            http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
-        else:
-            http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, None)
+    http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
     http_server.start()
 
     # Stop running as root



From oliver at linux-kernel.at  Wed Jul 20 14:56:43 2005
From: oliver at linux-kernel.at (Oliver Falk)
Date: Wed, 20 Jul 2005 16:56:43 +0200
Subject: extras-buildsys/client client.py,1.12,1.13
In-Reply-To: <200507201452.j6KEqKtr011675@cvs-int.fedora.redhat.com>
References: <200507201452.j6KEqKtr011675@cvs-int.fedora.redhat.com>
Message-ID: <42DE662B.9030106@linux-kernel.at>

On 07/20/2005 04:51 PM, Daniel Williams (dcbw) wrote:
> Author: dcbw
> 
> Update of /cvs/fedora/extras-buildsys/client
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/client
> 
> Modified Files:
> 	client.py 
> Log Message:
> 2005-07-20  Dan Williams 
> 
>     * builder/builder.py
>       server/main.py
>         - Don't use lighttpd any more
>         - Fix some issues with non-SSL build systems (Oliver Falk)

Oops, thanks for mentioning. :-)

Best,
  Oliver



From fedora-extras-commits at redhat.com  Wed Jul 20 15:25:05 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 20 Jul 2005 11:25:05 -0400
Subject: rpms/bash-completion/FC-4 .cvsignore, 1.7, 1.8 bash-completion.spec,
	1.9, 1.10 sources, 1.7, 1.8 bash-completion-documents.patch,
	1.1, NONE bash-completion-players.patch, 1.1,
	NONE bash-completion-tarballs.patch, 1.1, NONE
Message-ID: <200507201525.j6KFPaE8013070@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13032/FC-4

Modified Files:
	.cvsignore bash-completion.spec sources 
Removed Files:
	bash-completion-documents.patch bash-completion-players.patch 
	bash-completion-tarballs.patch 
Log Message:
* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
- 20050720, all patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Jul 2005 19:59:19 -0000	1.7
+++ .cvsignore	20 Jul 2005 15:25:03 -0000	1.8
@@ -1 +1 @@
-bash-completion-20050712.tar.bz2
+bash-completion-20050720.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bash-completion.spec	18 Jul 2005 19:58:46 -0000	1.9
+++ bash-completion.spec	20 Jul 2005 15:25:03 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bash-completion
-Version:        20050712
-Release:        1
+Version:        20050720
+Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,9 +8,6 @@
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
-Patch0:         %{name}-tarballs.patch
-Patch1:         %{name}-players.patch
-Patch2:         %{name}-documents.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,9 +20,6 @@
 
 %prep
 %setup -q -n bash_completion
-%patch0
-%patch1
-%patch2
 
 
 %build
@@ -133,6 +127,9 @@
 
 
 %changelog
+* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
+- 20050720, all patches applied upstream.
+
 * Mon Jul 18 2005 Ville Skytt??  - 20050712-1
 - 20050712.
 - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jul 2005 19:59:19 -0000	1.7
+++ sources	20 Jul 2005 15:25:03 -0000	1.8
@@ -1 +1 @@
-4f38a59eabf97a6dd7db0f10c0ee5063  bash-completion-20050712.tar.bz2
+2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2


--- bash-completion-documents.patch DELETED ---


--- bash-completion-players.patch DELETED ---


--- bash-completion-tarballs.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Jul 20 15:25:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 20 Jul 2005 11:25:06 -0400
Subject: rpms/bash-completion/devel .cvsignore, 1.7, 1.8 bash-completion.spec,
	1.9, 1.10 sources, 1.7, 1.8 bash-completion-documents.patch,
	1.1, NONE bash-completion-players.patch, 1.1,
	NONE bash-completion-tarballs.patch, 1.1, NONE
Message-ID: <200507201525.j6KFPaKj013075@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13032/devel

Modified Files:
	.cvsignore bash-completion.spec sources 
Removed Files:
	bash-completion-documents.patch bash-completion-players.patch 
	bash-completion-tarballs.patch 
Log Message:
* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
- 20050720, all patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Jul 2005 19:59:19 -0000	1.7
+++ .cvsignore	20 Jul 2005 15:25:04 -0000	1.8
@@ -1 +1 @@
-bash-completion-20050712.tar.bz2
+bash-completion-20050720.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bash-completion.spec	18 Jul 2005 19:58:47 -0000	1.9
+++ bash-completion.spec	20 Jul 2005 15:25:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           bash-completion
-Version:        20050712
-Release:        1
+Version:        20050720
+Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,9 +8,6 @@
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
-Patch0:         %{name}-tarballs.patch
-Patch1:         %{name}-players.patch
-Patch2:         %{name}-documents.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,9 +20,6 @@
 
 %prep
 %setup -q -n bash_completion
-%patch0
-%patch1
-%patch2
 
 
 %build
@@ -133,6 +127,9 @@
 
 
 %changelog
+* Wed Jul 20 2005 Ville Skytt??  - 20050720-1
+- 20050720, all patches applied upstream.
+
 * Mon Jul 18 2005 Ville Skytt??  - 20050712-1
 - 20050712.
 - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jul 2005 19:59:19 -0000	1.7
+++ sources	20 Jul 2005 15:25:04 -0000	1.8
@@ -1 +1 @@
-4f38a59eabf97a6dd7db0f10c0ee5063  bash-completion-20050712.tar.bz2
+2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2


--- bash-completion-documents.patch DELETED ---


--- bash-completion-players.patch DELETED ---


--- bash-completion-tarballs.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Jul 20 16:10:41 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 12:10:41 -0400
Subject: extras-buildsys/client client.py,1.13,1.14
Message-ID: <200507201610.j6KGAfT0014360@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14328/client

Modified Files:
	client.py 
Log Message:
Remove some debug prints


Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- client.py	20 Jul 2005 14:51:48 -0000	1.13
+++ client.py	20 Jul 2005 16:10:39 -0000	1.14
@@ -121,8 +121,6 @@
         # List all jobs
         query_args['uid_gt'] = "0"
 
-    print query_args
-
     try:
         (e, msg, jobs) = server.list_jobs(query_args)
     except socket.error, e:



From fedora-extras-commits at redhat.com  Wed Jul 20 16:10:41 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 12:10:41 -0400
Subject: extras-buildsys/server UserInterface.py,1.21,1.22
Message-ID: <200507201610.j6KGAfns014366@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14328/server

Modified Files:
	UserInterface.py 
Log Message:
Remove some debug prints


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- UserInterface.py	20 Jul 2005 14:51:53 -0000	1.21
+++ UserInterface.py	20 Jul 2005 16:10:39 -0000	1.22
@@ -216,8 +216,6 @@
             jobrec['archjobs'] = []
             jobs.append(copy.deepcopy(jobrec))
 
-        print len(jobs)
-
         # Mash all returned job UIDs into an SQL query to get all their archjobs
         uids = ''
         for job in jobs:
@@ -243,7 +241,6 @@
                 ajrec['builder_status'] = row[7]
                 for job in jobs:
                     if job['uid'] == ajrec['parent_uid']:
-                        print "appending"
                         job['archjobs'].append(copy.deepcopy(ajrec))
 
         del curs



From fedora-extras-commits at redhat.com  Wed Jul 20 16:15:21 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Wed, 20 Jul 2005 12:15:21 -0400
Subject: rpms/inadyn/devel .cvsignore, 1.2, 1.3 inadyn.spec, 1.10,
	1.11 sources, 1.2, 1.3
Message-ID: <200507201615.j6KGFLw2014579@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Apr 2005 19:42:23 -0000	1.2
+++ .cvsignore	20 Jul 2005 16:15:19 -0000	1.3
@@ -1 +1 @@
-inadyn.v1.90.zip
+inadyn.v1.95.zip


Index: inadyn.spec
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/inadyn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- inadyn.spec	8 Jul 2005 18:23:05 -0000	1.10
+++ inadyn.spec	20 Jul 2005 16:15:19 -0000	1.11
@@ -1,6 +1,7 @@
 Name:           inadyn
-Version:        1.90
-Release:        11%{?dist}
+
+Version:        1.95
+Release:        1
 
 Summary:        Dynamic DNS Client
 
@@ -31,18 +32,19 @@
 %setup -q -c
 
 %build
-make -f makefile.linux CFLAGS="$RPM_OPT_FLAGS"
+cd inadyn
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m 0755 bin/inadyn $RPM_BUILD_ROOT%{_sbindir}
+install -m 0755 inadyn/bin/linux/inadyn $RPM_BUILD_ROOT%{_sbindir}
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-install -p -m 0644 man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install -p -m 0644 man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
+install -p -m 0644 inadyn/man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -p -m 0644 inadyn/man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
@@ -74,13 +76,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc readme.html
+%doc inadyn/readme.html
 %{_sbindir}/inadyn
 %{_mandir}/man*/*
 %attr(0755,root,root) %{_initrddir}/inadyn
 %config %{_sysconfdir}/inadyn.conf
 
 %changelog
+* Wed Jul 20 2005 Jochen Schmitt  1.95-1
+- New upstream release
+
 * Tue May  3 2005 Jochen Schmitt  1.90-11
 - Move note from README.Fedora to %%description
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inadyn/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Apr 2005 19:42:23 -0000	1.2
+++ sources	20 Jul 2005 16:15:19 -0000	1.3
@@ -1 +1 @@
-65552d4a34f825aa7f214775bdeac1cc  inadyn.v1.90.zip
+3d4c912ba9678284d330de043b7d05cb  inadyn.v1.95.zip



From fedora-extras-commits at redhat.com  Wed Jul 20 16:25:39 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 12:25:39 -0400
Subject: rpms/koffice/devel admin-visibility.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 koffice.spec, 1.1, 1.2 sources, 1.2, 1.3 subdirs-koffice,
	1.1, 1.2 koffice-1.3-menu.patch, 1.1,
	NONE koffice-1.3.1-rpath.patch, 1.1,
	NONE koffice-1.3.5-immodule.patch, 1.1,
	NONE post-1.3.5-koffice.diff, 1.1, NONE
Message-ID: <200507201625.j6KGPdoU014643@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	.cvsignore koffice.spec sources subdirs-koffice 
Added Files:
	admin-visibility.patch 
Removed Files:
	koffice-1.3-menu.patch koffice-1.3.1-rpath.patch 
	koffice-1.3.5-immodule.patch post-1.3.5-koffice.diff 
Log Message:
update to 1.4.1


admin-visibility.patch:

--- NEW FILE admin-visibility.patch ---
--- arts-1.4.1/admin/acinclude.m4.in.gcc4	2005-05-23 13:28:33.000000000 +0200
+++ arts-1.4.1/admin/acinclude.m4.in	2005-05-24 18:46:07.000000000 +0200
@@ -3052,8 +3052,6 @@
 
   AC_PROG_CXX
 
-  KDE_CHECK_FOR_BAD_COMPILER
-
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
     if test "$kde_use_debug_code" != "no"; then
       if test "$CXX" = "KCC"; then
@@ -3282,14 +3280,7 @@
     KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-    [
-        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-        KDE_CHECK_VISIBILITY_GCC_BUG
-
-        HAVE_GCC_VISIBILITY=1
-        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-    ])
+    AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
   fi
 ])
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Jul 2005 09:21:50 -0000	1.2
+++ .cvsignore	20 Jul 2005 16:25:37 -0000	1.3
@@ -1,2 +1,29 @@
 koffice-1.3.5.tar.bz2
 koffice-i18n-1.3.5.tar.bz2
+koffice-l10n-bg-1.4.1.tar.bz2
+koffice-l10n-ca-1.4.1.tar.bz2
+koffice-l10n-cs-1.4.1.tar.bz2
+koffice-l10n-cy-1.4.1.tar.bz2
+koffice-l10n-da-1.4.1.tar.bz2
+koffice-l10n-de-1.4.1.tar.bz2
+koffice-l10n-el-1.4.1.tar.bz2
+koffice-l10n-en_GB-1.4.1.tar.bz2
+koffice-l10n-es-1.4.1.tar.bz2
+koffice-l10n-et-1.4.1.tar.bz2
+koffice-l10n-fi-1.4.1.tar.bz2
+koffice-l10n-fr-1.4.1.tar.bz2
+koffice-l10n-hu-1.4.1.tar.bz2
+koffice-l10n-it-1.4.1.tar.bz2
+koffice-l10n-nb-1.4.1.tar.bz2
+koffice-l10n-nl-1.4.1.tar.bz2
+koffice-l10n-nn-1.4.1.tar.bz2
+koffice-l10n-pl-1.4.1.tar.bz2
+koffice-l10n-pt-1.4.1.tar.bz2
+koffice-l10n-pt_BR-1.4.1.tar.bz2
+koffice-l10n-ru-1.4.1.tar.bz2
+koffice-l10n-sl-1.4.1.tar.bz2
+koffice-l10n-sr-1.4.1.tar.bz2
+koffice-l10n-sv-1.4.1.tar.bz2
+koffice-l10n-ta-1.4.1.tar.bz2
+koffice-l10n-tg-1.4.1.tar.bz2
+koffice-l10n-zh_CN-1.4.1.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- koffice.spec	20 Jul 2005 09:21:50 -0000	1.1
+++ koffice.spec	20 Jul 2005 16:25:37 -0000	1.2
@@ -1,8 +1,8 @@
 %define debug 0
 %define final 0
 
-%define qt_version 3.3.3
-%define kde_version 3.3.0
+%define qt_version 3.3.4
+%define kde_version 3.4.1
 
 %define redhatify 1
 
@@ -11,29 +11,50 @@
 %define buildall 0
 
 Name: koffice
-Version: 1.3.5
-Release: 3
+Version: 1.4.1
+Release: 1
 Epoch: 4
 URL: http://koffice.kde.org/
 Summary: A set of office applications for KDE.
 Group: User Interface/Desktops
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-i18n-%{version}.tar.bz2
-Source2: koshell.png
-Source3: subdirs-koffice
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-bg-1.4.1.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ca-1.4.1.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-cs-1.4.1.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-cy-1.4.1.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-da-1.4.1.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-de-1.4.1.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-el-1.4.1.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-en_GB-1.4.1.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-es-1.4.1.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-et-1.4.1.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-fi-1.4.1.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-fr-1.4.1.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-hu-1.4.1.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-it-1.4.1.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nb-1.4.1.tar.bz2
+Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nl-1.4.1.tar.bz2
+Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-nn-1.4.1.tar.bz2
+Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pl-1.4.1.tar.bz2
+Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pt-1.4.1.tar.bz2
+Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-pt_BR-1.4.1.tar.bz2
+Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ru-1.4.1.tar.bz2
+Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sl-1.4.1.tar.bz2
+Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sr-1.4.1.tar.bz2
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-sv-1.4.1.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-ta-1.4.1.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-tg-1.4.1.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/koffice-l10n-zh_CN-1.4.1.tar.bz2
+Source100: koshell.png
+Source101: subdirs-koffice
 
 Patch0: kde-libtool.patch
 Patch1: koffice-1.2.94-fPIC.patch
-Patch2: koffice-1.3-menu.patch 
-Patch3: koffice-1.3.1-rpath.patch
-Patch4: koffice-1.3.5-immodule.patch
-
-# security fixes
-# kpdf Buffer Overflow Vulnerability, CAN-2005-0064
-Patch100: post-1.3.5-koffice.diff
+Patch2: admin-visibility.patch
+Patch100: koffice-l10n-es-1.4.1-broken.patch
 
 Prereq: kdelibs >= 6:%{kde_version}
 
@@ -87,23 +108,29 @@
 %setup -q
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .fPIC
-%patch2 -p1 -b .menu
-%patch3 -p1 -b .rpath
-%patch4 -p1 -b .im
-%patch100 -p1 -b .CAN-2005-0064
+%patch2 -p1 -b .gcc4
 
-# Workaround for legacy auto* tools
 %if %{libtool}
   make -f admin/Makefile.common cvs
 %endif
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNO_DEBUG -DNDEBUG"
+FLAGS="$RPM_OPT_FLAGS"
 export KDEDIR=%{_prefix}
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS"
 
+# i18n
+for i in $(cat %{SOURCE101}) ; do
+  tar jxf $RPM_SOURCE_DIR/%{name}-l10n-$i-%{version}.tar.bz2
+  pushd %{name}-l10n-$i-%{version}
+  [ "$i" == "es" ] && patch -p1 < %{PATCH100}
+  %configure
+  make %{?_smp_mflags}
+  popd
+done
+
 # koffice
 %configure \
 %if %{final}
@@ -116,25 +143,13 @@
 
 make %{?_smp_mflags}
 
-# koffice-i18n
-tar jxf %{SOURCE1}
-pushd %{name}-i18n-%{version}
-%if ! %{buildall}
-  rm -rf ar bg bs eo eu fa lt ms mt se sr sq ta th ven vi xh zu
-  cp %{SOURCE3} subdirs
-%endif
-%if %{libtool}
-  make -f admin/Makefile.common cvs
-%endif
-%configure
-make %{?_smp_mflags}
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
-make DESTDIR=$RPM_BUILD_ROOT -C %{name}-i18n-%{version} install
+for i in $(cat %{SOURCE101}) ; do
+  make -C %{name}-l10n-$i-%{version} datadir=%{_datadir} DESTDIR=$RPM_BUILD_ROOT install
+done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
@@ -173,9 +188,14 @@
 %{_libdir}/*.so
 %{_libdir}/*.la
 %{_libdir}/kde3/*
+%{_datadir}/applications/kde/*
+%{_datadir}/applnk/Utilities/*
 %{_datadir}/applnk/Office
 %{_datadir}/apps/*
+%{_datadir}/config.kcfg/*
+%{_datadir}/config/*
 %{_datadir}/icons/*/*/*/*
+%{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/templates
@@ -188,17 +208,10 @@
 %files i18n
 %defattr(-,root,root)
 %{_datadir}/apps/koffice/autocorrect
-
-%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
-%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
 %lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
-%endif
-
 %lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
+%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
 %lang(da) %doc %{_docdir}/HTML/da/*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
@@ -206,92 +219,42 @@
 %lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
 %lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
 %lang(en_GB) %doc %{_docdir}/HTML/en_GB/*
-
-%if %{buildall}
-%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
-%endif
-
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
 %lang(es) %doc %{_docdir}/HTML/es/*
 %lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
 %lang(et) %doc %{_docdir}/HTML/et/*
-
-%if %{buildall}
-%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
-%endif
-
+%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
 %lang(fr) %doc %{_docdir}/HTML/fr/*
-%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
 %lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
 %lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
 %lang(it) %doc %{_docdir}/HTML/it/*
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
-%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
-%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
-%lang(ms) %{_datadir}/locale/ms/LC_MESSAGES/*
-%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
-%endif
-
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
 %lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
+%lang(nl) %doc %{_docdir}/HTML/nl/*
 %lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
-%lang(pl) %doc %{_docdir}/HTML/pl/*
 %lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
 %lang(pt) %doc %{_docdir}/HTML/pt/*
 %lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
 %lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
 %lang(ru) %doc %{_docdir}/HTML/ru/*
-
-%if %{buildall}
-%lang(se) %{_datadir}/locale/se/LC_MESSAGES/*
-%endif
-
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
-%lang(sk) %doc %{_docdir}/HTML/sk/*
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
 %lang(sl) %doc %{_docdir}/HTML/sl/*
-
-%if %{buildall}
-%lang(sq) %{_datadir}/locale/sq/LC_MESSAGES/*
 %lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
-%endif
-
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
 %lang(sv) %doc %{_docdir}/HTML/sv/*
-
-%if %{buildall}
-%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
-%endif
-
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
-
-%if %{buildall}
-%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
-%endif
-
-%if %{buildall}
-%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
-%endif
-
-%if %{buildall}
-%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
-%lang(xh) %doc %{_docdir}/HTML/xh/*
-%endif
-
+%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
+%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
-%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
 
-%if %{buildall}
-%lang(zu) %{_datadir}/locale/zu/LC_MESSAGES/*
-%endif
 
 %changelog
+* Wed Jul 20 2005 Than Ngo  5:1.4.1-1
+- update to 1.4.1
+- drop some patches, which are included in upstream
+
 * Sat Feb 12 2005 Than Ngo  4:1.3.5-3
 - backport from CVS for working with qt-immodule
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Jul 2005 09:21:50 -0000	1.2
+++ sources	20 Jul 2005 16:25:37 -0000	1.3
@@ -1,2 +1,27 @@
-dbc7e76c86647709a3e74f57c0fcf7f5  koffice-1.3.5.tar.bz2
-7a4af78be2a9e09a148717079f44a7a7  koffice-i18n-1.3.5.tar.bz2
+445f35bf43b60c7799df116bd90957ad  koffice-l10n-bg-1.4.1.tar.bz2
+f011aa527e4b476f18f1fda9a043f81b  koffice-l10n-ca-1.4.1.tar.bz2
+8b56e381765bece8a32fec3b67e881c2  koffice-l10n-cs-1.4.1.tar.bz2
+e15377d70faef67a91a361b421b8be84  koffice-l10n-cy-1.4.1.tar.bz2
+3bcda6ccf32a2b0916f5de47981be655  koffice-l10n-da-1.4.1.tar.bz2
+b54a04db280a5b00f0105407c24ce49c  koffice-l10n-de-1.4.1.tar.bz2
+a744de5d6e97a25257a809f7a0f79a11  koffice-l10n-el-1.4.1.tar.bz2
+deaaf836cce7efcd9c83d800a6b4e51b  koffice-l10n-en_GB-1.4.1.tar.bz2
+b779db42a85037de1c464c1027093ffb  koffice-l10n-es-1.4.1.tar.bz2
+0ecd275357b76d245b2367a1925bda59  koffice-l10n-et-1.4.1.tar.bz2
+a2e26094907dc77365266c215183c587  koffice-l10n-fi-1.4.1.tar.bz2
+37a18640975a8a1ba38044a6ea7dbd37  koffice-l10n-fr-1.4.1.tar.bz2
+95e046ab8097fda8b4f146b4a625b7a3  koffice-l10n-hu-1.4.1.tar.bz2
+cac43b60ea3d01cfa0ac337bc0a296be  koffice-l10n-it-1.4.1.tar.bz2
+0d9c12a3881861377130801a3a431dd2  koffice-l10n-nb-1.4.1.tar.bz2
+a960e30b5bd883ed71ada339f238bb38  koffice-l10n-nl-1.4.1.tar.bz2
+7e55ada0f26bc0125ae26ab7c7b1eae2  koffice-l10n-nn-1.4.1.tar.bz2
+c6c38ec4a42d2c2abd289b83e2398c21  koffice-l10n-pl-1.4.1.tar.bz2
+af2c79e0694d913a749a9591598641c5  koffice-l10n-pt-1.4.1.tar.bz2
+96f2a0ba7a249078e64ea319b8f27dc9  koffice-l10n-pt_BR-1.4.1.tar.bz2
+d198b6cc3574ea9305701a48324085bb  koffice-l10n-ru-1.4.1.tar.bz2
+3c27784f5630ca6f3b0cfbae89271176  koffice-l10n-sl-1.4.1.tar.bz2
+f49d2141aa8bd2c68f0ab892cdc4e1a8  koffice-l10n-sr-1.4.1.tar.bz2
+58ffb4991e48caa73f434f30ca2b4761  koffice-l10n-sv-1.4.1.tar.bz2
+43e954db7f2af6f4c4f34a85a31e33d2  koffice-l10n-ta-1.4.1.tar.bz2
+2e35a578c8afb853ef5c23e71c2d575e  koffice-l10n-tg-1.4.1.tar.bz2
+02491c50d888600dccd1685a9ef7ed6c  koffice-l10n-zh_CN-1.4.1.tar.bz2


Index: subdirs-koffice
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/subdirs-koffice,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subdirs-koffice	20 Jul 2005 09:21:50 -0000	1.1
+++ subdirs-koffice	20 Jul 2005 16:25:37 -0000	1.2
@@ -1,27 +1,27 @@
-af
+bg
 ca
 cs
+cy
 da
 de
 el
 en_GB
 es
 et
+fi
 fr
-he
 hu
 it
-ja
-nl
 nb
+nl
 nn
 pl
 pt
 pt_BR
 ru
-sk
 sl
+sr
 sv
-tr
+ta
+tg
 zh_CN
-zh_TW


--- koffice-1.3-menu.patch DELETED ---


--- koffice-1.3.1-rpath.patch DELETED ---


--- koffice-1.3.5-immodule.patch DELETED ---


--- post-1.3.5-koffice.diff DELETED ---



From fedora-extras-commits at redhat.com  Wed Jul 20 16:28:06 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 12:28:06 -0400
Subject: rpms/koffice/devel koffice-l10n-es-1.4.1-broken.patch,NONE,1.1
Message-ID: <200507201628.j6KGS6c2014681@cvs-int.fedora.redhat.com>

Author: than

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

Added Files:
	koffice-l10n-es-1.4.1-broken.patch 
Log Message:
fix broken docbooks


koffice-l10n-es-1.4.1-broken.patch:

--- NEW FILE koffice-l10n-es-1.4.1-broken.patch ---
--- koffice-l10n-es-1.4.1/docs/koffice/kword/index.docbook.tn	2005-07-20 12:45:37.000000000 +0200
+++ koffice-l10n-es-1.4.1/docs/koffice/kword/index.docbook	2005-07-20 13:18:38.000000000 +0200
@@ -3110,6 +3110,15 @@
 
 
 
+
+
+
+
+
+
+
 
 Encabezado
--- koffice-l10n-es-1.4.1/docs/koffice/kword/mailmerge.docbook.tn	2005-07-20 13:00:04.000000000 +0200
+++ koffice-l10n-es-1.4.1/docs/koffice/kword/mailmerge.docbook	2005-07-20 13:09:16.000000000 +0200
@@ -65,7 +65,7 @@
 
 Si quiere usar una base de datos SQL externa, haga clic Si quiere usar una base de datos SQL externa, haga clic aqu?? para tener acceso a las instrucciones.
@@ -353,7 +353,7 @@
 >
 
 Usar un documento de &kspread: para crear documentos personalizados es un proceso de tres pasos:
+>Usar un documento de &kspread; para crear documentos personalizados es un proceso de tres pasos:
 
 Tambi??n puede guardar una lista de distribuci??n usando el bot??n Guardar como lista de distribuci??n.... Si quiere m??s informaci??n sobre listas de distribuci??n puede ver la documentaci??n de la libreta de direcciones de &kde:.. Si quiere m??s informaci??n sobre listas de distribuci??n puede ver la documentaci??n de la libreta de direcciones de &kde;.
 
 &kword; puede verificar la ortograf??a de su documento mientras lo edita. Subrayar?? en rojo cualquier palabra que no encuentre en el diccionario. Este comportamiento lo puede activar y desactivar el usuario. Seleccionando HerramientasHerramientasVerificar ortograf??aComprobaci??n ortogr??fica autom??tica...

Author: qspencer

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 16:54:22 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:54:22 -0400
Subject: rpms/umfpack/devel - New directory
Message-ID: <200507201654.j6KGsMoW014817@cvs-int.fedora.redhat.com>

Author: qspencer

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

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




From fedora-extras-commits at redhat.com  Wed Jul 20 16:55:12 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:55:12 -0400
Subject: rpms/umfpack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507201655.j6KGtCRT014864@cvs-int.fedora.redhat.com>

Author: qspencer

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 20 16:55:13 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:55:13 -0400
Subject: rpms/umfpack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507201655.j6KGtDBW014869@cvs-int.fedora.redhat.com>

Author: qspencer

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

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


--- NEW 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 Jul 20 16:57:02 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:57:02 -0400
Subject: rpms/umfpack import.log,1.1,1.2
Message-ID: <200507201657.j6KGvWe7014940@cvs-int.fedora.redhat.com>

Author: qspencer

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/umfpack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Jul 2005 16:55:10 -0000	1.1
+++ import.log	20 Jul 2005 16:57:00 -0000	1.2
@@ -0,0 +1 @@
+umfpack-4_4-1:HEAD:umfpack-4.4-1.src.rpm:1121878610



From fedora-extras-commits at redhat.com  Wed Jul 20 16:57:02 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 12:57:02 -0400
Subject: rpms/umfpack/devel umfpack-4.4-make.patch, NONE, 1.1 umfpack.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200507201657.j6KGv2mR014935@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	.cvsignore sources 
Added Files:
	umfpack-4.4-make.patch umfpack.spec 
Log Message:
auto-import umfpack-4.4-1 on branch devel from umfpack-4.4-1.src.rpm

umfpack-4.4-make.patch:

--- NEW FILE umfpack-4.4-make.patch ---
--- AMD/Make/Make.include.~1~	2004-01-29 13:40:45.000000000 -0600
+++ AMD/Make/Make.include	2005-03-29 09:18:47.231800504 -0600
@@ -47,7 +47,7 @@
 # portable.  Try this option first, then use your architecture-specific
 # configuration, below, to add the BLAS library.  AMD ignores the -DNBLAS flag.
 
-CONFIG = -DNBLAS
+# CONFIG = -DNBLAS
 
 #------------------------------------------------------------------------------
 # Archicture-specific configuration (for both AMD and UMFPACK)


--- NEW FILE umfpack.spec ---
Name:           umfpack
Version:        4.4
Release:        1
Summary:        Routines for solving unsymmetric sparse linear systems

Group:          System Environment/Libraries
License:        Distributable
URL:            http://www.cise.ufl.edu/research/sparse/umfpack/
Source0:        http://www.cise.ufl.edu/research/sparse/umfpack/v4.4/UMFPACKv4.4.tar.gz
Patch0:         umfpack-4.4-make.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
UMFPACK is a set of routines for solving unsymmetric sparse linear
systems, Ax=b, using the Unsymmetric MultiFrontal method. Written in
ANSI/ISO C, with a MATLAB (Version 6.0 and later) interface.

Version 4.x uses dynamic memory allocation, and has a symbolic preordering
and analysis phase that also reports the upper bounds on the nonzeros
in L and U, flop count, and memory usage in the numeric phase. It supports
matrices that are both real and complex, rectangular and square, and
singular or non-singular.

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

%description devel
The umfpack-devel package contains files needed for developing
applications which use umfpack.


%prep
%setup -q -n UMFPACKv%{version}
%patch0 -p0


%build
%define amd_version 1.1
%define amd_version_major 1
%define version_major 4
pushd AMD
  pushd Source
    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
    gcc -shared -Wl,-soname,libamd.so.%{amd_version_major} -o ../Lib/libamd.so.%{amd_version} `ls *.o`
  popd
  cp Lib/*.a Lib/*.so* Include/*.h ..
  cp Doc/License ../AMD_License
  cp Doc/ChangeLog ../AMD_ChangeLog
popd
ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major}
ln -sf libamd.so.%{amd_version} libamd.so
pushd UMFPACK
  pushd Source
    make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" 
    gcc -shared -Wl,-soname,libumfpack.so.%{version_major} -o ../Lib/libumfpack.so.%{version} `ls *.o` -lblas -lm
  popd
  cp Lib/*.a Lib/*.so* Include/*.h ..
  cp Doc/License ../UMFPACK_License
  cp Doc/ChangeLog ../UMFPACK_ChangeLog
popd
ln -sf libumfpack.so.%{version} libumfpack.so.%{version_major}
ln -sf libumfpack.so.%{version} libumfpack.so


%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/%{name}
for f in *.a *.so*; do
  cp -a $f ${RPM_BUILD_ROOT}%{_libdir}/$f
done
for f in *.h;  do
  cp -a $f ${RPM_BUILD_ROOT}%{_includedir}/%{name}/$f
done


%clean
rm -rf ${RPM_BUILD_ROOT}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


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

%files devel
%defattr(-,root,root)
%doc AMD/Doc/*.pdf UMFPACK/Doc/*.pdf
%{_includedir}/umfpack
%{_libdir}/lib*.a
%{_libdir}/lib*.so

%changelog
* Wed Jul 20 2005 Quentin Spencer  4.4-1
- First version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/umfpack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jul 2005 16:55:11 -0000	1.1
+++ .cvsignore	20 Jul 2005 16:57:00 -0000	1.2
@@ -0,0 +1 @@
+UMFPACKv4.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/umfpack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jul 2005 16:55:11 -0000	1.1
+++ sources	20 Jul 2005 16:57:00 -0000	1.2
@@ -0,0 +1 @@
+6f4de37ec711c406a50f5d6760ea9f06  UMFPACKv4.4.tar.gz



From ivazquez at ivazquez.net  Wed Jul 20 17:05:46 2005
From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams)
Date: Wed, 20 Jul 2005 13:05:46 -0400
Subject: rpms/inadyn/devel .cvsignore, 1.2, 1.3 inadyn.spec, 1.10, 1.11
	sources, 1.2, 1.3
In-Reply-To: <200507201615.j6KGFLw2014579@cvs-int.fedora.redhat.com>
References: <200507201615.j6KGFLw2014579@cvs-int.fedora.redhat.com>
Message-ID: <1121879146.28256.44.camel@ignacio.lan>

On Wed, 2005-07-20 at 12:15 -0400, Jochen Schmitt wrote:
> Author: s4504kr
> 
> Update of /cvs/extras/rpms/inadyn/devel
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14556
> 
> Modified Files:
> 	.cvsignore inadyn.spec sources 
> Log Message:
> 
>   Description:
>     New upstream release.

>  Name:           inadyn
> -Version:        1.90
> -Release:        11%{?dist}
> +
> +Version:        1.95
> +Release:        1

Don't forget to put the dist tag back afterwards if you still need it.
 
>  %setup -q -c
>  
>  %build
> -make -f makefile.linux CFLAGS="$RPM_OPT_FLAGS"
> +cd inadyn
> +make CFLAGS="$RPM_OPT_FLAGS"

If you change the setup line to "%setup -q -n inadyn" then you won't
have to worry about going into the inadyn dir everywhere else.

-- 
Ignacio Vazquez-Abrams 
http://fedora.ivazquez.net/

gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: 

From fedora-extras-commits at redhat.com  Wed Jul 20 17:27:52 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Wed, 20 Jul 2005 13:27:52 -0400
Subject: rpms/koffice/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200507201727.j6KHRqPn016244@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	.cvsignore sources 
Log Message:
1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Jul 2005 16:25:37 -0000	1.3
+++ .cvsignore	20 Jul 2005 17:27:50 -0000	1.4
@@ -27,3 +27,4 @@
 koffice-l10n-ta-1.4.1.tar.bz2
 koffice-l10n-tg-1.4.1.tar.bz2
 koffice-l10n-zh_CN-1.4.1.tar.bz2
+koffice-1.4.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jul 2005 16:25:37 -0000	1.3
+++ sources	20 Jul 2005 17:27:50 -0000	1.4
@@ -25,3 +25,4 @@
 43e954db7f2af6f4c4f34a85a31e33d2  koffice-l10n-ta-1.4.1.tar.bz2
 2e35a578c8afb853ef5c23e71c2d575e  koffice-l10n-tg-1.4.1.tar.bz2
 02491c50d888600dccd1685a9ef7ed6c  koffice-l10n-zh_CN-1.4.1.tar.bz2
+91a7b68757addc5934c5a8209a4926d5  koffice-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jul 20 18:11:39 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 14:11:39 -0400
Subject: extras-buildsys/server BuildMaster.py, 1.17, 1.18 UserInterface.py,
	1.22, 1.23
Message-ID: <200507201811.j6KIBdJT017490@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17471/server

Modified Files:
	BuildMaster.py UserInterface.py 
Log Message:
Add an endtime to jobs


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BuildMaster.py	18 Jul 2005 21:11:27 -0000	1.17
+++ BuildMaster.py	20 Jul 2005 18:11:37 -0000	1.18
@@ -55,8 +55,8 @@
             curs.execute('CREATE TABLE jobs (uid INTEGER PRIMARY KEY, ' \
                 'username VARCHAR(20), package VARCHAR(50), ' \
                 'cvs_tag VARCHAR(255), target VARCHAR(20), ' \
-                'buildreq VARCHAR(75), time_submitted BIGINT, ' \
-                'status VARCHAR(15))')
+                'buildreq VARCHAR(75), starttime BIGINT, ' \
+                'endtime BIGINT, status VARCHAR(15))')
         except sqlite.OperationalError, e:
             print "Could not access the job database.  Reason: '%s'.  Exiting..." % e
             os._exit(1)
@@ -215,6 +215,13 @@
             uid = job.get_uid()
             self._write_job_status_to_db(uid, curstage)
 
+            # Update job end time
+            try:
+                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (time.time(), uid))
+            except sqlite.OperationalError, e:
+                print "DB Error: could not access jobs database. Reason: '%s'" % e
+            self.dbcx.commit()
+
             # If there are any status updates in the queue for this job, remove them
             self._status_updates_lock.acquire()
             if self._status_updates.has_key(uid):
@@ -286,8 +293,8 @@
                 continue
 
             self.curs.execute('INSERT INTO jobs (uid, username, package,' \
-                    ' cvs_tag, target, buildreq, time_submitted, status)' \
-                    ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, "%s")' \
+                    ' cvs_tag, target, buildreq, starttime, endtime, status)' \
+                    ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s")' \
                     % (item['email'], item['package'], locator, item['target'], \
                     item['buildreq'], item['time'], 'waiting'))
             self.dbcx.commit()
@@ -295,7 +302,7 @@
             # Find the UID
             self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \
                     ' package="%s" AND cvs_tag="%s" AND target="%s" AND' \
-                    ' buildreq="%s" AND time_submitted=%d AND status="waiting"' \
+                    ' buildreq="%s" AND starttime=%d AND status="waiting"' \
                     % (item['email'], item['package'], locator, item['target'], \
                     item['buildreq'], item['time']))
             self.dbcx.commit()


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- UserInterface.py	20 Jul 2005 16:10:39 -0000	1.22
+++ UserInterface.py	20 Jul 2005 18:11:37 -0000	1.23
@@ -151,7 +151,7 @@
     def list_jobs(self, args_dict):
         """ Query job information and return it to the user """
 
-        sql = 'SELECT uid, username, package, cvs_tag, target, time_submitted, status FROM jobs WHERE '
+        sql = 'SELECT uid, username, package, cvs_tag, target, starttime, endtime, status FROM jobs WHERE '
         sql_args = []
 
         if args_dict.has_key('email') and args_dict['email']:
@@ -211,8 +211,9 @@
             jobrec['package'] = row[2]
             jobrec['source'] = row[3]
             jobrec['target'] = row[4]
-            jobrec['submit_time'] = row[5]
-            jobrec['status'] = row[6]
+            jobrec['starttime'] = row[5]
+            jobrec['endtime'] = row[6]
+            jobrec['status'] = row[7]
             jobrec['archjobs'] = []
             jobs.append(copy.deepcopy(jobrec))
 



From fedora-extras-commits at redhat.com  Wed Jul 20 19:42:32 2005
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 20 Jul 2005 15:42:32 -0400
Subject: common tobuild,1.1962,1.1963
Message-ID: <200507201942.j6KJgWRL018846@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18829

Modified Files:
	tobuild 
Log Message:
request build of rpms/umfpack/devel umfpack-4_4-1 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1962
retrieving revision 1.1963
diff -u -r1.1962 -r1.1963
--- tobuild	20 Jul 2005 12:12:08 -0000	1.1962
+++ tobuild	20 Jul 2005 19:42:30 -0000	1.1963
@@ -103,3 +103,4 @@
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
 karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
+qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel



From fedora-extras-commits at redhat.com  Wed Jul 20 19:56:43 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 15:56:43 -0400
Subject: extras-buildsys/server UserInterface.py,1.23,1.24
Message-ID: <200507201956.j6KJuhuW018886@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18869/server

Modified Files:
	UserInterface.py 
Log Message:
Add an XMLRPC method to return targets the server supports


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- UserInterface.py	20 Jul 2005 18:11:37 -0000	1.23
+++ UserInterface.py	20 Jul 2005 19:56:41 -0000	1.24
@@ -72,6 +72,12 @@
         return None
     return uid
 
+def validate_target(target):
+    target_dict = config_opts['targets']
+    if target in target_dict.keys():
+        return True
+    return False
+
 
 class UserInterface:
     """
@@ -185,6 +191,11 @@
                 return (-1, "Error: Invalid job UID.", [])
             sql_args.append('uid<%d' % uid)
 
+        if args_dict.has_key('target') and args_dict['target']:
+            if not validate_target(args_dict['target']):
+                return (-1, "Error: Invalid job UID.", [])
+            sql_args.append('target="%s"' % args_dict['target'])
+
         if not len(sql_args):
             return (-1, "Error: Invalid query.", [])
 
@@ -261,6 +272,10 @@
         builder_list = self._builder_manager.list_builders()
         return (0, "Success.", builder_list)
 
+    def targets(self):
+        target_dict = config_opts['targets']
+        return target_dict.keys()
+
 
 class UserInterfaceSSLAuth(UserInterface):
     """
@@ -313,6 +328,11 @@
         return UserInterface.list_builders(self)
 
 
+    def targets(self):
+        user = AuthedXMLRPCServer.get_authinfo()
+        return UserInterface.targets(self)
+
+
 class UserInterfaceNoAuth(UserInterface):
     """
     Allow all operations, NULL authentication



From fedora-extras-commits at redhat.com  Wed Jul 20 20:50:09 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 20 Jul 2005 16:50:09 -0400
Subject: extras-buildsys/server Builder.py, 1.7, 1.8 BuilderManager.py, 1.6,
	1.7
Message-ID: <200507202050.j6KKo9u6020085@cvs-int.fedora.redhat.com>

Author: dcbw

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

Modified Files:
	Builder.py BuilderManager.py 
Log Message:
Return unavailable builders in the builder list


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Builder.py	16 Jul 2005 15:47:43 -0000	1.7
+++ Builder.py	20 Jul 2005 20:50:07 -0000	1.8
@@ -210,17 +210,17 @@
         return self._prepping_jobs
 
     def to_dict(self):
-        client_dict = {}
-        client_dict['address'] = self._address
+        builder_dict = {}
+        builder_dict['address'] = self._address
         arches = []
         for target in self._target_arches.keys():
             for arch in self._target_arches[target]:
                 if not arch in arches:
                     arches.append(arch)
-        client_dict['arches'] = arches
+        builder_dict['arches'] = arches
         if self._cur_jobid:
-            client_dict['status'] = 'building'
+            builder_dict['status'] = 'building'
         else:
-            client_dict['status'] = 'idle'
-        return client_dict
+            builder_dict['status'] = 'idle'
+        return builder_dict
 


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BuilderManager.py	18 Jul 2005 19:07:48 -0000	1.6
+++ BuilderManager.py	20 Jul 2005 20:50:07 -0000	1.7
@@ -111,6 +111,21 @@
         builder_list = []
         for builder in self.running_builders:
             builder_list.append(builder.to_dict())
+
+        # Add unavailable builders
+        for builder in self.possible_builders:
+            found = False
+            for tmp in builder_list:
+                if builder == tmp['address']:
+                    found = True
+            if found:
+                continue
+            builder_dict = {}
+            builder_dict['address'] = builder
+            builder_dict['arches'] = []
+            builder_dict['status'] = "unavailable"
+            builder_list.append(builder_dict)
+
         return builder_list
 
     def have_work(self):



From fedora-extras-commits at redhat.com  Wed Jul 20 22:27:50 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 20 Jul 2005 18:27:50 -0400
Subject: rpms/p7zip/FC-4 p7zip.spec,1.2,1.3
Message-ID: <200507202228.j6KMSbRZ022806@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	p7zip.spec 
Log Message:
Convert spec files to UTF-8 (and find out what the aogon is!).



Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/FC-4/p7zip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- p7zip.spec	5 Jun 2005 21:14:15 -0000	1.2
+++ p7zip.spec	20 Jul 2005 22:27:47 -0000	1.3
@@ -100,13 +100,13 @@
 - Move files from /usr/share to /usr/libexec.
 - Various other minor changes.
 
-* Mon Jan 24 2005 Marcin Zaj?czkowski 
+* Mon Jan 24 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14.01
 
-* Sun Jan 16 2005 Marcin Zaj?czkowski 
+* Sun Jan 16 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14
 
-* Mon Dec 20 2004 Marcin Zaj?czkowski 
+* Mon Dec 20 2004 Marcin Zaj??czkowski 
  - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z
    use it simultaneously
  - returned to plugins in separate package
@@ -116,14 +116,14 @@
  - added 7z (not just 7za) with a shell wrapper
  - added gcc-c++ to the BuildRequires list
 
-* Sat Nov 20 2004 Marcin Zaj?czkowski 
+* Sat Nov 20 2004 Marcin Zaj??czkowski 
  - upgraded to 4.12
  - added virtual file system for Midnight Commander
 
-* Thu Nov 11 2004 Marcin Zaj?czkowski 
+* Thu Nov 11 2004 Marcin Zaj??czkowski 
  - upgraded to 4.10
  - plugins support was dropped out from p7zip
 
-* Sun Aug 29 2004 Marcin Zaj?czkowski 
+* Sun Aug 29 2004 Marcin Zaj??czkowski 
  - initial release
 



From fedora-extras-commits at redhat.com  Wed Jul 20 22:27:51 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 20 Jul 2005 18:27:51 -0400
Subject: rpms/p7zip/devel p7zip.spec,1.2,1.3
Message-ID: <200507202228.j6KMSb9I022807@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	p7zip.spec 
Log Message:
Convert spec files to UTF-8 (and find out what the aogon is!).



Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- p7zip.spec	5 Jun 2005 21:14:16 -0000	1.2
+++ p7zip.spec	20 Jul 2005 22:27:49 -0000	1.3
@@ -100,13 +100,13 @@
 - Move files from /usr/share to /usr/libexec.
 - Various other minor changes.
 
-* Mon Jan 24 2005 Marcin Zaj?czkowski 
+* Mon Jan 24 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14.01
 
-* Sun Jan 16 2005 Marcin Zaj?czkowski 
+* Sun Jan 16 2005 Marcin Zaj??czkowski 
  - upgraded to 4.14
 
-* Mon Dec 20 2004 Marcin Zaj?czkowski 
+* Mon Dec 20 2004 Marcin Zaj??czkowski 
  - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z
    use it simultaneously
  - returned to plugins in separate package
@@ -116,14 +116,14 @@
  - added 7z (not just 7za) with a shell wrapper
  - added gcc-c++ to the BuildRequires list
 
-* Sat Nov 20 2004 Marcin Zaj?czkowski 
+* Sat Nov 20 2004 Marcin Zaj??czkowski 
  - upgraded to 4.12
  - added virtual file system for Midnight Commander
 
-* Thu Nov 11 2004 Marcin Zaj?czkowski 
+* Thu Nov 11 2004 Marcin Zaj??czkowski 
  - upgraded to 4.10
  - plugins support was dropped out from p7zip
 
-* Sun Aug 29 2004 Marcin Zaj?czkowski 
+* Sun Aug 29 2004 Marcin Zaj??czkowski 
  - initial release
 



From fedora-extras-commits at redhat.com  Thu Jul 21 01:07:44 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 20 Jul 2005 21:07:44 -0400
Subject: rpms/mod_security/FC-4 mod_security.conf, 1.1, 1.2 mod_security.spec,
	1.2, 1.3
Message-ID: <200507210107.j6L17iZr027190@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	mod_security.conf mod_security.spec 
Log Message:
Sync with devel



Index: mod_security.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_security.conf	19 May 2005 01:39:17 -0000	1.1
+++ mod_security.conf	21 Jul 2005 01:07:42 -0000	1.2
@@ -1,5 +1,4 @@
 # Example configuration file for the mod_security Apache module
-# This is a minimal setup. You should add some extra entries here.
 
 LoadModule security_module modules/mod_security.so
 
@@ -38,18 +37,18 @@
     # SecFilter 111
    
     # Prevent path traversal (..) attacks
-    SecFilter "\.\./"
+    # SecFilter "\.\./"
 
     # Weaker XSS protection but allows common HTML tags
-    SecFilter "<( |\n)*script"
+    # SecFilter "<( |\n)*script"
 
     # Prevent XSS atacks (HTML/Javascript injection)
-    SecFilter "<(.|\n)+>"
+    # SecFilter "<(.|\n)+>"
 
     # Very crude filters to prevent SQL injection attacks
-    SecFilter "delete[[:space:]]+from"
-    SecFilter "insert[[:space:]]+into"
-    SecFilter "select.+from"
+    # SecFilter "delete[[:space:]]+from"
+    # SecFilter "insert[[:space:]]+into"
+    # SecFilter "select.+from"
 
     # Require HTTP_USER_AGENT and HTTP_HOST headers
     SecFilterSelective "HTTP_USER_AGENT|HTTP_HOST" "^$"
@@ -69,4 +68,40 @@
     # (and you don't need it anyway)
     SecFilterSelective HTTP_Transfer-Encoding "!^$"
 
-    
+    # Some common application-related rules from
+    # http://modsecrules.monkeydev.org/rules.php?safety=safe
+
+    #Nuke Bookmarks XSS
+    SecFilterSelective THE_REQUEST "/modules\.php\?name=Bookmarks\&file=(del_cat\&catname|del_mark\&markname|edit_cat\&catname|edit_cat\&catcomment|marks\&catname|uploadbookmarks\&category)=(<[[:space:]]*script|(http|https|ftp)\:/)"
+
+    #Nuke Bookmarks Marks.php SQL Injection Vulnerability
+    SecFilterSelective THE_REQUEST "modules\.php\?name=Bookmarks\&file=marks\&catname=.*\&category=.*/\*\*/(union|select|delete|insert)"
+
+    #PHPNuke general XSS attempt
+    #/modules.php?name=News&file=article&sid=1&optionbox=
+    SecFilterSelective THE_REQUEST "/modules\.php\?*name=<[[:space:]]*script"
+
+    # PHPNuke SQL injection attempt
+    SecFilterSelective THE_REQUEST "/modules\.php\?*name=Search*instory="
+
+    #phpnuke sql insertion
+    SecFilterSelective THE_REQUEST "/modules\.php*name=Forums.*file=viewtopic*/forum=.*\'/"
+
+    # WEB-PHP phpbb quick-reply.php arbitrary command attempt
+
+    SecFilterSelective THE_REQUEST "/quick-reply\.php" chain
+    SecFilter "phpbb_root_path="
+
+    #Topic Calendar Mod for phpBB Cross-Site Scripting Attack
+    SecFilterSelective THE_REQUEST "/calendar_scheduler\.php\?start=(<[[:space:]]*script|(http|https|ftp)\:/)"
+    
+    # phpMyAdmin: Safe
+
+    #phpMyAdmin Export.PHP File Disclosure Vulnerability
+    SecFilterSelective SCRIPT_FILENAME "export\.php$" chain
+    SecFilterSelective ARG_what "\.\."
+
+    #phpMyAdmin path vln
+    SecFilterSelective REQUEST_URI "/css/phpmyadmin\.css\.php\?GLOBALS\[cfg\]\[ThemePath\]=/etc"
+    	
+


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_security.spec	19 May 2005 06:42:01 -0000	1.2
+++ mod_security.spec	21 Jul 2005 01:07:42 -0000	1.3
@@ -1,20 +1,20 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.8.7
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-1.8.7.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-%{version}.tar.gz
 Source1: mod_security.conf
-BuildRoot: %{_tmppath}/%{name}-root/
-Requires: httpd >= 2.0.38
-BuildRequires: httpd-devel >= 2.0.38
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
+BuildRequires: httpd-devel
 
 %description
-ModSecurity is an open source intrusion detection and prevention engine for web
-applications. It operates embedded into the web server, acting as a powerful
-umbrella - shielding web applications from attacks.
+ModSecurity is an open source intrusion detection and prevention engine
+for web applications. It operates embedded into the web server, acting
+as a powerful umbrella - shielding web applications from attacks.
 
 %prep
 
@@ -40,6 +40,15 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Sat Jul 9 2005 Michael Fleming  1.8.7-4
+- Add Requires: httpd-mmn to get the appropriate "module magic" version
+  (thanks Ville Skytt?)
+- Disabled an overly-agressive rule or two..
+
+* Sat Jul 9 2005 Michael Fleming  1.8.7-3
+- Correct Buildroot
+- Some sensible and safe rules for common apps in mod_security.conf
+
 * Thu May 19 2005 Michael Fleming  1.8.7-2
 - Don't strip the module (so we can get a useful debuginfo package)
 



From fedora-extras-commits at redhat.com  Thu Jul 21 01:12:46 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 20 Jul 2005 21:12:46 -0400
Subject: common tobuild,1.1963,1.1964
Message-ID: <200507210112.j6L1Ck1g027283@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27266

Modified Files:
	tobuild 
Log Message:
request build of rpms/mod_security/FC-3 mod_security-1_8_7-4_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1963
retrieving revision 1.1964
diff -u -r1.1963 -r1.1964
--- tobuild	20 Jul 2005 19:42:30 -0000	1.1963
+++ tobuild	21 Jul 2005 01:12:44 -0000	1.1964
@@ -104,3 +104,4 @@
 karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
 karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
+mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3



From fedora-extras-commits at redhat.com  Thu Jul 21 01:13:15 2005
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 20 Jul 2005 21:13:15 -0400
Subject: common tobuild,1.1964,1.1965
Message-ID: <200507210113.j6L1DFLC027316@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27299

Modified Files:
	tobuild 
Log Message:
request build of rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1964
retrieving revision 1.1965
diff -u -r1.1964 -r1.1965
--- tobuild	21 Jul 2005 01:12:44 -0000	1.1964
+++ tobuild	21 Jul 2005 01:13:13 -0000	1.1965
@@ -105,3 +105,4 @@
 karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
+mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 02:10:59 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 20 Jul 2005 22:10:59 -0400
Subject: owners owners.list,1.22,1.23
Message-ID: <200507210210.j6L2AxYP028593@cvs-int.fedora.redhat.com>

Author: tagoh

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

Modified Files:
	owners.list 
Log Message:
added apel


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- owners.list	17 Jul 2005 16:29:02 -0000	1.22
+++ owners.list	21 Jul 2005 02:10:57 -0000	1.23
@@ -26,6 +26,7 @@
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|apachetop|A top-like display of Apache logs|gauret at free.fr|extras-qa at fedoraproject.org|
+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|



From fedora-extras-commits at redhat.com  Thu Jul 21 04:03:36 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:03:36 -0400
Subject: extras-buildsys/www - New directory
Message-ID: <200507210403.j6L43aGn031007@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30993/www

Log Message:
Directory /cvs/fedora/extras-buildsys/www added to the repository




From fedora-extras-commits at redhat.com  Thu Jul 21 04:04:35 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:04:35 -0400
Subject: extras-buildsys/www/css - New directory
Message-ID: <200507210404.j6L44ZCt031025@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31015/css

Log Message:
Directory /cvs/fedora/extras-buildsys/www/css added to the repository




From fedora-extras-commits at redhat.com  Thu Jul 21 04:05:01 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:05:01 -0400
Subject: extras-buildsys/www/template - New directory
Message-ID: <200507210405.j6L451oW031037@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31015/template

Log Message:
Directory /cvs/fedora/extras-buildsys/www/template added to the repository




From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:55 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:55 -0400
Subject: extras-buildsys ChangeLog,1.66,1.67
Message-ID: <200507210407.j6L47tP9031182@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121

Modified Files:
	ChangeLog 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog	20 Jul 2005 14:51:47 -0000	1.66
+++ ChangeLog	21 Jul 2005 04:07:53 -0000	1.67
@@ -1,3 +1,8 @@
+2005-07-21  Dan Williams 
+
+    * www/*
+        - Add the web front-end
+
 2005-07-20  Dan Williams 
 
     * builder/builder.py



From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:56 -0400
Subject: extras-buildsys/www builders.psp, NONE, 1.1 config.psp, NONE,
	1.1 index.psp, NONE, 1.1 indiv.psp, NONE, 1.1
Message-ID: <200507210407.j6L47ubP031187@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/www

Added Files:
	builders.psp config.psp index.psp indiv.psp 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




--- NEW FILE builders.psp ---

<%
curpage = 'builders'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>


    

    

    

<%
import socket, xmlrpclib

args = {}
args['status'] = 'building'
try:
    (e, msg, jobs) = server.list_jobs(args)
    (e, msg, builders) = server.list_builders()
except socket.error, e:
    msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
except xmlrpclib.Fault, fault:
    msg = "XMLRPC Fault"
    e = -1

if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
else:
    for builder in builders:
        import urllib
        type, rest = urllib.splittype(builder['address'])
        addr, port = urllib.splitport(rest)
        addr = addr[2:]

        arch_list = ""
        for arch in builder['arches']:
            arch_list = arch_list + arch
            if arch != builder['arches'][len(builder['arches'])-1]:
                arch_list = arch_list + ", "
        # endfor

        unavail_color = ''
        if builder['status'] == 'unavailable':
            unavail_color = 'color="#ff4444"'
        # endif
%>

    
    
    
<%
        bjob = None
        for job in jobs:
            archjobs = job['archjobs']
            if not archjobs:
                continue
            job_text = 'Jobs:'
            for aj in archjobs:
                if aj['builder_addr'] == addr:
%>
        
<%
                # endif
                job_text = ''
            # endfor
        # endfor
%>
    
    
        
    
            ><%=addr%>  (<%=builder['status']%>)
            <%=arch_list%>
        
    
            
                
    
                
    
                    
    
                        
                            Job:
                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
                            Status:
                             <%=aj['status']%>/<%=aj['builder_status']%>
                        
                    
    
                
    
                
    
                		
        
    
    
    
    
    

<%
    # endfor
# endif
%>


    

<%@ include file="template/foot.psp"%>

    



--- NEW FILE config.psp ---
<%
config_opts = {}
config_opts['system_name'] = "Fedora Extras Build System"
config_opts['base_url'] = "http://127.0.0.1/"

%>


--- NEW FILE index.psp ---

<%
curpage = 'main'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>

<%
import socket, xmlrpclib
try:
    args = {}
    args['status'] = 'waiting'
    (e, msg, waiting_jobs) = server.list_jobs(args)
    args['status'] = 'building'
    (e, msg, building_jobs) = server.list_jobs(args)
except socket.error, e:
    msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
except xmlrpclib.Fault, fault:
    msg = "XMLRPC Fault"
    e = -1

if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
else:
    i = 1
%>


    

    


<%
    i = 1
    for job in building_jobs:
        # Don't show finished jobs older than 1 day
        col = '#efefef'
        if int(i / 2.0) == (i / 2.0):
            col = '#dddddd'
        # endif
        source = job['source']
        if '/' in source:
            import os
            source = os.path.basename(source)
        # endif
%>
        
<%
        i = i + 1
    # endfor

    for job in waiting_jobs:
        # Don't show finished jobs older than 1 day
        col = '#efefef'
        if int(i / 2.0) == (i / 2.0):
            col = '#dddddd'
        # endif
        source = job['source']
        if '/' in source:
            import os
            source = os.path.basename(source)
        # endif
%>
        
<%
        i = i + 1
    # endfor

    # No jobs...
    if i == 1:
%>
        
<%
    # endif
%>


    

    
    
    


    
    Job ID
    Package Name
    Source
    Status
    Target
    Submitter

    

    
            <%=job['uid']%>
            <%=job['package']%>
            <%=source%>
            <%=job['status']%>
            <%=job['target']%>
            <%=job['username']%>
        
    
            <%=job['uid']%>
            <%=job['package']%>
            <%=source%>
            <%=job['status']%>
            <%=job['target']%>
            <%=job['username']%>
        
    
            No jobs found.
        
    

    

    

    

<%
# endtry
%>

<%@ include file="template/foot.psp"%>

    



--- NEW FILE indiv.psp ---

<%
curpage = 'individual'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>

<%
if not len(user_email):
%>

    
    Email Address:  
    

    
<%
else:
    import socket, xmlrpclib
    args = {}
    args['email'] = str(user_email)
    cur_status = ''
    if form.has_key('status') and form['status']:
        cur_status = str(form['status'])
        if cur_status != 'ALL':
            args['status'] = cur_status
    cur_target = ''
    if form.has_key('target') and form['target']:
        cur_target = str(form['target'])
        if cur_target != 'ALL':
            args['target'] = cur_target
    try:
        (e, msg, jobs) = server.list_jobs(args)
        targets = server.targets()
        targets.insert(0, 'ALL')
    except socket.error, e:
        msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
    except xmlrpclib.Fault, fault:
        msg = "XMLRPC Fault"
        e = -1

    if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
    else:
%>

<%
        # default cutoff is 1 day
        cutoff_time = 86400

        status_list = ['ALL', 'waiting', 'building', 'addtorepo', 'needsign', 'failed', 'killed']
%>


    

    

    
    
    
        
            
    
                
    
                
    
                    Filter by:
                    
                        Status:
                        
                    
                    
                        Target:
                        
                    
                    
                
    
                
            
    
            		
    
    

    

    

    


    


<%
        i = 1
        for job in jobs:
            # Don't show finished jobs older than 1 day
            now = time.time()
            if job['status'] == 'killed' or job['status'] == 'needsign':
                if job['endtime'] != 0 and job['endtime'] < time.time() - cutoff_time:
                    continue
            col = '#efefef'
            if int(i / 2.0) == (i / 2.0):
                col = '#dddddd'
            # endif
            source = job['source']
            if '/' in source:
                import os
                source = os.path.basename(source)
            # endif
%>
        
<%
            i = i + 1
        # endfor

        # No jobs...
        if i == 1:
%>
        
<%
        # endif
    # endtry
%>


    

    
    
    


    
    Job ID
    Package Name
    Source
    Status
    Target

    

    
            <%=job['uid']%>
            <%=job['package']%>
            <%=source%>
            <%=job['status']%>
            <%=job['target']%>
        
    
            No jobs found.
        
    

    

    

    

<%
# endif
%>

<%@ include file="template/foot.psp"%>

    




From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:57 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:57 -0400
Subject: extras-buildsys/www/template foot.psp, NONE, 1.1 head.psp, NONE,
	1.1 main.psp, NONE, 1.1
Message-ID: <200507210407.j6L47vWw031197@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/www/template

Added Files:
	foot.psp head.psp main.psp 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




--- NEW FILE foot.psp ---

      
    
  



--- NEW FILE head.psp ---
<%@ include file="config.psp"%>
<%
import time

email_string = ''
email_url = ''
if len(user_email):
    email_string = "<" + user_email + ">"
    email_url = '?email=' + user_email
# endif

active_color = 'bgcolor="#0000cc"'

main_color = '#cc0000'
if curpage == 'main':
    main_color = active_color
builders_color = '#cc0000'
if curpage == 'builders':
    builders_color = active_color
indiv_color = '#cc0000'
if curpage == 'individual':
    indiv_color = active_color
#endif
%>


	
		Fedora Extras Build System
        
		
	
	


-            
+            
@@ -160,6 +164,7 @@
 
    
  
    
    
      
    
        
    
          <%=config_opts['system_name']%>  <%=str(email_string)%>
          Today is: <%=str(time.strftime("%A %B %d, %Y"))%>
        
    
        
    
            
                
    
                    
    
                        >Main
                        >Builders
                        >Individual View
                    
    
                
    
                		
        
    
      
    

      
      
@@ -86,7 +86,6 @@
         
 <%
                 # endif
-                job_text = ''
             # endfor
         # endfor
 %>


Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.psp	22 Jul 2005 05:39:19 -0000	1.2
+++ index.psp	23 Jul 2005 00:55:31 -0000	1.3
@@ -10,6 +10,7 @@
 try:
     args = {}
     args['status'] = 'waiting'
+    args['maxrows'] = 30
     (e, msg, waiting_jobs) = server.list_jobs(args)
     args['status'] = 'building'
     (e, msg, building_jobs) = server.list_jobs(args)
@@ -62,9 +63,11 @@
             import os
             source = os.path.basename(source)
         # endif
+
+        joblink = job_link(job['uid'])
 %>
         
-            
+            
@@ -90,7 +93,7 @@
         # endif
 %>
         
-            
+            
@@ -115,6 +118,7 @@
 
    
        
    
          
            
    


--- NEW FILE main.psp ---
<%
import time
import os
from plague import XMLRPCServerProxy
from OpenSSL import SSL

certs = {}
certs['key_and_cert'] = "/var/www/certs/fedora.cert"
certs['ca_cert'] = "/var/www/certs/fedora-upload-ca.cert"
certs['peer_ca_cert'] = "/var/www/certs/fedora-server-ca.cert"

server = XMLRPCServerProxy.PlgXMLRPCServerProxy("https://flare.boston.redhat.com:8887", certs)

action = 'status'
user_email = ''
if form.has_key('action'):
    action = str(form['action'])
if form.has_key('email'):
    user_email = str(form['email'])

# endif
%>



From fedora-extras-commits at redhat.com  Thu Jul 21 04:07:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 00:07:56 -0400
Subject: extras-buildsys/www/css style.css,NONE,1.1
Message-ID: <200507210407.j6L47uuT031192@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31121/www/css

Added Files:
	style.css 
Log Message:
2005-07-21  Dan Williams 

    * www/*
        - Add the web front-end




--- NEW FILE style.css ---
html {
	min-width: 800px;
}

body {
	margin: 0;
	padding: 0;
	text-align: center;
	background: #ffffff;
}

* {
	font-family:	"Luxi Sans", "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", helvetica, verdana, arial, sans-serif;
	font-size:	14px;
}

a:link {
	color:	#0468de;
}

table.page {
	width:			100%;
	border:			0px;
	background-color:	#ffffff;
	padding:			0px;
}


/*
-------------------------------
 Top table
-------------------------------
*/

table.top {
	text-align:		bottom;
	width:			100%;
	height:			75px;
	border:			0px;
    margin:         0px;
}

td.top {
    padding:        0px 2px 0px 2px;
    background-color:   #cc0000;
    vertical-align: bottom;
    text-align:     bottom;
    border-bottom:  1px solid #aaaaaa;
}

td.navtable-parent {
    background-color:   #ffffff;
    vertical-align: top;
}

table.navtable {
    background-color:   #cc0000;
    width:              auto;
    padding:            0px;
}

td.navtable-button-left {
    padding:            4px 17px 4px 17px;
}

td.navtable-button {
    padding:            4px 17px 4px 17px;
    border-left:        1px solid #d4d4d4;
}

font.header-text {
	font-size:	24px;
	font-weight:	800;
	color:		#ffffff;
	text-align:	left;
}

font.header-date {
	text-align:	right;
	font-weight:	bold;
	color: #ffffff;
}

a.navtable-button {
    text-align:         center;
    font-weight:        bold;
    color:              #ffffff;
    font-size:          12px;
    text-decoration:    none;
}

table.main {
	width:		100%;
	border:		0px;
}


/*
-------------------------------
 joblist table
-------------------------------
*/

#joblist table {
	padding:			0px;
	background-color:	#dedede;
	border:			solid 1px #999999;
	width:			80%;
	margin-bottom:		5px;
}

#joblist th {
    font-weight:    bold;
    font-size:      14px;
    border-bottom:  solid 1px #999999;
    padding:        3px;
}

#joblist td {
    font-size:      14px;
    text-align:     left;
    padding:        3px;
}

font.status-failed {
    color:          #aa0000;
    font-weight:    bold;
    font-size:      12px;
}

font.status-addtorepo {
    color:          #aaaa00;
    font-weight:    bold;
    font-size:      12px;
}

font.status-needsign {
    color:          #00aa00;
    font-weight:    bold;
    font-size:      12px;
}

font.status-building {
    color:          #0000aa;
    font-weight:    bold;
    font-size:      12px;
}


/*
-------------------------------
 builderlist table
-------------------------------
*/

#builderlist table {
    padding:            1px 2px 1px 2px;
    border:             solid 1px #999999;
    width:              60%; 
    background-color:   #dedede;
}

td.builderlist-head {
    font-size:      14px;
    padding:        1px 2px 1px 2px;
    border-bottom:  solid 1px #999999;
}

font.builderlistaddr {
    font-weight:    bold;
    font-size:      14px;
}

font.builderlistarches {
    font-size:      12px;
    text-align:     right;
}

#archjoblist table {
    padding:            1 px 2px 1px 2px;
    border:             none;
    background-color:   #efefef;
    width:              100%;
}

#archjoblist td {
    font-size:      14px;
    text-align:     left;
    padding-left:   2px;
    padding-right:  2px;
}

font.archjobtag {
    font-weight:    bold;
    font-size:      12px;
}



a.tasktable-item-option-link {
	font-size:	12px;
}

font.tasktable-item-option-nolink {
	font-weight:	800;
	font-size:	12px;
}

table.tasktable-parent-collapsed {
	width:		100%;
}

table.tasktable-parent-expanded {
	width:		100%;
}

a.tasktable-item-collapsed {
	text-align:		left;
	font-weight:		bold;
	border-bottom:		none;
	text-decoration:	none;
}

font.tasktable-item-aux {
	color:		#000000;
	text-align:	left;
	font-size:	12px;
}

a.tasktable-item-expanded {
	text-align:		left;
	font-weight:		bold;
	border-bottom:		none;
	text-decoration:	none;
}

td.tasktable-header {
	font-size:		12px;
	font-weight:		bold;
	color:			#000000;
	background-color:	#749CBB;
}

td.tasktable-task {
	font-size:		12px;
	border-bottom:		1px solid #bcd6f0;
	background-color:	inherit;
}

a.tasktable-bug-link {
	font-size:		12px;
}

td.tasktable-task-last {
	font-size:		12px;
	background-color:	inherit;
}

td.tasktable-no-tasks {
	font-style:		italic;
	background-color:	#ffffff;
}



From fedora-extras-commits at redhat.com  Thu Jul 21 05:42:23 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:23 -0400
Subject: rpms/nco - New directory
Message-ID: <200507210542.j6L5gNNE032553@cvs-int.fedora.redhat.com>

Author: edhill

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

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




From fedora-extras-commits at redhat.com  Thu Jul 21 05:42:23 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:23 -0400
Subject: rpms/nco/devel - New directory
Message-ID: <200507210542.j6L5gNUl032558@cvs-int.fedora.redhat.com>

Author: edhill

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

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




From fedora-extras-commits at redhat.com  Thu Jul 21 05:42:33 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:33 -0400
Subject: rpms/nco Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507210542.j6L5gX3t032605@cvs-int.fedora.redhat.com>

Author: edhill

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 21 05:42:34 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:42:34 -0400
Subject: rpms/nco/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507210542.j6L5gYBp032610@cvs-int.fedora.redhat.com>

Author: edhill

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

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


--- NEW 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 Jul 21 05:43:25 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:43:25 -0400
Subject: rpms/nco/devel nco-3.0.0-fixudunits.patch, NONE, 1.1 nco.spec, NONE,
	1.1 nco_install_C_headers.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200507210543.j6L5hPHE032684@cvs-int.fedora.redhat.com>

Author: edhill

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

Modified Files:
	.cvsignore sources 
Added Files:
	nco-3.0.0-fixudunits.patch nco.spec 
	nco_install_C_headers.patch 
Log Message:
auto-import nco-3.0.1-3 on branch devel from nco-3.0.1-3.src.rpm

nco-3.0.0-fixudunits.patch:

--- NEW FILE nco-3.0.0-fixudunits.patch ---
--- nco-3.0.0/configure.in.BAD	2005-04-22 10:53:36.000000000 -0500
+++ nco-3.0.0/configure.in	2005-04-22 10:53:54.000000000 -0500
@@ -408,10 +408,8 @@
     LDFLAGS="${LDFLAGS} -L${UDUNITS_PATH}/lib"
     CPPFLAGS="${CPPFLAGS} -I${UDUNITS_PATH}/include"
 #    nco_udunits_dat=${UDUNITS_PATH}/src/lib/udunits.dat
-  elif test "${NETCDF_INC}"; then
-    nco_udunits_dat="${NETCDF_INC}/../etc/udunits.dat"
   else
-    nco_udunits_dat="/usr/local/etc/udunits.dat"
+    nco_udunits_dat="/etc/udunits.dat"
   fi
 # warn if udunits.dat is not found, but continue anyway since the builder may savy and know to add it later, like when building packages (e.g. .debs)
   AC_CHECK_FILE([$nco_udunits_dat],,AC_WARN([file $nco_udunits_dat was not found but will be compiled into NCO. Some executables may fail without it.]))


--- NEW FILE nco.spec ---
Name:           nco
Version:        3.0.1
Release:        3%{?dist}
Summary:        Suite of programs for manipulating NetCDF/HDF4 files
Group:          Applications/Engineering
License:        GPL
URL:            http://nco.sourceforge.net/

#  The NCO web site now recommends CVS so the tar.gz was obtained
#  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
Patch0:		nco_install_C_headers.patch
Patch1:         nco-3.0.0-fixudunits.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  netcdf-devel, libtool, automake, autoconf
BuildRequires:  udunits, udunits-devel, opendap-devel
BuildRequires:  curl-devel, libxml2-devel, librx-devel

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

%description
The netCDF Operators, NCO, are a suite of command line programs known
as operators.  The operators facilitate manipulation and analysis of
self-describing data stored in the freely available netCDF and HDF
formats (http://www.unidata.ucar.edu/packages/netcdf and
http://hdf.ncsa.uiuc.edu, respectively).  Each NCO operator (e.g.,
ncks) takes netCDF or HDF input file(s), performs an operation (e.g.,
averaging, hyperslabbing, or renaming), and outputs a processed netCDF
file.  Although most users of netCDF and HDF data are involved in
scientific research, these data formats, and thus NCO, are generic and
are equally useful in fields from agriculture to zoology.  The NCO
User's Guide illustrates NCO use with examples from the field of
climate modeling and analysis.  The NCO homepage is
http://nco.sourceforge.net/.

%description devel
This package contains the NCO header files and static libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
aclocal
autoheader
automake --foreign
autoconf
export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
%configure --includedir=%{_includedir}/nco
make %{?_smp_mflags}
unset NETCDF_INC NETCDF_LIB CPPFLAGS

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/nco
make install DESTDIR=${RPM_BUILD_ROOT}
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir

%clean
rm -rf ${RPM_BUILD_ROOT}


%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/nco.info.gz \
    %{_infodir}/dir 2>/dev/null || :

%postun
/sbin/ldconfig
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/nco.info.gz \
    %{_infodir}/dir 2>/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc doc/README doc/LICENSE doc/rtfm.txt
%{_bindir}/*
%{_mandir}/*/*
%{_infodir}/*
%{_libdir}/libnco*[0-9]*.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/nco
%{_libdir}/libnco*.a
%{_libdir}/libnco.so
%{_libdir}/libnco_c++.so


%changelog
* Thu Jul 21 2005 Ed Hill  - 3.0.1-3
- add LICENSE file

* Sat Jul  9 2005 Ed Hill  - 3.0.1-2
- add BuildRequires: opendap-devel

* Sun Jun 19 2005 Ed Hill  - 3.0.1-1
- update to upstream 3.0.1
- comment & fixes for BuildRequires

* Sat Apr 23 2005 Ed Hill  - 3.0.0-2
- add BuildRequires and fix CXXFLAGS per Tom Callaway
- add udunits patch per Tom Callaway

* Sat Apr 16 2005 Ed Hill  - 3.0.0-1
- update to ver 3.0.0
- devel package fixes per D.M. Kaplan and M. Schwendt
- fix info post/postun

* Sun Dec  5 2004 Ed Hill  - 0:2.9.9-0.fdr.4
- sync with netcdf-3.6.0beta6-0.fdr.0
- split into devel and non-devel

* Wed Dec  1 2004 Ed Hill  - 0:2.9.9-0.fdr.3
- sync with netcdf-0:3.5.1-0.fdr.11
- added '-fpermissive' for GCC 3.4.2 warnings
- added "Provides:nco-devel" for the headers and libs

* Mon Oct  4 2004 Ed Hill  - 0:2.9.9-0.fdr.2
- Add some of Michael Schwendt's suggested INC/LIB path fixes and 
  sync with the netcdf-3.5.1-0.fdr.10 dependency.

* Thu Sep 23 2004 Ed Hill  - 0:2.9.9-0.fdr.1
- add NETCDF_INC and NETCDF_LIB to work on systems where old
  versions of netcdf may exist in /usr/local

* Wed Sep  8 2004 Ed Hill  - 0:2.9.9-0.fdr.0
- updated to ver 2.9.9

* Sat Aug  7 2004 Ed Hill  - 0:2.9.8-0.fdr.0
- updated to ver 2.9.8

* Sat Jul 17 2004 Ed Hill  - 0:2.9.7-0.fdr.2
- removed unneeded %ifarch

* Sat Jul 17 2004 Ed Hill  - 0:2.9.7-0.fdr.1
- Add %post,%postun

* Sat Jul 17 2004 Ed Hill  - 0:2.9.7-0.fdr.0
- Initial working version


nco_install_C_headers.patch:

--- NEW FILE nco_install_C_headers.patch ---
--- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
@@ -69,6 +69,8 @@
 # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
 libnco_la_LDFLAGS = -release @VERSION@
 
+include_HEADERS = $(HEADER_SRC)
+
 libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
 nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
 nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jul 2005 05:42:32 -0000	1.1
+++ .cvsignore	21 Jul 2005 05:43:23 -0000	1.2
@@ -0,0 +1 @@
+nco-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jul 2005 05:42:32 -0000	1.1
+++ sources	21 Jul 2005 05:43:23 -0000	1.2
@@ -0,0 +1 @@
+72f76553c95bc2b2fdaddcd7cc876f67  nco-3.0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 05:43:24 2005
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 21 Jul 2005 01:43:24 -0400
Subject: rpms/nco import.log,1.1,1.2
Message-ID: <200507210543.j6L5ht7Z032694@cvs-int.fedora.redhat.com>

Author: edhill

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nco/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jul 2005 05:42:31 -0000	1.1
+++ import.log	21 Jul 2005 05:43:22 -0000	1.2
@@ -0,0 +1 @@
+nco-3_0_1-3:HEAD:nco-3.0.1-3.src.rpm:1121924611



From fedora-extras-commits at redhat.com  Thu Jul 21 06:46:04 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 02:46:04 -0400
Subject: rpms/libapreq2/devel .cvsignore, 1.2, 1.3 libapreq2.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200507210646.j6L6k4Af001486@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore libapreq2.spec sources 
Log Message:
2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jul 2005 14:22:45 -0000	1.2
+++ .cvsignore	21 Jul 2005 06:46:02 -0000	1.3
@@ -1 +1 @@
-libapreq2-2.05-dev.tar.gz
+libapreq2-2.06-dev.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libapreq2.spec	10 Jul 2005 14:22:45 -0000	1.1
+++ libapreq2.spec	21 Jul 2005 06:46:02 -0000	1.2
@@ -1,9 +1,9 @@
 %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}}
 
 Name:           libapreq2
-Version:        2.05
-Release:        0.6
-Summary:        Generic Apache Request Library
+Version:        2.06
+Release:        1%{?dist}
+Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
@@ -13,7 +13,6 @@
 Patch0:         %{name}-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  httpd-devel >= 2.0.48
 BuildRequires:  libtool
 BuildRequires:  apr-devel >= 0.9.4
@@ -26,7 +25,10 @@
 Provides:       libapreq = %{version}-%{release}
 
 %description
-%{summary}.
+libapreq is a shared library with associated modules for manipulating
+client request data via the Apache API.  Functionality includes
+parsing of application/x-www-form-urlencoded and multipart/form-data
+content, as well as HTTP cookies.
 
 %package        devel
 Summary:        Development files for %{name}
@@ -39,14 +41,15 @@
 %{summary}.
 
 %package     -n perl-%{name}
-Summary:        Perl interface to %{name}
+Summary:        Perl interface to the Apache HTTP request library
 Group:          Development/Libraries
 Requires:       mod_perl >= 2.0.0-0.rc5
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-libapreq = %{version}-%{release}
 
 %description -n perl-%{name}
-%{summary}.
+This package contains a Perl interface to the Apache HTTP request
+library.
 
 
 %prep
@@ -77,7 +80,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 # make test # requires write access to system locations?
 
 
@@ -104,7 +107,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc __docs/*
+%doc STATUS __docs/*
 %{_bindir}/apreq2-config
 %{_includedir}/apreq2/
 %{_includedir}/httpd/apreq2/
@@ -121,6 +124,22 @@
 
 
 %changelog
+* Thu Jul 21 2005 Ville Skytt??  - 2.06-1
+- 2.06.
+
+* Tue Jul 19 2005 Ville Skytt??  - 2.06-0.2.rc4
+- 2.06-dev-rc4.
+
+* Sat Jul 16 2005 Ville Skytt??  - 2.06-0.2.rc3
+- 2.06-dev-rc3.
+
+* Wed Jul 13 2005 Ville Skytt??  - 2.06-0.2.rc2
+- 2.06-dev-rc2.
+
+* Sun Jul 10 2005 Ville Skytt??  - 2.06-0.1.rc1
+- 2.06-dev-rc1.
+- Improve summaries and descriptions.
+
 * Wed Jun 29 2005 Ville Skytt??  - 2.05-0.6
 - Rebuild with mod_perl 2.0.1.
 - Drop static libs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 14:22:45 -0000	1.2
+++ sources	21 Jul 2005 06:46:02 -0000	1.3
@@ -1 +1 @@
-0985e102b6d2bc9c747a56b04a85cba6  libapreq2-2.05-dev.tar.gz
+e245db341c4967e0a23b7f767d6486d9  libapreq2-2.06-dev.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 06:50:33 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 02:50:33 -0400
Subject: common tobuild,1.1965,1.1966
Message-ID: <200507210650.j6L6oX4K001516@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499

Modified Files:
	tobuild 
Log Message:
Prevent apel-xemacs from being built for now, use one from Sumo (#162952).


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1965
retrieving revision 1.1966
diff -u -r1.1965 -r1.1966
--- tobuild	21 Jul 2005 01:13:13 -0000	1.1965
+++ tobuild	21 Jul 2005 06:50:30 -0000	1.1966
@@ -93,7 +93,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 pfrields	rpms/nautilus-open-terminal/devel	nautilus-open-terminal-0_4-5_fc5	devel
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
-tagoh	rpms/apel/devel	apel-10_6-7_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
 jpo	rpms/perl-GD/FC-3	perl-GD-2_25-1_fc3	fc3
 jpo	rpms/perl-GD/FC-4	perl-GD-2_25-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 09:00:32 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 21 Jul 2005 05:00:32 -0400
Subject: fedora-security/audit fc4,1.27,1.28
Message-ID: <200507210900.j6L90WN6004600@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4583

Modified Files:
	fc4 
Log Message:
FC4 security updates for firefox, thunderbird, and mysql



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fc4	20 Jul 2005 09:45:53 -0000	1.27
+++ fc4	21 Jul 2005 09:00:30 -0000	1.28
@@ -3,25 +3,29 @@
 
 ** are items that need attention
 
-2005-2270 VULNERABLE (firefox, fixed 1.0.5)
+2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2270 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2269 VULNERABLE (firefox, fixed 1.0.5)
+2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2269 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2268 VULNERABLE (firefox, fixed 1.0.5)
+2005-2269 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2268 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2267 VULNERABLE (firefox, fixed 1.0.5)
-2005-2266 VULNERABLE (firefox, fixed 1.0.5)
+2005-2267 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2266 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2265 VULNERABLE (firefox, fixed 1.0.5)
-2005-2265 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2264 VULNERABLE (firefox, fixed 1.0.5)
-2005-2263 VULNERABLE (firefox, fixed 1.0.5)
+2005-2266 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
+2005-2265 VULNERABLE (mozilla, fixed 1.7.9) [si
+2005-2265 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2264 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2263 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2262 VULNERABLE (firefox, fixed 1.0.5)
-2005-2261 VULNERABLE (thunderbird, fixed 1.0.5)
-2005-2261 VULNERABLE (firefox, fixed 1.0.5)
+2005-2262 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+2005-2261 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2261 VULNERABLE (mozilla, fixed 1.7.9)
-2005-2260 VULNERABLE (firefox, fixed 1.0.5)
+2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2260 VULNERABLE (mozilla, fixed 1.7.9)
 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
 2005-2114 ** mozilla, can't find out when this was fixed upstream
@@ -29,7 +33,7 @@
 2005-2096 backport (rpm) [since FEDORA-2005-565]
 2005-2095 VULNERABLE (squirrelmail)
 2005-2088 VULNERABLE (httpd)
-2005-1937 VULNERABLE (firefox, fixed 1.0.5)
+2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-1937 VULNERABLE (mozilla, fixed 1.7.9)
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
@@ -66,10 +70,11 @@
 2005-1704 backport (binutils) ...eadelf-overflows.patch [since FEDORA-2005-498]
 2005-1689 backport (krb5) [since FEDORA-2005-553]
 2005-1686 ignore (gedit, not a vulnerability)
-2005-1636 VULNERABLE (mysql, fixed 4.1.12) minor issue
+2005-1636 version (mysql, fixed 4.1.12) [since FEDORA-2005-557]
 2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0
 2005-1544 version (libtiff, fixed 3.7.1 at least)
 2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
+2005-1532 version (thunderbird) [since FEDORA-2005-606]
 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]
@@ -120,7 +125,9 @@
 2005-1175 backport (krb5) [since FEDORA-2005-553]
 2005-1174 backport (krb5) [since FEDORA-2005-553]
 2005-1160 version (firefox, mozilla)
+2005-1160 version (thunderbird) [since FEDORA-2005-606]
 2005-1159 version (firefox, mozilla)
+2005-1159 version (thunderbird) [since FEDORA-2005-606]
 2005-1158 version (firefox, fixed 1.0.3)
 2005-1157 version (firefox, mozilla)
 2005-1156 version (firefox, mozilla)
@@ -139,6 +146,7 @@
 2005-0990 backport (sharutils) from srpm
 2005-0989 version (mozilla, fixed 1.7.7)
 2005-0989 version (firefox, fixed 1.0.3)
+2005-0989 version (thunderbird) [since FEDORA-2005-606]
 2005-0988 backport (gzip) from srpm
 2005-0977 version (kernel, fixed 2.6.11)
 2005-0967 version (gaim, fixed 1.2.1)



From fedora-extras-commits at redhat.com  Thu Jul 21 12:12:02 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 21 Jul 2005 08:12:02 -0400
Subject: rpms/brightside/devel brightside.spec,1.8,1.9
Message-ID: <200507211212.j6LCC2gY009705@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	brightside.spec 
Log Message:
rebuild due to updated libwnck


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- brightside.spec	23 May 2005 15:47:06 -0000	1.8
+++ brightside.spec	21 Jul 2005 12:11:59 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	7
+Release: 	8
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Thorsten Leemhuis  - 1.4.0-8
+- rebuild
+
 * Mon May 23 2005 Thorsten Leemhuis  - 1.4.0-7
 - ExcludeArch: ppc ppc64 for now (#158560)
 



From fedora-extras-commits at redhat.com  Thu Jul 21 12:12:54 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 21 Jul 2005 08:12:54 -0400
Subject: common tobuild,1.1966,1.1967
Message-ID: <200507211212.j6LCCsOn009767@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9750

Modified Files:
	tobuild 
Log Message:
request build of rpms/brightside/devel brightside-1_4_0-8 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1966
retrieving revision 1.1967
diff -u -r1.1966 -r1.1967
--- tobuild	21 Jul 2005 06:50:30 -0000	1.1966
+++ tobuild	21 Jul 2005 12:12:52 -0000	1.1967
@@ -105,3 +105,4 @@
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
+thl	rpms/brightside/devel	brightside-1_4_0-8	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 14:34:45 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Thu, 21 Jul 2005 10:34:45 -0400
Subject: rpms/scim/devel .cvsignore, 1.5, 1.6 scim.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200507211434.j6LEYjMX012310@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	.cvsignore scim.spec sources 
Log Message:
Import Scim-1.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jul 2005 03:38:16 -0000	1.5
+++ .cvsignore	21 Jul 2005 14:34:43 -0000	1.6
@@ -1 +1 @@
-scim-1.3.3.tar.gz
+scim-1.4.0.tar.gz


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim.spec	9 Jul 2005 03:38:16 -0000	1.6
+++ scim.spec	21 Jul 2005 14:34:43 -0000	1.7
@@ -1,5 +1,5 @@
 Name:      scim
-Version:   1.3.3
+Version:   1.4.0
 Release:   1%{?dist}
 Summary:   Smart Common Input Method platform
 
@@ -10,7 +10,7 @@
 Source1:   xinput-scim
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-PreReq:    %{_bindir}/update-gtk-immodules
+PreReq:        %{_bindir}/update-gtk-immodules
 BuildRequires: gtk2-devel, desktop-file-utils
 
 %description
@@ -36,7 +36,7 @@
 
 
 %build
-%configure --disable-static --disable-ld-version-script
+%configure
 make %{?_smp_mflags}
 
 
@@ -45,8 +45,8 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
-# remove .la files
-find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
+# Kill all .a and .la
+find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f
 
 # install setup panel
 desktop-file-install \
@@ -66,7 +66,7 @@
 
 # install xinput config file.
 mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d
-install -pm 644 %{SOURCE1} \
+install -pm 755 %{SOURCE1} \
   ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
 
 
@@ -132,23 +132,14 @@
 %{_libdir}/libscim*.so
 %{_libdir}/pkgconfig/*.pc
 
+#--------------------------------------------------
 
 %changelog
-* Sat Jul  9 2005 Jens Petersen  - 1.3.3-1
-- update to 1.3.3 release
-  - disable linking with version-scripts for now since they cause some problems
-- disable building of static libs
-
-* Tue Jul  5 2005 Jens Petersen  - 1.3.2-1
-- update to 1.3.2 test release
-- don't set xinput.d script executable
-- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script
+* Fri Jul 16 2005 Ryo Dairiki  - 1.4.0-1
+- update to 1.4.0 release
 
-* Mon Jun 20 2005 Ryo Dairiki  - 1.2.3-2
-- Remove one of doubled capplets for setup.
-
-* Sat May 28 2005 Ryo Dairiki  - 1.2.3-1
-- Update packaging for Fedora Extras
+* Sat May 28 2005 Ryo Dairiki  - 1.2.3-1
+- update to 1.2.3 release
 
 * Fri Mar 13 2005 Ryo Dairiki  - 1.2.2-9
 - Initial packaging for Fedora Extras
@@ -169,3 +160,120 @@
 * Sat Jun 19 2004  James Su 
 - Added /usr/libexec/scim-launcher.
 - Remove setup module for SocketFrontEnd and SocketIMEngine.
+
+* Mon Mar 8 2004  James Su 
+- Added scim-config-agent.
+
+* Thu Oct 30 2003 James Su 
+- Added Simplified Chinese User Manual.
+
+* Wed Sep 03 2003 James Su 
+- cleanup spec.
+
+* Tue Sep 02 2003 James Su 
+- upto 0.8.0
+
+* Tue Jul 29 2003 James Su 
+- updated to include scim-panel-gtk.
+
+* Thu Jun 19 2003 James Su 
+- updated to include scim-setup and its modules.
+
+* Thu Apr 3 2003 James Su 
+- added suite package, which includes all necessary components of SCIM.
+
+* Tue Mar 25 2003 James Su 
+- updated to v0.4.0
+
+* Wed Feb 26 2003 James Su 
+- implemented dynamic adjust feature for generic table module.
+- fixed key handling bug in generic table module.
+
+* Mon Feb 10 2003 James Su 
+- Replaced highlight_start and highlight_end in scim_server
+  and scim_frontend with AttributeList (scim_attributes.h)
+- Moved icons/* to data/icons and gtkstringview.* to
+  utils/
+
+* Thu Jan 2 2003 James Su 
+- updated configure.ac and Makefile.am
+- ready to release 0.3.0
+
+* Tue Nov 12 2002 James Su 
+- merged signal system from libinti.
+- implemented namespace scim.
+- implemented referenced object.
+- version 0.3.0
+
+* Tue Nov 05 2002 James Su 
+- minor fixes for table IM module.
+
+* Mon Nov 04 2002 James Su 
+- More IMdkit memory leak fixes.
+- Table input method bugfixes.
+- version 0.2.2
+
+* Fri Nov 01 2002 James Su 
+- improved table input method.
+- actually fixed the memleaks within IMdkit.
+- pumped the version to 0.2.1
+
+* Thu Oct 31 2002 James Su 
+- fixed some memory leaks in IMdkit
+- reduced memory usage.
+- upgraded to libtool-1.4.3
+
+* Tue Oct 29 2002 James Su 
+- finished Generic Table input server module.
+- fixed several bugs in scim-lib.
+
+* Thu Oct 10 2002 James Su 
+- used gettext to support i18n message.
+- added release info to lib name.
+
+* Mon Sep 30 2002 James Su 
+- version 0.1.4
+- added Embedded Lookup Table style into X11 FrontEnd.
+- use wchar_t instead of unsigned long if __STDC_ISO_10646__ defined.
+
+* Sun Sep 22 2002 James Su 
+- version 0.1.3
+- config button of X11 FrontEnd was disabled.
+
+* Fri Sep 6 2002 James Su 
+- simplified the utilities and lookup table interface.
+
+* Wed Aug 21 2002 James Su 
+- version 0.1.2
+- added configuration options to disable modules.
+- enhanced X11 FrontEnd.
+
+* Sun Aug 11 2002 James Su 
+- version 0.1.1
+- X11 FrontEnd was enhanced.
+
+* Sat Aug 10 2002 James Su 
+- version 0.1.0
+- many bugfixes.
+- Help window of X11 FrontEnd was implemented.
+- scim can exit cleanly.
+
+* Fri Aug 2 2002 James Su 
+- SCIM 0.0.13.
+- Minor bugfixes.
+
+* Mon Jul 29 2002 James Su 
+- SCIM 0.0.12.
+- Minor bugfixes.
+
+* Sun Jul 28 2002 James Su 
+- SCIM 0.0.11.
+- Minor bugfixes.
+
+* Sun Jul 21 2002 James Su 
+- SCIM 0.0.10.
+- Added Simple Config module.
+
+* Sat Jun 22 2002 James Su 
+- first public release of SCIM.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jul 2005 03:38:16 -0000	1.5
+++ sources	21 Jul 2005 14:34:43 -0000	1.6
@@ -1 +1 @@
-6644e6ff3a5c01fbb06ea5809c9396f8  scim-1.3.3.tar.gz
+9af14f5dc73435affb36b116ad77b53e  scim-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 14:36:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 10:36:56 -0400
Subject: extras-buildsys/server PackageJob.py,1.11,1.12
Message-ID: <200507211436.j6LEautj012376@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/server

Modified Files:
	PackageJob.py 
Log Message:
2005-07-21  Dan Williams 

    * common/FileDownloader.py
      server/PackageJob.py
        - Remove usage of os.chdir() since it's process-wide
        - Lock usage of tempfile.mkdtemp() since it seems to have
            threading issues




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PackageJob.py	18 Jul 2005 21:26:30 -0000	1.11
+++ PackageJob.py	21 Jul 2005 14:36:54 -0000	1.12
@@ -99,6 +99,10 @@
     return False
 
 
+# tempfile.mkdtemp seems to have threading issues
+_mkdtemp_lock = threading.Lock()
+
+
 class PackageJob:
     """ Controller object for building 1 SRPM on multiple arches """
 
@@ -249,11 +253,12 @@
     def _checkout(self):
         self._set_cur_stage('checkout')
         dir_prefix = self.cvs_tag + "-"
+        _mkdtemp_lock.acquire()
         self.checkout_tmpdir = tempfile.mkdtemp(prefix=dir_prefix, dir=config_opts['tmpdir'])
-        os.chdir(self.checkout_tmpdir)
+        _mkdtemp_lock.release()
 
         # Checkout the module
-        cmd = '%s co -r %s %s' % (config_opts['cvs_cmd'], self.cvs_tag, self.package)
+        cmd = 'cd %s; %s co -r %s %s' % (self.checkout_tmpdir, config_opts['cvs_cmd'], self.cvs_tag, self.package)
         debugprint("%d: Running %s" % (self.uid, cmd))
         s, o = commands.getstatusoutput(cmd)
         if s != 0:
@@ -264,11 +269,9 @@
         # get it from CVS
         pkg_path = os.path.join(self.checkout_tmpdir, self.package)
         if not os.path.exists(os.path.join(pkg_path, "common")):
-            os.chdir(pkg_path)
-            cmd = '%s co common' % config_opts['cvs_cmd']
+            cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd'])
             debugprint("%d: Running %s" % (self.uid, cmd))
             s, o = commands.getstatusoutput(cmd)
-            os.chdir(self.checkout_tmpdir)
             if s != 0:
                 msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o)
                 raise PrepError(msg)
@@ -290,9 +293,7 @@
             msg = "could not find path %s for %s." % (srpm_dir, self.cvs_tag)
             raise PrepError(msg)
 
-        os.chdir(srpm_dir)
-
-        cmd = '%s srpm' % config_opts['make_cmd']
+        cmd = 'cd %s; %s srpm' % (srpm_dir, config_opts['make_cmd'])
         debugprint("%d: Running %s in %s" % (self.uid, cmd, srpm_dir))
         s, o = commands.getstatusoutput(cmd)
         if s != 0:



From fedora-extras-commits at redhat.com  Thu Jul 21 14:36:51 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 10:36:51 -0400
Subject: extras-buildsys ChangeLog,1.67,1.68
Message-ID: <200507211437.j6LEbLGj012379@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329

Modified Files:
	ChangeLog 
Log Message:
2005-07-21  Dan Williams 

    * common/FileDownloader.py
      server/PackageJob.py
        - Remove usage of os.chdir() since it's process-wide
        - Lock usage of tempfile.mkdtemp() since it seems to have
            threading issues




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	21 Jul 2005 04:07:53 -0000	1.67
+++ ChangeLog	21 Jul 2005 14:36:48 -0000	1.68
@@ -1,5 +1,13 @@
 2005-07-21  Dan Williams 
 
+    * common/FileDownloader.py
+      server/PackageJob.py
+        - Remove usage of os.chdir() since it's process-wide
+        - Lock usage of tempfile.mkdtemp() since it seems to have
+            threading issues
+
+2005-07-21  Dan Williams 
+
     * www/*
         - Add the web front-end
 



From fedora-extras-commits at redhat.com  Thu Jul 21 14:36:51 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 10:36:51 -0400
Subject: extras-buildsys/common FileDownloader.py,1.12,1.13
Message-ID: <200507211437.j6LEbLrL012382@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12329/common

Modified Files:
	FileDownloader.py 
Log Message:
2005-07-21  Dan Williams 

    * common/FileDownloader.py
      server/PackageJob.py
        - Remove usage of os.chdir() since it's process-wide
        - Lock usage of tempfile.mkdtemp() since it seems to have
            threading issues




Index: FileDownloader.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FileDownloader.py	18 Jul 2005 17:24:38 -0000	1.12
+++ FileDownloader.py	21 Jul 2005 14:36:49 -0000	1.13
@@ -103,7 +103,6 @@
         if self._url and self._target_dir and self._filename:
             if not os.path.exists(self._target_dir):
                 os.makedirs(self._target_dir)
-            os.chdir(self._target_dir)
             target_file = os.path.join(self._target_dir, self._filename)
             try:
                 result = self._opener.retrieve(self._url, target_file)



From fedora-extras-commits at redhat.com  Thu Jul 21 14:40:46 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Thu, 21 Jul 2005 10:40:46 -0400
Subject: mock mock.py,1.21,1.22
Message-ID: <200507211440.j6LEekhX012412@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12393

Modified Files:
	mock.py 
Log Message:

make more exceptions to allow for better exit codes from mock to define
failures.



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mock.py	8 Jul 2005 05:49:52 -0000	1.21
+++ mock.py	21 Jul 2005 14:40:44 -0000	1.22
@@ -34,9 +34,35 @@
     print >> sys.stderr, msg
 
 
-class Locked(Exception): pass
-class ReturnValue(Exception): pass
-class Error(Exception): pass
+class Error(Exception):
+    def __init__(self, msg):
+        exceptions.Exception.__init__(self)
+        self.msg = msg
+        self.resultcode = 1
+
+class YumError(Error): 
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 30
+
+class PkgError(Error):
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 40
+
+class BuildError(Error):
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 10
+
+class RootError(Error):
+    def __init__(self, msg):
+        Error.__init__(self)
+        self.msg = msg
+        self.resultcode = 20
 
 
 
@@ -142,7 +168,7 @@
             if retval != 0:
                 error("Errors cleaning out chroot: %s" % output)
                 if os.path.exists(self.rootdir):
-                    raise Error, "Failed to clean basedir, exiting"
+                    raise RootError, "Failed to clean basedir, exiting"
 
 
     def state(self, curstate=None):
@@ -187,7 +213,7 @@
         self.root_log(output)
 
         if retval != 0:
-            raise Error, "Error peforming yum command: %s" % command
+            raise YumError, "Error peforming yum command: %s" % command
         
         return (retval, output)
         
@@ -216,14 +242,14 @@
         if retval != 0:
             msg = "Error installing srpm: %s" % srpmfn
             self.root_log(msg)
-            raise Error, msg
+            raise RootError, msg
         
         specdir = os.path.join(bd_out, 'SPECS')
         specs = glob.glob('%s/*.spec' % specdir)
         if len(specs) < 1:
             msg =  "No Spec file found in srpm: %s" % srpmfn
             self.root_log(msg)
-            raise Error, msg
+            raise PkgError, msg
 
         spec = specs[0] # if there's more than one then someone is an idiot
     
@@ -236,14 +262,14 @@
         (retval, output) = self.do_chroot(cmd)
         self.root_log(output)
         if retval != 0:
-            raise Error, "Error building srpm from installed spec. See Root log."
+            raise PkgError, "Error building srpm from installed spec. See Root log."
             
         srpmdir = os.path.join(bd_out, 'SRPMS')
         srpms = glob.glob('%s/*.src.rpm' % srpmdir)
         if len(srpms) < 1:
             msg = "No srpm created from specfile from srpm: %s" % srpmfn
             self.root_log(msg)
-            raise Error, msg
+            raise PkgError, msg
         
         srpm = srpms[0] # if there's more than one then something is weird
         
@@ -265,7 +291,7 @@
             for line in output.split('\n'):
                 if line.find('No Package Found for') != -1:
                     errorpkg = line.replace('No Package Found for', '')
-                    raise Error, "Cannot find build req %s. Exiting." % errorpkg
+                    raise BuildError, "Cannot find build req %s. Exiting." % errorpkg
             # nothing made us exit, so we continue
             self.yum('install %s' % arg_string)
 
@@ -296,7 +322,7 @@
         self.build_log(output)
         
         if retval != 0:
-            raise Error, "Error building package from %s, See build log" % srpmfn
+            raise BuildError, "Error building package from %s, See build log" % srpmfn
         
         bd_out = self.rootdir + self.builddir 
         rpms = glob.glob(bd_out + '/RPMS/*.rpm')
@@ -369,7 +395,7 @@
         if retval != 0:
             if output.find('already mounted') == -1: # probably won't work in other LOCALES
                 self.root_log(output)
-                raise Error, "could not mount /dev/pts error was: %s" % output
+                raise RootError, "could not mount /dev/pts error was: %s" % output
         
 
     def _umount(self, path):
@@ -381,7 +407,7 @@
         if retval != 0:
             if output.find('not mounted') == -1: # this probably won't work in other LOCALES
                 self.root_log(output)
-                raise Error, "could not umount %s error was: %s" % (path, output)
+                raise RootError, "could not umount %s error was: %s" % (path, output)
 
     
     def _umount_by_file(self):
@@ -417,7 +443,7 @@
 
         return (retval, output)
 
-    def do_chroot(self, command, fatal = False):
+    def do_chroot(self, command, fatal = False, exitcode=None):
         """execute given command in root"""
         cmd = ""
         
@@ -434,6 +460,9 @@
         (ret, output) = self.do(cmd)
         if (ret != 0) and fatal:
             self.close()
+            if exitcode:
+                ret = exitcode
+            
             error("Non-zero return value %d on executing %s\n" % (ret, cmd))
             sys.exit(ret)
         
@@ -493,7 +522,7 @@
                 (retval, output) = self.do(cmd)
                 if retval != 0:
                     self.root_log(output)
-                    raise Error, "could not mknod error was: %s" % output
+                    raise RootError, "could not mknod error was: %s" % output
 
         # link fd to ../proc/self/fd
         devpath = os.path.join(self.rootdir, 'dev/fd')
@@ -525,7 +554,7 @@
         # make the buildusers/groups
         if not os.path.exists(self.rootdir + self.homedir):
             if not os.path.exists(os.path.join(self.rootdir, 'usr/sbin/useradd')):
-                raise Error, "Could not find useradd in chroot, maybe the install failed?"
+                raise RootError, "Could not find useradd in chroot, maybe the install failed?"
             cmd = '/usr/sbin/useradd -u %s -d %s %s' % (self.config['chrootuid'], 
                     self.homedir, self.config['chrootuser'])
             self.do_chroot(cmd, fatal = True)
@@ -743,10 +772,10 @@
             my.prep()
             my.build(srpm)
         except Error, e:
-            print e
+            error(e)
             if my:
                 my.close()
-            sys.exit(100)
+            sys.exit(e.resultcode)
     
         my.close()
         print "Results and/or logs in: %s" % my.resultdir



From fedora-extras-commits at redhat.com  Thu Jul 21 16:43:28 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 21 Jul 2005 12:43:28 -0400
Subject: rpms/denyhosts/devel .cvsignore, 1.3, 1.4 denyhosts.spec, 1.2,
	1.3 sources, 1.3, 1.4 denyhosts-0.5.5-workdir.patch, 1.1,
	NONE denyhosts-0.6.0-version.patch, 1.1, NONE
Message-ID: <200507211643.j6LGhSG7015593@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	.cvsignore denyhosts.spec sources 
Removed Files:
	denyhosts-0.5.5-workdir.patch denyhosts-0.6.0-version.patch 
Log Message:
* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-1
- Update to 0.8.0
- Use proper Python installation mechanism.
- Drop denyhosts-0.6.0-version.patch as it's no longer necessary.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 21:37:55 -0000	1.3
+++ .cvsignore	21 Jul 2005 16:43:26 -0000	1.4
@@ -1 +1 @@
-DenyHosts-0.6.0.tar.gz
+DenyHosts-0.8.0.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts.spec	2 Jul 2005 21:37:55 -0000	1.2
+++ denyhosts.spec	21 Jul 2005 16:43:26 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        0.6.0
+Version:        0.8.0
 Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -10,12 +10,11 @@
 Source1:	denyhosts.cron
 Source2:	denyhosts.init
 Source3:	denyhosts-allowed-hosts
-Patch0:		denyhosts-0.5.5-workdir.patch
-Patch1:		denyhosts-0.6.0-version.patch
+Patch0:		denyhosts-0.8.0-workdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
-#BuildRequires:  
+BuildRequires:  python-devel
 Requires:       openssh-server
 
 %description
@@ -30,18 +29,19 @@
 %prep
 %setup -q -n DenyHosts-%{version}
 %patch0 -p0
-%patch1 -p0
+
+%build
+python ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
 
-install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 
 install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts
 
-install -p -m 755 denyhosts.py $RPM_BUILD_ROOT%{_bindir}
 install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts
@@ -56,11 +56,13 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/chkconfig --add denyhosts
 /sbin/service denyhosts condrestart >> /dev/null
 exit 0
 
+
 %preun
 if [ $1 = 0 ]; then
   /sbin/chkconfig --del denyhosts
@@ -68,7 +70,8 @@
 fi
 exit 0
 
-%files
+
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE.txt README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
@@ -85,10 +88,15 @@
 
 %dir %{_localstatedir}/lib/denyhosts
 
-%{_bindir}/denyhosts.py
 %{_initrddir}/denyhosts
 
+
 %changelog
+* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-1
+- Update to 0.8.0
+- Use proper Python installation mechanism.
+- Drop denyhosts-0.6.0-version.patch as it's no longer necessary.
+
 * Sat Jul  2 2005 Jason L Tibbitts III  - 0.6.0-1
 - Update to 0.6.0
 - Add fix for "from version import VERSION" issue.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 21:37:55 -0000	1.3
+++ sources	21 Jul 2005 16:43:26 -0000	1.4
@@ -1 +1 @@
-6d65457ed9c31c548160e2aa74e5a80e  DenyHosts-0.6.0.tar.gz
+951bfb51b045f12281d114594115878a  DenyHosts-0.8.0.tar.gz


--- denyhosts-0.5.5-workdir.patch DELETED ---


--- denyhosts-0.6.0-version.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jul 21 16:56:24 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 21 Jul 2005 12:56:24 -0400
Subject: rpms/denyhosts/devel denyhosts.spec,1.3,1.4
Message-ID: <200507211656.j6LGuO6k016779@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.spec 
Log Message:
* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-2
- Package CHANGELOG.txt and denyhosts.cfg-dist as well (as
  documentation).



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- denyhosts.spec	21 Jul 2005 16:43:26 -0000	1.3
+++ denyhosts.spec	21 Jul 2005 16:56:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        0.8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -73,7 +73,7 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc LICENSE.txt README.txt setup.py
+%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-2
+- Package CHANGELOG.txt and denyhosts.cfg-dist as well (as
+  documentation).
+
 * Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-1
 - Update to 0.8.0
 - Use proper Python installation mechanism.



From fedora-extras-commits at redhat.com  Thu Jul 21 16:57:12 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Thu, 21 Jul 2005 12:57:12 -0400
Subject: rpms/denyhosts/devel denyhosts-0.8.0-workdir.patch,NONE,1.1
Message-ID: <200507211657.j6LGvC08016813@cvs-int.fedora.redhat.com>

Author: tibbs

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

Added Files:
	denyhosts-0.8.0-workdir.patch 
Log Message:
Add file.


denyhosts-0.8.0-workdir.patch:

--- NEW FILE denyhosts-0.8.0-workdir.patch ---
--- denyhosts.cfg-dist.orig	2005-07-20 15:46:07.000000000 -0500
+++ denyhosts.cfg-dist	2005-07-21 09:10:52.257847547 -0500
@@ -89,7 +89,7 @@
 # WORK_DIR: the path that DenyHosts will use for writing data to
 # (it will be created if it does not already exist).       
 #
-WORK_DIR = denyhosts
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 



From fedora-extras-commits at redhat.com  Thu Jul 21 17:18:09 2005
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Thu, 21 Jul 2005 13:18:09 -0400
Subject: extras-buildsys/common AuthedXMLRPCServer.py,1.4,1.5
Message-ID: <200507211718.j6LHI9Yq017990@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17973/common

Modified Files:
	AuthedXMLRPCServer.py 
Log Message:


. Remove unnecessary/pointless locking. Since all operations use threading.currentThread(), there is no contention to 
avoid.
. Simplify get_authinfo.



Index: AuthedXMLRPCServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/AuthedXMLRPCServer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AuthedXMLRPCServer.py	13 Jul 2005 15:21:05 -0000	1.4
+++ AuthedXMLRPCServer.py	21 Jul 2005 17:18:07 -0000	1.5
@@ -37,30 +37,16 @@
 
 """
 
-__authinfos_lock = threading.Lock()
 __authinfos = {}
 
-
 def _add_authinfo(authinfo):
-    __authinfos_lock.acquire()
     __authinfos[threading.currentThread()] = authinfo
-    __authinfos_lock.release()
 
 def get_authinfo():
-    i = None
-    __authinfos_lock.acquire()
-    try:
-        i = __authinfos[threading.currentThread()]
-    except KeyError:
-        pass
-    __authinfos_lock.release()
-    return i
+    return __authinfos.get(threading.currentThread())
 
 def _del_authinfo():
-    __authinfos_lock.acquire()
     del __authinfos[threading.currentThread()]
-    __authinfos_lock.release()
-
 
 class AuthedSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
 



From fedora-extras-commits at redhat.com  Thu Jul 21 17:55:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 13:55:44 -0400
Subject: rpms/cdlabelgen/devel .cvsignore, 1.2, 1.3 cdlabelgen.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200507211756.j6LHuEUK018156@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
Update in order to prepare for first Extras build ever (#159127).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Mar 2005 11:04:45 -0000	1.2
+++ .cvsignore	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-cdlabelgen-3.0.0.tgz
+cdlabelgen-3.5.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/cdlabelgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdlabelgen.spec	7 Mar 2005 11:04:45 -0000	1.1
+++ cdlabelgen.spec	21 Jul 2005 17:55:42 -0000	1.2
@@ -1,12 +1,10 @@
 Name: cdlabelgen
-Summary: Generates frontcards and traycards for inserting in CD jewelcases.
-Version: 3.0.0
-Release: 1
-#Source: http://www.red-bean.com/~bwf/software/cdlabelgen/cdlabelgen-1.5.0.tar.gz
-#URL: http://www.red-bean.com/~bwf/software/cdlabelgen
-Source: http://www.aczone.com/pub/tools/cdlabelgen-%{version}.tgz
-URL: http://www.aczone.com/tools/cdinsert/
-BuildRoot: %{_tmppath}/%{name}-root
+Summary: Generates frontcards and traycards for inserting in CD jewelcases
+Version: 3.5.0
+Release: 1%{?dist}
+Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
+URL: http://www.aczoom.com/tools/cdinsert/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPL
 Group: Applications/Publishing
 BuildArch: noarch
@@ -24,9 +22,9 @@
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,10 +33,14 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README cdlabelgen.html
 %{_bindir}/cdlabelgen
-%{_datadir}/cdlabelgen
-%{_mandir}/*/*
+%{_datadir}/cdlabelgen/
+%{_mandir}/man1/*
 
 %changelog
+* Thu Jul 21 2005 Matthias Saou  3.5.0-1
+- Update to 3.5.0.
+- Update URL and Source to new locations.
+
 * Tue Sep 21 2004 Harald Hoyer  3.0.0
 - Updated to new version 3.0.0
 
@@ -88,8 +90,11 @@
 
 * Mon May 8 2000 Tim Powers 
 - rebuilt for 7.0
+
 * Tue Jan 4 2000 Tim Powers 
 - removed unneeded defines
 - rebuilt for 6.2
+
 * Mon Aug 23 1999 Preston Brown 
 - adopted for Powertools 6.1.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Mar 2005 11:04:45 -0000	1.2
+++ sources	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-7e5c5464c168dffa2fadfb6d0d36cdb7  cdlabelgen-3.0.0.tgz
+bbe82a25e9eeb66df54ca8f61d561f59  cdlabelgen-3.5.0.tgz



From fedora-extras-commits at redhat.com  Thu Jul 21 17:55:44 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 13:55:44 -0400
Subject: rpms/cdlabelgen/FC-4 .cvsignore, 1.2, 1.3 cdlabelgen.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200507211756.j6LHuE2v018161@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore cdlabelgen.spec sources 
Log Message:
Update in order to prepare for first Extras build ever (#159127).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Mar 2005 11:04:45 -0000	1.2
+++ .cvsignore	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-cdlabelgen-3.0.0.tgz
+cdlabelgen-3.5.0.tgz


Index: cdlabelgen.spec
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/FC-4/cdlabelgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdlabelgen.spec	7 Mar 2005 11:04:45 -0000	1.1
+++ cdlabelgen.spec	21 Jul 2005 17:55:42 -0000	1.2
@@ -1,12 +1,10 @@
 Name: cdlabelgen
-Summary: Generates frontcards and traycards for inserting in CD jewelcases.
-Version: 3.0.0
-Release: 1
-#Source: http://www.red-bean.com/~bwf/software/cdlabelgen/cdlabelgen-1.5.0.tar.gz
-#URL: http://www.red-bean.com/~bwf/software/cdlabelgen
-Source: http://www.aczone.com/pub/tools/cdlabelgen-%{version}.tgz
-URL: http://www.aczone.com/tools/cdinsert/
-BuildRoot: %{_tmppath}/%{name}-root
+Summary: Generates frontcards and traycards for inserting in CD jewelcases
+Version: 3.5.0
+Release: 1%{?dist}
+Source: http://www.aczoom.com/pub/tools/cdlabelgen-%{version}.tgz
+URL: http://www.aczoom.com/tools/cdinsert/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 License: GPL
 Group: Applications/Publishing
 BuildArch: noarch
@@ -24,9 +22,9 @@
 
 %install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/cdlabelgen,%{_mandir}/man1}
-install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}
-install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen
-install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 cdlabelgen $RPM_BUILD_ROOT%{_bindir}/
+install -m 644 postscript/* $RPM_BUILD_ROOT%{_datadir}/cdlabelgen/
+install -m 644 cdlabelgen.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,10 +33,14 @@
 %defattr(-,root,root,-)
 %doc ChangeLog README cdlabelgen.html
 %{_bindir}/cdlabelgen
-%{_datadir}/cdlabelgen
-%{_mandir}/*/*
+%{_datadir}/cdlabelgen/
+%{_mandir}/man1/*
 
 %changelog
+* Thu Jul 21 2005 Matthias Saou  3.5.0-1
+- Update to 3.5.0.
+- Update URL and Source to new locations.
+
 * Tue Sep 21 2004 Harald Hoyer  3.0.0
 - Updated to new version 3.0.0
 
@@ -88,8 +90,11 @@
 
 * Mon May 8 2000 Tim Powers 
 - rebuilt for 7.0
+
 * Tue Jan 4 2000 Tim Powers 
 - removed unneeded defines
 - rebuilt for 6.2
+
 * Mon Aug 23 1999 Preston Brown 
 - adopted for Powertools 6.1.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cdlabelgen/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Mar 2005 11:04:45 -0000	1.2
+++ sources	21 Jul 2005 17:55:42 -0000	1.3
@@ -1 +1 @@
-7e5c5464c168dffa2fadfb6d0d36cdb7  cdlabelgen-3.0.0.tgz
+bbe82a25e9eeb66df54ca8f61d561f59  cdlabelgen-3.5.0.tgz



From fedora-extras-commits at redhat.com  Thu Jul 21 17:56:58 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 13:56:58 -0400
Subject: common tobuild,1.1967,1.1968
Message-ID: <200507211756.j6LHuwtT018223@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18206

Modified Files:
	tobuild 
Log Message:
request build of rpms/cdlabelgen/FC-4 cdlabelgen-3_5_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1967
retrieving revision 1.1968
diff -u -r1.1967 -r1.1968
--- tobuild	21 Jul 2005 12:12:52 -0000	1.1967
+++ tobuild	21 Jul 2005 17:56:55 -0000	1.1968
@@ -106,3 +106,4 @@
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
 thl	rpms/brightside/devel	brightside-1_4_0-8	devel
+thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 18:02:26 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:02:26 -0400
Subject: rpms/libxml++/FC-4 .cvsignore, 1.2, 1.3 libxml++.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200507211803.j6LI3HQf019443@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19392

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Taking over from Panu.
Version 2.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:48:49 -0000	1.2
+++ .cvsignore	21 Jul 2005 18:02:23 -0000	1.3
@@ -1 +1 @@
-libxml++-0.26.0.tar.bz2
+libxml++-2.10.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libxml++.spec	22 May 2005 22:59:57 -0000	1.8
+++ libxml++.spec	21 Jul 2005 18:02:23 -0000	1.9
@@ -1,77 +1,89 @@
-Name: libxml++
-Version: 0.26.0
-Release: 5
-
-Summary: C++ wrapper for the libxml2 XML parser library
-Group: System Environment/Libraries
-License: LGPL
-URL: http://libxmlplusplus.sourceforge.net/
-Source: http://dl.sf.net/libxmlplusplus/libxml++-0.26.0.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxml2-devel >= 2.5.1, doxygen, graphviz
+Name:           libxml++
+Version:        2.10.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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
 author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
+
 %package devel
-Summary: %{summary}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig, libxml2-devel, glibmm24-devel
 
 %description devel
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
-author is Ari Johnson and it is currently maintained by Christophe de Vienne
-and Murray Cumming.
-
 This package contains the headers and libraries for libxml++ development.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
-make -C docs/reference
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
-rm -rf _reference _examples
-mkdir _reference && cp -a docs/reference/html _reference/reference
-mkdir _examples && cp -a examples _examples/examples
+rm -rf _reference _examples _manual
+mkdir -m 755 _reference _examples _manual
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/reference/2.*/html _reference/reference
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/manual _manual/manual
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+cp -a examples _examples/examples
 # Delete non-working makefiles, object files, prebuilt binaries and empty files.
 find _examples -type f -a \( -name Makefile\* -o -name \*.o \
-    -o \( -name example.C -a -perm +0111 \) -o -empty \) \
-    -exec rm -f {} ';'
-rm -rf _examples/*/*/.libs
+    -o \( -name example.C -a -perm +0111 \) -o -empty \) | xargs rm -f
+find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
-%{_libdir}/libxml++-0.1.so.*
+%{_libdir}/*.so.*
+
 
 %files devel
 %defattr (-,root,root,-)
-%doc _examples/examples _reference/reference
-%{_includedir}/libxml++-1.0
-%{_libdir}/libxml++-*a
-%{_libdir}/libxml++-*.so
-%{_libdir}/pkgconfig/libxml++-1.0.pc
+%doc _examples/examples _reference/reference _manual/manual
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
 
 %changelog
+* Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
+- Version 2.10.0
+- Rearrange and conform to new FE standards
+- Buildrequire glibmm24-devel
+- Add devel requires to -devel
+
 * Sun May 22 2005 Jeremy Katz  - 0.26.0-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:48:49 -0000	1.2
+++ sources	21 Jul 2005 18:02:24 -0000	1.3
@@ -1 +1 @@
-2602cf491a6d285f3f6c276ac2f659f7  libxml++-0.26.0.tar.bz2
+1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jul 21 18:02:52 2005
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 21 Jul 2005 14:02:52 -0400
Subject: common tobuild,1.1968,1.1969
Message-ID: <200507211803.j6LI3NtK019446@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19424

Modified Files:
	tobuild 
Log Message:
request build of rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1968
retrieving revision 1.1969
diff -u -r1.1968 -r1.1969
--- tobuild	21 Jul 2005 17:56:55 -0000	1.1968
+++ tobuild	21 Jul 2005 18:02:50 -0000	1.1969
@@ -107,3 +107,4 @@
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
 thl	rpms/brightside/devel	brightside-1_4_0-8	devel
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
+thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 18:06:22 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:06:22 -0400
Subject: rpms/libxml++/devel .cvsignore, 1.2, 1.3 libxml++.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200507211806.j6LI6MS6019480@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19455

Modified Files:
	.cvsignore libxml++.spec sources 
Log Message:
Taking over from Panu.
Version 2.10.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:48:49 -0000	1.2
+++ .cvsignore	21 Jul 2005 18:06:12 -0000	1.3
@@ -1 +1 @@
-libxml++-0.26.0.tar.bz2
+libxml++-2.10.0.tar.bz2


Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libxml++.spec	22 May 2005 22:59:57 -0000	1.8
+++ libxml++.spec	21 Jul 2005 18:06:12 -0000	1.9
@@ -1,77 +1,89 @@
-Name: libxml++
-Version: 0.26.0
-Release: 5
-
-Summary: C++ wrapper for the libxml2 XML parser library
-Group: System Environment/Libraries
-License: LGPL
-URL: http://libxmlplusplus.sourceforge.net/
-Source: http://dl.sf.net/libxmlplusplus/libxml++-0.26.0.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libxml2-devel >= 2.5.1, doxygen, graphviz
+Name:           libxml++
+Version:        2.10.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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxml2-devel >= 2.6.1, doxygen, glibmm24-devel >= 2.4.0
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
 author is Ari Johnson and it is currently maintained by Christophe de Vienne
 and Murray Cumming.
 
+
 %package devel
-Summary: %{summary}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig, libxml2-devel, glibmm24-devel
 
 %description devel
-libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
-author is Ari Johnson and it is currently maintained by Christophe de Vienne
-and Murray Cumming.
-
 This package contains the headers and libraries for libxml++ development.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
-make -C docs/reference
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
 # Modify temporary working directories for files section.
-rm -rf _reference _examples
-mkdir _reference && cp -a docs/reference/html _reference/reference
-mkdir _examples && cp -a examples _examples/examples
+rm -rf _reference _examples _manual
+mkdir -m 755 _reference _examples _manual
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/reference/2.*/html _reference/reference
+cp -a $RPM_BUILD_ROOT%{_docdir}/*/docs/manual _manual/manual
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+cp -a examples _examples/examples
 # Delete non-working makefiles, object files, prebuilt binaries and empty files.
 find _examples -type f -a \( -name Makefile\* -o -name \*.o \
-    -o \( -name example.C -a -perm +0111 \) -o -empty \) \
-    -exec rm -f {} ';'
-rm -rf _examples/*/*/.libs
+    -o \( -name example.C -a -perm +0111 \) -o -empty \) | xargs rm -f
+find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
 
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr (-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
-%{_libdir}/libxml++-0.1.so.*
+%{_libdir}/*.so.*
+
 
 %files devel
 %defattr (-,root,root,-)
-%doc _examples/examples _reference/reference
-%{_includedir}/libxml++-1.0
-%{_libdir}/libxml++-*a
-%{_libdir}/libxml++-*.so
-%{_libdir}/pkgconfig/libxml++-1.0.pc
+%doc _examples/examples _reference/reference _manual/manual
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
 
 %changelog
+* Thu Jul 21 2005 Konstantin Ryabitsev  - 2.10.0-1
+- Version 2.10.0
+- Rearrange and conform to new FE standards
+- Buildrequire glibmm24-devel
+- Add devel requires to -devel
+
 * Sun May 22 2005 Jeremy Katz  - 0.26.0-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:48:49 -0000	1.2
+++ sources	21 Jul 2005 18:06:20 -0000	1.3
@@ -1 +1 @@
-2602cf491a6d285f3f6c276ac2f659f7  libxml++-0.26.0.tar.bz2
+1494b12a2cf5e337d7717af4557a7711  libxml++-2.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jul 21 18:09:20 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:09:20 -0400
Subject: common tobuild,1.1969,1.1970
Message-ID: <200507211809.j6LI9K3n019589@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19572

Modified Files:
	tobuild 
Log Message:
request build of rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1969
retrieving revision 1.1970
diff -u -r1.1969 -r1.1970
--- tobuild	21 Jul 2005 18:02:50 -0000	1.1969
+++ tobuild	21 Jul 2005 18:09:18 -0000	1.1970
@@ -108,3 +108,4 @@
 thl	rpms/brightside/devel	brightside-1_4_0-8	devel
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
+icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 18:10:01 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 21 Jul 2005 14:10:01 -0400
Subject: common tobuild,1.1970,1.1971
Message-ID: <200507211810.j6LIA1vW019652@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19635

Modified Files:
	tobuild 
Log Message:
request build of rpms/libxml++/devel libxml++-2_10_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1970
retrieving revision 1.1971
diff -u -r1.1970 -r1.1971
--- tobuild	21 Jul 2005 18:09:18 -0000	1.1970
+++ tobuild	21 Jul 2005 18:09:59 -0000	1.1971
@@ -109,3 +109,4 @@
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4
+icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 18:24:34 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:24:34 -0400
Subject: rpms/libcddb/FC-3 .cvsignore, 1.3, 1.4 libcddb.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200507211824.j6LIOYdq019753@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
libcddb: 1.1.0 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 May 2005 12:01:25 -0000	1.3
+++ .cvsignore	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-libcddb-1.0.2.tar.gz
+libcddb-1.1.0.tar.gz


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcddb.spec	11 May 2005 12:01:25 -0000	1.6
+++ libcddb.spec	21 Jul 2005 18:24:32 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.0.2
-Release:	1
+Version:	1.1.0
+Release:	1%{?dist}
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -26,6 +26,7 @@
 This package contains development files (static libraries, headers)
 for libcddb.
 
+
 %prep
 %setup -q
 
@@ -65,6 +66,15 @@
 
 
 %changelog
+* Thu Jul 21 2005 Dams  - 1.1.0-1
+- Updated to 1.1.0
+
+* Sun May 22 2005 Jeremy Katz  - 1.0.2-2
+- rebuild on all arches
+
+* Wed May 11 2005 Dams  - 0:1.0.2-1.4
+- Rebuilt for FC4
+
 * Wed May 11 2005 Dams  - 0:1.0.2-1
 - Added libcdio and pkgconfig buildreq
 - Updated to 1.0.2
@@ -80,4 +90,3 @@
 
 * Tue Mar  9 2004 Dams 
 - Initial build.
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2005 12:01:25 -0000	1.3
+++ sources	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-a8f8549cc1afb3bc702a96c7d71d2241  libcddb-1.0.2.tar.gz
+c15ee69fcb9459c9450e8140cdef0952  libcddb-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 18:24:36 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:24:36 -0400
Subject: rpms/libcddb/devel .cvsignore, 1.3, 1.4 libcddb.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200507211824.j6LIOaRc019772@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
libcddb: 1.1.0 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 May 2005 12:01:25 -0000	1.3
+++ .cvsignore	21 Jul 2005 18:24:33 -0000	1.4
@@ -1 +1 @@
-libcddb-1.0.2.tar.gz
+libcddb-1.1.0.tar.gz


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libcddb.spec	23 May 2005 00:15:55 -0000	1.10
+++ libcddb.spec	21 Jul 2005 18:24:33 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.0.2
-Release: 2
+Version:	1.1.0
+Release:	1%{?dist}
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Dams  - 1.1.0-1
+- Updated to 1.1.0
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2005 12:01:25 -0000	1.3
+++ sources	21 Jul 2005 18:24:33 -0000	1.4
@@ -1 +1 @@
-a8f8549cc1afb3bc702a96c7d71d2241  libcddb-1.0.2.tar.gz
+c15ee69fcb9459c9450e8140cdef0952  libcddb-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 18:24:34 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:24:34 -0400
Subject: rpms/libcddb/FC-4 .cvsignore, 1.3, 1.4 libcddb.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200507211824.j6LIOYIe019764@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libcddb.spec sources 
Log Message:
libcddb: 1.1.0 version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 May 2005 12:01:25 -0000	1.3
+++ .cvsignore	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-libcddb-1.0.2.tar.gz
+libcddb-1.1.0.tar.gz


Index: libcddb.spec
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libcddb.spec	23 May 2005 00:15:55 -0000	1.10
+++ libcddb.spec	21 Jul 2005 18:24:32 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Library (C API) for accessing CDDB servers
 Name:		libcddb
-Version:	1.0.2
-Release: 2
+Version:	1.1.0
+Release:	1%{?dist}
 
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Dams  - 1.1.0-1
+- Updated to 1.1.0
+
 * Sun May 22 2005 Jeremy Katz  - 1.0.2-2
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libcddb/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 May 2005 12:01:25 -0000	1.3
+++ sources	21 Jul 2005 18:24:32 -0000	1.4
@@ -1 +1 @@
-a8f8549cc1afb3bc702a96c7d71d2241  libcddb-1.0.2.tar.gz
+c15ee69fcb9459c9450e8140cdef0952  libcddb-1.1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jul 21 18:26:00 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Thu, 21 Jul 2005 14:26:00 -0400
Subject: common tobuild,1.1971,1.1972
Message-ID: <200507211826.j6LIQ0vw019836@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19819

Modified Files:
	tobuild 
Log Message:
request build of rpms/libcddb/FC-4 libcddb-1_1_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1971
retrieving revision 1.1972
diff -u -r1.1971 -r1.1972
--- tobuild	21 Jul 2005 18:09:59 -0000	1.1971
+++ tobuild	21 Jul 2005 18:25:57 -0000	1.1972
@@ -110,3 +110,4 @@
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
+anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 19:02:10 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:02:10 -0400
Subject: rpms/lft/devel lft.spec,1.15,1.16
Message-ID: <200507211902.j6LJ2Ws2021022@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	lft.spec 
Log Message:
* Thu Jul 21 2005 Ville Skytt??  - 2.31-3
- Rebuild against new libpcap.



Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lft.spec	19 May 2005 18:38:28 -0000	1.15
+++ lft.spec	21 Jul 2005 19:02:08 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.31
-Release:        2
+Release:        3
 Summary:        Alternate traceroute tool
 
 Group:          Applications/Internet
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Thu Jul 21 2005 Ville Skytt??  - 2.31-3
+- Rebuild against new libpcap.
+
 * Thu May 19 2005 Ville Skytt??  - 2.31-2
 - 2.31.
 



From fedora-extras-commits at redhat.com  Thu Jul 21 19:04:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:04:32 -0400
Subject: common tobuild,1.1972,1.1973
Message-ID: <200507211905.j6LJ52jp021084@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21067

Modified Files:
	tobuild 
Log Message:
request build of rpms/lft/devel lft-2_31-3 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -r1.1972 -r1.1973
--- tobuild	21 Jul 2005 18:25:57 -0000	1.1972
+++ tobuild	21 Jul 2005 19:04:07 -0000	1.1973
@@ -111,3 +111,4 @@
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
+scop	rpms/lft/devel	lft-2_31-3	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 19:53:58 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:53:58 -0400
Subject: common tobuild,1.1973,1.1974
Message-ID: <200507211953.j6LJrwCW021296@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/FC-4 bash-completion-20050720-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1973
retrieving revision 1.1974
diff -u -r1.1973 -r1.1974
--- tobuild	21 Jul 2005 19:04:07 -0000	1.1973
+++ tobuild	21 Jul 2005 19:53:56 -0000	1.1974
@@ -112,3 +112,4 @@
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
+scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 19:54:51 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:54:51 -0400
Subject: common tobuild,1.1974,1.1975
Message-ID: <200507211954.j6LJsp4D021359@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21342

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/devel bash-completion-20050720-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1974
retrieving revision 1.1975
diff -u -r1.1974 -r1.1975
--- tobuild	21 Jul 2005 19:53:56 -0000	1.1974
+++ tobuild	21 Jul 2005 19:54:49 -0000	1.1975
@@ -113,3 +113,4 @@
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
+scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 19:56:50 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:56:50 -0400
Subject: common tobuild,1.1975,1.1976
Message-ID: <200507211956.j6LJuow9021455@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21438

Modified Files:
	tobuild 
Log Message:
request build of rpms/bochs/devel bochs-2_2_1-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1975
retrieving revision 1.1976
diff -u -r1.1975 -r1.1976
--- tobuild	21 Jul 2005 19:54:49 -0000	1.1975
+++ tobuild	21 Jul 2005 19:56:48 -0000	1.1976
@@ -114,3 +114,4 @@
 scop	rpms/lft/devel	lft-2_31-3	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
+scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 19:58:06 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 15:58:06 -0400
Subject: common tobuild,1.1976,1.1977
Message-ID: <200507211958.j6LJw6Ve021493@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21476

Modified Files:
	tobuild 
Log Message:
request build of rpms/bochs/FC-4 bochs-2_2_1-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -r1.1976 -r1.1977
--- tobuild	21 Jul 2005 19:56:48 -0000	1.1976
+++ tobuild	21 Jul 2005 19:58:04 -0000	1.1977
@@ -115,3 +115,4 @@
 scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
+scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:09:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:09:32 -0400
Subject: common tobuild,1.1977,1.1978
Message-ID: <200507212010.j6LKA2EA022679@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22662

Modified Files:
	tobuild 
Log Message:
request build of rpms/synaptic/FC-3 synaptic-0_57_2-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1977
retrieving revision 1.1978
diff -u -r1.1977 -r1.1978
--- tobuild	21 Jul 2005 19:58:04 -0000	1.1977
+++ tobuild	21 Jul 2005 20:09:30 -0000	1.1978
@@ -116,3 +116,4 @@
 scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
+scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3



From fedora-extras-commits at redhat.com  Thu Jul 21 20:11:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:11:43 -0400
Subject: common tobuild,1.1978,1.1979
Message-ID: <200507212012.j6LKCDGT022745@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22725

Modified Files:
	tobuild 
Log Message:
request build of rpms/synaptic/FC-4 synaptic-0_57_2-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -r1.1978 -r1.1979
--- tobuild	21 Jul 2005 20:09:30 -0000	1.1978
+++ tobuild	21 Jul 2005 20:11:41 -0000	1.1979
@@ -117,3 +117,4 @@
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
+scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:14:32 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:14:32 -0400
Subject: common tobuild,1.1979,1.1980
Message-ID: <200507212014.j6LKEWL1022838@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22821

Modified Files:
	tobuild 
Log Message:
request build of rpms/synaptic/devel synaptic-0_57_2-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -r1.1979 -r1.1980
--- tobuild	21 Jul 2005 20:11:41 -0000	1.1979
+++ tobuild	21 Jul 2005 20:14:30 -0000	1.1980
@@ -118,3 +118,4 @@
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
+scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:35:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:35:43 -0400
Subject: common tobuild,1.1980,1.1981
Message-ID: <200507212035.j6LKZhIb022931@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22914

Modified Files:
	tobuild 
Log Message:
request build of rpms/dvb-apps/FC-4 dvb-apps-1_1_0-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -r1.1980 -r1.1981
--- tobuild	21 Jul 2005 20:14:30 -0000	1.1980
+++ tobuild	21 Jul 2005 20:35:41 -0000	1.1981
@@ -119,3 +119,4 @@
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
+scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:36:10 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:36:10 -0400
Subject: common tobuild,1.1981,1.1982
Message-ID: <200507212036.j6LKaAUC022993@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22976

Modified Files:
	tobuild 
Log Message:
request build of rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -r1.1981 -r1.1982
--- tobuild	21 Jul 2005 20:35:41 -0000	1.1981
+++ tobuild	21 Jul 2005 20:36:08 -0000	1.1982
@@ -120,3 +120,4 @@
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
 scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
+scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:37:35 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:37:35 -0400
Subject: common tobuild,1.1982,1.1983
Message-ID: <200507212037.j6LKbZ6i023060@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23043

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-IO-Socket-SSL/FC-4 perl-IO-Socket-SSL-0_97-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -r1.1982 -r1.1983
--- tobuild	21 Jul 2005 20:36:08 -0000	1.1982
+++ tobuild	21 Jul 2005 20:37:33 -0000	1.1983
@@ -121,3 +121,4 @@
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
 scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
+scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:38:01 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:38:01 -0400
Subject: common tobuild,1.1983,1.1984
Message-ID: <200507212038.j6LKc1J8023122@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23105

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-IO-Socket-SSL/devel perl-IO-Socket-SSL-0_97-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -r1.1983 -r1.1984
--- tobuild	21 Jul 2005 20:37:33 -0000	1.1983
+++ tobuild	21 Jul 2005 20:37:59 -0000	1.1984
@@ -122,3 +122,4 @@
 scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
 scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
+scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:39:15 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:39:15 -0400
Subject: common tobuild,1.1984,1.1985
Message-ID: <200507212039.j6LKdFJF023191@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23174

Modified Files:
	tobuild 
Log Message:
request build of rpms/gdome2/FC-4 gdome2-0_8_1-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -r1.1984 -r1.1985
--- tobuild	21 Jul 2005 20:37:59 -0000	1.1984
+++ tobuild	21 Jul 2005 20:39:13 -0000	1.1985
@@ -123,3 +123,4 @@
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
 scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
 scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
+scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:39:43 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:39:43 -0400
Subject: common tobuild,1.1985,1.1986
Message-ID: <200507212039.j6LKdh94023253@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23236

Modified Files:
	tobuild 
Log Message:
request build of rpms/gdome2/devel gdome2-0_8_1-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1985
retrieving revision 1.1986
diff -u -r1.1985 -r1.1986
--- tobuild	21 Jul 2005 20:39:13 -0000	1.1985
+++ tobuild	21 Jul 2005 20:39:41 -0000	1.1986
@@ -124,3 +124,4 @@
 scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
 scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
 scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
+scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Thu Jul 21 20:41:52 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:41:52 -0400
Subject: common tobuild,1.1986,1.1987
Message-ID: <200507212041.j6LKfqux023325@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23308

Modified Files:
	tobuild 
Log Message:
request build of rpms/rpmlint/FC-4 rpmlint-0_70-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1986
retrieving revision 1.1987
diff -u -r1.1986 -r1.1987
--- tobuild	21 Jul 2005 20:39:41 -0000	1.1986
+++ tobuild	21 Jul 2005 20:41:50 -0000	1.1987
@@ -125,3 +125,4 @@
 scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
 scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
+scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4



From fedora-extras-commits at redhat.com  Thu Jul 21 20:42:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 21 Jul 2005 16:42:29 -0400
Subject: common tobuild,1.1987,1.1988
Message-ID: <200507212042.j6LKgTnj023387@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23370

Modified Files:
	tobuild 
Log Message:
request build of rpms/rpmlint/devel rpmlint-0_70-4_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -r1.1987 -r1.1988
--- tobuild	21 Jul 2005 20:41:50 -0000	1.1987
+++ tobuild	21 Jul 2005 20:42:27 -0000	1.1988
@@ -126,3 +126,4 @@
 scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
+scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 02:54:09 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 22:54:09 -0400
Subject: extras-buildsys/server CONFIG.py, 1.19, 1.20 UserInterface.py, 1.24,
	1.25
Message-ID: <200507220254.j6M2s9Hj030733@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30683/server

Modified Files:
	CONFIG.py UserInterface.py 
Log Message:
2005-07-21  Dan Williams 

    * builder/CONFIG.py
      builder/builder.py
        - You must now specify a target/arch -> mock buildroot name
            mapping in the config file

    * server/UserInterface.py
      server/CONFIG.py
        - Add client target alias support so people don't have to
            know the exact target name
        - Add rowlimit support to job listing




Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CONFIG.py	16 Jul 2005 15:47:43 -0000	1.19
+++ CONFIG.py	22 Jul 2005 02:54:07 -0000	1.20
@@ -58,11 +58,28 @@
 config_opts['targets'] = {  'development' :	['i386'] }
 
 
+# Client Target Map
+#
+# If people don't want to type the whole target name exactly, then add some
+# aliases here.  The target which the server receives from the client when 
+# it enqueues a package is run through this alias list first to determine
+# the final target name.  The aliases are NOT case-sensitive.
+#
+# Mapping - our_target: client_alias
+#
+# ex: { 'development' : ['devel'], '5' : ['fc-5', 'fc5'] }
+
+config_opts['client_target_map'] = { 'development' : ['devel'] }
+
+
+
 # If you're using CVS building, sometimes the CVS directory layout won't match
 # the targets we've defined in config_opts['target'].  Add aliases for them
-# here, like "{  'devel': 'development', '4': 'FC-4' }
+# here.
 #
 # Mapping -   our_target: cvs_target
+#
+# ex: { 'development': 'devel', '4': 'FC-4' }
 
 config_opts['cvs_target_map'] = {}
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- UserInterface.py	20 Jul 2005 19:56:41 -0000	1.24
+++ UserInterface.py	22 Jul 2005 02:54:07 -0000	1.25
@@ -22,6 +22,7 @@
 import sys
 import os
 import copy
+import exceptions
 import BuildMaster
 import PackageJob
 from plague import AuthedXMLRPCServer
@@ -72,11 +73,32 @@
         return None
     return uid
 
-def validate_target(target):
+
+class InvalidTargetError(exceptions.Exception): pass
+
+def resolve_target(target):
+    client_target_map = config_opts['client_target_map']
+
+    # Resolve aliases first
+    resolved_target = target
+    done = True
+    for master_target in client_target_map.keys():
+        for alias in client_target_map[master_target]:
+            if resolved_target.lower() == alias.lower():
+                resolved_target = master_target
+                done = True
+                break
+        if done:
+            break
+
+    # Make sure we actually build the resolved target
     target_dict = config_opts['targets']
-    if target in target_dict.keys():
-        return True
-    return False
+    for master_target in target_dict.keys():
+        if resolved_target.lower() == master_target.lower():
+            return master_target
+
+    raise InvalidTargetError()
+
 
 
 class UserInterface:
@@ -97,20 +119,16 @@
                     "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target))
             return (-1, "This build server is set up for building SRPMS only.  Use the 'enqueue_srpm' command instead.")
 
-        print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" \
-                % (package, cvs_tag, target, email)
-        targets = config_opts['targets']
-        jobid = -1
-        if not targets.has_key(target):
-            print "Error setting up build for %s on %s: target does not exist."\
-                    % (cvs_tag, target)
+        try:
+            real_target = resolve_target(target)
+        except InvalidTargetError:
             email_result(email, cvs_tag, "Error setting up build for %s on "\
                     "%s: target does not exist." % (cvs_tag, target))
             return (-1, "This build server does not support the target %s." % target)
         else:
-            self._bm.enqueue(email, package, cvs_tag, target, buildreq, time.time())
-        return (0, "Success: package has been queued.")
-
+            print "Request to enqueue '%s' tag '%s' for target '%s' (user '%s')" % (package, cvs_tag, real_target, email)
+            self._bm.enqueue(email, package, cvs_tag, real_target, buildreq, time.time())
+            return (0, "Success: package has been queued.")
 
     def enqueue_srpm(self, email, package, srpm_file, target, buildreq=None):
         """ Accept a job to build from SRPM file and stuff it into the job database """
@@ -132,19 +150,16 @@
                     "%s: The SRPM does not exist, or is not accessible.  Remember to use absolute paths." % (srpm_file, target))
             return (-1, "SRPM does not exist or is not accessible, remember to use absolute paths.")
 
-        print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" \
-                % (package, srpm_file, target, email)
-        targets = config_opts['targets']
-        jobid = -1
-        if not targets.has_key(target):
-            print "Error setting up build for %s on %s: target does not exist."\
-                    % (srpm_file, target)
+        try:
+            real_target = resolve_target(target)
+        except InvalidTargetError:
             email_result(email, srpm_file, "Error setting up build for %s on "\
                     "%s: target does not exist." % (srpm_file, target))
             return (-1, "This build server does not support the target %s." % target)
         else:
-            self._bm.enqueue_srpm(email, package, srpm_file, target, buildreq, time.time())
-        return (0, "Success: package has been queued.")
+            print "Request to enqueue '%s' file '%s' for target '%s' (user '%s')" % (package, srpm_file, real_target, email)
+            self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time())
+            return (0, "Success: package has been queued.")
 
     def _kill_job(self, email, job, jobid):
         if not job:
@@ -192,9 +207,11 @@
             sql_args.append('uid<%d' % uid)
 
         if args_dict.has_key('target') and args_dict['target']:
-            if not validate_target(args_dict['target']):
+            try:
+                real_target = resolve_target(args_dict['target'])
+            except InvalidTargetError:
                 return (-1, "Error: Invalid job UID.", [])
-            sql_args.append('target="%s"' % args_dict['target'])
+            sql_args.append('target="%s"' % real_target)
 
         if not len(sql_args):
             return (-1, "Error: Invalid query.", [])
@@ -207,6 +224,12 @@
                 sql = sql + " AND "
             i = i + 1
 
+        # Deal with max # records
+        if args_dict.has_key('maxrows') and args_dict['maxrows']:
+            if not validate_uid(args_dict['maxrows']):
+                return (-1, "Error: Invalid max rows number.", [])
+            sql = sql + " LIMIT %d" % args_dict['maxrows']
+
         # Run the query for the job
         try:
             dbcx, curs = get_dbcx()



From fedora-extras-commits at redhat.com  Fri Jul 22 02:54:03 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 22:54:03 -0400
Subject: extras-buildsys ChangeLog,1.68,1.69
Message-ID: <200507220254.j6M2sXP6030736@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30683

Modified Files:
	ChangeLog 
Log Message:
2005-07-21  Dan Williams 

    * builder/CONFIG.py
      builder/builder.py
        - You must now specify a target/arch -> mock buildroot name
            mapping in the config file

    * server/UserInterface.py
      server/CONFIG.py
        - Add client target alias support so people don't have to
            know the exact target name
        - Add rowlimit support to job listing




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog	21 Jul 2005 14:36:48 -0000	1.68
+++ ChangeLog	22 Jul 2005 02:54:00 -0000	1.69
@@ -1,5 +1,18 @@
 2005-07-21  Dan Williams 
 
+    * builder/CONFIG.py
+      builder/builder.py
+        - You must now specify a target/arch -> mock buildroot name
+            mapping in the config file
+
+    * server/UserInterface.py
+      server/CONFIG.py
+        - Add client target alias support so people don't have to
+            know the exact target name
+        - Add rowlimit support to job listing
+
+2005-07-21  Dan Williams 
+
     * common/FileDownloader.py
       server/PackageJob.py
         - Remove usage of os.chdir() since it's process-wide



From fedora-extras-commits at redhat.com  Fri Jul 22 02:54:04 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 21 Jul 2005 22:54:04 -0400
Subject: extras-buildsys/builder CONFIG.py,1.6,1.7 builder.py,1.22,1.23
Message-ID: <200507220254.j6M2sY7J030740@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30683/builder

Modified Files:
	CONFIG.py builder.py 
Log Message:
2005-07-21  Dan Williams 

    * builder/CONFIG.py
      builder/builder.py
        - You must now specify a target/arch -> mock buildroot name
            mapping in the config file

    * server/UserInterface.py
      server/CONFIG.py
        - Add client target alias support so people don't have to
            know the exact target name
        - Add rowlimit support to job listing




Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CONFIG.py	13 Jul 2005 19:36:06 -0000	1.6
+++ CONFIG.py	22 Jul 2005 02:54:01 -0000	1.7
@@ -5,26 +5,39 @@
 
 config_opts['builder_cmd'] = "/usr/bin/mock"
 
-# Distro and Repo:
-#
-# The builder constructs the buildroot name that it
-# passes to mock from a few things.  The format is:
-#
-# ---
+config_opts['ssl_buildserver'] = True
+config_opts['fileserver_port'] = 8889
+config_opts['xmlrpc_port'] = 8888
+config_opts['hostname'] = 'localhost'
+
+# distro and repo
 #
-# both  and  come from the build server.
-# This constructed name NEEDS to match a mock config
-# file in /etc/mock.
+# These will eventually go away...
 config_opts['distro_name'] = "fedora"
 config_opts['repo_name'] = "core"
 
-config_opts['ssl_buildserver'] = True
 
-config_opts['fileserver_port'] = 8889
-config_opts['xmlrpc_port'] = 8888
-config_opts['hostname'] = 'localhost'
+# Targets
+#
+# These targets are maps of (target, arch) -> "mock buildroot name"
+# Mock buildroot names must currently match the buildroot config files
+# found in /etc/mock
+
+config_opts['mock_buildroot_map'] = {
+    ('fedora', 'development', 'i386', 'core')   : "fedora-development-i386-core",
+    ('fedora', 'development', 'x86_64', 'core') : "fedora-development-x86_64-core",
+    ('fedora', '5', 'i386', 'core')             : "fedora-5-i386-core",
+    ('fedora', '5', 'x86_64', 'core')           : "fedora-5-x86_64-core"
+}
+
+# Arches
+#
+# A list of all architectures and sub-architectures that this builder
+# can build.
 config_opts['arches'] = ['i386', 'i486', 'i586', 'i686']
 
+
+
 BUILDER_DIR = "/etc/plague/builder"
 
 # SSL Certs and keys


Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- builder.py	20 Jul 2005 14:51:48 -0000	1.22
+++ builder.py	22 Jul 2005 02:54:01 -0000	1.23
@@ -30,6 +30,7 @@
 import fcntl
 import urllib
 import errno
+import exceptions
 from plague import ArchUtils
 from plague import FileDownloader
 from plague import AuthedXMLRPCServer
@@ -396,44 +397,54 @@
         return False
 
 
+def resolve_buildroot_name(target, arch):
+    buildroot_map = config_opts['mock_buildroot_map']
+    try:
+        return buildroot_map[(config_opts['distro_name'], target, arch, config_opts['repo_name'])]
+    except KeyError:
+        raise InvalidTargetError()
+
+
+class InvalidTargetError(exceptions.Exception): pass
+
 class i386Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-i386-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'i386')
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/setarch i686'
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class x86_64Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-x86_64-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'x86_64')
         self.buildarch = buildarch
         self.arch_command = ''
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class PPCArch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-ppc-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'ppc')
         self.buildarch = buildarch
         self.arch_command = ''
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class PPC64Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-ppc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'ppc64')
         self.buildarch = buildarch
         self.arch_command = ''
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class SparcArch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-sparc-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'sparc')
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/sparc32'
         BuilderMock.__init__(self, uniqid, target, srpm_url)
 
 class Sparc64Arch(BuilderMock):
     def __init__(self, uniqid, target, buildarch, srpm_url):
-        self.buildroot = '%s-%s-sparc64-%s' % (config_opts['distro_name'], target, config_opts['repo_name'])
+        self.buildroot = resolve_buildroot_name(target, 'sparc64')
         self.buildarch = buildarch
         self.arch_command = '/usr/bin/sparc64'
         BuilderMock.__init__(self, uniqid, target, srpm_url)
@@ -609,23 +620,10 @@
     return 0
 
 
-def read_mock_configs(allowed_arches):
-    MOCK_CONFIG_DIR = "/etc/mock/"
-    tmp_list = os.listdir(MOCK_CONFIG_DIR)
+def get_target_arches(allowed_arches):
     target_arches = {}
-    for f in tmp_list:
-        if not f.endswith(".cfg"):
-            continue
-        try:
-            t = f.index("-")
-        except ValueError:
-            continue
-        cfg_name = f[:len(f)-4]
-        try:
-            (distro, target, arch, repo) = cfg_name.split('-')
-        except ValueError:
-            print "Unrecognized config %s, ignoring." % cfg_name
-            continue
+    for t in config_opts['mock_buildroot_map'].keys():
+        (distro, target, arch, repo) = t
         if distro == config_opts['distro_name'] and repo == config_opts['repo_name']:
             # 'arch' is by definition the "master" arch, ie i386 or x86_64,
             # not i486/i586/ia32e/etc.  We want to add on the "sub" arches
@@ -693,9 +691,9 @@
             print "Arch '%s' specified in the config file is not supported." % arch
             sys.exit(1)
 
-    target_arch_dict = read_mock_configs(config_opts['arches'])
+    target_arch_dict = get_target_arches(config_opts['arches'])
     if len(target_arch_dict) == 0:
-        print "No mock configuration files were found.  Exiting."
+        print "No useable mock buildroot names configured.  Exiting."
         sys.exit(1)
 
     if opts.daemon:



From fedora-extras-commits at redhat.com  Fri Jul 22 04:43:19 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Fri, 22 Jul 2005 00:43:19 -0400
Subject: web/html/docs/release-notes index.php,1.4,1.5
Message-ID: <200507220443.j6M4hJbU000639@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv622

Modified Files:
	index.php 
Log Message:
Making it more obvious that these notes are recent.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.php	11 Jul 2005 10:00:19 -0000	1.4
+++ index.php	22 Jul 2005 04:43:17 -0000	1.5
@@ -24,7 +24,7 @@
 				
  • Fedora Core 4
    • 
 				
 				
  • Fedora Core 3
    • 



From fedora-extras-commits at redhat.com  Fri Jul 22 05:06:54 2005
From: fedora-extras-commits at redhat.com (Kevin Gray (iprone))
Date: Fri, 22 Jul 2005 01:06:54 -0400
Subject: owners owners.list,1.23,1.24
Message-ID: <200507220507.j6M57Qco001792@cvs-int.fedora.redhat.com>

Author: iprone

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- owners.list	21 Jul 2005 02:10:57 -0000	1.23
+++ owners.list	22 Jul 2005 05:06:49 -0000	1.24
@@ -278,7 +278,7 @@
 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|
-Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|hula|A calendar and mail server|hula-kevin at iprone.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jul 22 05:23:38 2005
From: fedora-extras-commits at redhat.com (Kevin Gray (iprone))
Date: Fri, 22 Jul 2005 01:23:38 -0400
Subject: rpms/hula/devel .cvsignore, 1.4, 1.5 hula.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200507220523.j6M5NcLY001925@cvs-int.fedora.redhat.com>

Author: iprone

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

Modified Files:
	.cvsignore hula.spec sources 
Log Message:
auto-import hula-r261-1 on branch devel from hula-r261-1.src.rpm
import of version r261


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Apr 2005 17:17:18 -0000	1.4
+++ .cvsignore	22 Jul 2005 05:23:35 -0000	1.5
@@ -1 +1 @@
-hula-r200.tgz
+hula-r261.tgz


Index: hula.spec
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/hula.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hula.spec	26 Apr 2005 17:17:18 -0000	1.4
+++ hula.spec	22 Jul 2005 05:23:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		hula
 Summary:	A calendar and mail server
-Version:	r200
+Version:	r261
 Release:	1
 Source0:	http://www.kelley.ca/hulaTar/tars/%{name}-%{version}.tgz
 Source1:	hula.init
@@ -32,7 +32,7 @@
 %setup -q
 
 %build 
-./autogen.sh
+./autogen.sh --with-user=hula
 %configure
 make %{?_smp_mflags}
 
@@ -41,7 +41,10 @@
 %makeinstall
 
 # remove all .la files
-/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/hulamdb/*.la $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/modweb/*.la
+/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/connmgr/*.la \
+	    $RPM_BUILD_ROOT%{_libdir}/hulamdb/*.la \
+	    $RPM_BUILD_ROOT%{_libdir}/*.la \
+	    $RPM_BUILD_ROOT%{_libdir}/modweb/*.la
 
 # remove empty or irrelevant doco
 for foo in ChangeLog INSTALL NEWS; do
@@ -56,6 +59,10 @@
   /sbin/chkconfig --add hula
 fi
 
+%pre
+# Create system user for hula
+/usr/sbin/useradd -c "Hula" -s /sbin/nologin -r hula 2> /dev/null || :
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/service hula stop >/dev/null 2>&1 ||:
@@ -71,10 +78,12 @@
 %defattr(-,root,root,0755)
 %doc HACKING TODO AUTHORS README style-guide.html
 %{_sysconfdir}/rc.d/init.d/hula
+%{_bindir}/hulasqlite
 %{_bindir}/mwcomp
 %{_sbindir}/hulaavirus
 %{_sbindir}/hulaantispam
 %{_sbindir}/hulacalagent
+%{_sbindir}/hulaconnmgr
 %{_sbindir}/huladmc
 %{_sbindir}/hulaforward
 %{_sbindir}/hulageneric
@@ -83,12 +92,19 @@
 %{_sbindir}/hulamanager
 %{_sbindir}/hulamodweb
 %{_sbindir}/hulanmap
+%{_sbindir}/hulapluspack
 %{_sbindir}/hulapop3
 %{_sbindir}/hularules
+%{_sbindir}/hulasendmail
 %{_sbindir}/hulasetup
 %{_sbindir}/hulasmtp
 %{_sbindir}/hulastats
 %{_sbindir}/hulawebadmin
+%dir %{_libdir}/connmgr
+%{_libdir}/connmgr/libcmlists.so
+%{_libdir}/connmgr/libcmrbl.so
+%{_libdir}/connmgr/libcmrdns.so
+%{_libdir}/connmgr/libcmuser.so
 %dir %{_libdir}/hulamdb
 %{_libdir}/hulamdb/libmdbfile.so
 %dir %{_libdir}/modweb
@@ -99,6 +115,8 @@
 %{_libdir}/modweb/public.ctp
 %dir %{_libdir}/netmail/schemas
 %{_libdir}/netmail/schemas/webadmin.sch
+%dir %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/hula.pc
 %dir %{_libdir}/webadmin
 %{_libdir}/webadmin/1stdobj.wat
 %{_libdir}/webadmin/5nmail.wat
@@ -109,14 +127,22 @@
 %{_libdir}/webadmin/8certgen.wat
 %{_libdir}/webadmin/chooser.wat
 %{_libdir}/webadmin/webadmin.wat
+%{_libdir}/libhulaconnio.so.0.0.0
+%{_libdir}/libhulaconnmgr.so.0.0.0
+%{_libdir}/libhulaical.so.0.0.0
+%{_libdir}/libhulaical2.so.0.0.0
 %{_libdir}/libhulalogger.so.0
 %{_libdir}/libhulalogger.so.0.0.0
+%{_libdir}/libhulamanagement.so.0.0.0
 %{_libdir}/libhulamdb.so.0
 %{_libdir}/libhulamdb.so.0.0.0
 %{_libdir}/libhulamemmgr.so.0
 %{_libdir}/libhulamemmgr.so.0.0.0
 %{_libdir}/libhulamsgapi.so.0
 %{_libdir}/libhulamsgapi.so.0.0.0
+%{_libdir}/libhulanmap.so.0.0.0
+%{_libdir}/libhulastreamio.so.0.0.0
+%{_libdir}/libhulautil.so.0.0.0
 %{_libdir}/libhulaxpl.so.0
 %{_libdir}/libhulaxpl.so.0.0.0
 %{_libdir}/libwacert.so
@@ -130,11 +156,14 @@
 %{_libdir}/libwastdobj.so.0
 %{_libdir}/libwastdobj.so.0.0.0
 
+
 %files -n %{name}-devel
 %defattr(-,root,root,0755)
 %dir %{_includedir}/hula
 %{_includedir}/hula/calendar.ary
 %{_includedir}/hula/calendar.tok
+%{_includedir}/hula/cmlib.h
+%{_includedir}/hula/connmgr.h
 %{_includedir}/hula/connio.h
 %{_includedir}/hula/hulautil.h
 %{_includedir}/hula/libical.h
@@ -184,7 +213,9 @@
 %{_includedir}/hula/xplthread.h
 %{_includedir}/hula/xplutil.h
 %{_libdir}/libhulaconnio.a
+%{_libdir}/libhulaconnmgr.a
 %{_libdir}/libhulaical.a
+%{_libdir}/libhulaical2.a
 %{_libdir}/libhulalogger.a
 %{_libdir}/libhulalogger.so
 %{_libdir}/libhulamanagement.a
@@ -203,6 +234,11 @@
 %{_libdir}/libwanmail.a
 %{_libdir}/libwastats.a
 %{_libdir}/libwastdobj.a
+%dir %{_libdir}/connmgr
+%{_libdir}/connmgr/libcmlists.a
+%{_libdir}/connmgr/libcmrbl.a
+%{_libdir}/connmgr/libcmrdns.a
+%{_libdir}/connmgr/libcmuser.a
 %dir %{_libdir}/hulamdb
 %{_libdir}/hulamdb/libmdbfile.a
 %dir %{_libdir}/modweb


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hula/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Apr 2005 17:17:18 -0000	1.4
+++ sources	22 Jul 2005 05:23:35 -0000	1.5
@@ -1 +1 @@
-020ed75fab30e0e081364c2468038541  hula-r200.tgz
+b35ff06992eb18a03df4fb3d438be811  hula-r261.tgz



From fedora-extras-commits at redhat.com  Fri Jul 22 05:23:32 2005
From: fedora-extras-commits at redhat.com (Kevin Gray (iprone))
Date: Fri, 22 Jul 2005 01:23:32 -0400
Subject: rpms/hula import.log,1.5,1.6
Message-ID: <200507220524.j6M5O3WK001928@cvs-int.fedora.redhat.com>

Author: iprone

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

Modified Files:
	import.log 
Log Message:
auto-import hula-r261-1 on branch devel from hula-r261-1.src.rpm
import of version r261


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hula/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	26 Apr 2005 17:17:18 -0000	1.5
+++ import.log	22 Jul 2005 05:23:28 -0000	1.6
@@ -2,3 +2,4 @@
 hula-r178-2:HEAD:hula-r178-2.src.rpm:1113599587
 hula-r186-1:HEAD:hula-r186-1.src.rpm:1114526895
 hula-r200-1:HEAD:hula-r200-1.src.rpm:1114535333
+hula-r261-1:HEAD:hula-r261-1.src.rpm:1122009801



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:21 -0400
Subject: extras-buildsys/www builders.psp, 1.1, 1.2 index.psp, 1.1,
	1.2 indiv.psp, 1.1, 1.2
Message-ID: <200507220539.j6M5dLbj002057@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www

Modified Files:
	builders.psp index.psp indiv.psp 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- builders.psp	21 Jul 2005 04:07:54 -0000	1.1
+++ builders.psp	22 Jul 2005 05:39:19 -0000	1.2
@@ -50,11 +50,14 @@
         # endif
 %>
 
-    
    
-    
+    
    
-            
+            
+            
 <%
         bjob = None
@@ -68,18 +71,17 @@
 %>
         
 <%
@@ -89,8 +91,7 @@
         # endfor
 %>
     
    
         
    ><%=addr%>  (<%=builder['status']%>)
-            <%=arch_list%>
+            
+                ><%=addr%>  (<%=builder['status']%>)
    
+                <%=arch_list%>
+                		
         
    
             
-                
    
-                
+                
    
-                        
+                        
    
                     
    
+                        
                             Job:
-                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
+                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
                             Status:
-                             <%=aj['status']%>/<%=aj['builder_status']%>
+                             <%=aj['status']%>/<%=aj['builder_status']%>
                         
                     
    
                 
    
-                
    
                 		
         
    
-    
    
-    
    
+    

    
 
 <%
     # endfor


Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.psp	21 Jul 2005 04:07:54 -0000	1.1
+++ index.psp	22 Jul 2005 05:39:19 -0000	1.2
@@ -31,31 +31,32 @@
 %>
 
 
    
-
    
-
+
    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
 
 <%
     i = 1
     for job in building_jobs:
-        # Don't show finished jobs older than 1 day
-        col = '#efefef'
+        top = ''
+        if i == 1:
+            top = '-top'
+        col_mod = ''
         if int(i / 2.0) == (i / 2.0):
-            col = '#dddddd'
-        # endif
+            col_mod = '-alt'
+
         source = job['source']
         if '/' in source:
             import os
@@ -63,23 +64,25 @@
         # endif
 %>
         
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
 <%
         i = i + 1
     # endfor
 
     for job in waiting_jobs:
-        # Don't show finished jobs older than 1 day
-        col = '#efefef'
+        top = ''
+        if i == 1:
+            top = '-top'
+        col_mod = ''
         if int(i / 2.0) == (i / 2.0):
-            col = '#dddddd'
-        # endif
+            col_mod = '-alt'
+
         source = job['source']
         if '/' in source:
             import os
@@ -87,12 +90,12 @@
         # endif
 %>
         
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
 <%
         i = i + 1


Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indiv.psp	21 Jul 2005 04:07:54 -0000	1.1
+++ indiv.psp	22 Jul 2005 05:39:19 -0000	1.2
@@ -55,17 +55,15 @@
 %>
 
 
    
-
    
-
    
 
     
     
     
 
 
    Job IDPackage NameSourceStatusTargetSubmitterJOB IDPACKAGE NAMESOURCESTATUSTARGETSUBMITTER
 
    
 
    <%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%><%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%>
         
    <%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%><%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['username']%>
         
    
-    
-        
    
-            
-                
-                
-                    
-                    
    Filter by:
-                        Status:
-                        
+    
-    
+                    
+                
+                
+            
+            
+        
    
+        
+            
+            
+                
+                
+                
-                    
+                
+                
-                    
-                
-                
-            
    Filter by:Status:
+                    
-                    
-                        Target:
-                        
+                Target:
+                    
-                    
    
-        
    
+    
    
 
    
-
-
    
 
-
    
-
+
    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
 
@@ -129,10 +123,12 @@
             if job['status'] == 'killed' or job['status'] == 'needsign':
                 if job['endtime'] != 0 and job['endtime'] < time.time() - cutoff_time:
                     continue
-            col = '#efefef'
+            top = ''
+            if i == 1:
+                top = '-top'
+            col_mod = ''
             if int(i / 2.0) == (i / 2.0):
-                col = '#dddddd'
-            # endif
+                col_mod = '-alt'
             source = job['source']
             if '/' in source:
                 import os
@@ -140,11 +136,11 @@
             # endif
 %>
         
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
 <%
             i = i + 1
@@ -154,7 +150,7 @@
         if i == 1:
 %>
         
-            
+            
 <%
         # endif
@@ -163,7 +159,6 @@
 
 
    
 
     
     
     
 
 
    Job IDPackage NameSourceStatusTargetJOB IDPACKAGE NAMESOURCESTATUSTARGET
 
    
 
    <%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%><%=job['uid']%><%=job['package']%><%=source%><%=job['status']%><%=job['target']%>
         
    No jobs found.No jobs found.
         
    
 
    
-
    
 
 
 <%



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:22 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:22 -0400
Subject: extras-buildsys/www/template head.psp,1.1,1.2
Message-ID: <200507220539.j6M5dM0P002069@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www/template

Modified Files:
	head.psp 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: head.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- head.psp	21 Jul 2005 04:07:55 -0000	1.1
+++ head.psp	22 Jul 2005 05:39:20 -0000	1.2
@@ -9,17 +9,15 @@
     email_url = '?email=' + user_email
 # endif
 
-active_color = 'bgcolor="#0000cc"'
-
-main_color = '#cc0000'
+main_active = ''
 if curpage == 'main':
-    main_color = active_color
-builders_color = '#cc0000'
+    main_active = '-active'
+builders_active = ''
 if curpage == 'builders':
-    builders_color = active_color
-indiv_color = '#cc0000'
+    builders_active = '-active'
+indiv_active = ''
 if curpage == 'individual':
-    indiv_color = active_color
+    indiv_active = '-active'
 #endif
 %>
 
@@ -36,19 +34,24 @@
         		
       
-          
-          
+          
+          
+      
    
         
    <%=config_opts['system_name']%>  <%=str(email_string)%>Today is: <%=str(time.strftime("%A %B %d, %Y"))%><%=config_opts['system_name']%>
+            
+              
+              
+            
    <%=str(email_string)%>
    Today is: <%=str(time.strftime("%A %B %d, %Y"))%>
    
+              		
         
    
+
+      
+      
-            
+          
+          
+          
+          
+          
    
         
    
-                
-                    
-                        
-                        
-                        
-                    
-                
    >Main>Builders>Individual View
    
-                		MainlBuilder StatuslMy Packages
         
    
       
    
 



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:21 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:21 -0400
Subject: extras-buildsys/www/css style.css,1.1,1.2
Message-ID: <200507220539.j6M5dLPQ002063@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/www/css

Modified Files:
	style.css 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: style.css
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- style.css	21 Jul 2005 04:07:54 -0000	1.1
+++ style.css	22 Jul 2005 05:39:19 -0000	1.2
@@ -10,8 +10,8 @@
 }
 
 * {
-	font-family:	"Luxi Sans", "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", helvetica, verdana, arial, sans-serif;
-	font-size:	14px;
+    font-family:    "Luxi Sans", "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", helvetica, verdana, arial, sans-serif;
+    font-size:      14px;
 }
 
 a:link {
@@ -19,10 +19,10 @@
 }
 
 table.page {
-	width:			100%;
-	border:			0px;
-	background-color:	#ffffff;
-	padding:			0px;
+    width:              100%;
+    border:             0px;
+    background-color:   #ffffff;
+    padding:            0px;
 }
 
 
@@ -41,34 +41,13 @@
 }
 
 td.top {
-    padding:        0px 2px 0px 2px;
+    padding:            0px 2px 0px 2px;
     background-color:   #cc0000;
-    vertical-align: bottom;
-    text-align:     bottom;
-    border-bottom:  1px solid #aaaaaa;
-}
-
-td.navtable-parent {
-    background-color:   #ffffff;
-    vertical-align: top;
-}
-
-table.navtable {
-    background-color:   #cc0000;
-    width:              auto;
-    padding:            0px;
-}
-
-td.navtable-button-left {
-    padding:            4px 17px 4px 17px;
+    vertical-align:     bottom;
+    text-align:         bottom;
 }
 
-td.navtable-button {
-    padding:            4px 17px 4px 17px;
-    border-left:        1px solid #d4d4d4;
-}
-
-font.header-text {
+font.header-system-name {
 	font-size:	24px;
 	font-weight:	800;
 	color:		#ffffff;
@@ -81,12 +60,37 @@
 	color: #ffffff;
 }
 
-a.navtable-button {
+/*
+-------------------------------
+ Navigation links table
+-------------------------------
+*/
+
+table.nav {
+    width:              auto;
+    padding:            5px 5px 5px 5px;
+}
+
+td.nav-link-sep {
+    padding:            0px 12px 0px 12px;
+}
+
+font.nav-link-sep {
+    text-align:         center;
+    color:              #000000;
+    font-weight:        bolder;
+    font-size:          18px;
+}
+
+a.nav-link {
+    text-align:         center;
+    font-weight:        bold;
+}
+
+a.nav-link-active {
+    color:              #cc0000;
     text-align:         center;
     font-weight:        bold;
-    color:              #ffffff;
-    font-size:          12px;
-    text-decoration:    none;
 }
 
 table.main {
@@ -97,29 +101,75 @@
 
 /*
 -------------------------------
+ Filter table
+-------------------------------
+*/
+
+table.filter {
+    width:          80%;
+    padding-bottom: 6px;
+}
+
+table.filter-form {
+    width:          auto;
+    vertical-align: center;
+}
+
+td.filter-form-head {
+    padding-left:   8px;
+    font-weight:    bold;
+    vertical-align: center;
+}
+
+td.filter-form-label {
+    padding-left:   10px;
+    text-align:     right;
+    vertical-align: center;
+}
+
+td.filter-form-item {
+    padding-left:   2px;
+    text-align:     left;
+    vertical-align: center;
+}
+
+
+/*
+-------------------------------
  joblist table
 -------------------------------
 */
 
-#joblist table {
-	padding:			0px;
-	background-color:	#dedede;
+table.jobs {
 	border:			solid 1px #999999;
 	width:			80%;
-	margin-bottom:		5px;
 }
 
-#joblist th {
-    font-weight:    bold;
-    font-size:      14px;
-    border-bottom:  solid 1px #999999;
-    padding:        3px;
+th.jobs {
+    font-weight:        bold;
+    font-size:          14px;
+    border-bottom:      solid 1px #999999;
+    padding:            3px;
+    text-align:         left;
+    background-color:   #86b5d9;
 }
 
-#joblist td {
-    font-size:      14px;
+td.job-top {
+    text-align:     left;
+    padding:        4px;
+}
+
+td.job {
     text-align:     left;
-    padding:        3px;
+    border-top:     1px solid #bcd6f0;
+    padding:        4px;
+}
+
+td.job-alt {
+    text-align:         left;
+    border-top:         1px solid #bcd6f0;
+    background-color:   #f1f1f1;
+    padding:            4px;
 }
 
 font.status-failed {
@@ -153,41 +203,40 @@
 -------------------------------
 */
 
-#builderlist table {
-    padding:            1px 2px 1px 2px;
-    border:             solid 1px #999999;
-    width:              60%; 
-    background-color:   #dedede;
+table.builderlist {
+    width:              50%;
 }
 
-td.builderlist-head {
-    font-size:      14px;
-    padding:        1px 2px 1px 2px;
-    border-bottom:  solid 1px #999999;
+td.builderaddr-side {
+    width:              3px;
+    background-color:   #aaaaaa;
+    padding-bottom:     5px;
+}
+
+td.builderaddr {
+    padding:            2px 4px 5px 4px;
+    background-color:   #efefef;
 }
 
-font.builderlistaddr {
+font.builderaddr {
     font-weight:    bold;
     font-size:      14px;
 }
 
-font.builderlistarches {
+font.builderarches {
     font-size:      12px;
-    text-align:     right;
+    font-style:     italic;
+    font-weight:    normal;
 }
 
-#archjoblist table {
+table.archjobs {
     padding:            1 px 2px 1px 2px;
     border:             none;
-    background-color:   #efefef;
-    width:              100%;
+    width:              80%;
 }
 
-#archjoblist td {
-    font-size:      14px;
-    text-align:     left;
-    padding-left:   2px;
-    padding-right:  2px;
+td.archjobs {
+    padding-top:        5px;
 }
 
 font.archjobtag {
@@ -195,68 +244,7 @@
     font-size:      12px;
 }
 
-
-
-a.tasktable-item-option-link {
-	font-size:	12px;
-}
-
-font.tasktable-item-option-nolink {
-	font-weight:	800;
-	font-size:	12px;
-}
-
-table.tasktable-parent-collapsed {
-	width:		100%;
-}
-
-table.tasktable-parent-expanded {
-	width:		100%;
-}
-
-a.tasktable-item-collapsed {
-	text-align:		left;
-	font-weight:		bold;
-	border-bottom:		none;
-	text-decoration:	none;
-}
-
-font.tasktable-item-aux {
-	color:		#000000;
-	text-align:	left;
-	font-size:	12px;
-}
-
-a.tasktable-item-expanded {
-	text-align:		left;
-	font-weight:		bold;
-	border-bottom:		none;
-	text-decoration:	none;
-}
-
-td.tasktable-header {
-	font-size:		12px;
-	font-weight:		bold;
-	color:			#000000;
-	background-color:	#749CBB;
-}
-
-td.tasktable-task {
-	font-size:		12px;
-	border-bottom:		1px solid #bcd6f0;
-	background-color:	inherit;
-}
-
-a.tasktable-bug-link {
-	font-size:		12px;
-}
-
-td.tasktable-task-last {
-	font-size:		12px;
-	background-color:	inherit;
+font.archjob {
+    font-size:      12px;
 }
 
-td.tasktable-no-tasks {
-	font-style:		italic;
-	background-color:	#ffffff;
-}



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:15 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:15 -0400
Subject: extras-buildsys ChangeLog,1.69,1.70
Message-ID: <200507220539.j6M5djBA002072@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981

Modified Files:
	ChangeLog 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog	22 Jul 2005 02:54:00 -0000	1.69
+++ ChangeLog	22 Jul 2005 05:39:13 -0000	1.70
@@ -1,3 +1,8 @@
+2005-07-22  Dan Williams 
+
+    * Web front-end cleanup
+        - Use Diana Fong's new design.  Delicious!
+
 2005-07-21  Dan Williams 
 
     * builder/CONFIG.py



From fedora-extras-commits at redhat.com  Fri Jul 22 05:39:15 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 01:39:15 -0400
Subject: extras-buildsys/builder builder.py,1.23,1.24
Message-ID: <200507220539.j6M5dkZ4002073@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1981/builder

Modified Files:
	builder.py 
Log Message:
2005-07-22  Dan Williams 

    * Web front-end cleanup
        - Use Diana Fong's new design.  Delicious!




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- builder.py	22 Jul 2005 02:54:01 -0000	1.23
+++ builder.py	22 Jul 2005 05:39:13 -0000	1.24
@@ -754,6 +754,9 @@
             xmlserver.handle_request()
         except KeyboardInterrupt, e:
             print "Shutting down..."
+            curjob = xmlserver.get_cur_job()
+            if curjob:
+                xmlserver.die(curjob)
             break
 
         cur_time = time.time()



From fedora-extras-commits at redhat.com  Fri Jul 22 06:51:55 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:51:55 -0400
Subject: rpms/bash-completion/FC-4 .cvsignore, 1.8, 1.9 bash-completion.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200507220651.j6M6ptdH003385@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350/FC-4

Modified Files:
	.cvsignore bash-completion.spec sources 
Log Message:
* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
- 20050721.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jul 2005 15:25:03 -0000	1.8
+++ .cvsignore	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-bash-completion-20050720.tar.bz2
+bash-completion-20050721.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bash-completion.spec	20 Jul 2005 15:25:03 -0000	1.10
+++ bash-completion.spec	22 Jul 2005 06:51:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           bash-completion
-Version:        20050720
+Version:        20050721
 Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
+- 20050721.
+
 * Wed Jul 20 2005 Ville Skytt??  - 20050720-1
 - 20050720, all patches applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Jul 2005 15:25:03 -0000	1.8
+++ sources	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2
+4de9f0dee0663f08b5e24f64490e642e  bash-completion-20050721.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jul 22 06:51:56 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:51:56 -0400
Subject: rpms/bash-completion/devel .cvsignore, 1.8, 1.9 bash-completion.spec,
	1.10, 1.11 sources, 1.8, 1.9
Message-ID: <200507220651.j6M6puwL003393@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3350/devel

Modified Files:
	.cvsignore bash-completion.spec sources 
Log Message:
* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
- 20050721.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jul 2005 15:25:04 -0000	1.8
+++ .cvsignore	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-bash-completion-20050720.tar.bz2
+bash-completion-20050721.tar.bz2


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bash-completion.spec	20 Jul 2005 15:25:04 -0000	1.10
+++ bash-completion.spec	22 Jul 2005 06:51:53 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           bash-completion
-Version:        20050720
+Version:        20050721
 Release:        1%{?dist}
 Summary:        Programmable completion for Bash
 
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Ville Skytt??  - 20050721-1
+- 20050721.
+
 * Wed Jul 20 2005 Ville Skytt??  - 20050720-1
 - 20050720, all patches applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Jul 2005 15:25:04 -0000	1.8
+++ sources	22 Jul 2005 06:51:53 -0000	1.9
@@ -1 +1 @@
-2118a649a55350358d879ca28e7e7d77  bash-completion-20050720.tar.bz2
+4de9f0dee0663f08b5e24f64490e642e  bash-completion-20050721.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jul 22 06:52:41 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:52:41 -0400
Subject: common tobuild,1.1988,1.1989
Message-ID: <200507220652.j6M6qfuF003458@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3441

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -r1.1988 -r1.1989
--- tobuild	21 Jul 2005 20:42:27 -0000	1.1988
+++ tobuild	22 Jul 2005 06:52:39 -0000	1.1989
@@ -127,3 +127,4 @@
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel
+scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 06:53:08 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:53:08 -0400
Subject: common tobuild,1.1989,1.1990
Message-ID: <200507220653.j6M6r8To003520@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3503

Modified Files:
	tobuild 
Log Message:
request build of rpms/bash-completion/devel bash-completion-20050721-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -r1.1989 -r1.1990
--- tobuild	22 Jul 2005 06:52:39 -0000	1.1989
+++ tobuild	22 Jul 2005 06:53:06 -0000	1.1990
@@ -128,3 +128,4 @@
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4
+scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 06:54:07 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 02:54:07 -0400
Subject: common tobuild,1.1990,1.1991
Message-ID: <200507220654.j6M6s7bG003548@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3531

Modified Files:
	tobuild 
Log Message:
Remove unneeded bash-completion builds.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -r1.1990 -r1.1991
--- tobuild	22 Jul 2005 06:53:06 -0000	1.1990
+++ tobuild	22 Jul 2005 06:54:05 -0000	1.1991
@@ -112,8 +112,6 @@
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
-scop	rpms/bash-completion/FC-4	bash-completion-20050720-1_fc4	fc4
-scop	rpms/bash-completion/devel	bash-completion-20050720-1_fc5	devel
 scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
 scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3



From fedora-extras-commits at redhat.com  Fri Jul 22 07:52:28 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 22 Jul 2005 03:52:28 -0400
Subject: fedora-security/audit fc4,1.28,1.29
Message-ID: <200507220752.j6M7qSoD004911@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4894

Modified Files:
	fc4 
Log Message:
Mozilla is now released; fix the bad sorting



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fc4	21 Jul 2005 09:00:30 -0000	1.28
+++ fc4	22 Jul 2005 07:52:26 -0000	1.29
@@ -4,57 +4,55 @@
 ** are items that need attention
 
 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2270 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2269 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2269 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2269 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2268 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2268 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+2005-2267 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2267 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2266 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2266 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2266 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
-2005-2265 VULNERABLE (mozilla, fixed 1.7.9) [si
+2005-2265 version (mozilla, fixed 1.7.9) [si [since FEDORA-2005-619]
 2005-2265 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2264 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2263 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2263 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2262 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2261 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
 2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2261 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2261 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-2260 VULNERABLE (mozilla, fixed 1.7.9)
+2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
 2005-2114 ** mozilla, can't find out when this was fixed upstream
 2005-2096 backport (zlib) [since FEDORA-2005-523]
 2005-2096 backport (rpm) [since FEDORA-2005-565]
 2005-2095 VULNERABLE (squirrelmail)
 2005-2088 VULNERABLE (httpd)
+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-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-2005-1937 VULNERABLE (mozilla, fixed 1.7.9)
+2005-1937 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
+2005-1831 ignore (sudo) unsubstantiated report
+2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
 2005-1768 version (kernel, fixed 2.6.6)
+2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483]
 2005-1765 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1764 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1763 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 2005-1761 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
-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-1937 VULNERABLE (firefox)
-2005-1937 VULNERABLE (mozilla)
-2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
-2005-1831 ignore (sudo) unsubstantiated report
-2005-1763 version (kernel) [since FEDORA-2005-510]
-2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
-2005-1766 version (HelixPlayer, fixed 1.0.5) [since FEDORA-2005-483]
 2005-1760 VULNERABLE (sysreport)
 2005-1759 VULNERABLE (nmap)
 2005-1759 VULNERABLE (openldap)
@@ -62,7 +60,6 @@
 2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
 2005-1751 VULNERABLE (openldap, fixed shtool 2.0.2)
 2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
-2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 2005-1740 backport (net-snmp, not fixed)
 2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1]
 2005-1705 version (gdb, fixed 6.3)
@@ -72,6 +69,7 @@
 2005-1686 ignore (gedit, not a vulnerability)
 2005-1636 version (mysql, fixed 4.1.12) [since FEDORA-2005-557]
 2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0
+2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 2005-1544 version (libtiff, fixed 3.7.1 at least)
 2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
 2005-1532 version (thunderbird) [since FEDORA-2005-606]



From fedora-extras-commits at redhat.com  Fri Jul 22 09:08:11 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Fri, 22 Jul 2005 05:08:11 -0400
Subject: web/html/docs/release-notes/fc4/errata index.php, 1.4,
	1.5 ld-txt-fedora-desktop-screenshot.php, 1.3, 1.4
Message-ID: <200507220908.j6M98Bm8007800@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes/fc4/errata
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7781

Modified Files:
	index.php ld-txt-fedora-desktop-screenshot.php 
Log Message:
Adding in a section that mirrors the Wiki page ForbiddenItems.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/fc4/errata/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.php	19 Jul 2005 23:10:39 -0000	1.4
+++ index.php	22 Jul 2005 09:08:09 -0000	1.5
@@ -22,40 +22,43 @@
 
 
    
 
    1. Welcome to Fedora Core 4
    
-
    1.1. New in Fedora Core 4
    
+
    
+
    1.1. New in Fedora Core 4
    
+
    1.2. MP3 Codecs and Other Patented or Closed Source Software
    
+
    
 
    2. Legalnotice
    
 
    3. Introduction and Technical Release Notes
    
 
    4. Hardware Requirements
    
 
    
-
    4.1. CPU Requirements
    
-
    4.2. Hard Disk Space Requirements
    
-
    4.3. Memory Requirements
    
+
    4.1. CPU Requirements
    
+
    4.2. Hard Disk Space Requirements
    
+
    4.3. Memory Requirements
    
 
    4.4. PPC Hardware Requirements
    
 
    
 
    5. Overview of This Release
    
 
    6. Installation-Related Notes
    
 
    
 
    6.1. PPC Installation Notes
    
-
    6.2. Anaconda Notes
    
-
    6.3. Installation-Related Issues
    
+
    6.2. Anaconda Notes
    
+
    6.3. Installation-Related Issues
    
 
    
-
    7. Package-Specific Notes
    
+
    7. Package-Specific Notes
    
 
    
 
    7.1. Basic Components
    
 
    
-
    7.1.1. Fedora Extras Repository
    
+
    7.1.1. Fedora Extras Repository
    
 
    7.1.2. Audit Daemon auditd and Log
 	Files
    
 
    7.1.3. LinuxThreads versus NPTL
    
-
    7.1.4. Enabling the slocate Database
    
-
    7.1.5. Stricter Controls in openssh
    
+
    7.1.4. Enabling the slocate Database
    
+
    7.1.5. Stricter Controls in openssh
    
 
    7.1.6. Perl Binary Compat Symlinks
    
 
    7.1.7. Server and System Configuration Tools
    
-
    7.1.8. Java Package Recommendations
    
+
    7.1.8. Java Package Recommendations
    
 
    
 
    7.2. Core
    
 
    
-
    7.2.1. yum
    
+
    7.2.1. yum
    
 
    7.2.2. 
     Linux Kernel
   
    
@@ -65,8 +68,8 @@
     Development Tools
   
 
    7.3.1. GCC Compiler Collection
    
-
    7.4. Language Support
    
-
    7.4.1. The IIIMF Input System
    
+
    7.4. Language Support
    
+
    7.4.1. The IIIMF Input System
    
 
    7.5. Web Servers
    
 
    
 
    7.5.1. mod_perl
    
@@ -151,8 +154,8 @@
 	
    
 
    
 
    
-
    
-
    [D]
+
    
+
    [D]
 
    
 
    
 
    Example??1.??New desktop featuring Clearlooks and Evince
    
@@ -223,6 +226,134 @@
 	
    
 
    
 
    
+
    
+
    
+
    
+1.2.??MP3 Codecs and Other Patented or Closed Source Software
    
+
    
+
    
+
    
+      This section is a brief explanation of why certain software is not
+      included in Fedora Core or Fedora Extras.  This information was drawn directly
+      from the canonical wiki page:
+    
    
+
    
+      http://fedoraproject.org/wiki/ForbiddenItems
+    
    
+
    
+      A frequent question of the Fedora Project is why certain items are not
+      included in Fedora Core or Fedora Extras. This briefly explains some of the
+      reasons.
+    
    
+
    
+      Other items, such as file systems support, requires community
+      participation.  For more information, refer to http://fedoraproject.org/wiki/Wishlist
+    
    
+
    
+
    NTFS
    
+
    
+	    NTFS Support is not included in the Fedora Core kernel because of
+	    patent concerns. Using a file system natively supported by
+	    Linux such as ext3 is a better option. If you must share
+	    files between Windows and Linux on a single system, use
+	    FAT/FAT32 (vfat) instead. For sharing across a network,
+	    Samba is a good option.
+	  
    
+
    MP3 encode/decode functionality
    
+
    
+	    MP3 support is not included in any Fedora Core application because
+	    MP3 is heavily patented in several regions including the
+	    United States. The patent holder is unwilling to give an
+	    unrestricted patent grant, as required by the GPL. Other
+	    platforms might have paid the royalty and/or included
+	    proprietary software. Other Linux distributions not based in
+	    a region affected by the patent might ship MP3
+	    decoders/encoders. However, Fedora Core cannot and does not ship
+	    MP3 decoders/encoders in order to serve the goal of shipping
+	    only free and open source software. Using other open source
+	    formats such as Ogg Vorbis (a lossy codec that has better
+	    quality than MP3) or FLAC (a lossless codec) is highly
+	    recommended.
+	  
    
+
    NVIDIA 3D drivers
    
+
    
+	    The NVIDIA 3D drivers are closed source. Fedora Core does not
+	    include proprietary binaries. Consider using an Intel or any
+	    other manufacturer that supports open source cards with full
+	    specifications and/or source code.
+	  
    
+
    ATI 3D drivers
    
+
    
+	    The ATI 3D drivers are closed source. Fedora Core does not include
+	    proprietary binaries. Consider using an Intel or any other
+	    manufacturer that supports open source cards with full
+	    specifications and/or source code.
+	  
    
+
    RealPlayer
    
+
    
+	    RealPlayer is a closed source application. Fedora Core does not
+	    include proprietary binaries. Consider using open source
+	    codecs that do not have patent restrictions.
+	  
    
+
    DVD video playback
    
+
    
+	    DVD video playback (of CSS encrypted DVDs) may violate the
+	    US DMCA (refer to http://en.wikipedia.org/wiki/DMCA) 
+	    because it may be considered circumventing an encryption
+	    mechanism. Additionally, MPEG2 is a patented codec, so even
+	    DVDs without encryption cannot be played. Consider using
+	    open source unencrypted mediums such as Ogg Theora formats.
+	  
    
+
    Mono
    
+
    
+	    Mono packages are not currently included due to potential
+	    legal issues. (Pending more input.) Applications can be
+	    written in other languages that are open source, such as
+	    Python, Perl, or Ruby. Java is cross-platform and GCJ is a
+	    relatively mature open source implementation of it. These
+	    are not direct one-to-one equivalents with .NET but might
+	    serve your purpose.
+	  
    
+
    Cryptology (mcrypt)
    
+
    
+	    Some cryptology related packages such as mcrypt are not
+	    included within Fedora Core due to US export restrictions. Consider
+	    using non-restricted cryptographical methods instead.
+	  
    
+
    szip
    
+
    
+	    The szip license is too restrictive for inclusion in Fedora Extras.
+	    Use other open source alternatives.
+	  
    
+
    
+
    
+      In conclusion:
+    
    
+
      
+
    •  If it is proprietary, it cannot be included in Fedora.
+	
      • 
+
    • 
+	  If it is legally encumbered, it cannot be included in Fedora.
+	
      • 
+
    • 
+	  If it violates US Federal law, it cannot be included in Fedora.
+	
      • 
+
    
+
    
+      Of course, the logical followup is: "But I want to get foo and do
+      bar, how can I do one of the items listed above?"
+    
    
+
    
+      The unofficial http://fedorafaq.org provides
+      useful answers on commonly asked questions. However, these are
+      completely unsupported by the Fedora Project. The Fedora Project recommends using free
+      and open source software alternatives whenever possible.
+    
    
+
    
+      The binary only drivers can be acquired from the vendors. You can
+      find many interesting things with Google.
+    
    
+
    
 
    
 
    
 
    
@@ -252,7 +383,7 @@
     produced for the Fedora Project.
     
    
 
    
-    RELEASE-NOTES-FC4 (2005-07-19-T16:20-0700)
+    RELEASE-NOTES-FC4 (2005-07-22-T04:20-0700)
   
    
 
    
     Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux
@@ -357,7 +488,7 @@
 
    
 
    
 
    
-4.1.??CPU Requirements
    
+4.1.??CPU Requirements
    
 
    
 
    
 
    This section lists the CPU specifications required by Fedora Core
@@ -401,7 +532,7 @@
 
    
 
    
 
    
-4.2.??Hard Disk Space Requirements
    
+4.2.??Hard Disk Space Requirements
    
 
    
 
    
 
    This section lists the disk space required to install Fedora Core
@@ -464,7 +595,7 @@
 
    
 
    
 
    
-4.3.??Memory Requirements
    
+4.3.??Memory Requirements
    
 
    
 
 
    This section lists the memory required to install Fedora Core
@@ -947,7 +1078,7 @@
 
    
 
    
 
    
-6.2.??Anaconda Notes
    
+6.2.??Anaconda Notes
    
 
    
 
 
      
@@ -1010,7 +1141,7 @@
 
      
 
      
 
      
-6.3.??Installation-Related Issues
      
+6.3.??Installation-Related Issues
      
 
      
 
    
 
      
@@ -1110,7 +1241,7 @@
 
      
 
      
 
      
-7.??Package-Specific Notes
      
+7.??Package-Specific Notes
      
 
      
 
    
 
    
@@ -1132,7 +1263,7 @@
 
    
 
    
 
    
-7.1.1.??Fedora Extras Repository
    
+7.1.1.??Fedora Extras Repository
    
 
    
 
 
    
@@ -1274,7 +1405,7 @@
 
    
 
    
 
    
-7.1.4.??Enabling the slocate Database
    
+7.1.4.??Enabling the slocate Database
    
 
    
 
 
    
@@ -1288,7 +1419,7 @@
 
    
 
    
 
    
-7.1.5.??Stricter Controls in openssh
    
+7.1.5.??Stricter Controls in openssh
    
 
    
 
 
    
@@ -1374,7 +1505,7 @@
 
    
 
    
 
    
-7.1.8.??Java Package Recommendations
    
+7.1.8.??Java Package Recommendations
    
 
    
 
 
    
@@ -1405,7 +1536,7 @@
 
    
 
    
 
    
-7.2.1.??yum
    
+7.2.1.??yum
    
 
    
 
 
    
@@ -1899,7 +2030,7 @@
 
    
 
    
 
    
-7.4.??Language Support
    
+7.4.??Language Support
    
 
    
 
 
    
@@ -1909,7 +2040,7 @@
 
    
 
    
 
    
-7.4.1.??The IIIMF Input System
    
+7.4.1.??The IIIMF Input System
    
 
    
 
 
    





From fedora-extras-commits at redhat.com  Fri Jul 22 10:04:16 2005
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Fri, 22 Jul 2005 06:04:16 -0400
Subject: rpms/scim/devel scim.spec,1.7,1.8
Message-ID: <200507221005.j6MA59PL008957@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	scim.spec 
Log Message:
Restore Jens previous commits



Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim.spec	21 Jul 2005 14:34:43 -0000	1.7
+++ scim.spec	22 Jul 2005 10:04:14 -0000	1.8
@@ -36,17 +36,17 @@
 
 
 %build
-%configure
+%configure --disable-static --disable-ld-version-script
 make %{?_smp_mflags}
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
-mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
+mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
 # Kill all .a and .la
-find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f
+find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
 # install setup panel
 desktop-file-install \
@@ -138,6 +138,16 @@
 * Fri Jul 16 2005 Ryo Dairiki  - 1.4.0-1
 - update to 1.4.0 release
 
+* Sat Jul  9 2005 Jens Petersen  - 1.3.3-1
+- update to 1.3.3 release
+- disable linking with version-scripts for now since they cause some problems
+- disable building of static libs
+
+* Tue Jul  5 2005 Jens Petersen  - 1.3.2-1
+- update to 1.3.2 test release
+- don't set xinput.d script executable
+- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script
+
 * Sat May 28 2005 Ryo Dairiki  - 1.2.3-1
 - update to 1.2.3 release
 



From fedora-extras-commits at redhat.com  Fri Jul 22 12:02:08 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 22 Jul 2005 08:02:08 -0400
Subject: fedora-security/audit fc4,1.29,1.30
Message-ID: <200507221202.j6MC2cBi011372@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11355

Modified Files:
	fc4 
Log Message:
Catch up on released updated



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fc4	22 Jul 2005 07:52:26 -0000	1.29
+++ fc4	22 Jul 2005 12:02:06 -0000	1.30
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+2005-2355 backport (fetchmail) [since FEDORA-2005-613]
 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
@@ -92,8 +93,8 @@
 2005-1458 version (ethereal, fixed 0.10.11)
 2005-1457 version (ethereal, fixed 0.10.11)
 2005-1456 version (ethereal, fixed 0.10.11)
-2005-1455 VULNERABLE (freeradius, affects 1.0.2) waiting for upstream
-2005-1454 VULNERABLE (freeradius, affects 1.0.2) waiting for upstream
+2005-1455 version (freeradius, fixed 1.0.3) [since FEDORA-2005-602]
+2005-1454 version (freeradius, fixed 1.0.3) [since FEDORA-2005-602]
 2005-1431 version (gnutls, fixed 1.0.25)
 2005-1410 version (postgresql, fixed 8.0.2)
 2005-1409 version (postgresql, fixed 8.0.1)



From fedora-extras-commits at redhat.com  Fri Jul 22 13:17:13 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Fri, 22 Jul 2005 09:17:13 -0400
Subject: rpms/galeon/FC-4 galeon.spec,1.12,1.13
Message-ID: <200507221317.j6MDHDcF012723@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	galeon.spec 
Log Message:
galeon: release bumping


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- galeon.spec	7 Jul 2005 20:52:05 -0000	1.12
+++ galeon.spec	22 Jul 2005 13:17:11 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	1.3.21
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -101,7 +101,10 @@
 
 
 %changelog
-* Thu Jul  7 2005 Dams  - 1.3.21
+* Fri Jul 22 2005 Dams  - 1.3.21-9
+- Rebuilt against mozilla 1.7.10
+
+* Thu Jul  7 2005 Dams  - 1.3.21-8
 - Hopefully fixed BuildReq.
 - replaced name by galeon in Source0
 



From fedora-extras-commits at redhat.com  Fri Jul 22 13:18:26 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Fri, 22 Jul 2005 09:18:26 -0400
Subject: common tobuild,1.1991,1.1992
Message-ID: <200507221318.j6MDIQ85012788@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12771

Modified Files:
	tobuild 
Log Message:
request build of rpms/galeon/FC-4 galeon-1_3_21-9_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -r1.1991 -r1.1992
--- tobuild	22 Jul 2005 06:54:05 -0000	1.1991
+++ tobuild	22 Jul 2005 13:18:24 -0000	1.1992
@@ -127,3 +127,4 @@
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel
 scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel
+anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 15:07:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:07:59 -0400
Subject: common tobuild,1.1992,1.1993
Message-ID: <200507221507.j6MF7xVE015400@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15383

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder-0_27-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -r1.1992 -r1.1993
--- tobuild	22 Jul 2005 13:18:24 -0000	1.1992
+++ tobuild	22 Jul 2005 15:07:56 -0000	1.1993
@@ -128,3 +128,4 @@
 scop	rpms/bash-completion/FC-4	bash-completion-20050721-1_fc4	fc4
 scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel
 anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4
+scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3



From fedora-extras-commits at redhat.com  Fri Jul 22 15:08:26 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:08:26 -0400
Subject: common tobuild,1.1993,1.1994
Message-ID: <200507221508.j6MF8QLR015433@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15416

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -r1.1993 -r1.1994
--- tobuild	22 Jul 2005 15:07:56 -0000	1.1993
+++ tobuild	22 Jul 2005 15:08:24 -0000	1.1994
@@ -129,3 +129,4 @@
 scop	rpms/bash-completion/devel	bash-completion-20050721-1_fc5	devel
 anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3
+scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 15:08:45 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:08:45 -0400
Subject: common tobuild,1.1994,1.1995
Message-ID: <200507221508.j6MF8jiJ015466@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15449

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -r1.1994 -r1.1995
--- tobuild	22 Jul 2005 15:08:24 -0000	1.1994
+++ tobuild	22 Jul 2005 15:08:43 -0000	1.1995
@@ -130,3 +130,4 @@
 anvil	rpms/galeon/FC-4	galeon-1_3_21-9_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3
 scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4
+scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 15:11:27 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:11:27 -0400
Subject: common tobuild,1.1995,1.1996
Message-ID: <200507221511.j6MFBRli015539@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15522

Modified Files:
	tobuild 
Log Message:
request build of rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -r1.1995 -r1.1996
--- tobuild	22 Jul 2005 15:08:43 -0000	1.1995
+++ tobuild	22 Jul 2005 15:11:25 -0000	1.1996
@@ -131,3 +131,4 @@
 scop	rpms/perl-ExtUtils-XSBuilder/FC-3	perl-ExtUtils-XSBuilder-0_27-2_fc3	fc3
 scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel
+scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 15:15:34 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 22 Jul 2005 11:15:34 -0400
Subject: common tobuild,1.1996,1.1997
Message-ID: <200507221515.j6MFFYEk015615@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15598

Modified Files:
	tobuild 
Log Message:
request build of rpms/libapreq2/devel libapreq2-2_06-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -r1.1996 -r1.1997
--- tobuild	22 Jul 2005 15:11:25 -0000	1.1996
+++ tobuild	22 Jul 2005 15:15:32 -0000	1.1997
@@ -132,3 +132,4 @@
 scop	rpms/perl-ExtUtils-XSBuilder/FC-4	perl-ExtUtils-XSBuilder-0_27-2_fc4	fc4
 scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel
 scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4
+scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 16:27:06 2005
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 22 Jul 2005 12:27:06 -0400
Subject: rpms/denyhosts/devel README.fedora, NONE,
	1.1 denyhosts-0.8.0-config.patch, NONE,
	1.1 denyhosts-0.8.0-setup.patch, NONE, 1.1 denyhosts.cron, 1.2,
	1.3 denyhosts.init, 1.1, 1.2 denyhosts.spec, 1.4,
	1.5 denyhosts-0.8.0-workdir.patch, 1.1, NONE
Message-ID: <200507221627.j6MGR6qw017048@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.cron denyhosts.init denyhosts.spec 
Added Files:
	README.fedora denyhosts-0.8.0-config.patch 
	denyhosts-0.8.0-setup.patch 
Removed Files:
	denyhosts-0.8.0-workdir.patch 
Log Message:
* Fri Jul 22 2005 Jason L Tibbitts III  - 0.8.0-3
- Rename the lockfile used by the initscript/cron setup because
  DenyHosts now has its own internal locking and they chose the exact
  same lockfile we were using.
- Turn on PURGE_DENY in the installed config file.
- Delete data_files from setup.py.
- Enable purging in denyhosts.cron.
- Add README.fedora file.



--- NEW FILE README.fedora ---
Some useful information about DenyHosts as packaged by Fedora Extras
--------------------------------------------------------------------

It installs and runs as a service, so you can start it with:

  service denyhosts start

and enable it at boot time with:

  chkconfig denyhosts on


By default it will process your logs every ten minutes.  You can
change the interval by editing /etc/cron.d/denyhosts.  You can see a
description of the file format by running:

  man 5 crontab


By default, DenyHosts is set up to purge old block entries, but only
after one year.  If you wish to adjust this, edit /etc/denyhosts.conf
and look for "PURGE_DENY".  The purge procedure is run daily at 5AM.
To adjust this frequency, edit /etc/cron.d/denyhosts.


DenyHosts will process only your current logfile (/var/log/secure).
If you want to incorporate an old logfile (in this example,
/var/log/secure.1) , you can run

  denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1

DenyHosts can also handle logs compressed with gzip or bzip2.



denyhosts-0.8.0-config.patch:

--- NEW FILE denyhosts-0.8.0-config.patch ---
--- denyhosts.cfg-dist.orig	2005-07-22 08:58:03.668064303 -0500
+++ denyhosts.cfg-dist	2005-07-22 10:15:48.146561932 -0500
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 1y
 #######################################################################
 
 
@@ -89,7 +94,7 @@
 # WORK_DIR: the path that DenyHosts will use for writing data to
 # (it will be created if it does not already exist).       
 #
-WORK_DIR = denyhosts
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 

denyhosts-0.8.0-setup.patch:

--- NEW FILE denyhosts-0.8.0-setup.patch ---
--- setup.py.orig	2005-07-22 10:18:29.184475189 -0500
+++ setup.py	2005-07-22 10:18:42.445844737 -0500
@@ -21,11 +21,11 @@
       ##package_dir={'': 'modules'},
       ##packages=["."],
       py_modules=["denyhosts_version"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
-                  (libpath, glob("LICENSE.txt"))],
+#      data_files=[(libpath, glob("denyhosts.cfg-dist")),
+#                  (libpath, glob("setup.py")),
+#                  (libpath, glob("CHANGELOG.txt")),
+#                  (libpath, glob("README.txt")),
+#                  (libpath, glob("LICENSE.txt"))],
       license="GPL",
       extra_path='denyhosts',
       long_description="""


Index: denyhosts.cron
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts.cron	2 Jul 2005 21:37:55 -0000	1.2
+++ denyhosts.cron	22 Jul 2005 16:27:04 -0000	1.3
@@ -2,5 +2,9 @@
 # heavily attacked then it is reasonable to make it run as frequently as once
 # every minute.  DenyHosts runs quickly once it has initially processed your
 # logs and should not take a significant amount of CPU time.
-*/10 * * * * root [ -f /var/lock/subsys/denyhosts ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
+*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+#
+# Automatically purge old entries early in the morning.  Note that you must
+# edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the
+# default value purge time is set very high.
+0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge


Index: denyhosts.init
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- denyhosts.init	20 May 2005 04:57:02 -0000	1.1
+++ denyhosts.init	22 Jul 2005 16:27:04 -0000	1.2
@@ -15,7 +15,7 @@
 # source function library
 . /etc/rc.d/init.d/functions
 
-lockfile=/var/lock/subsys/denyhosts
+lockfile=/var/lock/subsys/denyhosts.init
 
 RETVAL=0
 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- denyhosts.spec	21 Jul 2005 16:56:22 -0000	1.4
+++ denyhosts.spec	22 Jul 2005 16:27:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -10,7 +10,9 @@
 Source1:	denyhosts.cron
 Source2:	denyhosts.init
 Source3:	denyhosts-allowed-hosts
-Patch0:		denyhosts-0.8.0-workdir.patch
+Source4:	README.fedora
+Patch0:		denyhosts-0.8.0-config.patch
+Patch1:		denyhosts-0.8.0-setup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
@@ -29,10 +31,15 @@
 %prep
 %setup -q -n DenyHosts-%{version}
 %patch0 -p0
+%patch1 -p0
+
+cp %{SOURCE4} .
+
 
 %build
 python ./setup.py build
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
@@ -73,7 +80,8 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt README.txt setup.py
+%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
+%doc README.fedora README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts
@@ -92,6 +100,15 @@
 
 
 %changelog
+* Fri Jul 22 2005 Jason L Tibbitts III  - 0.8.0-3
+- Rename the lockfile used by the initscript/cron setup because
+  DenyHosts now has its own internal locking and they chose the exact
+  same lockfile we were using.
+- Turn on PURGE_DENY in the installed config file.
+- Delete data_files from setup.py.
+- Enable purging in denyhosts.cron.
+- Add README.fedora file.
+
 * Thu Jul 21 2005 Jason L Tibbitts III  - 0.8.0-2
 - Package CHANGELOG.txt and denyhosts.cfg-dist as well (as
   documentation).


--- denyhosts-0.8.0-workdir.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jul 22 17:04:08 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Fri, 22 Jul 2005 13:04:08 -0400
Subject: owners owners.list,1.24,1.25
Message-ID: <200507221704.j6MH4V06018229@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	owners.list 
Log Message:
extras-qa is not a valid owner


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- owners.list	22 Jul 2005 05:06:49 -0000	1.24
+++ owners.list	22 Jul 2005 17:04:04 -0000	1.25
@@ -62,7 +62,7 @@
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|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-qa at fedoraproject.org|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|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  Fri Jul 22 17:20:08 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:20:08 -0400
Subject: rpms/wesnoth/devel wesnoth.spec, 1.12, 1.13 wesnoth-64bit.patch, 1.1,
	NONE
Message-ID: <200507221720.j6MHK8IE018304@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	wesnoth.spec 
Removed Files:
	wesnoth-64bit.patch 
Log Message:
Delete obsolete patch and use an ugly %find_lang hack which also
works with FC3.



Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wesnoth.spec	8 Jul 2005 10:07:50 -0000	1.12
+++ wesnoth.spec	22 Jul 2005 17:20:06 -0000	1.13
@@ -85,7 +85,8 @@
 install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
 
-/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
+%find_lang %{name}.\*
+#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
 
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
@@ -114,7 +115,7 @@
 fi
 
 
-%files -f %{name}.lang
+%files -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %doc COPYING changelog README copyright MANUAL* README.fedora
 %{_bindir}/wesnoth


--- wesnoth-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jul 22 17:21:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:21:33 -0400
Subject: rpms/wesnoth/FC-4 README.fedora, NONE, 1.1 wesnoth.sysconfig, NONE,
	1.1 wesnothd.init, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wesnoth.spec, 1.8, 1.9 wesnoth-64bit.patch, 1.1, NONE
Message-ID: <200507221721.j6MHLXjA018344@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Added Files:
	README.fedora wesnoth.sysconfig wesnothd.init 
Removed Files:
	wesnoth-64bit.patch 
Log Message:
Sync with devel.



--- NEW FILE README.fedora ---
This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
upgrade this game package, since it may affect your [or your users'] saved
games or result in unexpected incompatibilities or changes.

With development release 0.8.8 the developers switched to a different
release model and discontinued their stable branch. There won't be another
stable release until 1.0 is ready. Version 0.8, which was the last stable
release from June/July 2004, is quite old, unsupported, and is also
incompatible with the official game server at wesnoth.org. The game server
will run always the most recent version of the software shortly after its
release.



--- NEW FILE wesnoth.sysconfig ---
#
# wesnothd(6) options. Pick a custom port here if needed, for example.
#
WESNOTHD_OPTIONS=""


--- NEW FILE wesnothd.init ---
#!/bin/sh
#
# wesnothd     This shell script takes care of starting and stopping
#              the Wesnoth game server.
#
# chkconfig:   - 15 85
# description: The Wesnoth server supports playing networked \
#              multi-player games.
# processname: wesnothd
# config:      /etc/sysconfig/wesnothd
# pidfile:     /var/run/wesnothd.pid

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

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/sbin/wesnothd"
prog=$(basename $exec)
pidfile=/var/run/$prog.pid
socketfile=/var/run/wesnothd/socket

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting Wesnoth game server: "
    if [ -n "`/sbin/pidof $prog`" ]; then
        echo -n $"$prog already running"
        failure
        echo
        return 1
    fi
    [ -p $socketfile ] && rm -f $socketfile
    daemon --user wesnothd $exec --daemon $WESNOTHD_OPTIONS >/dev/null 2>&1
    retval=$?
    if [ $retval -eq 0 ]; then
        success
        touch $lockfile
        pidofproc $prog > $pidfile
    else
        failure
    fi
    echo
    return $retval
}

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

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
    ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:33:21 -0000	1.3
+++ .cvsignore	22 Jul 2005 17:21:31 -0000	1.4
@@ -1 +1 @@
-wesnoth-0.8.tar.gz
+wesnoth-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:33:21 -0000	1.3
+++ sources	22 Jul 2005 17:21:31 -0000	1.4
@@ -1 +1 @@
-c6258d08645a97c311c9538128f5af6e  wesnoth-0.8.tar.gz
+833bd6995a26c873485750875607f127  wesnoth-0.9.3.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wesnoth.spec	26 May 2005 16:48:07 -0000	1.8
+++ wesnoth.spec	22 Jul 2005 17:21:31 -0000	1.9
@@ -1,19 +1,23 @@
 Name:           wesnoth
-Version:        0.8
-Release: 5
-
+Version:        0.9.3
+Release:        1%{?dist}
 Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.wesnoth.org/files/wesnoth-0.8.tar.gz
-Patch0: wesnoth-64bit.patch
+Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
+Source1:        wesnothd.init
+Source2:        wesnoth.sysconfig
+Source3:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  libpng-devel
+BuildRequires:  desktop-file-utils, gettext
+
+Requires:       /sbin/chkconfig
 
 %description
 %{summary}.
@@ -23,22 +27,46 @@
 of attacks. Units gain experience and advance levels, and are carried over
 from one scenario to the next campaign.
 
+
+%package server
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description server
+This package contains the binaries for running a Wesnoth server
+for multi-player games.
+
+
+%package tools
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description tools
+This package contains the game editor and development tools.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
+cp %{SOURCE3} .
 
 
 %build
 %configure --disable-dependency-tracking \
-           --enable-server \
-           --enable-editor
-
+    --with-localedir=%{_datadir}/locale \
+    --enable-editor \
+    --enable-tools \
+    --enable-server \
+    --with-fifodir=/var/run/wesnothd \
+    --with-server-uid=$(id -u) \
+    --with-server-gid=$(id -g) 
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
@@ -47,22 +75,93 @@
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 
+# arrange server package files
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p ${RPM_BUILD_ROOT}/var/run/wesnothd
+touch ${RPM_BUILD_ROOT}/var/run/wesnothd/socket
+install -Dpm 755 %{SOURCE1} \
+    $RPM_BUILD_ROOT%{_initrddir}/wesnothd
+install -Dpm 644 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
+
+%find_lang %{name}.\*
+#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
+
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+
+%pre server
+/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
+	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
+
+
+%post server
+/sbin/chkconfig --add wesnothd
+if [ $1 -gt 1 ]; then
+    %{_initrddir}/wesnothd try-restart >/dev/null || :
+fi
+
+
+%preun server
+if [ $1 -eq 0 ]; then
+    %{_initrddir}/wesnothd stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del wesnothd
+fi
+
+
+%files -f %{name}.\*.lang
 %defattr(-,root,root,-)
-%doc COPYING changelog README copyright MANUAL*
-%{_bindir}/*
+%doc COPYING changelog README copyright MANUAL* README.fedora
+%{_bindir}/wesnoth
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_mandir}/man6/*
+%{_mandir}/man6/wesnoth.6*
+%{_mandir}/*/man6/wesnoth.6*
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/wesnoth_editor
+%{_bindir}/exploder
+%{_bindir}/cutter
+%{_bindir}/wmlxgettext
+%{_mandir}/man6/wesnoth_editor.6*
+%{_mandir}/*/man6/wesnoth_editor.6*
+
+%files server
+%defattr(-,root,root,-)
+%config %{_initrddir}/wesnothd
+%config(noreplace) %{_sysconfdir}/sysconfig/wesnoth
+%{_sbindir}/wesnothd
+%{_mandir}/man6/wesnothd.*
+%{_mandir}/*/man6/wesnothd.*
+%attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/
+%ghost /var/run/wesnothd/socket
 
 %changelog
+* Fri Jul  8 2005 Michael Schwendt  - 0.9.3-1
+- update to 0.9.3
+
+* Mon Jun 13 2005 Michael Schwendt  - 0.9.2-1
+- update to 0.9.2
+- BR libpng-devel is needed
+- add initscript and scriptlets for -server package
+- don't build campaign server (upstream suggestion)
+- split off editor+tools into -tools sub-package
+- install translations into system's locale directories
+- merge Panu's changes:
+  Sat Apr 16 2005 Panu Matilainen  0.9.0-1
+- enable campaign server and tools
+- split server to separate package
+- add wesnothd user in server %%pre
+- buildrequire gettext
+
 * Thu May 26 2005 Jeremy Katz  - 0.8-5
 - fix build on x86_64
 


--- wesnoth-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jul 22 17:22:33 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:22:33 -0400
Subject: rpms/wesnoth/FC-3 README.fedora, NONE, 1.1 wesnoth.sysconfig, NONE,
	1.1 wesnothd.init, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 wesnoth.spec, 1.4, 1.5
Message-ID: <200507221722.j6MHMXRE018410@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Added Files:
	README.fedora wesnoth.sysconfig wesnothd.init 
Log Message:
Sync with devel.



--- NEW FILE README.fedora ---
This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
upgrade this game package, since it may affect your [or your users'] saved
games or result in unexpected incompatibilities or changes.

With development release 0.8.8 the developers switched to a different
release model and discontinued their stable branch. There won't be another
stable release until 1.0 is ready. Version 0.8, which was the last stable
release from June/July 2004, is quite old, unsupported, and is also
incompatible with the official game server at wesnoth.org. The game server
will run always the most recent version of the software shortly after its
release.



--- NEW FILE wesnoth.sysconfig ---
#
# wesnothd(6) options. Pick a custom port here if needed, for example.
#
WESNOTHD_OPTIONS=""


--- NEW FILE wesnothd.init ---
#!/bin/sh
#
# wesnothd     This shell script takes care of starting and stopping
#              the Wesnoth game server.
#
# chkconfig:   - 15 85
# description: The Wesnoth server supports playing networked \
#              multi-player games.
# processname: wesnothd
# config:      /etc/sysconfig/wesnothd
# pidfile:     /var/run/wesnothd.pid

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

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ "$NETWORKING" = "no" ] && exit 0

exec="/usr/sbin/wesnothd"
prog=$(basename $exec)
pidfile=/var/run/$prog.pid
socketfile=/var/run/wesnothd/socket

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting Wesnoth game server: "
    if [ -n "`/sbin/pidof $prog`" ]; then
        echo -n $"$prog already running"
        failure
        echo
        return 1
    fi
    [ -p $socketfile ] && rm -f $socketfile
    daemon --user wesnothd $exec --daemon $WESNOTHD_OPTIONS >/dev/null 2>&1
    retval=$?
    if [ $retval -eq 0 ]; then
        success
        touch $lockfile
        pidofproc $prog > $pidfile
    else
        failure
    fi
    echo
    return $retval
}

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

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
    ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:33:21 -0000	1.3
+++ .cvsignore	22 Jul 2005 17:22:31 -0000	1.4
@@ -1 +1 @@
-wesnoth-0.8.tar.gz
+wesnoth-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:33:21 -0000	1.3
+++ sources	22 Jul 2005 17:22:31 -0000	1.4
@@ -1 +1 @@
-c6258d08645a97c311c9538128f5af6e  wesnoth-0.8.tar.gz
+833bd6995a26c873485750875607f127  wesnoth-0.9.3.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wesnoth.spec	10 Dec 2004 22:03:12 -0000	1.4
+++ wesnoth.spec	22 Jul 2005 17:22:31 -0000	1.5
@@ -1,66 +1,176 @@
 Name:           wesnoth
-Version:        0.8
-Release:        2
-Epoch:          0
-Summary:        Battle for Wesnoth is a fantasy turn-based strategy game.
+Version:        0.9.3
+Release:        1%{?dist}
+Summary:        Battle for Wesnoth, a fantasy turn-based strategy game
 
-Group:         	Amusements/Games
+Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.wesnoth.org/files/wesnoth-0.8.tar.gz
+Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
+Source1:        wesnothd.init
+Source2:        wesnoth.sysconfig
+Source3:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
-BuildRequires:	SDL_ttf-devel, SDL_net-devel, freetype-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
+BuildRequires:  libpng-devel
+BuildRequires:  desktop-file-utils, gettext
+
+Requires:       /sbin/chkconfig
 
 %description
-%{summary}
+%{summary}.
 
-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 
+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.
 
+
+%package server
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description server
+This package contains the binaries for running a Wesnoth server
+for multi-player games.
+
+
+%package tools
+Summary:	%{summary}
+Group:		Amusements/Games
+Requires:   %{name} = %{version}-%{release}
+
+%description tools
+This package contains the game editor and development tools.
+
+
 %prep
 %setup -q
+cp %{SOURCE3} .
 
 
 %build
 %configure --disable-dependency-tracking \
-	   --enable-server \
-	   --enable-editor
-
-make %{?_smp_mflags} 
+    --with-localedir=%{_datadir}/locale \
+    --enable-editor \
+    --enable-tools \
+    --enable-server \
+    --with-fifodir=/var/run/wesnothd \
+    --with-server-uid=$(id -u) \
+    --with-server-gid=$(id -g) 
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-		     --mode="0644" --vendor fedora \
-		     --add-category="X-Fedora" icons/%{name}.desktop
-# add icon for menus		     
+                     --mode="0644" --vendor fedora \
+                     --add-category="X-Fedora" icons/%{name}.desktop
+# add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 
+# arrange server package files
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
+mkdir -p ${RPM_BUILD_ROOT}/var/run/wesnothd
+touch ${RPM_BUILD_ROOT}/var/run/wesnothd/socket
+install -Dpm 755 %{SOURCE1} \
+    $RPM_BUILD_ROOT%{_initrddir}/wesnothd
+install -Dpm 644 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
+
+%find_lang %{name}.\*
+#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name
+
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+
+%pre server
+/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
+	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
+
+
+%post server
+/sbin/chkconfig --add wesnothd
+if [ $1 -gt 1 ]; then
+    %{_initrddir}/wesnothd try-restart >/dev/null || :
+fi
+
+
+%preun server
+if [ $1 -eq 0 ]; then
+    %{_initrddir}/wesnothd stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del wesnothd
+fi
+
+
+%files -f %{name}.\*.lang
 %defattr(-,root,root,-)
-%doc COPYING changelog README copyright MANUAL*
-%{_bindir}/*
+%doc COPYING changelog README copyright MANUAL* README.fedora
+%{_bindir}/wesnoth
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
-%{_mandir}/man6/*
+%{_mandir}/man6/wesnoth.6*
+%{_mandir}/*/man6/wesnoth.6*
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/wesnoth_editor
+%{_bindir}/exploder
+%{_bindir}/cutter
+%{_bindir}/wmlxgettext
+%{_mandir}/man6/wesnoth_editor.6*
+%{_mandir}/*/man6/wesnoth_editor.6*
+
+%files server
+%defattr(-,root,root,-)
+%config %{_initrddir}/wesnothd
+%config(noreplace) %{_sysconfdir}/sysconfig/wesnoth
+%{_sbindir}/wesnothd
+%{_mandir}/man6/wesnothd.*
+%{_mandir}/*/man6/wesnothd.*
+%attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/
+%ghost /var/run/wesnothd/socket
 
 %changelog
+* Fri Jul  8 2005 Michael Schwendt  - 0.9.3-1
+- update to 0.9.3
+
+* Mon Jun 13 2005 Michael Schwendt  - 0.9.2-1
+- update to 0.9.2
+- BR libpng-devel is needed
+- add initscript and scriptlets for -server package
+- don't build campaign server (upstream suggestion)
+- split off editor+tools into -tools sub-package
+- install translations into system's locale directories
+- merge Panu's changes:
+  Sat Apr 16 2005 Panu Matilainen  0.9.0-1
+- enable campaign server and tools
+- split server to separate package
+- add wesnothd user in server %%pre
+- buildrequire gettext
+
+* Thu May 26 2005 Jeremy Katz  - 0.8-5
+- fix build on x86_64
+
+* Sun May 22 2005 Jeremy Katz  - 0.8-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Fri Jul 09 2004 Panu Matilainen  0:0.8-0.fdr.2
 - use upstream desktop file and icon
 



From fedora-extras-commits at redhat.com  Fri Jul 22 17:30:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:30:24 -0400
Subject: rpms/wesnoth/devel README.fedora,1.1,1.2
Message-ID: <200507221730.j6MHUsio018511@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	README.fedora 
Log Message:
fix a typo in readme


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/devel/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	17 Jun 2005 01:17:19 -0000	1.1
+++ README.fedora	22 Jul 2005 17:30:22 -0000	1.2
@@ -1,4 +1,4 @@
-This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
+This is a DEVELOPMENT release of "Battle for Wesnoth". Be careful when to
 upgrade this game package, since it may affect your [or your users'] saved
 games or result in unexpected incompatibilities or changes.
 



From fedora-extras-commits at redhat.com  Fri Jul 22 17:30:23 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:30:23 -0400
Subject: rpms/wesnoth/FC-3 README.fedora,1.1,1.2
Message-ID: <200507221730.j6MHUrdG018507@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	README.fedora 
Log Message:
fix a typo in readme


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-3/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	22 Jul 2005 17:22:31 -0000	1.1
+++ README.fedora	22 Jul 2005 17:30:21 -0000	1.2
@@ -1,4 +1,4 @@
-This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
+This is a DEVELOPMENT release of "Battle for Wesnoth". Be careful when to
 upgrade this game package, since it may affect your [or your users'] saved
 games or result in unexpected incompatibilities or changes.
 



From fedora-extras-commits at redhat.com  Fri Jul 22 17:30:24 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Fri, 22 Jul 2005 13:30:24 -0400
Subject: rpms/wesnoth/FC-4 README.fedora,1.1,1.2
Message-ID: <200507221730.j6MHUs1u018510@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	README.fedora 
Log Message:
fix a typo in readme


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-4/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	22 Jul 2005 17:21:31 -0000	1.1
+++ README.fedora	22 Jul 2005 17:30:21 -0000	1.2
@@ -1,4 +1,4 @@
-This is a DEVELOPMENT release of "Battle for Wesnoth. Be careful when to
+This is a DEVELOPMENT release of "Battle for Wesnoth". Be careful when to
 upgrade this game package, since it may affect your [or your users'] saved
 games or result in unexpected incompatibilities or changes.
 



From fedora-extras-commits at redhat.com  Fri Jul 22 18:11:10 2005
From: fedora-extras-commits at redhat.com (Than Ngo (than))
Date: Fri, 22 Jul 2005 14:11:10 -0400
Subject: owners owners.list,1.25,1.26
Message-ID: <200507221811.j6MIBAZx019753@cvs-int.fedora.redhat.com>

Author: than

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

Modified Files:
	owners.list 
Log Message:
extras-qa is not a valid owner


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- owners.list	22 Jul 2005 17:04:04 -0000	1.25
+++ owners.list	22 Jul 2005 18:11:08 -0000	1.26
@@ -280,7 +280,7 @@
 Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|hula-kevin at iprone.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org|
@@ -628,7 +628,7 @@
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|pure-ftpd|Lightweight, fast and secure FTP server|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|putty|Putty - a SSH, Telnet & Rlogin client|extras-qa at fedoraproject.org|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|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at linux.duke.edu|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|
@@ -861,7 +861,7 @@
 Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xosd|On-screen display library for X|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xtide|A program for calculating tide all over the world|extras-qa at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:05 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:05 -0400
Subject: rpms/pytz/devel - New directory
Message-ID: <200507222058.j6MKw5J6022426@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:04 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:04 -0400
Subject: rpms/pytz - New directory
Message-ID: <200507222058.j6MKw4H6022421@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:14 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:14 -0400
Subject: rpms/pytz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507222058.j6MKwEnh022469@cvs-int.fedora.redhat.com>

Author: orion

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 22 20:58:15 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:15 -0400
Subject: rpms/pytz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507222058.j6MKwFZI022474@cvs-int.fedora.redhat.com>

Author: orion

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

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


--- NEW 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 Jul 22 20:58:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:41 -0400
Subject: rpms/pytz import.log,1.1,1.2
Message-ID: <200507222058.j6MKwfSt022537@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	import.log 
Log Message:
auto-import pytz-2005i-2 on branch devel from pytz-2005i-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pytz/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jul 2005 20:58:12 -0000	1.1
+++ import.log	22 Jul 2005 20:58:38 -0000	1.2
@@ -0,0 +1 @@
+pytz-2005i-2:HEAD:pytz-2005i-2.src.rpm:1122065914



From fedora-extras-commits at redhat.com  Fri Jul 22 20:58:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 16:58:41 -0400
Subject: rpms/pytz/devel pytz.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200507222058.j6MKwfKY022544@cvs-int.fedora.redhat.com>

Author: orion

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

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


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

Name:           pytz
Version:        2005i
Release:        2
Summary:        World Timezone Definitions for Python

Group:          Development/Languages
License:        MIT
URL:            http://pytz.sourceforge.net/
Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python

%description
pytz brings the Olson tz database into Python. This library allows accurate
and cross platform timezone calculations using Python 2.3 or higher. It
also solves the issue of ambiguous times at the end of daylight savings,
which you can read more about in the Python Library Reference
(datetime.tzinfo).

Amost all (over 540) of the Olson timezones are supported.

%prep
%setup -q


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
chmod +x $RPM_BUILD_ROOT%{python_sitelib}/pytz/*.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt
%{python_sitelib}/pytz/

%changelog
* Fri Jul 22 2005 Orion Poplawski  2005i-2
- Remove -O1 from install command

* Tue Jul 05 2005 Orion Poplawski  2005i-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jul 2005 20:58:13 -0000	1.1
+++ .cvsignore	22 Jul 2005 20:58:39 -0000	1.2
@@ -0,0 +1 @@
+pytz-2005i.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jul 2005 20:58:13 -0000	1.1
+++ sources	22 Jul 2005 20:58:39 -0000	1.2
@@ -0,0 +1 @@
+45aeaba1bc49c62e65490c047ff7fbea  pytz-2005i.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:28 -0400
Subject: extras-buildsys ChangeLog,1.70,1.71
Message-ID: <200507222135.j6MLZS0O023830@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772

Modified Files:
	ChangeLog 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog	22 Jul 2005 05:39:13 -0000	1.70
+++ ChangeLog	22 Jul 2005 21:35:26 -0000	1.71
@@ -1,5 +1,40 @@
 2005-07-22  Dan Williams 
 
+    * builder/builder.py
+        - Fix traceback when killing jobs on shutdown of the builder
+
+    * client/client.py
+        - Add a job detail command
+
+    * server/ArchJob.py
+        - Store job start and end times in the database
+
+    * server/BuildMaster.py
+        - Remove JobsQuery class, no longer used
+        - Store more info in the job database to support web front end features
+        - Don't try to restart jobs in the 'initialize' state since they'll
+            get restarted anyway
+
+    * server/PackageJob.py
+        - Generalize log URL construction so it can be accessed from the user interface
+        - Pass more job info to the BuildMaster to be written to the DB
+        - Don't use tempfile.mkdtemp(), it seems to have issues
+        - Return 30 lines of log rather than 20
+
+    * server/User.py
+        - Grab a new connection to the database on every access, so that
+            user addition/modification can happen when the server is running
+
+    * server/UserInterface.py
+        - Add a "job detail" interface that returns information about a single
+            specific job
+
+    * server/main.py
+        - Greatly reduce buffer size for the logfile, now it actually gets written
+            out in a timely fashion
+
+2005-07-22  Dan Williams 
+
     * Web front-end cleanup
         - Use Diana Fong's new design.  Delicious!
 



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:28 -0400
Subject: extras-buildsys/builder builder.py,1.24,1.25
Message-ID: <200507222135.j6MLZSJ6023836@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772/builder

Modified Files:
	builder.py 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- builder.py	22 Jul 2005 05:39:13 -0000	1.24
+++ builder.py	22 Jul 2005 21:35:26 -0000	1.25
@@ -104,7 +104,7 @@
     def die(self, sig=15):
         # Do nothing if we've already been killed
         if self._done_status == 'killed':
-            return
+            return True
 
         self.log("Killing build process...\n")
         # Don't try to kill a running cleanup process
@@ -754,9 +754,9 @@
             xmlserver.handle_request()
         except KeyboardInterrupt, e:
             print "Shutting down..."
-            curjob = xmlserver.get_cur_job()
+            (curjob, status) = bcs.get_cur_job()
             if curjob:
-                xmlserver.die(curjob)
+                bcs.die(curjob)
             break
 
         cur_time = time.time()



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:29 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:29 -0400
Subject: extras-buildsys/client client.py,1.14,1.15
Message-ID: <200507222135.j6MLZTWf023840@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772/client

Modified Files:
	client.py 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- client.py	20 Jul 2005 16:10:39 -0000	1.14
+++ client.py	22 Jul 2005 21:35:27 -0000	1.15
@@ -141,6 +141,20 @@
             except IOError:
                 pass
 
+def detail_job(server, email, jobid):
+    """
+    Get a single job's details
+    """
+    try:
+        (err, msg, jobrec) = server.detail_job(email, jobid)
+    except socket.error, e:
+        print "Error connecting to build server: '%s'" % e
+        return
+    if err == -1:
+        print msg
+    else:
+        print jobrec
+
 
 def kill(server, email, jobid):
     """
@@ -293,6 +307,8 @@
             print e.message
     elif cmd == 'list':
         list_jobs(server, sys.argv[2:])
+    elif cmd == 'detail':
+        detail_job(server, email, sys.argv[2])
     elif cmd == 'kill':
         if len(sys.argv) < 3:
             print "Error: need a job UID to kill"



From fedora-extras-commits at redhat.com  Fri Jul 22 21:35:29 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 17:35:29 -0400
Subject: extras-buildsys/server ArchJob.py, 1.6, 1.7 BuildMaster.py, 1.18,
	1.19 PackageJob.py, 1.12, 1.13 User.py, 1.4,
	1.5 UserInterface.py, 1.25, 1.26 main.py, 1.10, 1.11
Message-ID: <200507222135.j6MLZTpl023847@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23772/server

Modified Files:
	ArchJob.py BuildMaster.py PackageJob.py User.py 
	UserInterface.py main.py 
Log Message:
2005-07-22  Dan Williams 

    * builder/builder.py
        - Fix traceback when killing jobs on shutdown of the builder

    * client/client.py
        - Add a job detail command

    * server/ArchJob.py
        - Store job start and end times in the database

    * server/BuildMaster.py
        - Remove JobsQuery class, no longer used
        - Store more info in the job database to support web front end features
        - Don't try to restart jobs in the 'initialize' state since they'll
            get restarted anyway

    * server/PackageJob.py
        - Generalize log URL construction so it can be accessed from the user interface
        - Pass more job info to the BuildMaster to be written to the DB
        - Don't use tempfile.mkdtemp(), it seems to have issues
        - Return 30 lines of log rather than 20

    * server/User.py
        - Grab a new connection to the database on every access, so that
            user addition/modification can happen when the server is running

    * server/UserInterface.py
        - Add a "job detail" interface that returns information about a single
            specific job

    * server/main.py
        - Greatly reduce buffer size for the logfile, now it actually gets written
            out in a timely fashion




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ArchJob.py	18 Jul 2005 17:24:39 -0000	1.6
+++ ArchJob.py	22 Jul 2005 21:35:27 -0000	1.7
@@ -51,6 +51,7 @@
         self._builder_gone = False
         self.downloads = {}
         self.starttime = time.time()
+        self.endtime = 0
 
     def _builder_finished(self):
         if self.builder_status == 'done' or self.builder_status == 'killed' or self.builder_status == 'failed' or self.builder_status == 'orphaned':
@@ -83,6 +84,8 @@
         attrdict['builder_addr'] = host
         attrdict['status'] = self.status
         attrdict['builder_status'] = self.builder_status
+        attrdict['starttime'] = self.starttime
+        attrdict['endtime'] = self.endtime
         return attrdict
 
     def set_builder_status(self, status):
@@ -189,6 +192,7 @@
             # All done downloading?
             if not undownloaded:
                 self._print_downloaded_files()
+                self.endtime = time.time()
                 self._set_status('done')
                 self.par_job.wake()
 


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BuildMaster.py	20 Jul 2005 18:11:37 -0000	1.18
+++ BuildMaster.py	22 Jul 2005 21:35:27 -0000	1.19
@@ -30,18 +30,6 @@
 execfile(CONFIG_LOCATION + "CONFIG.py")
 
 
-class JobsQuery:
-    """ Wrapper class around DB query results.  Since only one
-        thread has access to the database (to work around sqlite
-        locking limitations), this object wraps requests to and
-        from the BuildMaster thread.
-    """
-    def __init__(self, query):
-        self.sql = query
-        self.done = False
-        self.result = None
-
-
 def ensure_job_db_tables(dbcx):
     """ Central routine to create the database table structure """
 
@@ -52,11 +40,22 @@
     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), ' \
-                'cvs_tag VARCHAR(255), target VARCHAR(20), ' \
-                'buildreq VARCHAR(75), starttime BIGINT, ' \
-                'endtime BIGINT, status VARCHAR(15))')
+            curs.execute('CREATE TABLE jobs ('  \
+                'uid INTEGER PRIMARY KEY, '     \
+                'username VARCHAR(20), '        \
+                'package VARCHAR(50), '         \
+                'cvs_tag VARCHAR(255), '        \
+                'target VARCHAR(20), '          \
+                'buildreq VARCHAR(75), '        \
+                'starttime BIGINT, '            \
+                'endtime BIGINT, '              \
+                'status 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)
@@ -75,10 +74,16 @@
     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))')
+            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)
@@ -111,7 +116,7 @@
         self._archjob_status_updates = {}
         self._archjob_status_updates_lock = threading.Lock()
 
-        self._building_jobs = []
+        self._building_jobs = {}
         self._building_jobs_lock = threading.Lock()
 
         try:
@@ -131,7 +136,7 @@
 
     def _restart_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed")')
+        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize")')
         self.dbcx.commit()
         jobs = self.curs.fetchall()
 
@@ -139,21 +144,21 @@
             return
 
         for row in jobs:
-            uniqid = row[0]
+            uid = row[0]
             # Kill any archjobs that are left around
-            self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uniqid)
+            self.curs.execute('DELETE FROM archjobs WHERE parent_uid=%d' % uid)
             self.dbcx.commit()
 
             # Now requeue the job
             try:
                 repo = self.repos[row[4]]
             except KeyError:
-                print "%s (%s): Target '%s' not found." % (uniqid, row[2], row[4])
+                print "%s (%s): Target '%s' not found." % (uid, row[2], row[4])
             else:
-                job = PackageJob.PackageJob(uniqid, row[1], row[2], row[3], repo, self, self.hostname)
-                print "%s (%s): Restarting '%s' on target '%s'" % (uniqid, row[2], row[3], row[4])
+                job = PackageJob.PackageJob(uid, row[1], row[2], row[3], repo, self, self.hostname)
+                print "%s (%s): Restarting '%s' on target '%s'" % (uid, row[2], row[3], row[4])
                 self._building_jobs_lock.acquire()
-                self._building_jobs.append(job)
+                self._building_jobs[uid] = job
                 self._building_jobs_lock.release()
 
     def stop(self):
@@ -188,18 +193,18 @@
         self._new_queue.append(job_desc)
         self._new_queue_lock.release()
 
-    def queue_job_status_update(self, uid, status):
+    def queue_job_status_update(self, uid, attrdict):
         self._status_updates_lock.acquire()
         lcl_uid = copy.copy(uid)
-        lcl_status = copy.copy(status)
-        self._status_updates[lcl_uid] = lcl_status
+        lcl_attrdict = copy.deepcopy(attrdict)
+        self._status_updates[lcl_uid] = lcl_attrdict
         self._status_updates_lock.release()
 
-    def queue_archjob_status_update(self, jobid, attrdict):
+    def queue_archjob_status_update(self, uid, attrdict):
         self._archjob_status_updates_lock.acquire()
-        lcl_jobid = copy.copy(jobid)
+        lcl_uid = copy.copy(uid)
         lcl_attrdict = copy.deepcopy(attrdict)
-        self._archjob_status_updates[lcl_jobid] = lcl_attrdict
+        self._archjob_status_updates[lcl_uid] = lcl_attrdict
         self._archjob_status_updates_lock.release()
 
     def notify_job_done(self, job):
@@ -211,9 +216,10 @@
         self._done_queue_lock.acquire()
 
         for job in self._done_queue:
-            curstage = job.get_cur_stage()
             uid = job.get_uid()
-            self._write_job_status_to_db(uid, curstage)
+            attrdict = {}
+            attrdict['status'] = job.get_cur_stage()
+            self._write_job_status_to_db(uid, attrdict)
 
             # Update job end time
             try:
@@ -229,36 +235,44 @@
             self._status_updates_lock.release()
 
             print "%s (%s): Job finished." % (uid, job.package)
+
             self._building_jobs_lock.acquire()
-            self._building_jobs.remove(job)
+            self._building_jobs[uid] = None
             self._building_jobs_lock.release()
 
         self._done_queue = []
         self._done_queue_lock.release()
 
-    def _write_job_status_to_db(self, uid, status):
+    def _write_job_status_to_db(self, uid, attrdict):
+        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'], attrdict['version'], attrdict['release'])
+        if attrdict.has_key('result_msg'):
+            import urllib
+            sql = sql + ', result_msg="%s"' % (urllib.quote(attrdict['result_msg']))
+
+        sql = 'UPDATE jobs SET ' + sql + ' WHERE uid=%d' % uid
         try:
-            self.curs.execute('UPDATE jobs SET status="%s" WHERE uid=%d' \
-                % (status, uid))
+            self.curs.execute(sql)
         except sqlite.OperationalError, e:
             print "DB Error: could not access jobs database. Reason: '%s'" % e
 
         self.dbcx.commit()
 
-    def _write_archjob_status_to_db(self, jobid, attrdict):
-        self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % jobid)
+    def _write_archjob_status_to_db(self, uid, attrdict):
+        self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % uid)
         self.dbcx.commit()
         if len(self.curs.fetchall()) == 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")' % (jobid, attrdict['parent_uid'], time.time(), 0, attrdict['arch'], \
-                    attrdict['builder_addr'], attrdict['status'], attrdict['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:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
         else:            
             try:
-                self.curs.execute('UPDATE archjobs SET status="%s", builder_status="%s" ' \
-                    'WHERE jobid="%s" AND parent_uid=%d' % (attrdict['status'], attrdict['builder_status'], jobid, attrdict['parent_uid']))
+                self.curs.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:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
 
@@ -275,8 +289,8 @@
         self._status_updates_lock.release()
 
         self._archjob_status_updates_lock.acquire()
-        for jobid in self._archjob_status_updates.keys():
-            self._write_archjob_status_to_db(jobid, self._archjob_status_updates[jobid])
+        for uid in self._archjob_status_updates.keys():
+            self._write_archjob_status_to_db(uid, self._archjob_status_updates[uid])
         self._archjob_status_updates = {}
         self._archjob_status_updates_lock.release()
 
@@ -319,7 +333,7 @@
                     item['package'], locator, item['target'])
 
             self._building_jobs_lock.acquire()
-            self._building_jobs.append(job)
+            self._building_jobs[row['uid']] = job
             self._building_jobs_lock.release()
 
         self._new_queue = []
@@ -354,13 +368,12 @@
 
         return False
 
-    def get_job(self, jobid):
+    def get_job(self, uid):
         self._building_jobs_lock.acquire()
-        ret_job = None
-        for job in self._building_jobs:
-            if job.uid == jobid:
-                ret_job = job
-                break
+        try:
+            ret_job = self._building_jobs[uid]
+        except KeyError:
+            ret_job = None
         self._building_jobs_lock.release()
         return ret_job
 


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PackageJob.py	21 Jul 2005 14:36:54 -0000	1.12
+++ PackageJob.py	22 Jul 2005 21:35:27 -0000	1.13
@@ -27,6 +27,7 @@
 import shutil
 import tempfile
 import smtplib
+import copy
 from email.MIMEText import MIMEText
 import string
 import SimpleXMLRPCServer
@@ -98,9 +99,10 @@
         return True
     return False
 
-
-# tempfile.mkdtemp seems to have threading issues
-_mkdtemp_lock = threading.Lock()
+def make_job_log_url(target, uid, name, ver, release):
+    if target and uid and name and ver and release:
+        return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], target, uid, name, ver, release)
+    return None
 
 
 class PackageJob:
@@ -112,14 +114,16 @@
         self.curstage = ''
         self.bm = buildmaster
         self.uid = uid
+        self.package = package
+        self.name = None
+        self.epoch = None
+        self.ver = None
+        self.release = None
         pjc = PackageJobController(self, 'initialize', 'waiting')
 
         self.hostname = hostname
         self.username = username
         self.starttime = time.time()
-        self.endtime = None
-        self.package = package
-        self.name = None
         self.target = repo.target()
         self.repo = repo
         self.no_cvs = config_opts['use_srpm_not_cvs']
@@ -139,14 +143,23 @@
     def get_cur_stage(self):
         return self.curstage
 
-    def _set_cur_stage(self, stage):
+    def _set_cur_stage(self, stage, result_msg=None):
         """ Update our internal job stage, and notify the BuildMaster that
             we've changed as well.
         """
         oldstage = self.curstage
         self.curstage = stage
         if oldstage != stage:
-            self.bm.queue_job_status_update(self.uid, stage)
+            attrdict = {}
+            attrdict['status'] = copy.copy(stage)
+            if self.name and self.epoch and self.ver and self.release:
+                attrdict['epoch'] = self.epoch
+                attrdict['version'] = self.ver
+                attrdict['release'] = self.release
+            if result_msg:
+                attrdict['result_msg'] = result_msg
+
+            self.bm.queue_job_status_update(self.uid, attrdict)
 
     def get_uid(self):
         return self.uid
@@ -252,10 +265,13 @@
         
     def _checkout(self):
         self._set_cur_stage('checkout')
-        dir_prefix = self.cvs_tag + "-"
-        _mkdtemp_lock.acquire()
-        self.checkout_tmpdir = tempfile.mkdtemp(prefix=dir_prefix, dir=config_opts['tmpdir'])
-        _mkdtemp_lock.release()
+
+        # Create the temporary checkout directory
+        dirname = "%s-%s-%d" % (self.uid, self.cvs_tag, time.time())
+        self.checkout_tmpdir = os.path.join(config_opts['tmpdir'], dirname)
+        if os.path.exists(self.checkout_tmpdir):
+            shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
+        os.makedirs(self.checkout_tmpdir)
 
         # Checkout the module
         cmd = 'cd %s; %s co -r %s %s' % (self.checkout_tmpdir, config_opts['cvs_cmd'], self.cvs_tag, self.package)
@@ -323,6 +339,9 @@
         ts = rpmUtils.transaction.initReadOnlyTransaction()
         hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.srpm_path)
         self.name = hdr['name']
+        self.epoch = hdr['epoch']
+        if not self.epoch:
+            self.epoch = '0'
         self.ver = hdr['version']
         self.release = hdr['release']
         (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr)
@@ -411,7 +430,11 @@
 
     def die(self, username):
         # Kill any building jobs
-        self._set_cur_stage('killed')
+        resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username)
+
+        self._set_cur_stage('killed', resultstring)
+        self.email_result(resultstring)
+
         self._archjobs_lock.acquire()
         for job in self.archjobs.values():
             if job:
@@ -419,8 +442,6 @@
         self.archjobs = {}
         self._archjobs_lock.release()
 
-        resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username)
-        self.email_result(resultstring)
         self.bm.notify_job_done(self)
 
     def wake(self):
@@ -451,10 +472,11 @@
                 shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
             subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
             self.email_result(resultstring=e.args, subject=subj)
-            self._failed()
+            self._failed(e.args)
         except BuildError, e:
             subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
-            msg = "%s\n\n         Build logs may be found at %s\n\n" % (e.msg, self._make_log_url())
+            log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release)
+            msg = "%s\n\n         Build logs may be found at %s\n\n" % (e.msg, log_url)
             logtail = self._get_log_tail(e.arch)
             msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail)
             self.email_result(resultstring=msg, subject=subj)
@@ -464,7 +486,7 @@
                 if job:
                     job.die()
             self._archjobs_lock.release()
-            self._failed()
+            self._failed(e.msg)
         else:
             # Wait to be woken up when long-running operations complete
             if wait:
@@ -499,8 +521,8 @@
     def get_stage_dir(self):
         return self.stage_dir
 
-    def _failed(self):
-        self._set_cur_stage('failed')
+    def _failed(self, msg=None):
+        self._set_cur_stage('failed', msg)
         self.bm.notify_job_done(self)
         
     def _add_to_repo(self):
@@ -535,19 +557,17 @@
         self.wake()
 
     def _succeeded(self):
-        self._set_cur_stage('needsign')
-        resultstring = """ %s (%s): Build on target %s succeeded.
+        resultstring = " %s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target)
+        self._set_cur_stage('needsign', resultstring)
 
-     Build logs may be found at %s
-""" % (self.uid, self.name, self.target, self._make_log_url())
+        log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release)
+        resultstring = resultstring + "\n     Build logs may be found at %s\n" % (log_url)
         self.email_result(resultstring)
-        self.bm.notify_job_done(self)
 
-    def _make_log_url(self, arch=None):
-        return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release)
+        self.bm.notify_job_done(self)
 
     def _get_log_tail(self, arch):
-        """ Returns the last 20 lines of the most relevant log file """
+        """ Returns the last 30 lines of the most relevant log file """
 
         pkg_dir = "%s-%s-%s-%s" % (self.uid, self.name, self.ver, self.release)
         log_dir = os.path.join(config_opts['server_work_dir'], self.target, pkg_dir, arch)
@@ -577,14 +597,14 @@
         except:
             pass
         lines = []
-        # Grab the last 20 lines from the file
+        # Grab the last 30 lines from the file
         while True:
             try:
                 line = f.next()
             except StopIteration:
                 break
             lines.append(line)
-            if len(lines) > 20:  # only want last 20 lines
+            if len(lines) > 30:  # only want last 30 lines
                 del lines[0]
 
         f.close()


Index: User.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/User.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- User.py	10 Jul 2005 03:44:37 -0000	1.4
+++ User.py	22 Jul 2005 21:35:27 -0000	1.5
@@ -34,45 +34,51 @@
         self.server_admin = False
 
 
+def get_userdb_dbcx():
+    try:
+        dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=4)
+        curs = dbcx.cursor()
+        return (dbcx, curs)
+    except sqlite.DatabaseError, e:
+        print "sqlite DatabaseError: %s" % str(e)
+        return (None, None)
+
 class Authenticator:
     """
     Talks to a database of users & capabilities
     """
 
     def __init__(self):
-        try:
-            self.dbcx = sqlite.connect(CONFIG_LOCATION + "userdb", encoding="utf-8", timeout=2)
-        except sqlite.DatabaseError, e:
-            s = "%s" % e
-            if s == 'unable to open database file':
-                print "Unable to open the user database.  Exiting..."
-                os._exit(1)
-        self.curs = self.dbcx.cursor()
+        (dbcx, curs) = get_userdb_dbcx()
+        if not dbcx or not curs:
+            print "Unable to open the user database.  Exiting..."
+            os._exit(1)
 
         # Ensure the table exists in the database
         create = False
         try:
-            self.curs.execute('SELECT * FROM users')
-            self.dbcx.commit()
+            curs.execute('SELECT * FROM users')
+            dbcx.commit()
         except sqlite._sqlite.DatabaseError, e:
             create = True
 
         if create:
-            self.curs.execute('CREATE TABLE users (email VARCHAR(50), ' \
+            curs.execute('CREATE TABLE users (email VARCHAR(50), ' \
                     'own_jobs BOOLEAN, kill_any_job BOOLEAN, ' \
                     'modify_users BOOLEAN, server_admin BOOLEAN)')
-            self.dbcx.commit()
+            dbcx.commit()
 
 
     def new_authed_user(self, email, client_address):
         if not email:
             return None
 
+        (dbcx, curs) = get_userdb_dbcx()
         user = None
-        self.curs.execute('SELECT email, own_jobs, kill_any_job, modify_users, ' \
+        curs.execute('SELECT email, own_jobs, kill_any_job, modify_users, ' \
                 'server_admin FROM users WHERE email="%s"' % email)
-        self.dbcx.commit()
-        item = self.curs.fetchone()
+        dbcx.commit()
+        item = curs.fetchone()
         if item:
             user = User(email, False)
             user.own_jobs = item['own_jobs']


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- UserInterface.py	22 Jul 2005 02:54:07 -0000	1.25
+++ UserInterface.py	22 Jul 2005 21:35:27 -0000	1.26
@@ -69,6 +69,8 @@
         uid = int(uid_in)
     except ValueError:
         return None
+    except TypeError:
+        return None
     if uid < 0:
         return None
     return uid
@@ -284,6 +286,71 @@
         return (0, "Success.", jobs)
 
 
+    def detail_job(self, uid):
+        """ Query job information and return it to the user """
+
+        uid = validate_uid(uid)
+        if not uid:
+            return (-1, "Error: Invalid job UID.", {})
+
+        sql = 'SELECT uid, username, package, cvs_tag, target, starttime, endtime, status, '\
+                'epoch, version, release, archlist, result_msg 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.", {})
+        curs.execute(sql)
+        job = curs.fetchone()
+        if not job:
+            return (-1, "Error: Invalid job UID.", {})
+        jobrec = {}
+        jobrec['uid'] = job[0]
+        jobrec['username'] = job[1]
+        jobrec['package'] = job[2]
+        jobrec['source'] = job[3]
+        jobrec['target'] = job[4]
+        jobrec['starttime'] = job[5]
+        jobrec['endtime'] = job[6]
+        jobrec['status'] = job[7]
+        if job[8]:
+            jobrec['epoch'] = job[8]
+        if job[9]:
+            jobrec['version'] = job[9]
+        if job[10]:
+            jobrec['release'] = job[10]
+        if job[12]:        
+            jobrec['result_msg'] = job[12]
+        log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
+        if log_url and len(log_url):
+            jobrec['log_url'] = log_url
+        jobrec['archjobs'] = []
+
+        # Get all archjobs for this job
+        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()
+        for row in data:
+            ajrec = {}
+            ajrec['jobid'] = row[0]
+            ajrec['parent_uid'] = row[1]
+            ajrec['starttime'] = row[2]
+            ajrec['endtime'] = row[3]
+            ajrec['arch'] = row[4]
+            ajrec['builder_addr'] = row[5]
+            ajrec['status'] = row[6]
+            ajrec['builder_status'] = row[7]
+            jobrec['archjobs'].append(ajrec)
+
+        del curs
+        del dbcx
+
+        ret_job = copy.deepcopy(jobrec)
+        return (0, "Success.", ret_job)
+
+
     def update_builders(self):
         execfile("/etc/plague/server/CONFIG.py")
         builder_list = self._builder_manager.update_builders()
@@ -337,6 +404,11 @@
         return UserInterface.list_jobs(self, args_dict)
 
 
+    def detail_job(self, email, jobid):
+        user = AuthedXMLRPCServer.get_authinfo()
+        return UserInterface.detail_job(self, jobid)
+
+
     def update_builders(self):
         user = AuthedXMLRPCServer.get_authinfo()
         if not user or not user.server_admin:


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- main.py	20 Jul 2005 14:51:53 -0000	1.10
+++ main.py	22 Jul 2005 21:35:27 -0000	1.11
@@ -86,7 +86,8 @@
         open(opts.pidfile, 'w').write('%d\n' % os.getpid())
 
     if opts.logfile:
-        log=open(opts.logfile, 'a')
+        # 1 == line buffer the log file
+        log=open(opts.logfile, 'a', 1)
         sys.stdout=log
         sys.stderr=log
 



From fedora-extras-commits at redhat.com  Fri Jul 22 21:57:09 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:57:09 -0400
Subject: rpms/liferea/devel .cvsignore, 1.7, 1.8 liferea.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200507222157.j6MLv9K9023942@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Jul 22 2005 Brian Pepple  - 0.9.4-2
- Update to 0.9.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jul 2005 20:22:17 -0000	1.7
+++ .cvsignore	22 Jul 2005 21:57:07 -0000	1.8
@@ -1 +1 @@
-liferea-0.9.3.tar.gz
+liferea-0.9.4.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- liferea.spec	7 Jul 2005 20:22:17 -0000	1.12
+++ liferea.spec	22 Jul 2005 21:57:07 -0000	1.13
@@ -1,14 +1,14 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        0.9.3
-Release:        1%{?dist}
+Version:        0.9.4
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/%{name}-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Brian Pepple  - 0.9.4-2
+- Update to 0.9.4.
+
 * Thu Jul  7 2005 Brian Pepple  - 0.9.3-1
 - Update to 0.9.3.
 - Enable dbus.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jul 2005 20:22:17 -0000	1.8
+++ sources	22 Jul 2005 21:57:07 -0000	1.9
@@ -1 +1 @@
-8a592a2e73b8d6e1bc78417e91ab82b2  liferea-0.9.3.tar.gz
+91994fb89c107230ef3b15708aa31209  liferea-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Jul 22 21:59:00 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:59:00 -0400
Subject: rpms/liferea/FC-4 .cvsignore, 1.7, 1.8 liferea.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200507222159.j6MLx0N7023975@cvs-int.fedora.redhat.com>

Author: bpepple

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

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Fri Jul 22 2005 Brian Pepple  - 0.9.4-1
- Update to 0.9.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Jul 2005 20:23:42 -0000	1.7
+++ .cvsignore	22 Jul 2005 21:58:57 -0000	1.8
@@ -1 +1 @@
-liferea-0.9.3.tar.gz
+liferea-0.9.4.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- liferea.spec	7 Jul 2005 20:23:43 -0000	1.12
+++ liferea.spec	22 Jul 2005 21:58:57 -0000	1.13
@@ -1,14 +1,14 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://liferea.sourceforge.net/
-Source0:        http://download.sourceforge.net/liferea/%{name}-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Jul 22 2005 Brian Pepple  - 0.9.4-1
+- Update to 0.9.4.
+
 * Thu Jul  7 2005 Brian Pepple  - 0.9.3-1
 - Update to 0.9.3.
 - Enable dbus.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jul 2005 20:23:43 -0000	1.8
+++ sources	22 Jul 2005 21:58:57 -0000	1.9
@@ -1 +1 @@
-8a592a2e73b8d6e1bc78417e91ab82b2  liferea-0.9.3.tar.gz
+91994fb89c107230ef3b15708aa31209  liferea-0.9.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Jul 22 21:59:37 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:59:37 -0400
Subject: common tobuild,1.1997,1.1998
Message-ID: <200507222159.j6MLxbwS024066@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24049

Modified Files:
	tobuild 
Log Message:
request build of rpms/liferea/devel liferea-0_9_4-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -r1.1997 -r1.1998
--- tobuild	22 Jul 2005 15:15:32 -0000	1.1997
+++ tobuild	22 Jul 2005 21:59:35 -0000	1.1998
@@ -133,3 +133,4 @@
 scop	rpms/perl-ExtUtils-XSBuilder/devel	perl-ExtUtils-XSBuilder-0_27-2_fc5	devel
 scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4
 scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel
+bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel



From fedora-extras-commits at redhat.com  Fri Jul 22 21:59:53 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 22 Jul 2005 17:59:53 -0400
Subject: common tobuild,1.1998,1.1999
Message-ID: <200507222159.j6MLxrmB024099@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24082

Modified Files:
	tobuild 
Log Message:
request build of rpms/liferea/FC-4 liferea-0_9_4-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1998
retrieving revision 1.1999
diff -u -r1.1998 -r1.1999
--- tobuild	22 Jul 2005 21:59:35 -0000	1.1998
+++ tobuild	22 Jul 2005 21:59:51 -0000	1.1999
@@ -134,3 +134,4 @@
 scop	rpms/libapreq2/FC-4	libapreq2-2_06-1_fc4	fc4
 scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
+bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4



From fedora-extras-commits at redhat.com  Fri Jul 22 22:25:27 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 22 Jul 2005 18:25:27 -0400
Subject: common tobuild,1.1999,1.2000
Message-ID: <200507222225.j6MMPRUV025363@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25346

Modified Files:
	tobuild 
Log Message:
request build of rpms/pytz/devel pytz-2005i-2 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.1999
retrieving revision 1.2000
diff -u -r1.1999 -r1.2000
--- tobuild	22 Jul 2005 21:59:51 -0000	1.1999
+++ tobuild	22 Jul 2005 22:25:25 -0000	1.2000
@@ -135,3 +135,4 @@
 scop	rpms/libapreq2/devel	libapreq2-2_06-1_fc5	devel
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
+orion	rpms/pytz/devel	pytz-2005i-2	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 00:39:42 2005
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Fri, 22 Jul 2005 20:39:42 -0400
Subject: owners owners.list,1.26,1.27
Message-ID: <200507230039.j6N0dg8R029156@cvs-int.fedora.redhat.com>

Author: wtogami

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

Modified Files:
	owners.list 
Log Message:
hula-kevin at iprone.com doesn't exist



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- owners.list	22 Jul 2005 18:11:08 -0000	1.26
+++ owners.list	23 Jul 2005 00:39:39 -0000	1.27
@@ -278,7 +278,7 @@
 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|
-Fedora Extras|hula|A calendar and mail server|hula-kevin at iprone.com|extras-qa at fedoraproject.org|
+Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:39 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:39 -0400
Subject: extras-buildsys/www/template head.psp,1.2,1.3
Message-ID: <200507230055.j6N0tdTW030323@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/www/template

Modified Files:
	head.psp 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: head.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- head.psp	22 Jul 2005 05:39:20 -0000	1.2
+++ head.psp	23 Jul 2005 00:55:37 -0000	1.3
@@ -9,6 +9,15 @@
     email_url = '?email=' + user_email
 # endif
 
+def job_link(uid):
+    string = ''
+    if len(email_url):
+        string = "%s&uid=%d" % (email_url, uid)
+    else:
+        string = "?uid=%d" % uid
+    return string
+
+
 main_active = ''
 if curpage == 'main':
     main_active = '-active'
@@ -45,13 +54,33 @@
       
    
 
       
-      
+      
    
-          
-          
-          
-          
-          
+          
+          
    
         
    MainlBuilder StatuslMy Packages
+            
+              
+                
+                
+                
+                
+                
+              
+            
    MainlBuilder StatuslMy Packages
    
+              		
+            
    
+                Job ID:  
+<%
+if user_email and len(user_email):
+    t = 1
+%>
+                
+<%
+# endif
+%>
+                  
+             
    
+              		
         
    
       
    
 



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:27 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:27 -0400
Subject: extras-buildsys ChangeLog,1.71,1.72
Message-ID: <200507230055.j6N0twch030336@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232

Modified Files:
	ChangeLog 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	22 Jul 2005 21:35:26 -0000	1.71
+++ ChangeLog	23 Jul 2005 00:55:25 -0000	1.72
@@ -1,5 +1,14 @@
 2005-07-22  Dan Williams 
 
+    * server/UserInterface.py
+        - Fix traceback in job detail code
+
+    * www/*
+        - Add an individual job view
+        - Cleanups for Safari
+
+2005-07-22  Dan Williams 
+
     * builder/builder.py
         - Fix traceback when killing jobs on shutdown of the builder
 



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:28 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:28 -0400
Subject: extras-buildsys/server UserInterface.py,1.26,1.27
Message-ID: <200507230055.j6N0tx48030339@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/server

Modified Files:
	UserInterface.py 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- UserInterface.py	22 Jul 2005 21:35:27 -0000	1.26
+++ UserInterface.py	23 Jul 2005 00:55:26 -0000	1.27
@@ -314,17 +314,15 @@
         jobrec['starttime'] = job[5]
         jobrec['endtime'] = job[6]
         jobrec['status'] = job[7]
-        if job[8]:
+        if job[8] and job[9] and job[10]:
             jobrec['epoch'] = job[8]
-        if job[9]:
             jobrec['version'] = job[9]
-        if job[10]:
             jobrec['release'] = job[10]
+            log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
+            if log_url and len(log_url):
+                jobrec['log_url'] = log_url
         if job[12]:        
             jobrec['result_msg'] = job[12]
-        log_url = PackageJob.make_job_log_url(jobrec['target'], str(uid), jobrec['package'], jobrec['version'], jobrec['release'])
-        if log_url and len(log_url):
-            jobrec['log_url'] = log_url
         jobrec['archjobs'] = []
 
         # Get all archjobs for this job



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:33 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:33 -0400
Subject: extras-buildsys/www job.psp, NONE, 1.1 builders.psp, 1.2,
	1.3 index.psp, 1.2, 1.3 indiv.psp, 1.2, 1.3
Message-ID: <200507230055.j6N0tX44030298@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/www

Modified Files:
	builders.psp index.psp indiv.psp 
Added Files:
	job.psp 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




--- NEW FILE job.psp ---

<%
curpage = 'job'
%>
<%@ include file="template/main.psp"%>
<%@ include file="template/head.psp"%>


    

    

    

<%
if not form.has_key('uid') or not form['uid'] or not len(str(form['uid'])):
    i = 1
%>
        
    Please enter a Job ID.
    
<%
else:
    uid = str(form['uid'])
    import socket, xmlrpclib

    try:
        (e, msg, job) = server.detail_job('', uid)
    except socket.error, e:
        msg = str(e)
%>
        
    Could not contact the server.

    Error was:<%=msg%>
    
<%
    except xmlrpclib.Fault, fault:
        msg = "XMLRPC Fault"
        e = -1

    if e == -1:
%>
        
    The server could not process the request.

    Error was:  <%=msg%>
    
<%
    else:
        if job.has_key('version') and job.has_key('release'):
            title = "%s-%s-%s" % (job['package'], job['version'], job['release'])
        else:
            title = job['package']
        # endif
%>

    
    
        
    
            
            
                
<%
        if job['endtime'] != 0:
            total_time = (int(job['endtime']) - int(job['starttime'])) / 60
%>
                    
<%
        # endif
        if job.has_key('log_url') and job['log_url'] and len(job['log_url']):
            log_url = str(job['log_url'])
%>
                    
<%
        # endif
        if job.has_key('result_msg') and job['result_msg'] and len(job['result_msg']):
            import urllib
            result_msg = urllib.unquote(str(job['result_msg']))
%>
                    
<%
        # endif
%>
                
    
                    
    <%=str(job['uid'])%>: <%=title%>  (<%=job['status']%>)
    
                    
    Target:<%=str(job['target'])%>
    
                    
    Submitter:<%=str(job['username'])%>
    
                    
    Source:<%=str(job['source'])%>
    Build Time:<%=str(total_time)%> minutes
    Logs:<%=log_url%>
    Result:"<%=result_msg%>"
    
                		
            
        
    
    
    
    
    
    
<%
        for aj in job['archjobs']:
            i = 1
%>
        
<%
        # endfor
%>
    
    
            
                
<%
            colspan = ''
            if aj['endtime'] == 0:
                colspan = 'colspan="2"'
            #endif
%>
                        
<%
            if aj['endtime'] != 0:
                aj_time = (int(aj['endtime']) - int(aj['starttime'])) / 60
%>
                        
<%
            # endif
%>
                        
    
                    
    
                        
                        
                            <%=aj['arch']%>:
                             <%=aj['builder_addr']%>
                        >
                            Status:
                             <%=aj['status']%>/<%=aj['builder_status']%>
                        
                            Build Time:
                             <%=aj_time%> minutes
                        
                    
    
                
    
                		
        
    
    

    

<%
    # endif
# endif
%>


    

<%@ include file="template/foot.psp"%>

    



Index: builders.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- builders.psp	22 Jul 2005 05:39:19 -0000	1.2
+++ builders.psp	23 Jul 2005 00:55:31 -0000	1.3
@@ -65,9 +65,9 @@
             archjobs = job['archjobs']
             if not archjobs:
                 continue
-            job_text = 'Jobs:'
             for aj in archjobs:
                 if aj['builder_addr'] == addr:
+                    joblink = job_link(job['uid'])
 %>
         
    
             
@@ -76,7 +76,7 @@
                         
                         
                             Job:
-                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
+                             <%=aj['parent_uid']%> (<%=job['package']%>/<%=aj['arch']%>)   
                             Status:
                              <%=aj['status']%>/<%=aj['builder_status']%>
                         
    <%=job['uid']%><%=job['uid']%>
             <%=job['package']%>
             <%=source%>
             <%=job['status']%>
    <%=job['uid']%><%=job['uid']%>
             <%=job['package']%>
             <%=source%>
             <%=job['status']%>
    
 
 
+

    
 
 <%
 # endtry


Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- indiv.psp	22 Jul 2005 05:39:19 -0000	1.2
+++ indiv.psp	23 Jul 2005 00:55:31 -0000	1.3
@@ -8,10 +8,12 @@
 <%
 if not len(user_email):
 %>
+
    
 
    
     Email Address:  
     
 
    
+
    
 <%
 else:
     import socket, xmlrpclib
@@ -134,9 +136,11 @@
                 import os
                 source = os.path.basename(source)
             # endif
+
+            joblink = job_link(job['uid'])
 %>
         
    <%=job['uid']%><%=job['uid']%>
             <%=job['package']%>
             <%=source%>
             <%=job['status']%>
    
 
    
 
+

    
 
 <%
 # endif



From fedora-extras-commits at redhat.com  Sat Jul 23 00:55:34 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 22 Jul 2005 20:55:34 -0400
Subject: extras-buildsys/www/css style.css,1.2,1.3
Message-ID: <200507230056.j6N0u4GM030348@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/css
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30232/www/css

Modified Files:
	style.css 
Log Message:
2005-07-22  Dan Williams 

    * server/UserInterface.py
        - Fix traceback in job detail code

    * www/*
        - Add an individual job view
        - Cleanups for Safari




Index: style.css
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- style.css	22 Jul 2005 05:39:19 -0000	1.2
+++ style.css	23 Jul 2005 00:55:32 -0000	1.3
@@ -82,6 +82,17 @@
     font-size:          18px;
 }
 
+td.nav-job-form {
+    padding:            5px 6px 0px 6px;
+    vertical-align:     center;
+}
+
+font.nav-job-form {
+    color:              #000000;
+    font-weight:        bold;
+    font-size:          14px;
+}
+
 a.nav-link {
     text-align:         center;
     font-weight:        bold;
@@ -232,11 +243,11 @@
 table.archjobs {
     padding:            1 px 2px 1px 2px;
     border:             none;
-    width:              80%;
+    width:              100%;
 }
 
 td.archjobs {
-    padding-top:        5px;
+    padding:        5px 10px 5px 10px;
 }
 
 font.archjobtag {
@@ -248,3 +259,58 @@
     font-size:      12px;
 }
 
+
+/*
+-------------------------------
+ jobdetail table
+-------------------------------
+*/
+
+table.jobdetail {
+    width:              50%;
+}
+
+td.jobdetail-side {
+    width:              3px;
+    background-color:   #aaaaaa;
+    padding-bottom:     5px;
+}
+
+td.jobdetail-info {
+    padding:            2px 4px 5px 4px;
+    background-color:   #efefef;
+}
+
+td.jobdetail-title {
+    padding:            2px 4px 5px 4px;
+    background-color:   #efefef;
+    border-bottom:      solid 1px #999999;
+}
+
+font.jobdetail-title {
+    font-weight:    bold;
+    font-size:      14px;
+}
+
+td.jobdetail-tag {
+    padding:        4px 2px 0px 2px;
+    text-align:     right;
+    width:          15%;
+}
+
+font.jobdetail-tag {
+    font-weight:    bold;
+    font-size:      12px;
+}
+
+td.jobdetail-text {
+    padding:        4px 2px 0px 2px;
+    text-align:     left;
+}
+
+font.builderarches {
+    font-size:      12px;
+    font-style:     italic;
+    font-weight:    normal;
+}
+



From fedora-extras-commits at redhat.com  Sat Jul 23 06:48:27 2005
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sat, 23 Jul 2005 02:48:27 -0400
Subject: common tobuild,1.2000,1.2001
Message-ID: <200507230648.j6N6mRDl005102@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5079

Modified Files:
	tobuild 
Log Message:

get rid of some outdated entries



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2000
retrieving revision 1.2001
diff -u -r1.2000 -r1.2001
--- tobuild	22 Jul 2005 22:25:25 -0000	1.2000
+++ tobuild	23 Jul 2005 06:48:24 -0000	1.2001
@@ -25,7 +25,6 @@
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-2_fc4	fc4
 petersen	rpms/scim/devel	scim-1_3_3-1_fc5	devel
 ensc	rpms/ip-sentinel/FC-3	ip-sentinel-0_12-5_fc3	fc3
-ixs	rpms/barcode/devel	barcode-0_98-6_fc5	devel
 ensc	rpms/ip-sentinel/FC-4	ip-sentinel-0_12-5_fc4	fc4
 ensc	rpms/ip-sentinel/devel	ip-sentinel-0_12-5_fc5	devel
 ixs	rpms/mod_suphp/devel	mod_suphp-0_5_2-8_fc5	devel
@@ -62,9 +61,6 @@
 ixs	rpms/perl-Crypt-CBC/devel	perl-Crypt-CBC-2_14-2_fc5	devel
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
-jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-1_fc5	devel
-jwboyer	rpms/gaim-meanwhile/FC-4	gaim-meanwhile-1_2_4-1_fc4	fc4
-jwboyer	rpms/gaim-meanwhile/FC-3	gaim-meanwhile-1_2_4-1_fc3	fc3
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel
 thias	rpms/gkrellm-freq/devel	gkrellm-freq-0_1_1-2_fc5	devel
 bpepple	rpms/freeciv/devel	freeciv-2_0_3-2_fc5	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 07:30:29 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:30:29 -0400
Subject: rpms/leafpad/FC-3 leafpad.spec,1.9,1.10
Message-ID: <200507230730.j6N7UTbS006322@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	leafpad.spec 
Log Message:
Upstream update


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-3/leafpad.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- leafpad.spec	19 May 2005 06:45:20 -0000	1.9
+++ leafpad.spec	23 Jul 2005 07:30:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.1
-Release:        1.fc3
+Version:        0.8.3
+Release:        1%{?dist}
 Summary:        GTK+ based simple text editor
 
 Group:          Applications/Editors
@@ -56,10 +56,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1.fc3
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  0.8.3-1
 - Upstream update
 
-* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1.fc3
+* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1
+- Upstream update
+
+* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1
 - Upstream update
 - Cleanups
 



From fedora-extras-commits at redhat.com  Sat Jul 23 07:30:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:30:30 -0400
Subject: rpms/leafpad/devel .cvsignore, 1.4, 1.5 leafpad.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200507230730.j6N7UUh4006338@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore leafpad.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 May 2005 06:45:21 -0000	1.4
+++ .cvsignore	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-leafpad-0.8.1.tar.gz
+leafpad-0.8.3.tar.gz


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- leafpad.spec	19 May 2005 06:45:21 -0000	1.11
+++ leafpad.spec	23 Jul 2005 07:30:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.1
-Release:        1.fc4
+Version:        0.8.3
+Release:        1%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -57,10 +57,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1.fc4
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  0.8.3-1
 - Upstream update
 
-* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1.fc4
+* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1
+- Upstream update
+
+* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1
 - Upstream update
 
 * Fri Apr 22 2005 Ignacio Vazquez-Abrams  0.7.9-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 May 2005 06:45:21 -0000	1.4
+++ sources	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-4e640c48b45f5963109b376b57a4c2be  leafpad-0.8.1.tar.gz
+a19aaeba4ba7cdfce5d08903a4d9086b  leafpad-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 07:30:30 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:30:30 -0400
Subject: rpms/leafpad/FC-4 .cvsignore, 1.4, 1.5 leafpad.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200507230730.j6N7UUA1006330@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore leafpad.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 May 2005 06:45:21 -0000	1.4
+++ .cvsignore	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-leafpad-0.8.1.tar.gz
+leafpad-0.8.3.tar.gz


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-4/leafpad.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- leafpad.spec	19 May 2005 06:45:21 -0000	1.11
+++ leafpad.spec	23 Jul 2005 07:30:28 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.1
-Release:        1.fc4
+Version:        0.8.3
+Release:        1%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -57,10 +57,13 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1.fc4
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  0.8.3-1
 - Upstream update
 
-* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1.fc4
+* Thu May 19 2005 Ignacio Vazquez-Abrams  0.8.1-1
+- Upstream update
+
+* Fri Apr 29 2005 Ignacio Vazquez-Abrams  0.8.0-1
 - Upstream update
 
 * Fri Apr 22 2005 Ignacio Vazquez-Abrams  0.7.9-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 May 2005 06:45:21 -0000	1.4
+++ sources	23 Jul 2005 07:30:28 -0000	1.5
@@ -1 +1 @@
-4e640c48b45f5963109b376b57a4c2be  leafpad-0.8.1.tar.gz
+a19aaeba4ba7cdfce5d08903a4d9086b  leafpad-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 07:31:32 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:31:32 -0400
Subject: common tobuild,1.2001,1.2002
Message-ID: <200507230731.j6N7VWRm006458@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441

Modified Files:
	tobuild 
Log Message:
request build of rpms/leafpad/FC-3 leafpad-0_8_3-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2001
retrieving revision 1.2002
diff -u -r1.2001 -r1.2002
--- tobuild	23 Jul 2005 06:48:24 -0000	1.2001
+++ tobuild	23 Jul 2005 07:31:30 -0000	1.2002
@@ -132,3 +132,4 @@
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
+ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sat Jul 23 07:31:48 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:31:48 -0400
Subject: common tobuild,1.2002,1.2003
Message-ID: <200507230731.j6N7VmoB006491@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6474

Modified Files:
	tobuild 
Log Message:
request build of rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2002
retrieving revision 1.2003
diff -u -r1.2002 -r1.2003
--- tobuild	23 Jul 2005 07:31:30 -0000	1.2002
+++ tobuild	23 Jul 2005 07:31:46 -0000	1.2003
@@ -133,3 +133,4 @@
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3
+ivazquez	rpms/leafpad/FC-4	leafpad-0_8_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 07:32:01 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:32:01 -0400
Subject: common tobuild,1.2003,1.2004
Message-ID: <200507230732.j6N7W1Wi006524@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6507

Modified Files:
	tobuild 
Log Message:
request build of rpms/leafpad/devel leafpad-0_8_3-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2003
retrieving revision 1.2004
diff -u -r1.2003 -r1.2004
--- tobuild	23 Jul 2005 07:31:46 -0000	1.2003
+++ tobuild	23 Jul 2005 07:31:58 -0000	1.2004
@@ -134,3 +134,4 @@
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3
 ivazquez	rpms/leafpad/FC-4	leafpad-0_8_3-1_fc4	fc4
+ivazquez	rpms/leafpad/devel	leafpad-0_8_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 07:53:26 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:53:26 -0400
Subject: rpms/notecase/FC-3 notecase-1.0.0-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 notecase.spec, 1.9, 1.10 sources, 1.3,
	1.4 notecase-0.8.9-paths.patch, 1.1, NONE
Message-ID: <200507230753.j6N7rQuO006638@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.0.0-paths.patch 
Removed Files:
	notecase-0.8.9-paths.patch 
Log Message:
Upstream update

notecase-1.0.0-paths.patch:

--- NEW FILE notecase-1.0.0-paths.patch ---
--- notecase/Makefile.paths	2005-07-23 03:40:28.000000000 -0400
+++ notecase/Makefile	2005-07-23 03:41:07.000000000 -0400
@@ -44,7 +44,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
 
 #
 # define default project to build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:33:39 -0000	1.3
+++ .cvsignore	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-notecase-0.8.9_src.zip
+notecase-1.0.0_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-3/notecase.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- notecase.spec	29 May 2005 13:37:47 -0000	1.9
+++ notecase.spec	23 Jul 2005 07:53:24 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           notecase
-Version:        0.8.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
 Patch:          notecase-0.8.9-unix2dos.patch
 Patch1:         notecase-0.8.9-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,14 +32,13 @@
 s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
 
 %build
-make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-echo "GenericName=Hierarchical Note Manager" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -67,6 +66,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  1.0.0-1
+- Upstream update
+
 * Sun May 29 2005 Ignacio Vazquez-Abrams  0.8.9-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:33:39 -0000	1.3
+++ sources	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip
+702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip


--- notecase-0.8.9-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 07:53:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:53:27 -0400
Subject: rpms/notecase/devel notecase-1.0.0-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 notecase.spec, 1.10, 1.11 sources, 1.3,
	1.4 notecase-0.8.9-paths.patch, 1.1, NONE
Message-ID: <200507230753.j6N7rR6Z006656@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.0.0-paths.patch 
Removed Files:
	notecase-0.8.9-paths.patch 
Log Message:
Upstream update

notecase-1.0.0-paths.patch:

--- NEW FILE notecase-1.0.0-paths.patch ---
--- notecase/Makefile.paths	2005-07-23 03:40:28.000000000 -0400
+++ notecase/Makefile	2005-07-23 03:41:07.000000000 -0400
@@ -44,7 +44,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
 
 #
 # define default project to build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:33:40 -0000	1.3
+++ .cvsignore	23 Jul 2005 07:53:25 -0000	1.4
@@ -1 +1 @@
-notecase-0.8.9_src.zip
+notecase-1.0.0_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/notecase.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- notecase.spec	29 May 2005 13:37:48 -0000	1.10
+++ notecase.spec	23 Jul 2005 07:53:25 -0000	1.11
@@ -1,14 +1,14 @@
 Name:           notecase
-Version:        0.8.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
 Patch:          notecase-0.8.9-unix2dos.patch
-Patch1:         notecase-0.8.9-paths.patch
+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
@@ -32,14 +32,13 @@
 s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
 
 %build
-make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-echo "GenericName=Hierarchical Note Manager" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -67,6 +66,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  1.0.0-1
+- Upstream update
+
 * Sun May 29 2005 Ignacio Vazquez-Abrams  0.8.9-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:33:40 -0000	1.3
+++ sources	23 Jul 2005 07:53:25 -0000	1.4
@@ -1 +1 @@
-a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip
+702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip


--- notecase-0.8.9-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 07:53:27 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:53:27 -0400
Subject: rpms/notecase/FC-4 notecase-1.0.0-paths.patch, NONE, 1.1 .cvsignore,
	1.3, 1.4 notecase.spec, 1.10, 1.11 sources, 1.3,
	1.4 notecase-0.8.9-paths.patch, 1.1, NONE
Message-ID: <200507230753.j6N7rRr0006648@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore notecase.spec sources 
Added Files:
	notecase-1.0.0-paths.patch 
Removed Files:
	notecase-0.8.9-paths.patch 
Log Message:
Upstream update

notecase-1.0.0-paths.patch:

--- NEW FILE notecase-1.0.0-paths.patch ---
--- notecase/Makefile.paths	2005-07-23 03:40:28.000000000 -0400
+++ notecase/Makefile	2005-07-23 03:41:07.000000000 -0400
@@ -44,7 +44,7 @@
 
 # define compile/link command line with flags
 CC=$(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
-LD=$(CXX) $(DEBUG) $(PROFILE) -L/usr/lib -L/usr/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
+LD=$(CXX) $(DEBUG) $(PROFILE) -L$(libdir) -L$(prefix)/X11R6/lib -ldl -export-dynamic $(LOPTIMIZE)
 
 #
 # define default project to build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:33:40 -0000	1.3
+++ .cvsignore	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-notecase-0.8.9_src.zip
+notecase-1.0.0_src.zip


Index: notecase.spec
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/notecase.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- notecase.spec	29 May 2005 13:37:48 -0000	1.10
+++ notecase.spec	23 Jul 2005 07:53:24 -0000	1.11
@@ -1,14 +1,14 @@
 Name:           notecase
-Version:        0.8.9
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A hierarchical note manager
 
 Group:          Applications/Productivity
 License:        BSD
 URL:            http://notecase.sourceforge.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
+Source0:        http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip
 Patch:          notecase-0.8.9-unix2dos.patch
-Patch1:         notecase-0.8.9-paths.patch
+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
@@ -32,14 +32,13 @@
 s!\(#define LOCALE_DIR\).*!\1 "%{_datadir}/locale/"!' src/config.h
 
 %build
-make LD="$(CXX) $(DEBUG) $(PROFILE) -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make LD="$CXX $DEBUG $PROFILE -L%{_libdir} -L%{_prefix}/X11R6/%{_lib} -ldl -export-dynamic" CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-echo "GenericName=Hierarchical Note Manager" >> $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -67,6 +66,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  1.0.0-1
+- Upstream update
+
 * Sun May 29 2005 Ignacio Vazquez-Abrams  0.8.9-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/notecase/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:33:40 -0000	1.3
+++ sources	23 Jul 2005 07:53:24 -0000	1.4
@@ -1 +1 @@
-a88b8b75c70939ebfd95307a926d38d1  notecase-0.8.9_src.zip
+702e508340c736e47ee8ec7e0cbb669a  notecase-1.0.0_src.zip


--- notecase-0.8.9-paths.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 07:54:09 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:54:09 -0400
Subject: common tobuild,1.2004,1.2005
Message-ID: <200507230754.j6N7s9FH006686@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6669

Modified Files:
	tobuild 
Log Message:
Not just yet...


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2004
retrieving revision 1.2005
diff -u -r1.2004 -r1.2005
--- tobuild	23 Jul 2005 07:31:58 -0000	1.2004
+++ tobuild	23 Jul 2005 07:54:07 -0000	1.2005
@@ -132,6 +132,3 @@
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
-ivazquez	rpms/leafpad/FC-3	leafpad-0_8_3-1_fc3	fc3
-ivazquez	rpms/leafpad/FC-4	leafpad-0_8_3-1_fc4	fc4
-ivazquez	rpms/leafpad/devel	leafpad-0_8_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 07:54:58 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 03:54:58 -0400
Subject: rpms/leafpad/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200507230754.j6N7swtB006716@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore sources 
Log Message:
Whoops, missed these...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 May 2005 06:45:20 -0000	1.4
+++ .cvsignore	23 Jul 2005 07:54:56 -0000	1.5
@@ -1 +1 @@
-leafpad-0.8.1.tar.gz
+leafpad-0.8.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 May 2005 06:45:20 -0000	1.4
+++ sources	23 Jul 2005 07:54:56 -0000	1.5
@@ -1 +1 @@
-4e640c48b45f5963109b376b57a4c2be  leafpad-0.8.1.tar.gz
+a19aaeba4ba7cdfce5d08903a4d9086b  leafpad-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 08:40:49 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 04:40:49 -0400
Subject: rpms/gpredict/FC-3 gpredict.spec,1.6,1.7
Message-ID: <200507230840.j6N8en0W008442@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	gpredict.spec 
Log Message:
Fixed Source0 URL (#161673)


Index: gpredict.spec
===================================================================
RCS file: /cvs/extras/rpms/gpredict/FC-3/gpredict.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpredict.spec	26 May 2005 16:44:28 -0000	1.6
+++ gpredict.spec	23 Jul 2005 08:40:47 -0000	1.7
@@ -5,7 +5,7 @@
 Group:          Applications/Communications
 License:        GPL
 URL:            http://sourceforge.net/projects/groundstation/
-Source0:        http://prdownloads.sourceforge.net/groundstation/%{name}-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/groundstation/%{name}-%{version}.tar.gz
 Patch0:         gpredict-0.5.0-po.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk+-devel hamlib-devel gnome-libs-devel gettext GConf-devel gnome-vfs-devel gnome-print-devel gal-devel desktop-file-utils
@@ -64,6 +64,9 @@
 %{_datadir}/pixmaps/%{name}
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams 
+- Fixed Source0 URL (#161673)
+
 * Thu May 26 2005 Ignacio Vazquez-Abrams  0.5.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Jul 23 09:00:24 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 05:00:24 -0400
Subject: rpms/kphone/devel kphone-4.2-callaudio-stun-init.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.16, 1.17 sources, 1.3, 1.4
Message-ID: <200507230900.j6N90OEp008926@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:04 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:22 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/kphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kphone.spec	20 May 2005 05:42:04 -0000	1.16
+++ kphone.spec	23 Jul 2005 09:00:22 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams  4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13.fc4
+* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13
 - Patch to prevent stripping of binary (#157261)
 
 * Thu Apr  7 2005 Michael Schwendt 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:04 -0000	1.3
+++ sources	23 Jul 2005 09:00:22 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 09:00:18 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 05:00:18 -0400
Subject: rpms/kphone/FC-3 kphone-4.2-callaudio-stun-init.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <200507230900.j6N90mPk008943@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:03 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:16 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/kphone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kphone.spec	20 May 2005 05:42:03 -0000	1.12
+++ kphone.spec	23 Jul 2005 09:00:16 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams  4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-12.fc3
+* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-12
 - Patch to prevent stripping of binary (#157261)
 
 * Sat Mar 26 2005 Ignacio Vazquez-Abrams  4.1.0-11


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:03 -0000	1.3
+++ sources	23 Jul 2005 09:00:16 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 09:00:19 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 23 Jul 2005 05:00:19 -0400
Subject: rpms/kphone/FC-4 kphone-4.2-callaudio-stun-init.patch, NONE,
	1.1 .cvsignore, 1.3, 1.4 kphone.spec, 1.16, 1.17 sources, 1.3, 1.4
Message-ID: <200507230900.j6N90nXK008949@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore kphone.spec sources 
Added Files:
	kphone-4.2-callaudio-stun-init.patch 
Log Message:
- Upstream update
- Add STUN patch from Stefan Becker (#163322)


kphone-4.2-callaudio-stun-init.patch:

--- NEW FILE kphone-4.2-callaudio-stun-init.patch ---
--- kphone-4.2/kphone/callaudio.cpp~	2005-06-21 04:14:49.000000000 -0700
+++ kphone-4.2/kphone/callaudio.cpp	2005-07-14 21:04:44.000000000 -0700
@@ -29,6 +29,7 @@
 CallAudio::CallAudio(  KPhoneView *phoneview )
 {
 	view = phoneview;
+	useStun = false;
 	if( view->useStunSrv() ) {
 		setStunSrv( view->getStunSrv() );
 	}
@@ -51,7 +52,6 @@
 	videoCodec = codecUnknown;
 	videoRtpCodec = codecUnknown;
 	bodyMask = QString::null;
-	useStun = false;
 	symMedia = false;
 	pidVideo = 0;
 	audio_fd = -1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 05:42:04 -0000	1.3
+++ .cvsignore	23 Jul 2005 09:00:17 -0000	1.4
@@ -1 +1 @@
-kphone-4.1.1.tar.gz
+kphone-4.2.tar.gz


Index: kphone.spec
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/kphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kphone.spec	20 May 2005 05:42:04 -0000	1.16
+++ kphone.spec	23 Jul 2005 09:00:17 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           kphone
-Version:        4.1.1
+Version:        4.2
 Release:        1%{?dist}
 Summary:        A SIP (Session Initiation Protocol) user agent for Linux
 
@@ -11,6 +11,7 @@
 Patch0:         kphone-4.1.1-iso.patch
 Patch1:         kphone-4.1.0-endian.patch
 Patch2:         kphone-4.1.0-strip.patch
+Patch3:         kphone-4.2-callaudio-stun-init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel alsa-lib-devel desktop-file-utils openssl-devel
@@ -23,9 +24,10 @@
 
 %prep
 %setup -q -n kphone
-%patch -p1 -b .iso
+#%patch -p1 -b .iso
 %patch1 -p1 -b .endian
 %patch2 -p1 -b .strip
+%patch3 -p1 -b .stun-init
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -58,10 +60,14 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Sat Jul 23 2005 Ignacio Vazquez-Abrams  4.2-1
+- Upstream update
+- Add STUN patch from Stefan Becker (#163322)
+
 * Fri May 20 2005 Ignacio Vazquez-Abrams  4.1.1-1
 - Upstream update
 
-* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13.fc4
+* Mon May  9 2005 Ignacio Vazquez-Abrams  4.1.0-13
 - Patch to prevent stripping of binary (#157261)
 
 * Thu Apr  7 2005 Michael Schwendt 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kphone/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 05:42:04 -0000	1.3
+++ sources	23 Jul 2005 09:00:17 -0000	1.4
@@ -1 +1 @@
-b95252f527e2fbe107f5d3c1159e2e25  kphone-4.1.1.tar.gz
+632abebc16d4f40bf03d191892e00e22  kphone-4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 12:29:59 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 23 Jul 2005 08:29:59 -0400
Subject: rpms/xemacs-sumo/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xemacs-sumo.spec, 1.9, 1.10 xemacs-sumo-jde-equal.patch,
	1.1, NONE xemacs-sumo-sql-abbrev.patch, 1.1,
	NONE xemacs-sumo-w3.css, 1.1, NONE
Message-ID: <200507231229.j6NCTx64013893@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs-sumo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13872

Modified Files:
	.cvsignore sources xemacs-sumo.spec 
Removed Files:
	xemacs-sumo-jde-equal.patch xemacs-sumo-sql-abbrev.patch 
	xemacs-sumo-w3.css 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jun 2005 21:00:01 -0000	1.5
+++ .cvsignore	23 Jul 2005 12:29:57 -0000	1.6
@@ -1,3 +1,2 @@
-xemacs-mule-sumo-2005-05-05.tar.bz2
-xemacs-sumo-2005-05-05.tar.bz2
-cc-mode-1.45-pkg.tar.gz
+xemacs-mule-sumo-2005-07-15.tar.bz2
+xemacs-sumo-2005-07-15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jun 2005 21:00:01 -0000	1.5
+++ sources	23 Jul 2005 12:29:57 -0000	1.6
@@ -1,3 +1,2 @@
-561bac71479bc400173c21c854c37beb  xemacs-mule-sumo-2005-05-05.tar.bz2
-f98700b3db3ce279fe2c4234806f7dfa  xemacs-sumo-2005-05-05.tar.bz2
-e1a2e251e57f29ce6e082181c13c7f04  cc-mode-1.45-pkg.tar.gz
+016362256e4de4b150d6c2f8d686dd3f  xemacs-mule-sumo-2005-07-15.tar.bz2
+28b92fa2e0bcd0c8e81fd6286d37af30  xemacs-sumo-2005-07-15.tar.bz2


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xemacs-sumo.spec	2 Jun 2005 16:56:40 -0000	1.9
+++ xemacs-sumo.spec	23 Jul 2005 12:29:57 -0000	1.10
@@ -1,94 +1,81 @@
-%define sumo_ver 2005-05-05
+%define sumo    2005-07-15
+%define pkgdir  %{_datadir}/xemacs
 
-Summary: XEmacs Lisp packages
-Name: xemacs-sumo
-Version: %(echo %{sumo_ver} | tr -d -)
-Release: 4.1
-License: GPL
-Group: Applications/Editors
-Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo_ver}.tar.bz2
-Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo_ver}.tar.bz2
-Source2: %{name}-w3.css
-Source3: ftp://ftp.xemacs.org/beta/experimental/packages/cc-mode-1.45-pkg.tar.gz
-Source10: Emacs.ad.ja_JP.eucJP
-Source11: Emacs.ad.ko_KR.eucKR
-Source12: Emacs.ad.zh_CN.GB2312
-Source13: Emacs.ad.zh_TW.Big5
-Source14: Emacs.ad.ja_JP.UTF-8
-Source15: Emacs.ad.ko_KR.UTF-8
-Source16: Emacs.ad.zh_CN.UTF-8
-Source17: Emacs.ad.zh_TW.UTF-8
-URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: xemacs-nox perl /sbin/install-info
-Requires: xemacs-common
-Conflicts: xemacs < 21.4.12-12
-BuildArch: noarch
-Provides:  ruby-mode-xemacs
-Obsoletes: ruby-mode-xemacs tm
-# Provides/Obsoletes for upgradeability from the latest FC version, needed
-# until (if?) there will be separate apel, mew, and ddskk packages for
-# XEmacs again.  ddskk-xemacs is not provided because the
-# version shipping here is the original skk, not ddskk.  It is obsoleted
-# anyway to for the sake of smooth upgrades.
-Provides: apel-xemacs = 10.2 mew-xemacs = 1.94.2
-Obsoletes: apel-xemacs < 10.6-6 mew-xemacs < 4.1-2 ddskk-xemacs < 12.2.0-5
-Patch0: %{name}-jde-equal.patch
-Patch1: %{name}-sql-abbrev.patch
-Patch6: auctex-texsite-jlatex-detect-69129.patch
-Patch7: auctex-texjp-platex.patch
-Patch8: egg-wnn-host-unix-79826.patch
-Patch11: browse-url-htmlview-84262.patch
-Patch12: psgml-browsers-84262.patch
-Patch13: jde-ug-rel-links.patch
-Patch14: jde-ug-section-links-89499.patch
-Patch15: avoid-catch-error-65346.patch
+Name:           xemacs-sumo
+Version:        %(echo %{sumo} | tr -d -)
+Release:        1
+Summary:        XEmacs lisp packages
+
+Group:          Applications/Editors
+License:        GPL
+URL:            http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball
+Source0:        ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2
+Source1:        ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2
+Source10:       Emacs.ad.ja_JP.eucJP
+Source11:       Emacs.ad.ko_KR.eucKR
+Source12:       Emacs.ad.zh_CN.GB2312
+Source13:       Emacs.ad.zh_TW.Big5
+Source14:       Emacs.ad.ja_JP.UTF-8
+Source15:       Emacs.ad.ko_KR.UTF-8
+Source16:       Emacs.ad.zh_CN.UTF-8
+Source17:       Emacs.ad.zh_TW.UTF-8
+Patch6:         auctex-texsite-jlatex-detect-69129.patch
+Patch7:         auctex-texjp-platex.patch
+Patch8:         egg-wnn-host-unix-79826.patch
+Patch11:        browse-url-htmlview-84262.patch
+Patch12:        psgml-browsers-84262.patch
+Patch13:        jde-ug-rel-links.patch
+Patch14:        jde-ug-section-links-89499.patch
+Patch15:        avoid-catch-error-65346.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  xemacs-nox
+BuildRequires:  sed >= 3.95
+BuildRequires:  /sbin/install-info
+Requires:       xemacs-common
+Provides:       apel-xemacs = 10.2
+Provides:       ruby-mode-xemacs
+Obsoletes:      apel-xemacs < 10.6-6
+Obsoletes:      ruby-mode-xemacs
+Obsoletes:      tm
+Conflicts:      xemacs < 21.4.12-12
 
 %description
-XEmacs (like GNU Emacs) is a self-documenting, customizable,
-extensible, real-time display editor. XEmacs is self-documenting
-because at any time you can type control-h to find out what your
-options are or find out what a command does. XEmacs is customizable
-because you can change the definitions of XEmacs commands. XEmacs is
-extensible because you can write entirely new commands-programs in the
-Lisp language to be run by Emacs' own Lisp interpreter. XEmacs
-includes a real-time display, which means that the text being edited
-is visible on the screen and is updated very frequently (usually after
-every character or pair of characters) as you type.
-
-The XEmacs Sumo packages contain a large collection of useful
-Lisp packages for XEmacs including mailreaders, programming modes
-and utilities, and mule related packages.
-
-%package el
-Summary: The .el source files for the XEmacs Sumo packages.
-Group: Applications/Editors
-Requires: xemacs-sumo = %{version}
-Conflicts: xemacs-el < 21.4.12-12
-
-%description el
-xemacs-sumo-el is not needed to run XEmacs. You only need to install it if
-you are planning to incorporate some Lisp programming into your XEmacs
-experience.
-
-%package info
-Summary: Information files for XEmacs.
-Group: Applications/Editors
-Conflicts: xemacs-info < 21.4.12-12
-
-%description info
-This package contains optional info files that are distributed
-with the XEmacs Sumo packages.
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+The XEmacs Sumo packages contain a large collection of useful lisp
+packages for XEmacs including mailreaders, programming modes and
+utilities, and packages related to using XEmacs in multi-lingual
+environments.
+
+%package        el
+Summary:        Emacs lisp source files for the XEmacs Sumo packages
+Group:          Development/Libraries
+Requires:       xemacs-sumo = %{version}
+Conflicts:      xemacs-el < 21.4.12-12
+
+%description    el
+This package is not needed to run XEmacs; it contains the lisp source
+files for the XEmacs Sumo packages, mainly of interest when developing
+or debugging the packages.
+
+%package        info
+Summary:        XEmacs packages documentation in GNU texinfo format
+Group:          Documentation
+Conflicts:      xemacs-info < 21.4.12-12
+
+%description    info
+This package contains optional documentation for the XEmacs Sumo
+packages in GNU texinfo format
 
-%define pkgdir %{_datadir}/xemacs
 
 %prep
 %setup -q -c -a1
-%{__tar} zx -C xemacs-packages -f %{SOURCE3}
-# fix font-lock warnings in JDE
-%patch0 -p0
-# fix abbrev error when loading sql-mode
-%patch1 -p0
 # fix jlatex autodetection
 %patch6 -p0
 # use ptex rather jtex by default for Japanese
@@ -106,87 +93,89 @@
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch15 -p0
 
-rm xemacs-packages/etc/w3/stylesheet
-install -pm 644 %{SOURCE2} xemacs-packages/etc/w3/stylesheet
-
-perl -pi -e "s|/usr/local/bin/perl5?|/usr/bin/perl|g" \
+sed -i -e "s|/usr/local/bin/perl5\\?|/usr/bin/perl|g" \
   xemacs-packages/{lisp/hyperbole/file-newer,etc/bbdb/*.pl}
 
-chmod +x \
-  xemacs-packages/etc/bbdb/*.pl \
-  xemacs-packages/etc/erc/servers.pl \
-  xemacs-packages/etc/ess/config.guess \
-  xemacs-packages/etc/idlwave/idlwave_catalog
-
 # remove game we shouldn't ship
 rm xemacs-packages/lisp/games/tetris.el*
 
 
 %build
-%define _xemacs_batch xemacs-nox -batch -vanilla
+export xemacs_batch="xemacs-nox -batch -vanilla"
+
+# mew is provided by mew-xemacs, and skk by ddskk-xemacs
+$xemacs_batch -l package-admin -eval \
+  "(package-admin-delete-binary-package 'mew \"xemacs-packages\")"
+rmdir xemacs-packages/{etc,lisp,man}/mew
+$xemacs_batch -l package-admin -eval \
+  "(package-admin-delete-binary-package 'skk \"mule-packages\")"
+rmdir mule-packages/{etc,lisp,man}/skk
 
 export EMACSPACKAGEPATH=`pwd`
-%_xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
+$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \
   -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/*
-%_xemacs_batch -f batch-byte-recompile-directory \
+$xemacs_batch -f batch-byte-recompile-directory \
   xemacs-packages/lisp mule-packages/lisp
 
 
 %install
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
-# install packages in buildroot
-mkdir -p %buildroot%{pkgdir}
-cp -rp xemacs-packages mule-packages %buildroot%{pkgdir}
-
-( cd %buildroot%{pkgdir}/mule-packages/etc/app-defaults
-  mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
-  iconv -f ISO-8859-1 -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
-  iconv -f ISO-8859-1 -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
-  iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
-  mv de de_DE
-  mv fr fr_FR
-  mv ro ro_RO
-  install -m 644 %SOURCE10 ja_JP.eucJP/Emacs
-  install -m 644 %SOURCE11 ko_KR.eucKR/Emacs
-  install -m 644 %SOURCE12 zh_CN.GB2312/Emacs
-  install -m 644 %SOURCE13 zh_TW.Big5/Emacs
-  install -m 644 %SOURCE14 ja_JP.UTF-8/Emacs
-  install -m 644 %SOURCE15 ko_KR.UTF-8/Emacs
-  install -m 644 %SOURCE16 zh_CN.UTF-8/Emacs
-  install -m 644 %SOURCE17 zh_TW.UTF-8/Emacs
-## don't seem to appear in manifest
-#  ln -s ja_JP.eucJP ja_JP
-#  ln -s ko_KR.eucKR ko_KR
-#  ln -s zh_CN.GB2312 zh_CN
-#  ln -s zh_TW.Big5 zh_TW
-)
+mkdir -p $RPM_BUILD_ROOT%{pkgdir}
+cp -rp xemacs-packages mule-packages $RPM_BUILD_ROOT%{pkgdir}
 
-# Make sure nothing is 0400
-chmod -R a+rX  %buildroot/usr
+cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
+mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \
+  ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
+iconv -f ISO-8859-1  -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
+iconv -f ISO-8859-1  -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
+iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
+mv de de_DE
+mv fr fr_FR
+mv ro ro_RO
+install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs
+install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs
+install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs
+install -pm 644 %{SOURCE13} zh_TW.Big5/Emacs
+install -pm 644 %{SOURCE14} ja_JP.UTF-8/Emacs
+install -pm 644 %{SOURCE15} ko_KR.UTF-8/Emacs
+install -pm 644 %{SOURCE16} zh_CN.UTF-8/Emacs
+install -pm 644 %{SOURCE17} zh_TW.UTF-8/Emacs
+# these don't seem to appear in manifest
+#ln -s ja_JP.eucJP ja_JP
+#ln -s ko_KR.eucKR ko_KR
+#ln -s zh_CN.GB2312 zh_CN
+#ln -s zh_TW.Big5 zh_TW
+cd -
 
 # info docs: pre-generate "dir"s and compress files
-for file in %buildroot%{pkgdir}/*-packages/info/*.info ; do
+for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do
   /sbin/install-info $file `dirname $file`/dir
 done
-find %buildroot%{pkgdir} -type f -name '*.info*' | xargs -r gzip -9
+find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
 
 # separate files
 rm -f *.files base-files el-files info-files
-echo "%defattr(-,root,root)" > base-files
-echo "%defattr(-,root,root)" > el-files
-echo "%defattr(-,root,root)" > info-files
+echo "%%defattr(-,root,root,-)" > base-files
+echo "%%defattr(-,root,root,-)" > el-files
+echo "%%defattr(-,root,root,-)" > info-files
+
+find $RPM_BUILD_ROOT%{pkgdir}/* \
+  \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
+  \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
+  \( -type d -name info -fprint info.files -prune \) -o \
+  \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
+  \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \
+     -fprint base-el-not-bytecomped.files \) \)
 
-find %buildroot%{pkgdir}/* \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \)
-
-perl -pi -e "s|%buildroot||" *.files
+sed -i -e "s|$RPM_BUILD_ROOT||" *.files
 cat base-*.files dir.files >> base-files
-cat el-*.files dir.files >> el-files
-cat info.files >> info-files
+cat el-*.files   dir.files >> el-files
+cat info.files             >> info-files
 
 
 %clean
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f base-files
@@ -197,6 +186,15 @@
 
 
 %changelog
+* Sat Jul 16 2005 Ville Skytt??  - 20050715-1
+- 2005-07-15; jde font-lock, sql-mode abbrev, w3 stylesheet and file
+  permissions fixed upstream.
+- Use sed instead of perl for in-place edits during build.
+
+* Wed Jul 13 2005 Ville Skytt??  - 20050505-7
+- Remove mew and skk, they're in separate packages again (#162952).
+- Reformat specfile.
+
 * Thu Jun  2 2005 Ville Skytt??  - 20050505-4.1
 - Make sure we're using files included in this package
   when byte-recompiling patched *.el; also allows the byte-compilation


--- xemacs-sumo-jde-equal.patch DELETED ---


--- xemacs-sumo-sql-abbrev.patch DELETED ---


--- xemacs-sumo-w3.css DELETED ---



From fedora-extras-commits at redhat.com  Sat Jul 23 12:31:13 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 23 Jul 2005 08:31:13 -0400
Subject: common tobuild,1.2005,1.2006
Message-ID: <200507231231.j6NCVDUK013955@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13938

Modified Files:
	tobuild 
Log Message:
request build of rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2005
retrieving revision 1.2006
diff -u -r1.2005 -r1.2006
--- tobuild	23 Jul 2005 07:54:07 -0000	1.2005
+++ tobuild	23 Jul 2005 12:31:11 -0000	1.2006
@@ -132,3 +132,4 @@
 bpepple	rpms/liferea/devel	liferea-0_9_4-2_fc5	devel
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
+scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 13:16:00 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 09:16:00 -0400
Subject: rpms/gcfilms import.log,1.5,1.6
Message-ID: <200507231316.j6NDG0DP015225@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	import.log 
Log Message:
auto-import gcfilms-5.3-1.fc4 on branch FC-4 from gcfilms-5.3-1.fc4.src.rpm
New upstream version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	29 Jun 2005 16:58:40 -0000	1.5
+++ import.log	23 Jul 2005 13:15:57 -0000	1.6
@@ -2,3 +2,4 @@
 gcfilms-5_1-1:FC-4:gcfilms-5.1-1.src.rpm:1119195786
 gcfilms-5_2-1:FC-4:gcfilms-5.2-1.src.rpm:1119471667
 gcfilms-5_2-1:HEAD:gcfilms-5.2-1.src.rpm:1120064311
+gcfilms-5_3-1_fc4:FC-4:gcfilms-5.3-1.fc4.src.rpm:1122124549



From fedora-extras-commits at redhat.com  Sat Jul 23 13:16:00 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 09:16:00 -0400
Subject: rpms/gcfilms/FC-4 .cvsignore, 1.4, 1.5 gcfilms.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200507231316.j6NDG05J015233@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	.cvsignore gcfilms.spec sources 
Log Message:
auto-import gcfilms-5.3-1.fc4 on branch FC-4 from gcfilms-5.3-1.fc4.src.rpm
New upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 20:21:23 -0000	1.4
+++ .cvsignore	23 Jul 2005 13:15:58 -0000	1.5
@@ -1 +1 @@
-gcfilms-5.2.tar.gz
+gcfilms-5.3.tar.gz


Index: gcfilms.spec
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/gcfilms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcfilms.spec	22 Jun 2005 20:21:23 -0000	1.3
+++ gcfilms.spec	23 Jul 2005 13:15:58 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gcfilms
-Version:        5.2
-Release:        1
+Version:        5.3
+Release:        1%{?dist}
 Summary:        Movies collection management
 
 Group:          Applications/Databases
@@ -100,6 +100,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Fri Jul 1 2005 Tian  - 5.3-1
+  - New upstream version.
+  - Added dist tag
 * Wed Jun 22 2005 Tian  - 5.2-1
   - New upstream version with important bug fixes.
 * Sun Jun 19 2005 Tian  - 5.1-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 20:21:23 -0000	1.4
+++ sources	23 Jul 2005 13:15:58 -0000	1.5
@@ -1 +1 @@
-5b8954427e264998b8078bc0a0b1be6f  gcfilms-5.2.tar.gz
+91a9c544d1c904928ea0744755078fa8  gcfilms-5.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Jul 23 13:38:32 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 09:38:32 -0400
Subject: common tobuild,1.2006,1.2007
Message-ID: <200507231338.j6NDcW6T015318@cvs-int.fedora.redhat.com>

Author: Tian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15300

Modified Files:
	tobuild 
Log Message:
request build of rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2006
retrieving revision 1.2007
diff -u -r1.2006 -r1.2007
--- tobuild	23 Jul 2005 12:31:11 -0000	1.2006
+++ tobuild	23 Jul 2005 13:38:30 -0000	1.2007
@@ -133,3 +133,4 @@
 bpepple	rpms/liferea/FC-4	liferea-0_9_4-1_fc4	fc4
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4
+Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 15:09:02 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 23 Jul 2005 11:09:02 -0400
Subject: rpms/mhonarc/devel .cvsignore, 1.4, 1.5 mhonarc.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200507231509.j6NF921e017716@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore mhonarc.spec sources 
Log Message:
- version 2.6.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Jun 2005 19:58:18 -0000	1.4
+++ .cvsignore	23 Jul 2005 15:09:00 -0000	1.5
@@ -1 +1 @@
-MHonArc-2.6.12.tar.bz2
+MHonArc-2.6.14.tar.bz2


Index: mhonarc.spec
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mhonarc.spec	11 Jun 2005 19:58:18 -0000	1.8
+++ mhonarc.spec	23 Jul 2005 15:09:00 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           mhonarc
-Version:        2.6.12
+Version:        2.6.14
 Release:        1%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.mhonarc.org/
-Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.12.tar.bz2
+Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.14.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Sat Jul 23 2005 Aurelien Bompard  2.6.14-1
+- version 2.6.14
+
 * Sat Jun 11 2005 Aurelien Bompard  2.6.12-1
 - version 2.6.12 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mhonarc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Jun 2005 19:58:18 -0000	1.4
+++ sources	23 Jul 2005 15:09:00 -0000	1.5
@@ -1 +1 @@
-b1aa510bc503f4e47d3cf23419a41166  MHonArc-2.6.12.tar.bz2
+c0565ec34a4cfaaee9cbfa76fe817539  MHonArc-2.6.14.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jul 23 16:11:27 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 12:11:27 -0400
Subject: devel/cgoban cgoban.spec,1.7,1.8
Message-ID: <200507231611.j6NGBR8m018957@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/cgoban
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18940

Modified Files:
	cgoban.spec 
Log Message:
Apply patch from bugzilla #161676.


Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/devel/cgoban/cgoban.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cgoban.spec	6 Apr 2005 22:11:34 -0000	1.7
+++ cgoban.spec	23 Jul 2005 16:11:25 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           cgoban
 Version:        1.9.14
-Release:        4
+Release:        5
 
 Summary:        X board for playing go
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://cgoban1.sourceforge.net/
-Source0:	http://prdownloads.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
+Source0:	http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
 Source1:        cgoban.desktop
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sat Jun 25 2005 Colin Charles  1.9.14-5
+- Fix download URL
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Jul 23 17:12:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 13:12:05 -0400
Subject: devel/cksfv cksfv-1.3-print.c.patch,NONE,1.1 cksfv.spec,1.7,1.8
Message-ID: <200507231712.j6NHC5Pv020251@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/cksfv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20231

Modified Files:
	cksfv.spec 
Added Files:
	cksfv-1.3-print.c.patch 
Log Message:
Bug-fix. Package is orphaned.

cksfv-1.3-print.c.patch:

--- NEW FILE cksfv-1.3-print.c.patch ---
diff -Nur cksfv-1.3-orig/src/print.c cksfv-1.3/src/print.c
--- cksfv-1.3-orig/src/print.c	2001-07-06 08:33:08.000000000 +0200
+++ cksfv-1.3/src/print.c	2005-07-23 19:09:45.000000000 +0200
@@ -66,7 +66,7 @@
 
 void prsfv_head(char *fn)
 {
-  char          head[81], *p;
+  char          head[82], *p;
   int           len;
   
   fprintf(stderr, "cksfv v%s written by Bryan Call \n",


Index: cksfv.spec
===================================================================
RCS file: /cvs/extras/devel/cksfv/cksfv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cksfv.spec	6 Apr 2005 22:11:34 -0000	1.7
+++ cksfv.spec	23 Jul 2005 17:12:03 -0000	1.8
@@ -1,12 +1,12 @@
 Summary:          Utility to manipulate SFV files
 Name:             cksfv
 Version:          1.3
-Release:          3
-
+Release:          4
 URL:              http://www.fodder.org/cksfv
 License:          GPL
 Group:            Applications/File
 Source0:          http://www.fodder.org/cksfv/cksfv-1.3.tar.gz
+Patch0:           cksfv-1.3-print.c.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 Prefix:           %{_prefix}
 
@@ -17,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .print.c
 
 %build
 make %{?_smp_mflags} "CFLAGS=-Wall %{optflags}"
@@ -36,6 +37,9 @@
 %{_bindir}/cksfv
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 1.3-4
+- Fix "array subscript out of range" (#149461).
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Jul 23 17:12:53 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 13:12:53 -0400
Subject: common tobuild,1.2007,1.2008
Message-ID: <200507231712.j6NHCriI020310@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20293

Modified Files:
	tobuild 
Log Message:
request build of devel/cksfv cksfv-1_3-4 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2007
retrieving revision 1.2008
diff -u -r1.2007 -r1.2008
--- tobuild	23 Jul 2005 13:38:30 -0000	1.2007
+++ tobuild	23 Jul 2005 17:12:51 -0000	1.2008
@@ -134,3 +134,4 @@
 orion	rpms/pytz/devel	pytz-2005i-2	devel
 scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
+mschwendt	devel/cksfv	cksfv-1_3-4	devel



From ed at eh3.com  Sat Jul 23 17:18:00 2005
From: ed at eh3.com (Ed Hill)
Date: Sat, 23 Jul 2005 13:18:00 -0400
Subject: APPROVED: hdf
Message-ID: <1122139080.5322.203.camel@ernie>

Name: hdf
Summary: A general purpose library and file format for storing
scientific data

HDF is a general purpose library and file format for storing scientific
data.  HDF can store two primary objects: datasets and groups.  A
dataset is essentially a multidimensional array of data elements, and a
group is a structure for organizing objects in an HDF file.  Using these
two basic objects, one can create and store almost any kind of
scientific data structure, such as images, arrays of vectors, and
structured and unstructured grids.  You can also mix and match them in
HDF files according to your needs.

Maintainer:  Orion Poplawski
Reviewer:  Ed Hill

-- 
Edward H. Hill III, PhD
office:  MIT Dept. of EAPS;  Rm 54-1424;  77 Massachusetts Ave.
             Cambridge, MA 02139-4307
emails:  eh3 at mit.edu                ed at eh3.com
URLs:    http://web.mit.edu/eh3/    http://eh3.com/
phone:   617-253-0098
fax:     617-253-4464



From fedora-extras-commits at redhat.com  Sat Jul 23 18:27:18 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 14:27:18 -0400
Subject: devel/freeze freeze-2.5.0-printf.patch, NONE,
	1.1 freeze-2.5.0-deffile.patch, NONE, 1.1 freeze.spec, 1.6, 1.7
Message-ID: <200507231827.j6NIRIA4021570@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/freeze
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21547

Modified Files:
	freeze.spec 
Added Files:
	freeze-2.5.0-printf.patch freeze-2.5.0-deffile.patch 
Log Message:
see changelog entry

freeze-2.5.0-printf.patch:

--- NEW FILE freeze-2.5.0-printf.patch ---
diff -Nur freeze-2.5.0-orig/freeze.c freeze-2.5.0/freeze.c
--- freeze-2.5.0-orig/freeze.c	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/freeze.c	2005-07-23 20:25:42.000000000 +0200
@@ -76,7 +76,7 @@
     fprintf(stderr, "\n\
       -c         Write output on stdout, don't remove original.\n\
       -d         If given, melting is done instead.\n\
-      -g         Use \"greedy\" parsing (1.5% worse, 40% faster).\n\
+      -g         Use \"greedy\" parsing (1.5%% worse, 40%% faster).\n\
       -f         Forces output file to be generated, even if one already\n\
                  exists, and even if no space is saved by freezeing.\n\
       -i         Image mode.\n\
diff -Nur freeze-2.5.0-orig/statist.c freeze-2.5.0/statist.c
--- freeze-2.5.0-orig/statist.c	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/statist.c	2005-07-23 20:25:42.000000000 +0200
@@ -261,7 +261,7 @@
 		}
 		in_count += i;
 		if ((in_count > indc_count)) {
-			fprintf(stderr, "%5dK\b\b\b\b\b\b", in_count / 1024);
+			fprintf(stderr, "%5ldK\b\b\b\b\b\b", in_count / 1024);
 			fflush (stderr);
 			indc_count += 4096;
 		}

freeze-2.5.0-deffile.patch:

--- NEW FILE freeze-2.5.0-deffile.patch ---
diff -Nur freeze-2.5.0-orig/freeze.1 freeze-2.5.0/freeze.1
--- freeze-2.5.0-orig/freeze.1	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/freeze.1	2005-07-23 20:21:06.000000000 +0200
@@ -109,7 +109,7 @@
 of following files in the command string. An explicite definition
 of the file's type can give up to 2% of additional compression.
 The list of types is stored in file
-.IR /usr/local/lib/freeze.cnf .
+.IR /usr/lib/freeze.cnf .
 Types may be abbreviated while not ambigious. You can also determine
 values for the static Huffman table by using a list of 8 numbers
 separated by commas instead of
diff -Nur freeze-2.5.0-orig/README freeze-2.5.0/README
--- freeze-2.5.0-orig/README	1999-05-20 11:07:51.000000000 +0200
+++ freeze-2.5.0/README	2005-07-23 20:23:28.000000000 +0200
@@ -160,7 +160,7 @@
 Note: If you use "gensample | statist", remember that INTR influence BOTH
 processes !!
 
-You may create the /etc/default/freeze (or rather /usr/local/lib/freeze.cnf,
+You may create the /etc/default/freeze (or rather /usr/lib/freeze.cnf,
 which is now the default, NOTE IT!) file (in MS-DOS it is FREEZE.CNF in
 the directory of FREEZE.EXE), which has the following format:  name =
 ``statist's output (8 numbers)'', e.g.:


Index: freeze.spec
===================================================================
RCS file: /cvs/extras/devel/freeze/freeze.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freeze.spec	6 Apr 2005 22:11:37 -0000	1.6
+++ freeze.spec	23 Jul 2005 18:27:16 -0000	1.7
@@ -1,13 +1,14 @@
 Name:    freeze
 Version: 2.5.0
-Release: 3
-
+Release: 4
 Summary: freeze/melt/fcat compression utilities
 
 Group:     Applications/Archiving
 License:   Distributable
 Source:    http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
-Patch:     freeze-2.5.patch
+Patch0:    freeze-2.5.patch
+Patch1:    freeze-2.5.0-printf.patch
+Patch2:    freeze-2.5.0-deffile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -17,7 +18,9 @@
 
 %prep
 %setup
-%patch
+%patch0 -p1 -b .Makefile
+%patch1 -p1 -b .printf
+%patch2 -p1 -b .deffile
 
 %build
 chmod u+x configure
@@ -48,6 +51,11 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 2.5.0-4
+- Fix bad printf string (#149613).
+- Fix default cnf file location in readme and man page.
+- Don't strip.
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sat Jul 23 18:28:04 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 14:28:04 -0400
Subject: devel/freeze freeze-2.5.patch,1.1,1.2
Message-ID: <200507231828.j6NIS4be021622@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/freeze
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21602

Modified Files:
	freeze-2.5.patch 
Log Message:


freeze-2.5.patch:

Index: freeze-2.5.patch
===================================================================
RCS file: /cvs/extras/devel/freeze/freeze-2.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freeze-2.5.patch	8 Nov 2004 04:20:29 -0000	1.1
+++ freeze-2.5.patch	23 Jul 2005 18:28:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -uNr freeze-2.5.orig/Makefile.in freeze-2.5/Makefile.in
---- Makefile.in.in	Wed Sep 11 09:54:37 1996
-+++ Makefile.in	Wed Sep 11 10:14:28 1996
+diff -Nur freeze-2.5.0-orig/Makefile.in freeze-2.5.0/Makefile.in
+--- freeze-2.5.0-orig/Makefile.in	1999-05-20 11:07:51.000000000 +0200
++++ freeze-2.5.0/Makefile.in	2005-07-23 19:44:41.000000000 +0200
 @@ -18,7 +18,7 @@
  default:        prog
  
@@ -10,7 +10,23 @@
  DEST          = $(prefix)/bin
  MANDEST       = $(prefix)/man/man1
  SEC           = 1
-@@ -101,18 +101,18 @@
+@@ -79,15 +79,12 @@
+ 
+ freeze$(EXE):   $(OBJS)
+ 		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+-		-strip $@
+ 
+ statist$(EXE):  statist.$(OBJ) lz.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ statist.$(OBJ) lz.$(OBJ) $(LIBS)
+-		-strip $@
+ 
+ showhuf$(EXE):  showhuf.$(OBJ)
+ 		$(CC) $(LDFLAGS) -o $@ showhuf.$(OBJ) $(LIBS)
+-		-strip $@
+ 
+ clobber:        clean
+ 		rm -f freeze$(EXE) statist$(EXE) showhuf$(EXE) *.man \#* *~ config.h Makefile
+@@ -101,18 +98,18 @@
  
  $(DEST)/freeze: freeze
  		$(INSTALL_PROGRAM) freeze $@



From fedora-extras-commits at redhat.com  Sat Jul 23 18:29:16 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 14:29:16 -0400
Subject: common tobuild,1.2008,1.2009
Message-ID: <200507231829.j6NITGJN021704@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21687

Modified Files:
	tobuild 
Log Message:
request build of devel/freeze freeze-2_5_0-4 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -r1.2008 -r1.2009
--- tobuild	23 Jul 2005 17:12:51 -0000	1.2008
+++ tobuild	23 Jul 2005 18:29:14 -0000	1.2009
@@ -135,3 +135,4 @@
 scop	rpms/xemacs-sumo/FC-4	xemacs-sumo-20050715-1	fc4
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
 mschwendt	devel/cksfv	cksfv-1_3-4	devel
+mschwendt	devel/freeze	freeze-2_5_0-4	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 19:44:34 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:44:34 -0400
Subject: devel/tetex-lgrind lgrind-3.67-parsevartab.patch, NONE,
	1.1 tetex-lgrind.spec, 1.9, 1.10
Message-ID: <200507231944.j6NJiYdm023029@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/tetex-lgrind
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23009

Modified Files:
	tetex-lgrind.spec 
Added Files:
	lgrind-3.67-parsevartab.patch 
Log Message:
Bug-fix. Package is orphaned.

lgrind-3.67-parsevartab.patch:

--- NEW FILE lgrind-3.67-parsevartab.patch ---
diff -Nur lgrind-orig/source/lgutil.c lgrind/source/lgutil.c
--- lgrind-orig/source/lgutil.c	2001-11-04 12:24:22.000000000 +0100
+++ lgrind/source/lgutil.c	2005-07-23 21:43:45.000000000 +0200
@@ -277,7 +277,7 @@
 	char linebuf[201], *cp;
 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
 
-	if (f==NULL) return;
+	if (f==NULL) return NULL;
 	while (!feof(f))
 	{
 		fscanf(f, "%200[^\n]", linebuf);


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/devel/tetex-lgrind/tetex-lgrind.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-lgrind.spec	22 May 2005 22:26:49 -0000	1.9
+++ tetex-lgrind.spec	23 Jul 2005 19:44:32 -0000	1.10
@@ -6,8 +6,7 @@
 Summary:          Source-code pretty-printer for LaTeX
 Name:             tetex-lgrind
 Version:          3.67
-Release: 6
-
+Release:          7
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -15,6 +14,7 @@
 # automatically generated by the FTP site. To verify the file, the
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
+Patch0:           lgrind-3.67-parsevartab.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):   tetex
 Requires(postun): tetex
@@ -33,6 +33,7 @@
 
 %prep
 %setup -q -n lgrind
+%patch0 -p1 -b .parsevartab
 
 %build
 make %{?_smp_mflags} \
@@ -78,6 +79,9 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 3.67-7
+- Fix "missing expression in return statement" (#150297).
+
 * Sun May 22 2005 Jeremy Katz  - 3.67-6
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sat Jul 23 19:55:14 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:55:14 -0400
Subject: common tobuild,1.2009,1.2010
Message-ID: <200507231955.j6NJtErE023090@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23073

Modified Files:
	tobuild 
Log Message:
request build of devel/tetex-lgrind tetex-lgrind-3_67-7 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2009
retrieving revision 1.2010
diff -u -r1.2009 -r1.2010
--- tobuild	23 Jul 2005 18:29:14 -0000	1.2009
+++ tobuild	23 Jul 2005 19:55:12 -0000	1.2010
@@ -136,3 +136,4 @@
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
 mschwendt	devel/cksfv	cksfv-1_3-4	devel
 mschwendt	devel/freeze	freeze-2_5_0-4	devel
+mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel



From fedora-extras-commits at redhat.com  Sat Jul 23 19:57:37 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:57:37 -0400
Subject: rpms/tetex-lgrind/FC-4 lgrind-3.67-parsevartab.patch, NONE,
	1.1 tetex-lgrind.spec, 1.9, 1.10
Message-ID: <200507231957.j6NJvbFc023121@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	tetex-lgrind.spec 
Added Files:
	lgrind-3.67-parsevartab.patch 
Log Message:
Sync with devel to fix #162523.

lgrind-3.67-parsevartab.patch:

--- NEW FILE lgrind-3.67-parsevartab.patch ---
diff -Nur lgrind-orig/source/lgutil.c lgrind/source/lgutil.c
--- lgrind-orig/source/lgutil.c	2001-11-04 12:24:22.000000000 +0100
+++ lgrind/source/lgutil.c	2005-07-23 21:43:45.000000000 +0200
@@ -277,7 +277,7 @@
 	char linebuf[201], *cp;
 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
 
-	if (f==NULL) return;
+	if (f==NULL) return NULL;
 	while (!feof(f))
 	{
 		fscanf(f, "%200[^\n]", linebuf);


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-lgrind/FC-4/tetex-lgrind.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tetex-lgrind.spec	22 May 2005 22:26:49 -0000	1.9
+++ tetex-lgrind.spec	23 Jul 2005 19:57:35 -0000	1.10
@@ -6,8 +6,7 @@
 Summary:          Source-code pretty-printer for LaTeX
 Name:             tetex-lgrind
 Version:          3.67
-Release: 6
-
+Release:          6.1
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -15,6 +14,7 @@
 # automatically generated by the FTP site. To verify the file, the
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
+Patch0:           lgrind-3.67-parsevartab.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):   tetex
 Requires(postun): tetex
@@ -33,6 +33,7 @@
 
 %prep
 %setup -q -n lgrind
+%patch0 -p1 -b .parsevartab
 
 %build
 make %{?_smp_mflags} \
@@ -78,6 +79,9 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 3.67-6.1
+- Fix "missing expression in return statement" (#150297).
+
 * Sun May 22 2005 Jeremy Katz  - 3.67-6
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sat Jul 23 19:58:19 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 15:58:19 -0400
Subject: common tobuild,1.2010,1.2011
Message-ID: <200507231958.j6NJwJeK023178@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23161

Modified Files:
	tobuild 
Log Message:
request build of rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2010
retrieving revision 1.2011
diff -u -r1.2010 -r1.2011
--- tobuild	23 Jul 2005 19:55:12 -0000	1.2010
+++ tobuild	23 Jul 2005 19:58:17 -0000	1.2011
@@ -137,3 +137,4 @@
 mschwendt	devel/cksfv	cksfv-1_3-4	devel
 mschwendt	devel/freeze	freeze-2_5_0-4	devel
 mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel
+mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4



From fedora-extras-commits at redhat.com  Sat Jul 23 20:00:55 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 16:00:55 -0400
Subject: rpms/tetex-lgrind/FC-3 lgrind-3.67-parsevartab.patch, NONE,
	1.1 tetex-lgrind.spec, 1.5, 1.6
Message-ID: <200507232000.j6NK0tdR023223@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/tetex-lgrind/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23203

Modified Files:
	tetex-lgrind.spec 
Added Files:
	lgrind-3.67-parsevartab.patch 
Log Message:
Sync with FC-4 and devel.

lgrind-3.67-parsevartab.patch:

--- NEW FILE lgrind-3.67-parsevartab.patch ---
diff -Nur lgrind-orig/source/lgutil.c lgrind/source/lgutil.c
--- lgrind-orig/source/lgutil.c	2001-11-04 12:24:22.000000000 +0100
+++ lgrind/source/lgutil.c	2005-07-23 21:43:45.000000000 +0200
@@ -277,7 +277,7 @@
 	char linebuf[201], *cp;
 	varsubst *varsubsts=NULL, *substitem, *substlistpos;
 
-	if (f==NULL) return;
+	if (f==NULL) return NULL;
 	while (!feof(f))
 	{
 		fscanf(f, "%200[^\n]", linebuf);


Index: tetex-lgrind.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex-lgrind/FC-3/tetex-lgrind.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tetex-lgrind.spec	10 Dec 2004 22:03:12 -0000	1.5
+++ tetex-lgrind.spec	23 Jul 2005 20:00:53 -0000	1.6
@@ -1,13 +1,12 @@
 %define texmf       %{_datadir}/texmf
-%define tdsname     lgrind 
+%define tdsname     lgrind
 %define itexhash    $RPM_INSTALL_PREFIX/bin/texhash
 %define itexmf      $RPM_INSTALL_PREFIX/share/texmf
 
 Summary:          Source-code pretty-printer for LaTeX
 Name:             tetex-lgrind
 Version:          3.67
-Release:          4
-Epoch:            0
+Release:          4.1
 URL:              http://www.ctan.org/tex-archive/support/lgrind
 License:          BSD
 Group:            Applications/Publishing
@@ -15,8 +14,10 @@
 # automatically generated by the FTP site. To verify the file, the
 # file contained in the tarballs have to be verified one by one.
 Source0:          ftp://ftp.dante.de/tex-archive/support/lgrind.tar.gz
+Patch0:           lgrind-3.67-parsevartab.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires(post,postun): tetex
+Requires(post):   tetex
+Requires(postun): tetex
 Requires:         tetex-latex
 BuildRequires:    tetex-latex, perl
 Prefix:           %{_prefix}
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q -n lgrind
+%patch0 -p1 -b .parsevartab
 
 %build
 make %{?_smp_mflags} \
@@ -44,7 +46,7 @@
 
 %install
 rm -rf %{buildroot}
- 
+
 # Install TeX files.
 mkdir -p %{buildroot}%{texmf}/tex/latex/%{tdsname}/
 install -m 644 lgrind.sty %{buildroot}%{texmf}/tex/latex/%{tdsname}/
@@ -77,6 +79,13 @@
 %{texmf}/tex/latex/%{tdsname}
 
 %changelog
+* Sat Jul 23 2005 Michael Schwendt  - 3.67-4.1
+- Fix "missing expression in return statement" (#150297).
+- Drop explicit Epoch 0.
+
+* Fri Mar  4 2005 Ville Skytt?? 
+- Split context marked dependency syntax to work around #118773.
+
 * Fri May  2 2003 Marius Johndal  0:3.67-0.fdr.4
 - Invoke make with %{?_smp_mflags} and from top-level directory to get
   defines right.



From fedora-extras-commits at redhat.com  Sat Jul 23 20:02:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat, 23 Jul 2005 16:02:39 -0400
Subject: common tobuild,1.2011,1.2012
Message-ID: <200507232002.j6NK2eoT024376@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24361

Modified Files:
	tobuild 
Log Message:
request build of rpms/tetex-lgrind/FC-3 tetex-lgrind-3_67-4_1 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2011
retrieving revision 1.2012
diff -u -r1.2011 -r1.2012
--- tobuild	23 Jul 2005 19:58:17 -0000	1.2011
+++ tobuild	23 Jul 2005 20:02:13 -0000	1.2012
@@ -138,3 +138,4 @@
 mschwendt	devel/freeze	freeze-2_5_0-4	devel
 mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel
 mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4
+mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3



From fedora-extras-commits at redhat.com  Sat Jul 23 22:31:55 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 18:31:55 -0400
Subject: rpms/gcfilms/devel gcfilms.spec,1.3,1.4
Message-ID: <200507232231.j6NMVt0f026947@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	gcfilms.spec 
Log Message:
New upstream version



Index: gcfilms.spec
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/devel/gcfilms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcfilms.spec	1 Jul 2005 17:05:28 -0000	1.3
+++ gcfilms.spec	23 Jul 2005 22:31:53 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           gcfilms
-Version:        5.2
+Version:        5.3
 Release:        1%{?dist}
 Summary:        Movies collection management
 
@@ -100,6 +100,9 @@
 %{_datadir}/mime/packages/%{name}.xml
 
 %changelog
+* Fri Jul 1 2005 Tian  - 5.3-1
+  - New upstream version.
+  - Added dist tag
 * Wed Jun 22 2005 Tian  - 5.2-1
   - New upstream version with important bug fixes.
 * Sun Jun 19 2005 Tian  - 5.1-1



From fedora-extras-commits at redhat.com  Sat Jul 23 22:32:28 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Sat, 23 Jul 2005 18:32:28 -0400
Subject: common tobuild,1.2012,1.2013
Message-ID: <200507232232.j6NMWSBY027009@cvs-int.fedora.redhat.com>

Author: Tian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26992

Modified Files:
	tobuild 
Log Message:
request build of rpms/gcfilms/devel gcfilms-5_3-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2012
retrieving revision 1.2013
diff -u -r1.2012 -r1.2013
--- tobuild	23 Jul 2005 20:02:13 -0000	1.2012
+++ tobuild	23 Jul 2005 22:32:26 -0000	1.2013
@@ -139,3 +139,4 @@
 mschwendt	devel/tetex-lgrind	tetex-lgrind-3_67-7	devel
 mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4
 mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3
+Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 08:49:03 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 04:49:03 -0400
Subject: rpms/ulogd/FC-4 ulogd-1.02-init.patch, 1.1, 1.2 ulogd.logrotate, 1.1,
	1.2 ulogd.spec, 1.10, 1.11
Message-ID: <200507240849.j6O8n3bT010666@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd-1.02-init.patch ulogd.logrotate ulogd.spec 
Log Message:
- compress rotated logs
- start after mysql in the init process
- use dist tag



ulogd-1.02-init.patch:

Index: ulogd-1.02-init.patch
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd-1.02-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd-1.02-init.patch	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd-1.02-init.patch	24 Jul 2005 08:49:01 -0000	1.2
@@ -4,7 +4,7 @@
  #!/bin/sh
  #
 -# chkconfig: 345 81 19
-+# chkconfig: 2345 11 89
++# chkconfig: - 81 19
  # description: ulogd is the userspace logging daemon for netfilter/iptables
  #
  


Index: ulogd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd.logrotate	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd.logrotate	24 Jul 2005 08:49:01 -0000	1.2
@@ -2,6 +2,7 @@
     missingok
     notifempty
     weekly
+    compress
     sharedscripts
     postrotate
 	/etc/init.d/ulogd reload > /dev/null 2>&1


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ulogd.spec	19 Apr 2005 12:19:27 -0000	1.10
+++ ulogd.spec	24 Jul 2005 08:49:01 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.23
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
@@ -120,6 +120,11 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  1.23-2
+- compress rotated logs
+- start after mysql in the init process
+- use dist tag
+
 * Tue Apr 19 2005 Aurelien Bompard  1.23-1.fc4
 - version 1.23
 - change release tag for FC4
@@ -162,4 +167,3 @@
 - Add Epoch: 0
 
 * Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1
-- initial package



From fedora-extras-commits at redhat.com  Sun Jul 24 08:49:04 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 04:49:04 -0400
Subject: rpms/ulogd/devel ulogd-1.02-init.patch, 1.1, 1.2 ulogd.logrotate,
	1.1, 1.2 ulogd.spec, 1.10, 1.11
Message-ID: <200507240849.j6O8n42K010677@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd-1.02-init.patch ulogd.logrotate ulogd.spec 
Log Message:
- compress rotated logs
- start after mysql in the init process
- use dist tag



ulogd-1.02-init.patch:

Index: ulogd-1.02-init.patch
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd-1.02-init.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd-1.02-init.patch	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd-1.02-init.patch	24 Jul 2005 08:49:02 -0000	1.2
@@ -4,7 +4,7 @@
  #!/bin/sh
  #
 -# chkconfig: 345 81 19
-+# chkconfig: 2345 11 89
++# chkconfig: - 81 19
  # description: ulogd is the userspace logging daemon for netfilter/iptables
  #
  


Index: ulogd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ulogd.logrotate	26 Nov 2004 13:46:02 -0000	1.1
+++ ulogd.logrotate	24 Jul 2005 08:49:02 -0000	1.2
@@ -2,6 +2,7 @@
     missingok
     notifempty
     weekly
+    compress
     sharedscripts
     postrotate
 	/etc/init.d/ulogd reload > /dev/null 2>&1


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ulogd.spec	19 Apr 2005 12:19:27 -0000	1.10
+++ ulogd.spec	24 Jul 2005 08:49:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ulogd
 Version:        1.23
-Release:        1.fc4
+Release:        2%{?dist}
 Summary:        The userspace logging daemon for netfilter
 License:        GPL
 Group:          System Environment/Daemons
@@ -120,6 +120,11 @@
 %{_libdir}/ulogd/ulogd_PGSQL.so
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  1.23-2
+- compress rotated logs
+- start after mysql in the init process
+- use dist tag
+
 * Tue Apr 19 2005 Aurelien Bompard  1.23-1.fc4
 - version 1.23
 - change release tag for FC4
@@ -162,4 +167,3 @@
 - Add Epoch: 0
 
 * Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1
-- initial package



From fedora-extras-commits at redhat.com  Sun Jul 24 09:13:54 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 05:13:54 -0400
Subject: rpms/ulogd/FC-4 ulogd.spec,1.11,1.12
Message-ID: <200507240913.j6O9DsBI011919@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd.spec 
Log Message:
- syntax error


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/FC-4/ulogd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ulogd.spec	24 Jul 2005 08:49:01 -0000	1.11
+++ ulogd.spec	24 Jul 2005 09:13:52 -0000	1.12
@@ -165,5 +165,3 @@
 
 * Sun May 16 2004 Aurelien Bompard  0:1.02-0.fdr.2
 - Add Epoch: 0
-
-* Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1



From fedora-extras-commits at redhat.com  Sun Jul 24 09:13:55 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 05:13:55 -0400
Subject: rpms/ulogd/devel ulogd.spec,1.11,1.12
Message-ID: <200507240913.j6O9Dt7x011925@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	ulogd.spec 
Log Message:
- syntax error


Index: ulogd.spec
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ulogd.spec	24 Jul 2005 08:49:02 -0000	1.11
+++ ulogd.spec	24 Jul 2005 09:13:53 -0000	1.12
@@ -165,5 +165,3 @@
 
 * Sun May 16 2004 Aurelien Bompard  0:1.02-0.fdr.2
 - Add Epoch: 0
-
-* Sat May 15 2004 Aurelien Bompard  1.02-0.fdr.1



From fedora-extras-commits at redhat.com  Sun Jul 24 09:23:17 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:23:17 -0400
Subject: rpms/moodss/FC-3 .cvsignore, 1.5, 1.6 moodss.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200507240923.j6O9NHwS011975@cvs-int.fedora.redhat.com>

Author: jfontain

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jul 2005 11:00:44 -0000	1.5
+++ .cvsignore	24 Jul 2005 09:23:14 -0000	1.6
@@ -1 +1 @@
-moodss-20.2.tar.bz2
+moodss-20.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- moodss.spec	1 Jul 2005 23:32:26 -0000	1.10
+++ moodss.spec	24 Jul 2005 09:23:14 -0000	1.11
@@ -1,11 +1,11 @@
 Name: moodss
-Version: 20.2
+Version: 20.3
 Release: 1%{?dist}
 Epoch: 0
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-20.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 0:8.4.7
@@ -59,6 +59,9 @@
 
 %changelog
 
+* Sun Jul 10 2005 Jean-Luc Fontaine  0:20.3-1
+- 20.3 upstream release
+
 * Sun Jun 26 2005 Jean-Luc Fontaine  0:20.2-1
 - 20.2 source release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jul 2005 00:05:17 -0000	1.5
+++ sources	24 Jul 2005 09:23:14 -0000	1.6
@@ -1 +1 @@
-151a823de023ddb1961d046d8adfaa0b  moodss-20.2.tar.bz2
+fbe241b915fea8d52616be017dee0d54  moodss-20.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jul 24 09:24:46 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:24:46 -0400
Subject: common tobuild,1.2013,1.2014
Message-ID: <200507240924.j6O9Ok9Y012054@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12037

Modified Files:
	tobuild 
Log Message:
request build of rpms/moodss/FC-3 moodss-20_3-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -r1.2013 -r1.2014
--- tobuild	23 Jul 2005 22:32:26 -0000	1.2013
+++ tobuild	24 Jul 2005 09:24:44 -0000	1.2014
@@ -140,3 +140,4 @@
 mschwendt	rpms/tetex-lgrind/FC-4	tetex-lgrind-3_67-6_1	fc4
 mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3
 Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel
+jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sun Jul 24 09:26:09 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:26:09 -0400
Subject: rpms/moodss/FC-4 .cvsignore, 1.5, 1.6 moodss.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200507240926.j6O9Q9AF012081@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
upstream release 20.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2005 19:47:17 -0000	1.5
+++ .cvsignore	24 Jul 2005 09:26:07 -0000	1.6
@@ -1 +1 @@
-moodss-20.2.tar.bz2
+moodss-20.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- moodss.spec	1 Jul 2005 19:47:17 -0000	1.16
+++ moodss.spec	24 Jul 2005 09:26:07 -0000	1.17
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 20.2
+Version: 20.3
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-20.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -58,6 +58,9 @@
 
 %changelog
 
+* Sun Jul 10 2005 Jean-Luc Fontaine  20.3-1
+- 20.3 upstream release
+
 * Sun Jun 26 2005 Jean-Luc Fontaine  20.2-1
 - 20.2 source release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jul 2005 19:47:17 -0000	1.5
+++ sources	24 Jul 2005 09:26:07 -0000	1.6
@@ -1 +1 @@
-151a823de023ddb1961d046d8adfaa0b  moodss-20.2.tar.bz2
+fbe241b915fea8d52616be017dee0d54  moodss-20.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jul 24 09:27:05 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 24 Jul 2005 05:27:05 -0400
Subject: rpms/moodss/devel .cvsignore, 1.4, 1.5 moodss.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200507240927.j6O9R57f012137@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
upstream release 20.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 May 2005 19:36:38 -0000	1.4
+++ .cvsignore	24 Jul 2005 09:27:02 -0000	1.5
@@ -1 +1 @@
-moodss-20.1.tar.bz2
+moodss-20.3.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- moodss.spec	2 Jul 2005 10:43:07 -0000	1.16
+++ moodss.spec	24 Jul 2005 09:27:03 -0000	1.17
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 20.2
+Version: 20.3
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.2.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-20.3.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -58,6 +58,9 @@
 
 %changelog
 
+* Sun Jul 10 2005 Jean-Luc Fontaine  20.3-1
+- 20.3 upstream release
+
 * Sun Jun 26 2005 Jean-Luc Fontaine  20.2-1
 - 20.2 source release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jul 2005 10:43:07 -0000	1.5
+++ sources	24 Jul 2005 09:27:03 -0000	1.6
@@ -1 +1 @@
-151a823de023ddb1961d046d8adfaa0b  moodss-20.2.tar.bz2
+fbe241b915fea8d52616be017dee0d54  moodss-20.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jul 24 10:40:33 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 06:40:33 -0400
Subject: common tobuild,1.2014,1.2015
Message-ID: <200507241040.j6OAeX1u013449@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13432

Modified Files:
	tobuild 
Log Message:
request build of rpms/ulogd/FC-4 ulogd-1_23-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -r1.2014 -r1.2015
--- tobuild	24 Jul 2005 09:24:44 -0000	1.2014
+++ tobuild	24 Jul 2005 10:40:31 -0000	1.2015
@@ -141,3 +141,4 @@
 mschwendt	rpms/tetex-lgrind/FC-3	tetex-lgrind-3_67-4_1	fc3
 Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel
 jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3
+abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 10:40:57 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 06:40:57 -0400
Subject: common tobuild,1.2015,1.2016
Message-ID: <200507241040.j6OAevog013511@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13494

Modified Files:
	tobuild 
Log Message:
request build of rpms/ulogd/devel ulogd-1_23-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2015
retrieving revision 1.2016
diff -u -r1.2015 -r1.2016
--- tobuild	24 Jul 2005 10:40:31 -0000	1.2015
+++ tobuild	24 Jul 2005 10:40:55 -0000	1.2016
@@ -142,3 +142,4 @@
 Tian	rpms/gcfilms/devel	gcfilms-5_3-1_fc5	devel
 jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3
 abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4
+abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 11:07:41 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:07:41 -0400
Subject: rpms/showimg/FC-4 showimg.spec,1.3,1.4
Message-ID: <200507241108.j6OB8BM7014712@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	showimg.spec 
Log Message:
- rebuild for libexif
- use dist tags




Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- showimg.spec	1 Apr 2005 16:36:00 -0000	1.3
+++ showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.4.1
-Release:        3
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -83,6 +83,10 @@
 
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  0.9.4.1-4
+- rebuild for libexif
+- use dist tags
+
 * Fri Apr  1 2005 Michael Schwendt  - 0.9.4.1-3
 - add missing %%dir entry for showimgpart directory
 



From fedora-extras-commits at redhat.com  Sun Jul 24 11:07:41 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:07:41 -0400
Subject: rpms/showimg/devel showimg.spec,1.3,1.4
Message-ID: <200507241108.j6OB8C5b014715@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	showimg.spec 
Log Message:
- rebuild for libexif
- use dist tags




Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- showimg.spec	1 Apr 2005 16:36:00 -0000	1.3
+++ showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.4.1
-Release:        3
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -83,6 +83,10 @@
 
 
 %changelog
+* Sun Jul 24 2005 Aurelien Bompard  0.9.4.1-4
+- rebuild for libexif
+- use dist tags
+
 * Fri Apr  1 2005 Michael Schwendt  - 0.9.4.1-3
 - add missing %%dir entry for showimgpart directory
 



From fedora-extras-commits at redhat.com  Sun Jul 24 11:08:42 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:08:42 -0400
Subject: common tobuild,1.2016,1.2017
Message-ID: <200507241108.j6OB8goF014777@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14760

Modified Files:
	tobuild 
Log Message:
request build of rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -r1.2016 -r1.2017
--- tobuild	24 Jul 2005 10:40:55 -0000	1.2016
+++ tobuild	24 Jul 2005 11:08:40 -0000	1.2017
@@ -143,3 +143,4 @@
 jfontain	rpms/moodss/FC-3	moodss-20_3-1_fc3	fc3
 abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4
 abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel
+abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 11:09:13 2005
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 24 Jul 2005 07:09:13 -0400
Subject: common tobuild,1.2017,1.2018
Message-ID: <200507241109.j6OB9D1X014839@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14822

Modified Files:
	tobuild 
Log Message:
request build of rpms/showimg/devel showimg-0_9_4_1-4_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2017
retrieving revision 1.2018
diff -u -r1.2017 -r1.2018
--- tobuild	24 Jul 2005 11:08:40 -0000	1.2017
+++ tobuild	24 Jul 2005 11:09:11 -0000	1.2018
@@ -144,3 +144,4 @@
 abompard	rpms/ulogd/FC-4	ulogd-1_23-2_fc4	fc4
 abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel
 abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4
+abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 12:48:02 2005
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 24 Jul 2005 08:48:02 -0400
Subject: common tobuild,1.2018,1.2019
Message-ID: <200507241248.j6OCm232016299@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16282

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-Crypt-CBC/FC-3 perl-Crypt-CBC-2_14-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -r1.2018 -r1.2019
--- tobuild	24 Jul 2005 11:09:11 -0000	1.2018
+++ tobuild	24 Jul 2005 12:48:00 -0000	1.2019
@@ -145,3 +145,4 @@
 abompard	rpms/ulogd/devel	ulogd-1_23-2_fc5	devel
 abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4
 abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel
+ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3



From fedora-extras-commits at redhat.com  Sun Jul 24 12:49:45 2005
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 24 Jul 2005 08:49:45 -0400
Subject: common tobuild,1.2019,1.2020
Message-ID: <200507241249.j6OCnjU7016361@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16344

Modified Files:
	tobuild 
Log Message:
request build of rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC-2_14-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2019
retrieving revision 1.2020
diff -u -r1.2019 -r1.2020
--- tobuild	24 Jul 2005 12:48:00 -0000	1.2019
+++ tobuild	24 Jul 2005 12:49:43 -0000	1.2020
@@ -146,3 +146,4 @@
 abompard	rpms/showimg/FC-4	showimg-0_9_4_1-4_fc4	fc4
 abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel
 ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3
+ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 13:08:22 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 24 Jul 2005 09:08:22 -0400
Subject: common tobuild,1.2020,1.2021
Message-ID: <200507241308.j6OD8MD5017584@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17567

Modified Files:
	tobuild 
Log Message:
request build of rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -r1.2020 -r1.2021
--- tobuild	24 Jul 2005 12:49:43 -0000	1.2020
+++ tobuild	24 Jul 2005 13:08:20 -0000	1.2021
@@ -147,3 +147,4 @@
 abompard	rpms/showimg/devel	showimg-0_9_4_1-4_fc5	devel
 ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3
 ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4
+jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 13:58:54 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 24 Jul 2005 09:58:54 -0400
Subject: common tobuild,1.2021,1.2022
Message-ID: <200507241358.j6ODwsLO017682@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17665

Modified Files:
	tobuild 
Log Message:
Remove builds that I got a "success" notification for.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2021
retrieving revision 1.2022
diff -u -r1.2021 -r1.2022
--- tobuild	24 Jul 2005 13:08:20 -0000	1.2021
+++ tobuild	24 Jul 2005 13:58:52 -0000	1.2022
@@ -113,11 +113,7 @@
 scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
 scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
 scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
-scop	rpms/dvb-apps/FC-4	dvb-apps-1_1_0-1_fc4	fc4
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
-scop	rpms/perl-IO-Socket-SSL/FC-4	perl-IO-Socket-SSL-0_97-1_fc4	fc4
-scop	rpms/perl-IO-Socket-SSL/devel	perl-IO-Socket-SSL-0_97-1_fc5	devel
-scop	rpms/gdome2/FC-4	gdome2-0_8_1-1_fc4	fc4
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4
 scop	rpms/rpmlint/devel	rpmlint-0_70-4_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 14:02:07 2005
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 24 Jul 2005 10:02:07 -0400
Subject: common tobuild,1.2022,1.2023
Message-ID: <200507241402.j6OE27cu018821@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807

Modified Files:
	tobuild 
Log Message:
purged successful builds



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -r1.2022 -r1.2023
--- tobuild	24 Jul 2005 13:58:52 -0000	1.2022
+++ tobuild	24 Jul 2005 14:02:05 -0000	1.2023
@@ -58,7 +58,6 @@
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_2-5_fc5	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 eyecon	rpms/leafnode/FC-4	leafnode-1_11_3-2_fc4	fc4
-ixs	rpms/perl-Crypt-CBC/devel	perl-Crypt-CBC-2_14-2_fc5	devel
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel
@@ -70,9 +69,6 @@
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
 jwboyer	rpms/gaim-meanwhile/FC-4	gaim-meanwhile-1_2_4-2_fc4	fc4
 jwboyer	rpms/gaim-meanwhile/FC-3	gaim-meanwhile-1_2_4-2_fc3	fc3
-ixs	rpms/barcode/devel	barcode-0_98-7_fc5	devel
-ixs	rpms/barcode/FC-4	barcode-0_98-7_fc4	fc4
-ixs	rpms/barcode/FC-3	barcode-0_98-7_fc3	fc3
 smccann	rpms/proj/devel	proj-4_4_9-1_fc5	devel
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 ensc	rpms/util-vserver/devel	util-vserver-0_30_208-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 14:19:29 2005
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sun, 24 Jul 2005 10:19:29 -0400
Subject: common tobuild,1.2023,1.2024
Message-ID: <200507241419.j6OEJT5g018942@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18925

Modified Files:
	tobuild 
Log Message:
Cleanup



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2023
retrieving revision 1.2024
diff -u -r1.2023 -r1.2024
--- tobuild	24 Jul 2005 14:02:05 -0000	1.2023
+++ tobuild	24 Jul 2005 14:19:27 -0000	1.2024
@@ -66,9 +66,6 @@
 bpepple	rpms/freeciv/FC-4	freeciv-2_0_3-1_fc4	fc4
 mschwendt	devel/sylpheed	sylpheed-2_0_0-0_4_beta6	devel
 jfontain	rpms/moodss/FC-3	moodss-20_2-1_fc3	fc3
-jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
-jwboyer	rpms/gaim-meanwhile/FC-4	gaim-meanwhile-1_2_4-2_fc4	fc4
-jwboyer	rpms/gaim-meanwhile/FC-3	gaim-meanwhile-1_2_4-2_fc3	fc3
 smccann	rpms/proj/devel	proj-4_4_9-1_fc5	devel
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 ensc	rpms/util-vserver/devel	util-vserver-0_30_208-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 14:40:12 2005
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 24 Jul 2005 10:40:12 -0400
Subject: common tobuild,1.2024,1.2025
Message-ID: <200507241440.j6OEeCw5019006@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18989

Modified Files:
	tobuild 
Log Message:
remove succesfull build


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2024
retrieving revision 1.2025
diff -u -r1.2024 -r1.2025
--- tobuild	24 Jul 2005 14:19:27 -0000	1.2024
+++ tobuild	24 Jul 2005 14:40:10 -0000	1.2025
@@ -94,7 +94,6 @@
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4
-thl	rpms/brightside/devel	brightside-1_4_0-8	devel
 thias	rpms/cdlabelgen/FC-4	cdlabelgen-3_5_0-1_fc4	fc4
 thias	rpms/cdlabelgen/devel	cdlabelgen-3_5_0-1_fc5	devel
 icon	rpms/libxml++/FC-4	libxml++-2_10_0-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 14:49:45 2005
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Sun, 24 Jul 2005 10:49:45 -0400
Subject: rpms/galeon/FC-4 galeon.spec,1.13,1.14
Message-ID: <200507241449.j6OEnjKD019037@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	galeon.spec 
Log Message:
galeon/FC-4: release-bumping


Index: galeon.spec
===================================================================
RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- galeon.spec	22 Jul 2005 13:17:11 -0000	1.13
+++ galeon.spec	24 Jul 2005 14:49:43 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	1.3.21
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Sun Jul 24 2005 Dams  - 1.3.21-10
+- Bumped release because build server didnt built my previous request
+
 * Fri Jul 22 2005 Dams  - 1.3.21-9
 - Rebuilt against mozilla 1.7.10
 



From fedora-extras-commits at redhat.com  Sun Jul 24 15:52:58 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Sun, 24 Jul 2005 11:52:58 -0400
Subject: web/html/docs/release-notes index.php,1.5,1.6
Message-ID: <200507241552.j6OFqweG020343@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/release-notes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20326

Modified Files:
	index.php 
Log Message:
New date on updated notice.


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- index.php	22 Jul 2005 04:43:17 -0000	1.5
+++ index.php	24 Jul 2005 15:52:56 -0000	1.6
@@ -24,7 +24,7 @@
 				
  • Fedora Core 4
    • 
 				
 				
  • Fedora Core 3
    • 



From fedora-extras-commits at redhat.com  Sun Jul 24 16:22:22 2005
From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten))
Date: Sun, 24 Jul 2005 12:22:22 -0400
Subject: common tobuild,1.2025,1.2026
Message-ID: <200507241622.j6OGMMuM021568@cvs-int.fedora.redhat.com>

Author: karsten

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21551

Modified Files:
	tobuild 
Log Message:
builds succeded, remove entries as requested by Seth


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2025
retrieving revision 1.2026
diff -u -r1.2025 -r1.2026
--- tobuild	24 Jul 2005 14:40:10 -0000	1.2025
+++ tobuild	24 Jul 2005 16:22:20 -0000	1.2026
@@ -89,8 +89,6 @@
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
-karsten	rpms/x3270/FC-4	x3270-3_3_4-4_fc4	fc4
-karsten	rpms/x3270/devel	x3270-3_3_4-4_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3
 mfleming	rpms/mod_security/FC-4	mod_security-1_8_7-4_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 16:23:20 2005
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sun, 24 Jul 2005 12:23:20 -0400
Subject: common tobuild,1.2026,1.2027
Message-ID: <200507241623.j6OGNKX2021606@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21589

Modified Files:
	tobuild 
Log Message:
Removed build line per SV request


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -r1.2026 -r1.2027
--- tobuild	24 Jul 2005 16:22:20 -0000	1.2026
+++ tobuild	24 Jul 2005 16:23:18 -0000	1.2027
@@ -80,7 +80,6 @@
 thias	rpms/lighttpd/devel	lighttpd-1_3_15-1_fc5	devel
 thias	rpms/lighttpd/FC-4	lighttpd-1_3_15-1_fc4	fc4
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
-pfrields	rpms/nautilus-open-terminal/devel	nautilus-open-terminal-0_4-5_fc5	devel
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
 jpo	rpms/perl-GD/FC-3	perl-GD-2_25-1_fc3	fc3



From fedora-extras-commits at redhat.com  Sun Jul 24 16:31:16 2005
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 24 Jul 2005 12:31:16 -0400
Subject: common tobuild,1.2027,1.2028
Message-ID: <200507241631.j6OGVGYs021658@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21641

Modified Files:
	tobuild 
Log Message:
Cleanup


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2027
retrieving revision 1.2028
diff -u -r1.2027 -r1.2028
--- tobuild	24 Jul 2005 16:23:18 -0000	1.2027
+++ tobuild	24 Jul 2005 16:31:14 -0000	1.2028
@@ -3,12 +3,6 @@
 #
 ertzing	rpms/libevent/devel	libevent-1_1a-2_fc5	devel
 jspaleta	rpms/glabels/FC-3	glabels-2_0_3-2_fc3	fc3
-ivazquez	rpms/libifp/FC-3	libifp-1_0_0_1-1_fc3	fc3
-ivazquez	rpms/libifp/FC-4	libifp-1_0_0_1-1_fc4	fc4
-ivazquez	rpms/libifp/devel	libifp-1_0_0_1-1_fc5	devel
-ivazquez	rpms/fyre/FC-3	fyre-1_0_0-9_fc3	fc3
-ivazquez	rpms/fyre/FC-4	fyre-1_0_0-9_fc4	fc4
-ivazquez	rpms/fyre/devel	fyre-1_0_0-9_fc5	devel
 scop	rpms/fedora-rpmdevtools/FC-3	fedora-rpmdevtools-1_1-1_fc3	fc3
 scop	rpms/fedora-rpmdevtools/FC-4	fedora-rpmdevtools-1_1-1_fc4	fc4
 scop	rpms/fedora-rpmdevtools/devel	fedora-rpmdevtools-1_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 16:33:41 2005
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 24 Jul 2005 12:33:41 -0400
Subject: common tobuild,1.2028,1.2029
Message-ID: <200507241633.j6OGXfor021691@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21674

Modified Files:
	tobuild 
Log Message:
perl-GD: build success in FC-3, FC-4, and devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2028
retrieving revision 1.2029
diff -u -r1.2028 -r1.2029
--- tobuild	24 Jul 2005 16:31:14 -0000	1.2028
+++ tobuild	24 Jul 2005 16:33:39 -0000	1.2029
@@ -76,9 +76,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
-jpo	rpms/perl-GD/FC-3	perl-GD-2_25-1_fc3	fc3
-jpo	rpms/perl-GD/FC-4	perl-GD-2_25-1_fc4	fc4
-jpo	rpms/perl-GD/devel	perl-GD-2_25-1_fc5	devel
 adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 16:38:29 2005
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 24 Jul 2005 12:38:29 -0400
Subject: common tobuild,1.2029,1.2030
Message-ID: <200507241638.j6OGcT5n021731@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21714

Modified Files:
	tobuild 
Log Message:
Remove more reportedly successful builds.


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2029
retrieving revision 1.2030
diff -u -r1.2029 -r1.2030
--- tobuild	24 Jul 2005 16:33:39 -0000	1.2029
+++ tobuild	24 Jul 2005 16:38:27 -0000	1.2030
@@ -88,11 +88,6 @@
 icon	rpms/libxml++/devel	libxml++-2_10_0-1_fc5	devel
 anvil	rpms/libcddb/FC-4	libcddb-1_1_0-1_fc4	fc4
 scop	rpms/lft/devel	lft-2_31-3	devel
-scop	rpms/bochs/devel	bochs-2_2_1-1_fc5	devel
-scop	rpms/bochs/FC-4	bochs-2_2_1-1_fc4	fc4
-scop	rpms/synaptic/FC-3	synaptic-0_57_2-1_fc3	fc3
-scop	rpms/synaptic/FC-4	synaptic-0_57_2-1_fc4	fc4
-scop	rpms/synaptic/devel	synaptic-0_57_2-1_fc5	devel
 scop	rpms/dvb-apps/devel	dvb-apps-1_1_0-1_fc5	devel
 scop	rpms/gdome2/devel	gdome2-0_8_1-1_fc5	devel
 scop	rpms/rpmlint/FC-4	rpmlint-0_70-4_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 19:04:37 2005
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 24 Jul 2005 15:04:37 -0400
Subject: common tobuild,1.2030,1.2031
Message-ID: <200507241905.j6OJ5QBS025280@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25263

Modified Files:
	tobuild 
Log Message:
cleanup



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2030
retrieving revision 1.2031
diff -u -r1.2030 -r1.2031
--- tobuild	24 Jul 2005 16:38:27 -0000	1.2030
+++ tobuild	24 Jul 2005 19:04:29 -0000	1.2031
@@ -6,15 +6,10 @@
 scop	rpms/fedora-rpmdevtools/FC-3	fedora-rpmdevtools-1_1-1_fc3	fc3
 scop	rpms/fedora-rpmdevtools/FC-4	fedora-rpmdevtools-1_1-1_fc4	fc4
 scop	rpms/fedora-rpmdevtools/devel	fedora-rpmdevtools-1_1-1_fc5	devel
-adrian	rpms/jhead/devel	jhead-2_4-1_fc5	devel
 lmacken	rpms/naim/devel	naim-0_11_7_3_1-2_fc5	devel
 uwog	rpms/aiksaurus/devel	aiksaurus-1_2_1-9	devel
-adrian	rpms/jhead/devel	jhead-2_4-2_fc5	devel
-adrian	rpms/jhead/FC-4	jhead-2_4-2_fc4	fc4
-adrian	rpms/jhead/FC-3	jhead-2_4-2_fc3	fc3
 adrian	rpms/jhead/FC-3	jhead-2_4-3_fc3	fc3
 adrian	rpms/jhead/FC-4	jhead-2_4-3_fc4	fc4
-adrian	rpms/jhead/devel	jhead-2_4-3_fc5	devel
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-1_fc4	fc4
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-2_fc4	fc4
 petersen	rpms/scim/devel	scim-1_3_3-1_fc5	devel
@@ -76,7 +71,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
-adrian	rpms/libcdio/devel	libcdio-0_75-1_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 19:28:30 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 24 Jul 2005 15:28:30 -0400
Subject: common tobuild,1.2031,1.2032
Message-ID: <200507241928.j6OJSUNP025353@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25336

Modified Files:
	tobuild 
Log Message:
request build of rpms/inadyn/devel inadyn-1_95-1 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2031
retrieving revision 1.2032
diff -u -r1.2031 -r1.2032
--- tobuild	24 Jul 2005 19:04:29 -0000	1.2031
+++ tobuild	24 Jul 2005 19:28:27 -0000	1.2032
@@ -113,3 +113,4 @@
 ixs	rpms/perl-Crypt-CBC/FC-3	perl-Crypt-CBC-2_14-2_fc3	fc3
 ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
+s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 22:07:49 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:07:49 -0400
Subject: rpms/contact-lookup-applet/devel .cvsignore, 1.6,
	1.7 contact-lookup-applet.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200507242208.j6OM8JaY028985@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28933

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Log Message:
* Sun Jul 24 2005 Brian Pepple  - 0.13-2
- Update to 0.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Apr 2005 15:49:50 -0000	1.6
+++ .cvsignore	24 Jul 2005 22:06:58 -0000	1.7
@@ -1 +1 @@
-contact-lookup-applet-0.12.tar.gz
+contact-lookup-applet-0.13.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- contact-lookup-applet.spec	10 May 2005 04:59:36 -0000	1.9
+++ contact-lookup-applet.spec	24 Jul 2005 22:06:58 -0000	1.10
@@ -1,11 +1,11 @@
 Name:		contact-lookup-applet
-Version:	0.12
-Release:	3%{?dist}
+Version:	0.13
+Release:	2%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
-URL:		http://www.burtonini.com/blog/computers/contact-lookup-applet-0.12
+URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
 Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz       
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sun Jul 24 2005 Brian Pepple  - 0.13-2
+- Update to 0.13.
+
 * Tue May 10 2005 Brian Pepple  - 0.12-3
 - Remove hard-coded dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Apr 2005 15:49:50 -0000	1.6
+++ sources	24 Jul 2005 22:06:58 -0000	1.7
@@ -1 +1 @@
-34199504980ac48676c4d5efed6dd56d  contact-lookup-applet-0.12.tar.gz
+8b4b4dbc2778b571e05e583e614ae5a7  contact-lookup-applet-0.13.tar.gz



From fedora-extras-commits at redhat.com  Sun Jul 24 22:08:55 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:08:55 -0400
Subject: common tobuild,1.2032,1.2033
Message-ID: <200507242208.j6OM8td7029047@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29030

Modified Files:
	tobuild 
Log Message:
request build of rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2032
retrieving revision 1.2033
diff -u -r1.2032 -r1.2033
--- tobuild	24 Jul 2005 19:28:27 -0000	1.2032
+++ tobuild	24 Jul 2005 22:08:52 -0000	1.2033
@@ -114,3 +114,4 @@
 ixs	rpms/perl-Crypt-CBC/FC-4	perl-Crypt-CBC-2_14-2_fc4	fc4
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
+bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel



From fedora-extras-commits at redhat.com  Sun Jul 24 22:10:20 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:10:20 -0400
Subject: rpms/contact-lookup-applet/FC-4 .cvsignore, 1.6,
	1.7 contact-lookup-applet.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200507242210.j6OMArxZ029082@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29060

Modified Files:
	.cvsignore contact-lookup-applet.spec sources 
Log Message:
* Sun Jul 24 2005 Brian Pepple  - 0.13-1
- Update to 0.13.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Apr 2005 15:49:50 -0000	1.6
+++ .cvsignore	24 Jul 2005 22:10:18 -0000	1.7
@@ -1 +1 @@
-contact-lookup-applet-0.12.tar.gz
+contact-lookup-applet-0.13.tar.gz


Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-4/contact-lookup-applet.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- contact-lookup-applet.spec	10 May 2005 04:59:36 -0000	1.9
+++ contact-lookup-applet.spec	24 Jul 2005 22:10:18 -0000	1.10
@@ -1,11 +1,11 @@
 Name:		contact-lookup-applet
-Version:	0.12
-Release:	3%{?dist}
+Version:	0.13
+Release:	1%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
 License:	GPL
-URL:		http://www.burtonini.com/blog/computers/contact-lookup-applet-0.12
+URL:		http://www.burtonini.com/blog//computers/contact-lookup-applet-0.13
 Source0:	http://www.burtonini.com/computing/%{name}-%{version}.tar.gz       
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sun Jul 24 2005 Brian Pepple  - 0.13-1
+- Update to 0.13.
+
 * Tue May 10 2005 Brian Pepple  - 0.12-3
 - Remove hard-coded dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Apr 2005 15:49:50 -0000	1.6
+++ sources	24 Jul 2005 22:10:18 -0000	1.7
@@ -1 +1 @@
-34199504980ac48676c4d5efed6dd56d  contact-lookup-applet-0.12.tar.gz
+8b4b4dbc2778b571e05e583e614ae5a7  contact-lookup-applet-0.13.tar.gz



From fedora-extras-commits at redhat.com  Sun Jul 24 22:11:06 2005
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 24 Jul 2005 18:11:06 -0400
Subject: common tobuild,1.2033,1.2034
Message-ID: <200507242211.j6OMB6Hg029145@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29128

Modified Files:
	tobuild 
Log Message:
request build of rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2033
retrieving revision 1.2034
diff -u -r1.2033 -r1.2034
--- tobuild	24 Jul 2005 22:08:52 -0000	1.2033
+++ tobuild	24 Jul 2005 22:11:04 -0000	1.2034
@@ -115,3 +115,4 @@
 jwboyer	rpms/gaim-meanwhile/devel	gaim-meanwhile-1_2_4-2_fc5	devel
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel
+bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4



From fedora-extras-commits at redhat.com  Sun Jul 24 23:15:01 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 24 Jul 2005 19:15:01 -0400
Subject: rpms/glunarclock/devel glunarclock-0.32.4-bug149711.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200507242315.j6ONF10C030380@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore glunarclock.spec sources 
Added Files:
	glunarclock-0.32.4-bug149711.patch 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 0.32.4-1
- Update to 0.32.4.
- Fix compiler warnings bug #149711.
- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether
  they are still needed.


glunarclock-0.32.4-bug149711.patch:

--- NEW FILE glunarclock-0.32.4-bug149711.patch ---
diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c
--- glunarclock-0.32.4-orig/src/glunarclock.c	2005-04-06 12:51:29.000000000 +0200
+++ glunarclock-0.32.4/src/glunarclock.c	2005-07-25 00:39:56.000000000 +0200
@@ -154,14 +154,14 @@
 			gtk_toggle_button_get_active (toggle), NULL);
 }
 
-static gboolean
+static void
 delete_event (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
 	gtk_widget_hide (widget);
 }
 
-static gboolean
+static void
 close_dialog (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c
--- glunarclock-0.32.4-orig/src/moondata.c	2005-01-04 18:28:43.000000000 +0100
+++ glunarclock-0.32.4/src/moondata.c	2005-07-25 00:39:55.000000000 +0200
@@ -219,14 +219,14 @@
 	mod_time(&moondata.LAT);
 }
 
-static gboolean
+static void
 delete_event (GtkWidget  *widget,
 	      MoonApplet *moon)
 {
 	gtk_widget_hide (widget);
 }
 
-static gboolean
+static void
 close_data_dialog (GtkWidget  *widget,
 		   MoonApplet *moon)
 {
@@ -280,10 +280,10 @@
 /* 	gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */
 /* 	format_time(buf, size, moondata.NewMoon*24.0); */
 
-	g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon);
+	g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon);
 	gtk_label_set_text(GTK_LABEL(mw.flm), buf);
 
-	g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon));
+	g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon));
 	gtk_label_set_text(GTK_LABEL(mw.nwm), buf);
 
 /*  	g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Feb 2005 16:42:01 -0000	1.4
+++ .cvsignore	24 Jul 2005 23:14:59 -0000	1.5
@@ -1,2 +1,2 @@
 glunarclock-0.32.2-autoreconf.patch.bz2
-glunarclock-0.32.2.tar.gz
+glunarclock-0.32.4.tar.gz


Index: glunarclock.spec
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glunarclock.spec	15 Apr 2005 00:38:26 -0000	1.7
+++ glunarclock.spec	24 Jul 2005 23:14:59 -0000	1.8
@@ -1,14 +1,14 @@
 Name:           glunarclock
-Version:        0.32.2
-Release:        4
+Version:        0.32.4
+Release:        1%{?dist}
 Summary:        GNOME applet that displays the current lunar phase
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://glunarclock.sourceforge.net/
-Source0:        http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz
-Patch0:         glunarclock-configure.in.patch
-Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Patch0:         glunarclock-configure.in.patch
+#Patch1:         glunarclock-0.32.2-autoreconf.patch.bz2
 Patch2:         glunarclock-0.32.2-i18n_macro.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,12 +33,12 @@
 
 %prep
 %setup -q
-%ifarch x86_64
+#%ifarch x86_64
 # patch0 is normally only needed if you want to recreate patch1
-%patch0
+#%patch0
 # was created after autoreconf -f -i and removing autom4te.cache/
-%patch1 -p1
-%endif
+#%patch1 -p1
+#%endif
 %patch2 -p1 -b .i18n_macro
 
 %build
@@ -95,6 +95,12 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 0.32.4-1
+- Update to 0.32.4.
+- Fix compiler warnings bug #149711.
+- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether
+  they are still needed.
+
 * Fri Apr 15 2005 Michael Schwendt  - 0.32.2-4
 - Add patch2 to fix build for FC4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glunarclock/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 16:42:01 -0000	1.4
+++ sources	24 Jul 2005 23:14:59 -0000	1.5
@@ -1,2 +1,2 @@
 3ac5e08b5ffa5cd697fe4115d791f4ab  glunarclock-0.32.2-autoreconf.patch.bz2
-3ac61aa62af4e0d53c90c18f09ee988f  glunarclock-0.32.2.tar.gz
+63e1d989581e6bf95cec82ff1bbc56ef  glunarclock-0.32.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Jul 24 23:15:50 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 24 Jul 2005 19:15:50 -0400
Subject: common tobuild,1.2034,1.2035
Message-ID: <200507242315.j6ONFoYG030442@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30425

Modified Files:
	tobuild 
Log Message:
request build of rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2034
retrieving revision 1.2035
diff -u -r1.2034 -r1.2035
--- tobuild	24 Jul 2005 22:11:04 -0000	1.2034
+++ tobuild	24 Jul 2005 23:15:48 -0000	1.2035
@@ -116,3 +116,4 @@
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel
 bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4
+mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 01:09:45 2005
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 24 Jul 2005 21:09:45 -0400
Subject: common tobuild,1.2035,1.2036
Message-ID: <200507250109.j6P19jOH000385@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv368

Modified Files:
	tobuild 
Log Message:
cleanup


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2035
retrieving revision 1.2036
diff -u -r1.2035 -r1.2036
--- tobuild	24 Jul 2005 23:15:48 -0000	1.2035
+++ tobuild	25 Jul 2005 01:09:43 -0000	1.2036
@@ -31,7 +31,6 @@
 tagoh	rpms/kinput2/devel	kinput2-v3_1-26_fc5	devel
 tagoh	rpms/kinput2/FC-4	kinput2-v3_1-26_fc4	fc4
 tagoh	rpms/uim/devel	uim-0_4_7-1_fc5	devel
-tagoh	rpms/uim/FC-4	uim-0_4_7-1_fc4	fc4
 tagoh	rpms/uim/FC-3	uim-0_4_7-1_fc3	fc3
 thias	rpms/gkrellm-aclock/devel	gkrellm-aclock-0_3_3-1_fc5	devel
 thias	rpms/gkrellm-freq/devel	gkrellm-freq-0_1_1-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:16:22 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 25 Jul 2005 02:16:22 -0400
Subject: common tobuild,1.2036,1.2037
Message-ID: <200507250616.j6P6GMlk006640@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6623

Modified Files:
	tobuild 
Log Message:
remove successfully-built package



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2036
retrieving revision 1.2037
diff -u -r1.2036 -r1.2037
--- tobuild	25 Jul 2005 01:09:43 -0000	1.2036
+++ tobuild	25 Jul 2005 06:16:20 -0000	1.2037
@@ -43,7 +43,6 @@
 thias	rpms/gkrellm-aclock/FC-4	gkrellm-aclock-0_3_3-1_fc4	fc4
 thias	rpms/gkrellm-freq/FC-3	gkrellm-freq-0_1_1-1_fc3	fc3
 thias	rpms/gkrellm-freq/FC-4	gkrellm-freq-0_1_1-1_fc4	fc4
-pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_2-5_fc5	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 eyecon	rpms/leafnode/FC-4	leafnode-1_11_3-2_fc4	fc4
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:18:20 2005
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Mon, 25 Jul 2005 02:18:20 -0400
Subject: common tobuild,1.2037,1.2038
Message-ID: <200507250618.j6P6IK2n006715@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6698

Modified Files:
	tobuild 
Log Message:
request build of rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2037
retrieving revision 1.2038
diff -u -r1.2037 -r1.2038
--- tobuild	25 Jul 2005 06:16:20 -0000	1.2037
+++ tobuild	25 Jul 2005 06:18:18 -0000	1.2038
@@ -115,3 +115,4 @@
 bpepple	rpms/contact-lookup-applet/devel	contact-lookup-applet-0_13-2_fc5	devel
 bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4
 mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel
+pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:31:27 2005
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 25 Jul 2005 02:31:27 -0400
Subject: common tobuild,1.2038,1.2039
Message-ID: <200507250631.j6P6VRri006757@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6740

Modified Files:
	tobuild 
Log Message:
- remove broken scim-anthy-0_5_1-1_fc4 and built scim-1_3_3-1_fc5



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -r1.2038 -r1.2039
--- tobuild	25 Jul 2005 06:18:18 -0000	1.2038
+++ tobuild	25 Jul 2005 06:31:24 -0000	1.2039
@@ -10,9 +10,7 @@
 uwog	rpms/aiksaurus/devel	aiksaurus-1_2_1-9	devel
 adrian	rpms/jhead/FC-3	jhead-2_4-3_fc3	fc3
 adrian	rpms/jhead/FC-4	jhead-2_4-3_fc4	fc4
-petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-1_fc4	fc4
 petersen	rpms/scim-anthy/FC-4	scim-anthy-0_5_1-2_fc4	fc4
-petersen	rpms/scim/devel	scim-1_3_3-1_fc5	devel
 ensc	rpms/ip-sentinel/FC-3	ip-sentinel-0_12-5_fc3	fc3
 ensc	rpms/ip-sentinel/FC-4	ip-sentinel-0_12-5_fc4	fc4
 ensc	rpms/ip-sentinel/devel	ip-sentinel-0_12-5_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:57:15 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:57:15 -0400
Subject: common tobuild,1.2039,1.2040
Message-ID: <200507250657.j6P6vFud006816@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6799

Modified Files:
	tobuild 
Log Message:
request build of rpms/icmpdn/FC-3 icmpdn-0_3-2 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2039
retrieving revision 1.2040
diff -u -r1.2039 -r1.2040
--- tobuild	25 Jul 2005 06:31:24 -0000	1.2039
+++ tobuild	25 Jul 2005 06:57:13 -0000	1.2040
@@ -114,3 +114,4 @@
 bpepple	rpms/contact-lookup-applet/FC-4	contact-lookup-applet-0_13-1_fc4	fc4
 mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel
+oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 06:57:35 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:57:35 -0400
Subject: common tobuild,1.2040,1.2041
Message-ID: <200507250657.j6P6vZwx006849@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6832

Modified Files:
	tobuild 
Log Message:
request build of rpms/icmpdn/FC-4 icmpdn-0_3-2 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -r1.2040 -r1.2041
--- tobuild	25 Jul 2005 06:57:13 -0000	1.2040
+++ tobuild	25 Jul 2005 06:57:33 -0000	1.2041
@@ -115,3 +115,4 @@
 mschwendt	rpms/glunarclock/devel	glunarclock-0_32_4-1_fc5	devel
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel
 oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3
+oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 06:57:52 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:57:52 -0400
Subject: common tobuild,1.2041,1.2042
Message-ID: <200507250657.j6P6vq3j006882@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6865

Modified Files:
	tobuild 
Log Message:
request build of rpms/icmpdn/devel icmpdn-0_3-2 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2041
retrieving revision 1.2042
diff -u -r1.2041 -r1.2042
--- tobuild	25 Jul 2005 06:57:33 -0000	1.2041
+++ tobuild	25 Jul 2005 06:57:50 -0000	1.2042
@@ -116,3 +116,4 @@
 pghmcfc	rpms/bittorrent/devel	bittorrent-4_1_3-1_fc5	devel
 oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3
 oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4
+oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:58:13 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:58:13 -0400
Subject: common tobuild,1.2042,1.2043
Message-ID: <200507250658.j6P6wDf6006915@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6898

Modified Files:
	tobuild 
Log Message:
request build of rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2042
retrieving revision 1.2043
diff -u -r1.2042 -r1.2043
--- tobuild	25 Jul 2005 06:57:50 -0000	1.2042
+++ tobuild	25 Jul 2005 06:58:11 -0000	1.2043
@@ -117,3 +117,4 @@
 oliver	rpms/icmpdn/FC-3	icmpdn-0_3-2	fc3
 oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4
 oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel
+oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 06:58:37 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:58:37 -0400
Subject: common tobuild,1.2043,1.2044
Message-ID: <200507250658.j6P6wbZp006948@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6931

Modified Files:
	tobuild 
Log Message:
request build of rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2043
retrieving revision 1.2044
diff -u -r1.2043 -r1.2044
--- tobuild	25 Jul 2005 06:58:11 -0000	1.2043
+++ tobuild	25 Jul 2005 06:58:35 -0000	1.2044
@@ -118,3 +118,4 @@
 oliver	rpms/icmpdn/FC-4	icmpdn-0_3-2	fc4
 oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
+oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 06:58:51 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:58:51 -0400
Subject: common tobuild,1.2044,1.2045
Message-ID: <200507250658.j6P6wp9N006982@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6964

Modified Files:
	tobuild 
Log Message:
request build of rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -r1.2044 -r1.2045
--- tobuild	25 Jul 2005 06:58:35 -0000	1.2044
+++ tobuild	25 Jul 2005 06:58:49 -0000	1.2045
@@ -119,3 +119,4 @@
 oliver	rpms/icmpdn/devel	icmpdn-0_3-2	devel
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3
+oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 06:59:31 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 02:59:31 -0400
Subject: common tobuild,1.2045,1.2046
Message-ID: <200507250659.j6P6xV0e007020@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7003

Modified Files:
	tobuild 
Log Message:
request build of rpms/libdnet/devel libdnet-1_10-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2045
retrieving revision 1.2046
diff -u -r1.2045 -r1.2046
--- tobuild	25 Jul 2005 06:58:49 -0000	1.2045
+++ tobuild	25 Jul 2005 06:59:29 -0000	1.2046
@@ -120,3 +120,4 @@
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3
 oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4
+oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 07:00:10 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:00:10 -0400
Subject: common tobuild,1.2046,1.2047
Message-ID: <200507250700.j6P70A1E007108@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7091

Modified Files:
	tobuild 
Log Message:
request build of rpms/libdnet/FC-4 libdnet-1_10-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2046
retrieving revision 1.2047
diff -u -r1.2046 -r1.2047
--- tobuild	25 Jul 2005 06:59:29 -0000	1.2046
+++ tobuild	25 Jul 2005 07:00:08 -0000	1.2047
@@ -121,3 +121,4 @@
 oliver	rpms/bwm-ng/FC-3	bwm-ng-0_5-5_fc3	fc3
 oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4
 oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel
+oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 07:00:28 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:00:28 -0400
Subject: common tobuild,1.2047,1.2048
Message-ID: <200507250700.j6P70St4007170@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7153

Modified Files:
	tobuild 
Log Message:
request build of rpms/libdnet/FC-3 libdnet-1_10-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2047
retrieving revision 1.2048
diff -u -r1.2047 -r1.2048
--- tobuild	25 Jul 2005 07:00:08 -0000	1.2047
+++ tobuild	25 Jul 2005 07:00:26 -0000	1.2048
@@ -122,3 +122,4 @@
 oliver	rpms/bwm-ng/FC-4	bwm-ng-0_5-5_fc4	fc4
 oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel
 oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4
+oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 07:01:22 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:01:22 -0400
Subject: common tobuild,1.2048,1.2049
Message-ID: <200507250701.j6P71MGV008284@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7967

Modified Files:
	tobuild 
Log Message:
request build of rpms/fish/devel fish-1_12_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2048
retrieving revision 1.2049
diff -u -r1.2048 -r1.2049
--- tobuild	25 Jul 2005 07:00:26 -0000	1.2048
+++ tobuild	25 Jul 2005 07:01:20 -0000	1.2049
@@ -123,3 +123,4 @@
 oliver	rpms/libdnet/devel	libdnet-1_10-2_fc5	devel
 oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4
 oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3
+oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 07:03:17 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:03:17 -0400
Subject: common tobuild,1.2049,1.2050
Message-ID: <200507250703.j6P73mHY008360@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8343

Modified Files:
	tobuild 
Log Message:
request build of rpms/fish/FC-3 fish-1_11_1-10_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2049
retrieving revision 1.2050
diff -u -r1.2049 -r1.2050
--- tobuild	25 Jul 2005 07:01:20 -0000	1.2049
+++ tobuild	25 Jul 2005 07:03:15 -0000	1.2050
@@ -124,3 +124,4 @@
 oliver	rpms/libdnet/FC-4	libdnet-1_10-2_fc4	fc4
 oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
+oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 07:05:13 2005
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Mon, 25 Jul 2005 03:05:13 -0400
Subject: common tobuild,1.2050,1.2051
Message-ID: <200507250706.j6P768sZ008394@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8377

Modified Files:
	tobuild 
Log Message:
request build of rpms/fish/FC-4 fish-1_11_1-10_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2050
retrieving revision 1.2051
diff -u -r1.2050 -r1.2051
--- tobuild	25 Jul 2005 07:03:15 -0000	1.2050
+++ tobuild	25 Jul 2005 07:05:11 -0000	1.2051
@@ -125,3 +125,4 @@
 oliver	rpms/libdnet/FC-3	libdnet-1_10-2_fc3	fc3
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3
+oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 08:38:09 2005
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 25 Jul 2005 04:38:09 -0400
Subject: fedora-security/audit fc4,1.30,1.31
Message-ID: <200507250838.j6P8c94X010282@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10265

Modified Files:
	fc4 
Log Message:
Updates for Friday pushes



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fc4	22 Jul 2005 12:02:06 -0000	1.30
+++ fc4	25 Jul 2005 08:38:06 -0000	1.31
@@ -45,6 +45,8 @@
 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
+2005-1852 backport (kdenetwork) [since FEDORA-2005-624]
+2005-1849 backport (zlib, fixed 1.2.3) [since FEDORA-2005-626]
 2005-1831 ignore (sudo) unsubstantiated report
 2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5)
 2005-1768 version (kernel, fixed 2.6.6)



From bugs.michael at gmx.net  Mon Jul 25 10:56:08 2005
From: bugs.michael at gmx.net (Michael Schwendt)
Date: Mon, 25 Jul 2005 12:56:08 +0200
Subject: common tobuild,1.2048,1.2049
In-Reply-To: <200507250701.j6P71MGV008284@cvs-int.fedora.redhat.com>
References: <200507250701.j6P71MGV008284@cvs-int.fedora.redhat.com>
Message-ID: <20050725125608.2228b04e.bugs.michael@gmx.net>

On Mon, 25 Jul 2005 03:01:22 -0400, Oliver Falk wrote:

> Author: oliver
> 
> Update of /cvs/extras/common
> In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7967
> 
> Modified Files:
> 	tobuild 
> Log Message:
> request build of rpms/fish/devel fish-1_12_0-1_fc5 for devel

Hmm... you've added quite some duplicates with your recent batch.

$ grep oliver tobuild | sort
oliver  rpms/bwm-ng/devel       bwm-ng-0_5-5_fc5        devel
oliver  rpms/bwm-ng/devel       bwm-ng-0_5-5_fc5        devel
oliver  rpms/bwm-ng/FC-3        bwm-ng-0_5-5_fc3        fc3
oliver  rpms/bwm-ng/FC-3        bwm-ng-0_5-5_fc3        fc3
oliver  rpms/bwm-ng/FC-4        bwm-ng-0_5-5_fc4        fc4
oliver  rpms/bwm-ng/FC-4        bwm-ng-0_5-5_fc4        fc4
oliver  rpms/fish/devel fish-1_12_0-1_fc5       devel
oliver  rpms/fish/devel fish-1_12_0-1_fc5       devel
oliver  rpms/fish/FC-3  fish-1_11_1-10_fc3      fc3
oliver  rpms/fish/FC-4  fish-1_11_1-10_fc4      fc4
oliver  rpms/icmpdn/devel       icmpdn-0_3-2    devel
oliver  rpms/icmpdn/devel       icmpdn-0_3-2    devel
oliver  rpms/icmpdn/FC-3        icmpdn-0_3-2    fc3
oliver  rpms/icmpdn/FC-3        icmpdn-0_3-2    fc3
oliver  rpms/icmpdn/FC-4        icmpdn-0_3-2    fc4
oliver  rpms/icmpdn/FC-4        icmpdn-0_3-2    fc4
oliver  rpms/libdnet/devel      libdnet-1_10-2_fc5      devel
oliver  rpms/libdnet/devel      libdnet-1_10-2_fc5      devel
oliver  rpms/libdnet/FC-3       libdnet-1_10-2_fc3      fc3
oliver  rpms/libdnet/FC-4       libdnet-1_10-2_fc4      fc4
oliver  rpms/libstatgrab/devel  libstatgrab-0_11_1-3_fc5        devel
oliver  rpms/libstatgrab/FC-3   libstatgrab-0_11_1-3_fc3        fc3
oliver  rpms/libstatgrab/FC-4   libstatgrab-0_11_1-3_fc4        fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 11:16:34 2005
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon, 25 Jul 2005 07:16:34 -0400
Subject: common tobuild,1.2051,1.2052
Message-ID: <200507251116.j6PBGYjd013888@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13871

Modified Files:
	tobuild 
Log Message:
request build of rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2051
retrieving revision 1.2052
diff -u -r1.2051 -r1.2052
--- tobuild	25 Jul 2005 07:05:11 -0000	1.2051
+++ tobuild	25 Jul 2005 11:16:32 -0000	1.2052
@@ -126,3 +126,4 @@
 oliver	rpms/fish/devel	fish-1_12_0-1_fc5	devel
 oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3
 oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4
+adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 11:18:17 2005
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon, 25 Jul 2005 07:18:17 -0400
Subject: common tobuild,1.2052,1.2053
Message-ID: <200507251118.j6PBIH7M013931@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13914

Modified Files:
	tobuild 
Log Message:
request build of rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2052
retrieving revision 1.2053
diff -u -r1.2052 -r1.2053
--- tobuild	25 Jul 2005 11:16:32 -0000	1.2052
+++ tobuild	25 Jul 2005 11:18:15 -0000	1.2053
@@ -127,3 +127,4 @@
 oliver	rpms/fish/FC-3	fish-1_11_1-10_fc3	fc3
 oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4
 adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel
+adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 11:28:22 2005
From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz))
Date: Mon, 25 Jul 2005 07:28:22 -0400
Subject: common tobuild,1.2053,1.2054
Message-ID: <200507251128.j6PBSMGk014125@cvs-int.fedora.redhat.com>

Author: adalloz

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14108

Modified Files:
	tobuild 
Log Message:
request build of rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2053
retrieving revision 1.2054
diff -u -r1.2053 -r1.2054
--- tobuild	25 Jul 2005 11:18:15 -0000	1.2053
+++ tobuild	25 Jul 2005 11:28:20 -0000	1.2054
@@ -128,3 +128,4 @@
 oliver	rpms/fish/FC-4	fish-1_11_1-10_fc4	fc4
 adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel
 adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3
+adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 15:18:39 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 25 Jul 2005 11:18:39 -0400
Subject: rpms/kyum/devel .cvsignore, 1.4, 1.5 kyum.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200507251518.j6PFId3I019033@cvs-int.fedora.redhat.com>

Author: s4504kr

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

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

  Description:
    New upstream release




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jul 2005 18:07:56 -0000	1.4
+++ .cvsignore	25 Jul 2005 15:18:36 -0000	1.5
@@ -1 +1 @@
-kyum-0.7.3.tar.gz
+kyum-0.7.5.tar.gz


Index: kyum.spec
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kyum.spec	19 Jul 2005 18:07:56 -0000	1.7
+++ kyum.spec	25 Jul 2005 15:18:36 -0000	1.8
@@ -1,13 +1,13 @@
 Name:    kyum
-Version: 0.7.3
+Version: 0.7.5
 Release: 1
 
 Summary: Graphical User Frontend (GUI) for yum
 
 License: GPL
 Group:   Applications/System
-URL:     http://kde-apps.org/content/show.php?content=22185
-Source:  http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz
+URL:     http://www.sourceforge.net/projects/kyum
+Source:  http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz
 Patch1:  kyum-0.6.3-workaround-missing-libfam.la.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -67,6 +67,12 @@
 %doc ChangeLog COPYING README AUTHORS
 
 %changelog
+* Mon Jul 25 2005 Jochen Schmitt  0.7.5-1
+- New upstream release
+
+* Thu Jul 21 2005 Jochen Schmitt  0.7.3-2
+- Upstream author has moved the project to sourceforge.net
+
 * Tue Jul 19 2005 Jochen Schmitt  0.7.3-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kyum/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Jul 2005 18:07:56 -0000	1.4
+++ sources	25 Jul 2005 15:18:36 -0000	1.5
@@ -1 +1 @@
-8f3436ec802306c2d68b8d574af748be  kyum-0.7.3.tar.gz
+b1ff5c4dfd14145535d344ef346bac74  kyum-0.7.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 15:20:15 2005
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Mon, 25 Jul 2005 11:20:15 -0400
Subject: common tobuild,1.2054,1.2055
Message-ID: <200507251520.j6PFKF4W019140@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123

Modified Files:
	tobuild 
Log Message:
request build of rpms/inadyn/devel inadyn-1_95-1 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2054
retrieving revision 1.2055
diff -u -r1.2054 -r1.2055
--- tobuild	25 Jul 2005 11:28:20 -0000	1.2054
+++ tobuild	25 Jul 2005 15:20:13 -0000	1.2055
@@ -129,3 +129,4 @@
 adalloz	rpms/pam_abl/devel	pam_abl-0_2_2-2_fc5	devel
 adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3
 adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4
+s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 16:29:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 12:29:11 -0400
Subject: owners owners.list,1.27,1.28
Message-ID: <200507251629.j6PGTBxb020426@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
Add lots of missing components (sorted!). Still missing:

  pygsl
  splint
  tcllib




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- owners.list	23 Jul 2005 00:39:39 -0000	1.27
+++ owners.list	25 Jul 2005 16:29:09 -0000	1.28
@@ -105,7 +105,9 @@
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
+Fedora Extras|ddskk|Daredevil SKK - Simple Kana to Kanji conversion program for Emacs|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
 Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -175,6 +177,7 @@
 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|
 Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
+Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gai-pal|GAI Pal applet|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|galculator|GTK 2 based scientific calculator|compton at pcompton.com|extras-qa at fedoraproject.org|
@@ -196,6 +199,7 @@
 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|
 Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+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|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|
@@ -318,6 +322,7 @@
 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|
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|koffice|A set of office applications for KDE|than at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -333,14 +338,17 @@
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|lft|Alternate traceroute tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libapreq2|Apache HTTP request library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libcdio|A CD-ROM input and control library|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|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|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|
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|libfac|An extension to Singular-factory|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libfwbuilder|Firewall Builder API|sgrubb at redhat.com|extras-qa at fedoraproject.org|
@@ -364,10 +372,12 @@
 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|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|
 Fedora Extras|libol|Support library for syslog-ng|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libpqxx|C++ client API for PostgreSQL|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|librsync|Rsync libraries|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|librx|POSIX regexp functions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -416,9 +426,9 @@
 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|python-matplotlib|Python plotting library|orion at cora.nwra.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|
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -429,10 +439,12 @@
 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|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_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|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
@@ -443,11 +455,14 @@
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|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|
 Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.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|nethack|A rouge-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|
+Fedora Extras|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|newpg|Temporary project to work on GnuPG extensions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|neXtaw|A modified version of the Athena Widgets with a N*XTSTEP appearance.|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -474,10 +489,12 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at kspei.com|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|Package Review|Choose this to request QA on a new package|dkl at redhat.com|dkl at redhat.com|
+Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_mount|A PAM module that can mount volumes for a user session|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|pam_mysql| PAM module for auth UNIX users using MySQL data base|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
@@ -610,6 +627,8 @@
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+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|pinentry|Collection of simple PIN or passphrase entry dialogs|ville.skytta at iki.fi|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|
@@ -648,6 +667,7 @@
 Fedora Extras|python-irclib|A set of Python modules for IRC support|lmacken at redhat.com|extras-qa at fedoraproject.org|
 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-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|
 Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
@@ -658,6 +678,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|pytz|World Timezone Definitions for Python|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 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|
@@ -789,6 +810,7 @@
 Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|uim|A multilingual input method library|tagoh at redhat.com|extras-qa at fedoraproject.org|petersen at redhat.com
 Fedora Extras|ulogd|The userspace logging daemon for netfilter|gauret at free.fr|extras-qa at fedoraproject.org|
+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|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 17:06:52 2005
From: fedora-extras-commits at redhat.com (David Cary Hart (eyecon))
Date: Mon, 25 Jul 2005 13:06:52 -0400
Subject: common tobuild,1.2055,1.2056
Message-ID: <200507251707.j6PH7O20021637@cvs-int.fedora.redhat.com>

Author: eyecon

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21615

Modified Files:
	tobuild 
Log Message:



Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2055
retrieving revision 1.2056
diff -u -r1.2055 -r1.2056
--- tobuild	25 Jul 2005 15:20:13 -0000	1.2055
+++ tobuild	25 Jul 2005 17:06:47 -0000	1.2056
@@ -42,7 +42,6 @@
 thias	rpms/gkrellm-freq/FC-3	gkrellm-freq-0_1_1-1_fc3	fc3
 thias	rpms/gkrellm-freq/FC-4	gkrellm-freq-0_1_1-1_fc4	fc4
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
-eyecon	rpms/leafnode/FC-4	leafnode-1_11_3-2_fc4	fc4
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
 pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 17:17:08 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:17:08 -0400
Subject: rpms/clamav/devel clamav-update.cron, NONE, 1.1 freshclam-sleep,
	NONE, 1.1 freshclam.sysconfig, NONE, 1.1
Message-ID: <200507251717.j6PHH8JY021715@cvs-int.fedora.redhat.com>

Author: ensc

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

Added Files:
	clamav-update.cron freshclam-sleep freshclam.sysconfig 
Log Message:
initial checkin



--- NEW FILE clamav-update.cron ---
## Adjust this line...
MAILTO=root,postmaster,webmaster,clamav

## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
0  */3 * * * root /usr/share/clamav/freshclam-sleep


--- NEW FILE freshclam-sleep ---
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz 
#  
# 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; version 2 of the License.
#  
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#  
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


FRESHCLAM_MOD=$[ 3*60 ]		# 3 hours

f=/etc/sysconfig/freshclam
test ! -e "$f" || . "$f"


case x"$1" in
    (xnow)		FRESHCLAM_DELAY=0;;
    (x|xrandom)		: ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};;
    (*)			FRESHCLAM_DELAY=$1;;
esac

set -e

case $FRESHCLAM_DELAY in
    (disabled-warn)
	echo $"\
WARNING: update of clamav database is disabled; please see
  '$f'  
  for information how to enable the periodic update resp. how to turn
  off this message." >&2
	exit 1
	;;

    (disabled)
	exit 0
	;;

    (*)
	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
	;;
esac


/usr/bin/freshclam --quiet && {
    test -x /usr/sbin/clamav-notify-servers &&  \
	exec /usr/sbin/clamav-notify-servers || \
	:
}


--- NEW FILE freshclam.sysconfig ---
## When changing the periodicity of freshclam runs in the crontab,
## this value must be adjusted also. Its value is the timespan between
## two subsequent freshclam runs in minutes. E.g. for the default
##
## | 0 */3 * * *  ...
##
## crontab line, the value is 180 (minutes).
# FRESHCLAM_MOD=

## A predefined value for the delay in seconds. By default, the value is
## 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:
## 'disabled-warn'  ...  disables the automatic freshclam update and
##                         gives out a warning
## 'disabled'       ...  disables the automatic freshclam silently
# FRESHCLAM_DELAY=


### !!!!! REMOVE ME !!!!!!
### REMOVE ME: By default, the freshclam update is disabled to avoid
### REMOVE ME: network access without prior activation
FRESHCLAM_DELAY=disabled-warn	# REMOVE ME



From fedora-extras-commits at redhat.com  Mon Jul 25 17:19:24 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:19:24 -0400
Subject: rpms/clamav/devel clamav.spec,1.23,1.24
Message-ID: <200507251719.j6PHJOE9021755@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
- updated to 0.86.2 (SECURITY)
- changed the freshclam updating mechanism (again); now, it consists
  of a crontab which does not need to be changed and a helper script
  (freshclam-sleep). This helper script is configured by
  /etc/sysconfig/freshclam




Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- clamav.spec	25 Jun 2005 18:01:32 -0000	1.23
+++ clamav.spec	25 Jul 2005 17:19:21 -0000	1.24
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.1
-Release:	%release_func 2
+Version:	0.86.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -67,10 +67,13 @@
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
+Source200:	freshclam-sleep
+Source201:	freshclam.sysconfig
+Source202:	clamav-update.cron
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%__chown %__chmod %__sed diffutils
+Requires(post):		%__chown %__chmod
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -204,6 +207,20 @@
 rm -rf "$RPM_BUILD_ROOT" _doc*
 %{__make} DESTDIR="$RPM_BUILD_ROOT" install
 
+function smartsubst() {
+	local tmp
+	local regexp=$1
+	shift
+
+	tmp=$(mktemp /tmp/%name-subst.XXXXXX)
+	for i; do
+		sed -e "$regexp" "$i" >$tmp
+		cmp -s $tmp "$i" || cat $tmp >"$i"
+		rm -f $tmp
+	done
+}
+
+
 %{__install} -d -m755 \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
@@ -230,10 +247,7 @@
 cp -pa _doc_server/*                    $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper         $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
 
-f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
-sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
-cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
-rm -f "$f".tmp
+smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
 
 
 ## prepare the update-files
@@ -241,17 +255,17 @@
 %{__install} -m755 -p %{SOURCE8}	${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers
 touch ${RPM_BUILD_ROOT}%{freshclamlog}
 
-cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
-## Adjust this line...
-MAILTO=root,postmaster,webmaster,%username
-
-## It is ok to execute it as root; freshclam drops privileges and becomes
-## user 'clamav' as soon as possible
-# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+%__install -p -m0755 %SOURCE200		$RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
+%__install -p -m0644 %SOURCE201		$RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam
+%__install -p -m0600 %SOURCE202		$RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update
+
+smartsubst 's!webmaster,clamav!webmaster,%username!g;
+	    s!/usr/share/clamav!%pkgdatadir!g;
+	    s!/usr/bin!%_bindir!g;
+            s!/usr/sbin!%_sbindir!g;' \
+   $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \
+   $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
-## Comment out or remove this line...
-1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
-EOF
 
 %if 0%{!?_without_milter:1}
 #### The milter stuff
@@ -260,6 +274,7 @@
 	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+
 subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
@@ -295,15 +310,6 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
-min=$[ RANDOM % 60 ]
-hour=$[ RANDOM % 3 ]
-tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
-src=%_sysconfdir/cron.d/clamav-update
-%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp
-cmp -s $tmp "$src" || cat "$tmp" >"$src"
-rm -f $tmp
-
-
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -375,9 +381,11 @@
 %defattr(-,root,root,-)
 %_bindir/freshclam
 %_mandir/man1/freshclam*
-%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
-%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
+%pkgdatadir/freshclam-sleep
+%config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
+%config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
+%config(noreplace) %_sysconfdir/cron.d/*
+%config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
 
@@ -414,6 +422,13 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+- updated to 0.86.2 (SECURITY)
+- changed the freshclam updating mechanism (again); now, it consists
+  of a crontab which does not need to be changed and a helper script
+  (freshclam-sleep). This helper script is configured by
+  /etc/sysconfig/freshclam
+
 * Sat Jun 25 2005 Enrico Scholz  - 0.86.1-2
 - updated to 0.86.1
 - fixed randomization in %%post scriptlet: hour should be a range but



From fedora-extras-commits at redhat.com  Mon Jul 25 17:19:40 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:19:40 -0400
Subject: rpms/clamav/devel sources,1.10,1.11
Message-ID: <200507251719.j6PHJesl021778@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	sources 
Log Message:
version 0.86.2



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Jun 2005 17:35:47 -0000	1.10
+++ sources	25 Jul 2005 17:19:38 -0000	1.11
@@ -1,2 +1,2 @@
-df7116898cdd80ce56721a91e9cff206  clamav-0.86.1.tar.gz
-dd5b89f732f84112207843748df5218c  clamav-0.86.1.tar.gz.sig
+870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
+7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jul 25 17:40:38 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:40:38 -0400
Subject: rpms/TeXmacs/FC-4 .cvsignore, 1.11, 1.12 TeXmacs.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <200507251740.j6PHecb7021881@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Jul 2005 17:42:44 -0000	1.11
+++ .cvsignore	25 Jul 2005 17:40:36 -0000	1.12
@@ -1 +1 @@
-TeXmacs-1.0.5.5-src.tar.gz
+TeXmacs-1.0.5.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TeXmacs.spec	5 Jul 2005 17:42:44 -0000	1.16
+++ TeXmacs.spec	25 Jul 2005 17:40:36 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		TeXmacs
-Version:	1.0.5.5
+Version:	1.0.5.6
 Release:	1%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors
 License:	GPL
 URL:		http://www.texmacs.org
-Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.5-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.6-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
@@ -125,6 +125,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 25 2005 Gerard Milmeister  - 1.0.5.6
+- New Version 1.0.5.6
+
 * Tue Jul  5 2005 Gerard Milmeister  - 1.0.5.5
 - New Version 1.0.5.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jul 2005 17:42:44 -0000	1.11
+++ sources	25 Jul 2005 17:40:36 -0000	1.12
@@ -1 +1 @@
-492bf5f75791c80d64a727767fedb8bc  TeXmacs-1.0.5.5-src.tar.gz
+09d86d4b8b08baf28303434b72cb8589  TeXmacs-1.0.5.6-src.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 17:41:04 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:41:04 -0400
Subject: rpms/TeXmacs/FC-4 TeXmacs.spec,1.17,1.18
Message-ID: <200507251741.j6PHf4A6021934@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	TeXmacs.spec 
Log Message:
new version 1.0.5.6


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/FC-4/TeXmacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TeXmacs.spec	25 Jul 2005 17:40:36 -0000	1.17
+++ TeXmacs.spec	25 Jul 2005 17:41:02 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		TeXmacs
 Version:	1.0.5.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Structured wysiwyg scientific text editor
 
 Group:		Applications/Editors



From fedora-extras-commits at redhat.com  Mon Jul 25 17:42:08 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:42:08 -0400
Subject: common tobuild,1.2056,1.2057
Message-ID: <200507251742.j6PHg8Hn022007@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21989

Modified Files:
	tobuild 
Log Message:
request build of rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2056
retrieving revision 1.2057
diff -u -r1.2056 -r1.2057
--- tobuild	25 Jul 2005 17:06:47 -0000	1.2056
+++ tobuild	25 Jul 2005 17:42:06 -0000	1.2057
@@ -129,3 +129,4 @@
 adalloz	rpms/pam_abl/FC-3	pam_abl-0_2_2-2_fc3	fc3
 adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
+gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 17:43:00 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:43:00 -0400
Subject: rpms/TeXmacs/devel .cvsignore, 1.11, 1.12 TeXmacs.spec, 1.16,
	1.17 sources, 1.11, 1.12
Message-ID: <200507251743.j6PHh0ek022046@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	.cvsignore TeXmacs.spec sources 
Log Message:
new version 1.0.5.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	5 Jul 2005 17:44:10 -0000	1.11
+++ .cvsignore	25 Jul 2005 17:42:58 -0000	1.12
@@ -1 +1 @@
-TeXmacs-1.0.5.5-src.tar.gz
+TeXmacs-1.0.5.6-src.tar.gz


Index: TeXmacs.spec
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TeXmacs.spec	5 Jul 2005 17:44:10 -0000	1.16
+++ TeXmacs.spec	25 Jul 2005 17:42:58 -0000	1.17
@@ -1,12 +1,12 @@
 Name:		TeXmacs
-Version:	1.0.5.5
-Release:	1%{?dist}
+Version:	1.0.5.6
+Release:	2%{?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.5-src.tar.gz
+Source:		ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.5.6-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
@@ -125,6 +125,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jul 25 2005 Gerard Milmeister  - 1.0.5.6
+- New Version 1.0.5.6
+
 * Tue Jul  5 2005 Gerard Milmeister  - 1.0.5.5
 - New Version 1.0.5.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/TeXmacs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Jul 2005 17:44:10 -0000	1.11
+++ sources	25 Jul 2005 17:42:58 -0000	1.12
@@ -1 +1 @@
-492bf5f75791c80d64a727767fedb8bc  TeXmacs-1.0.5.5-src.tar.gz
+09d86d4b8b08baf28303434b72cb8589  TeXmacs-1.0.5.6-src.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 17:43:20 2005
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 25 Jul 2005 13:43:20 -0400
Subject: common tobuild,1.2057,1.2058
Message-ID: <200507251743.j6PHhKP4022110@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22093

Modified Files:
	tobuild 
Log Message:
request build of rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2057
retrieving revision 1.2058
diff -u -r1.2057 -r1.2058
--- tobuild	25 Jul 2005 17:42:06 -0000	1.2057
+++ tobuild	25 Jul 2005 17:43:17 -0000	1.2058
@@ -130,3 +130,4 @@
 adalloz	rpms/pam_abl/FC-4	pam_abl-0_2_2-2_fc4	fc4
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4
+gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 17:47:56 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:47:56 -0400
Subject: rpms/clamav/FC-3 clamav-update.cron, NONE, 1.1 freshclam-sleep, NONE,
	1.1 freshclam.sysconfig, NONE, 1.1 clamav.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200507251748.j6PHmQoX022308@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec sources 
Added Files:
	clamav-update.cron freshclam-sleep freshclam.sysconfig 
Log Message:
synced with devel/



--- NEW FILE clamav-update.cron ---
## Adjust this line...
MAILTO=root,postmaster,webmaster,clamav

## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
0  */3 * * * root /usr/share/clamav/freshclam-sleep


--- NEW FILE freshclam-sleep ---
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz 
#  
# 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; version 2 of the License.
#  
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#  
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


FRESHCLAM_MOD=$[ 3*60 ]		# 3 hours

f=/etc/sysconfig/freshclam
test ! -e "$f" || . "$f"


case x"$1" in
    (xnow)		FRESHCLAM_DELAY=0;;
    (x|xrandom)		: ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};;
    (*)			FRESHCLAM_DELAY=$1;;
esac

set -e

case $FRESHCLAM_DELAY in
    (disabled-warn)
	echo $"\
WARNING: update of clamav database is disabled; please see
  '$f'  
  for information how to enable the periodic update resp. how to turn
  off this message." >&2
	exit 1
	;;

    (disabled)
	exit 0
	;;

    (*)
	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
	;;
esac


/usr/bin/freshclam --quiet && {
    test -x /usr/sbin/clamav-notify-servers &&  \
	exec /usr/sbin/clamav-notify-servers || \
	:
}


--- NEW FILE freshclam.sysconfig ---
## When changing the periodicity of freshclam runs in the crontab,
## this value must be adjusted also. Its value is the timespan between
## two subsequent freshclam runs in minutes. E.g. for the default
##
## | 0 */3 * * *  ...
##
## crontab line, the value is 180 (minutes).
# FRESHCLAM_MOD=

## A predefined value for the delay in seconds. By default, the value is
## 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:
## 'disabled-warn'  ...  disables the automatic freshclam update and
##                         gives out a warning
## 'disabled'       ...  disables the automatic freshclam silently
# FRESHCLAM_DELAY=


### !!!!! REMOVE ME !!!!!!
### REMOVE ME: By default, the freshclam update is disabled to avoid
### REMOVE ME: network access without prior activation
FRESHCLAM_DELAY=disabled-warn	# REMOVE ME


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clamav.spec	25 Jun 2005 18:01:54 -0000	1.13
+++ clamav.spec	25 Jul 2005 17:47:53 -0000	1.14
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.1
-Release:	%release_func 2
+Version:	0.86.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -67,10 +67,13 @@
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
+Source200:	freshclam-sleep
+Source201:	freshclam.sysconfig
+Source202:	clamav-update.cron
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%__chown %__chmod %__sed diffutils
+Requires(post):		%__chown %__chmod
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -204,6 +207,20 @@
 rm -rf "$RPM_BUILD_ROOT" _doc*
 %{__make} DESTDIR="$RPM_BUILD_ROOT" install
 
+function smartsubst() {
+	local tmp
+	local regexp=$1
+	shift
+
+	tmp=$(mktemp /tmp/%name-subst.XXXXXX)
+	for i; do
+		sed -e "$regexp" "$i" >$tmp
+		cmp -s $tmp "$i" || cat $tmp >"$i"
+		rm -f $tmp
+	done
+}
+
+
 %{__install} -d -m755 \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
@@ -230,10 +247,7 @@
 cp -pa _doc_server/*                    $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper         $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
 
-f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
-sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
-cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
-rm -f "$f".tmp
+smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
 
 
 ## prepare the update-files
@@ -241,17 +255,17 @@
 %{__install} -m755 -p %{SOURCE8}	${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers
 touch ${RPM_BUILD_ROOT}%{freshclamlog}
 
-cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
-## Adjust this line...
-MAILTO=root,postmaster,webmaster,%username
-
-## It is ok to execute it as root; freshclam drops privileges and becomes
-## user 'clamav' as soon as possible
-# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+%__install -p -m0755 %SOURCE200		$RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
+%__install -p -m0644 %SOURCE201		$RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam
+%__install -p -m0600 %SOURCE202		$RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update
+
+smartsubst 's!webmaster,clamav!webmaster,%username!g;
+	    s!/usr/share/clamav!%pkgdatadir!g;
+	    s!/usr/bin!%_bindir!g;
+            s!/usr/sbin!%_sbindir!g;' \
+   $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \
+   $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
-## Comment out or remove this line...
-1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
-EOF
 
 %if 0%{!?_without_milter:1}
 #### The milter stuff
@@ -260,6 +274,7 @@
 	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+
 subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
@@ -295,15 +310,6 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
-min=$[ RANDOM % 60 ]
-hour=$[ RANDOM % 3 ]
-tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
-src=%_sysconfdir/cron.d/clamav-update
-%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp
-cmp -s $tmp "$src" || cat "$tmp" >"$src"
-rm -f $tmp
-
-
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -375,9 +381,11 @@
 %defattr(-,root,root,-)
 %_bindir/freshclam
 %_mandir/man1/freshclam*
-%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
-%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
+%pkgdatadir/freshclam-sleep
+%config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
+%config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
+%config(noreplace) %_sysconfdir/cron.d/*
+%config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
 
@@ -414,6 +422,13 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+- updated to 0.86.2 (SECURITY)
+- changed the freshclam updating mechanism (again); now, it consists
+  of a crontab which does not need to be changed and a helper script
+  (freshclam-sleep). This helper script is configured by
+  /etc/sysconfig/freshclam
+
 * Sat Jun 25 2005 Enrico Scholz  - 0.86.1-2
 - updated to 0.86.1
 - fixed randomization in %%post scriptlet: hour should be a range but


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jun 2005 17:51:53 -0000	1.8
+++ sources	25 Jul 2005 17:47:53 -0000	1.9
@@ -1,2 +1,2 @@
-df7116898cdd80ce56721a91e9cff206  clamav-0.86.1.tar.gz
-dd5b89f732f84112207843748df5218c  clamav-0.86.1.tar.gz.sig
+870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
+7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jul 25 17:47:56 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:47:56 -0400
Subject: rpms/clamav/FC-4 clamav-update.cron, NONE, 1.1 freshclam-sleep, NONE,
	1.1 freshclam.sysconfig, NONE, 1.1 clamav.spec, 1.22,
	1.23 sources, 1.10, 1.11
Message-ID: <200507251748.j6PHmQW6022312@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec sources 
Added Files:
	clamav-update.cron freshclam-sleep freshclam.sysconfig 
Log Message:
synced with devel/



--- NEW FILE clamav-update.cron ---
## Adjust this line...
MAILTO=root,postmaster,webmaster,clamav

## It is ok to execute it as root; freshclam drops privileges and becomes
## user 'clamav' as soon as possible
0  */3 * * * root /usr/share/clamav/freshclam-sleep


--- NEW FILE freshclam-sleep ---
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz 
#  
# 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; version 2 of the License.
#  
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#  
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


FRESHCLAM_MOD=$[ 3*60 ]		# 3 hours

f=/etc/sysconfig/freshclam
test ! -e "$f" || . "$f"


case x"$1" in
    (xnow)		FRESHCLAM_DELAY=0;;
    (x|xrandom)		: ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};;
    (*)			FRESHCLAM_DELAY=$1;;
esac

set -e

case $FRESHCLAM_DELAY in
    (disabled-warn)
	echo $"\
WARNING: update of clamav database is disabled; please see
  '$f'  
  for information how to enable the periodic update resp. how to turn
  off this message." >&2
	exit 1
	;;

    (disabled)
	exit 0
	;;

    (*)
	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
	;;
esac


/usr/bin/freshclam --quiet && {
    test -x /usr/sbin/clamav-notify-servers &&  \
	exec /usr/sbin/clamav-notify-servers || \
	:
}


--- NEW FILE freshclam.sysconfig ---
## When changing the periodicity of freshclam runs in the crontab,
## this value must be adjusted also. Its value is the timespan between
## two subsequent freshclam runs in minutes. E.g. for the default
##
## | 0 */3 * * *  ...
##
## crontab line, the value is 180 (minutes).
# FRESHCLAM_MOD=

## A predefined value for the delay in seconds. By default, the value is
## 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:
## 'disabled-warn'  ...  disables the automatic freshclam update and
##                         gives out a warning
## 'disabled'       ...  disables the automatic freshclam silently
# FRESHCLAM_DELAY=


### !!!!! REMOVE ME !!!!!!
### REMOVE ME: By default, the freshclam update is disabled to avoid
### REMOVE ME: network access without prior activation
FRESHCLAM_DELAY=disabled-warn	# REMOVE ME


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- clamav.spec	25 Jun 2005 18:01:46 -0000	1.22
+++ clamav.spec	25 Jul 2005 17:47:54 -0000	1.23
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.86.1
-Release:	%release_func 2
+Version:	0.86.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -67,10 +67,13 @@
 %package update
 Summary:	Auto-updater for the Clam Antivirus scanner data-files
 Group:		Applications/File
+Source200:	freshclam-sleep
+Source201:	freshclam.sysconfig
+Source202:	clamav-update.cron
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%__chown %__chmod %__sed diffutils
+Requires(post):		%__chown %__chmod
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -204,6 +207,20 @@
 rm -rf "$RPM_BUILD_ROOT" _doc*
 %{__make} DESTDIR="$RPM_BUILD_ROOT" install
 
+function smartsubst() {
+	local tmp
+	local regexp=$1
+	shift
+
+	tmp=$(mktemp /tmp/%name-subst.XXXXXX)
+	for i; do
+		sed -e "$regexp" "$i" >$tmp
+		cmp -s $tmp "$i" || cat $tmp >"$i"
+		rm -f $tmp
+	done
+}
+
+
 %{__install} -d -m755 \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \
 	${RPM_BUILD_ROOT}%{_var}/log \
@@ -230,10 +247,7 @@
 cp -pa _doc_server/*                    $RPM_BUILD_ROOT%pkgdatadir/template
 ln -s %pkgdatadir/clamd-wrapper         $RPM_BUILD_ROOT%_initrddir/clamd-wrapper
 
-f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
-sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp
-cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f"
-rm -f "$f".tmp
+smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper
 
 
 ## prepare the update-files
@@ -241,17 +255,17 @@
 %{__install} -m755 -p %{SOURCE8}	${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers
 touch ${RPM_BUILD_ROOT}%{freshclamlog}
 
-cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF"
-## Adjust this line...
-MAILTO=root,postmaster,webmaster,%username
-
-## It is ok to execute it as root; freshclam drops privileges and becomes
-## user 'clamav' as soon as possible
-# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+%__install -p -m0755 %SOURCE200		$RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
+%__install -p -m0644 %SOURCE201		$RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam
+%__install -p -m0600 %SOURCE202		$RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update
+
+smartsubst 's!webmaster,clamav!webmaster,%username!g;
+	    s!/usr/share/clamav!%pkgdatadir!g;
+	    s!/usr/bin!%_bindir!g;
+            s!/usr/sbin!%_sbindir!g;' \
+   $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \
+   $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep
 
-## Comment out or remove this line...
-1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
-EOF
 
 %if 0%{!?_without_milter:1}
 #### The milter stuff
@@ -260,6 +274,7 @@
 	sed -e 's!!milter!g;s!!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2"
 }
 
+
 subst etc/clamd.conf /etc/clamd.d/milter.conf \
 	's!^##*\(\(LogFile\|LocalSocket\|PidFile\|User\)\s\|\(StreamSaveToDisk\|ScanMail\)$\)!\1!;'
 
@@ -295,15 +310,6 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
-min=$[ RANDOM % 60 ]
-hour=$[ RANDOM % 3 ]
-tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
-src=%_sysconfdir/cron.d/clamav-update
-%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp
-cmp -s $tmp "$src" || cat "$tmp" >"$src"
-rm -f $tmp
-
-
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -375,9 +381,11 @@
 %defattr(-,root,root,-)
 %_bindir/freshclam
 %_mandir/man1/freshclam*
-%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf
-%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/*
-%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/*
+%pkgdatadir/freshclam-sleep
+%config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
+%config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
+%config(noreplace) %_sysconfdir/cron.d/*
+%config(noreplace) %_sysconfdir/sysconfig/freshclam
 
 %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog}
 
@@ -414,6 +422,13 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+- updated to 0.86.2 (SECURITY)
+- changed the freshclam updating mechanism (again); now, it consists
+  of a crontab which does not need to be changed and a helper script
+  (freshclam-sleep). This helper script is configured by
+  /etc/sysconfig/freshclam
+
 * Sat Jun 25 2005 Enrico Scholz  - 0.86.1-2
 - updated to 0.86.1
 - fixed randomization in %%post scriptlet: hour should be a range but


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Jun 2005 17:51:52 -0000	1.10
+++ sources	25 Jul 2005 17:47:54 -0000	1.11
@@ -1,2 +1,2 @@
-df7116898cdd80ce56721a91e9cff206  clamav-0.86.1.tar.gz
-dd5b89f732f84112207843748df5218c  clamav-0.86.1.tar.gz.sig
+870de14ba123d6e9cba9850498c49f5d  clamav-0.86.2.tar.gz
+7d9ffe964a67ee6db157e112203a2678  clamav-0.86.2.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jul 25 17:56:57 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:56:57 -0400
Subject: rpms/clamav/FC-3 clamav.spec,1.14,1.15
Message-ID: <200507251756.j6PHuvHK022440@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
bump release: to fix broken cvs tags


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clamav.spec	25 Jul 2005 17:47:53 -0000	1.14
+++ clamav.spec	25 Jul 2005 17:56:55 -0000	1.15
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -422,7 +422,7 @@
 %endif	# _without_milter
 
 %changelog
-* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists
   of a crontab which does not need to be changed and a helper script



From fedora-extras-commits at redhat.com  Mon Jul 25 17:56:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:56:58 -0400
Subject: rpms/clamav/devel clamav.spec,1.24,1.25
Message-ID: <200507251756.j6PHuw4s022450@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
bump release: to fix broken cvs tags


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- clamav.spec	25 Jul 2005 17:19:21 -0000	1.24
+++ clamav.spec	25 Jul 2005 17:56:56 -0000	1.25
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -422,7 +422,7 @@
 %endif	# _without_milter
 
 %changelog
-* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists
   of a crontab which does not need to be changed and a helper script



From fedora-extras-commits at redhat.com  Mon Jul 25 17:56:58 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:56:58 -0400
Subject: rpms/clamav/FC-4 clamav.spec,1.23,1.24
Message-ID: <200507251757.j6PHuwIY022446@cvs-int.fedora.redhat.com>

Author: ensc

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

Modified Files:
	clamav.spec 
Log Message:
bump release: to fix broken cvs tags


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- clamav.spec	25 Jul 2005 17:47:54 -0000	1.23
+++ clamav.spec	25 Jul 2005 17:56:56 -0000	1.24
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -422,7 +422,7 @@
 %endif	# _without_milter
 
 %changelog
-* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-1
+* Mon Jul 25 2005 Enrico Scholz  - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists
   of a crontab which does not need to be changed and a helper script



From fedora-extras-commits at redhat.com  Mon Jul 25 17:57:32 2005
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 25 Jul 2005 13:57:32 -0400
Subject: common tobuild,1.2058,1.2059
Message-ID: <200507251757.j6PHvWEn022516@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22499

Modified Files:
	tobuild 
Log Message:
request build of rpms/clamav/devel clamav-0_86_2-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2058
retrieving revision 1.2059
diff -u -r1.2058 -r1.2059
--- tobuild	25 Jul 2005 17:43:17 -0000	1.2058
+++ tobuild	25 Jul 2005 17:57:30 -0000	1.2059
@@ -131,3 +131,4 @@
 s4504kr	rpms/inadyn/devel	inadyn-1_95-1	devel
 gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4
 gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel
+ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 17:57:53 2005
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 25 Jul 2005 13:57:53 -0400
Subject: common tobuild,1.2059,1.2060
Message-ID: <200507251757.j6PHvr1c022547@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22530

Modified Files:
	tobuild 
Log Message:
request build of rpms/moodss/FC-4 moodss-20_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2059
retrieving revision 1.2060
diff -u -r1.2059 -r1.2060
--- tobuild	25 Jul 2005 17:57:30 -0000	1.2059
+++ tobuild	25 Jul 2005 17:57:51 -0000	1.2060
@@ -132,3 +132,4 @@
 gemi	rpms/TeXmacs/FC-4	TeXmacs-1_0_5_6-2_fc4	fc4
 gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel
 ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel
+jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 18:00:15 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:15 -0400
Subject: rpms/hdf - New directory
Message-ID: <200507251800.j6PI0FMA022624@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Mon Jul 25 18:00:16 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:16 -0400
Subject: rpms/hdf/devel - New directory
Message-ID: <200507251800.j6PI0GI2022629@cvs-int.fedora.redhat.com>

Author: orion

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

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




From fedora-extras-commits at redhat.com  Mon Jul 25 18:00:29 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:29 -0400
Subject: rpms/hdf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200507251800.j6PI0TgI022680@cvs-int.fedora.redhat.com>

Author: orion

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

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


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

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

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like 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 Jul 25 18:00:30 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:00:30 -0400
Subject: rpms/hdf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200507251800.j6PI0U8A022685@cvs-int.fedora.redhat.com>

Author: orion

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

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


--- NEW 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 Jul 25 18:07:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:07:41 -0400
Subject: rpms/hdf import.log,1.1,1.2
Message-ID: <200507251808.j6PI8B0Y023890@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	import.log 
Log Message:
auto-import hdf-4.2r1-2 on branch devel from hdf-4.2r1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hdf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Jul 2005 18:00:27 -0000	1.1
+++ import.log	25 Jul 2005 18:07:39 -0000	1.2
@@ -0,0 +1 @@
+hdf-4_2r1-2:HEAD:hdf-4.2r1-2.src.rpm:1122314854



From fedora-extras-commits at redhat.com  Mon Jul 25 18:07:41 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:07:41 -0400
Subject: rpms/hdf/devel hdf-4.2r1-configure.patch, NONE, 1.1 hdf.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200507251807.j6PI7fhD023885@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore sources 
Added Files:
	hdf-4.2r1-configure.patch hdf.spec 
Log Message:
auto-import hdf-4.2r1-2 on branch devel from hdf-4.2r1-2.src.rpm

hdf-4.2r1-configure.patch:

--- NEW FILE hdf-4.2r1-configure.patch ---
--- HDF4.2r1/configure.ac.orig	2005-07-15 14:52:14.000000000 -0600
+++ HDF4.2r1/configure.ac	2005-07-15 14:53:35.000000000 -0600
@@ -528,7 +528,7 @@
 dnl ======================================================================
 
 AC_MSG_CHECKING([for math library support])
-AC_TRY_LINK([#include ], [sqrt(37.927)],
+AC_TRY_LINK([#include ], [sinh(37.927)],
             [AC_MSG_RESULT([yes])],
             [AC_MSG_RESULT([no]); LIBS="$LIBS -lm"])
 
--- HDF4.2r1/mfhdf/fortran/config/ftest-linux.f.orig	2005-02-08 20:04:07.000000000 -0700
+++ HDF4.2r1/mfhdf/fortran/config/ftest-linux.f	2005-07-15 15:37:22.000000000 -0600
@@ -138,13 +138,13 @@
       integer*2 shval(2)
       integer i, j, k
       character*31 varnam, attname(2,7), gattnam(2)
-      byte bytval(2)
+      integer*1 bytval(2)
       common /atts/attname, gattnam
       integer*2 svalidrg(2)
       real rvalidrg(2)
       integer lvalidrg(2)
       double precision dvalidrg(2)
-      byte bvalidrg(2)
+      integer*1 bvalidrg(2)
       character*31 gavalue(2), cavalue(2)
       real epsilon
 
@@ -337,7 +337,7 @@
       real flval(2)
       integer lngval(2)
       integer*2 shval(2)
-      byte bytval(2)
+      integer*1 bytval(2)
       integer vartyp, nvdims, vdims(MAXVDIMS), nvatts
 
       character*31 varnam, attname(2,7), gattnam(2)
@@ -346,7 +346,7 @@
       real rvalidrg(2)
       integer lvalidrg(2)
       double precision dvalidrg(2)
-      byte bvalidrg(2)
+      integer*1 bvalidrg(2)
       character*31 gavalue(2), cavalue(2)
       real epsilon
 
@@ -470,7 +470,7 @@
       real rvalidrg(2)
       integer lvalidrg(2)
       double precision dvalidrg(2)
-      byte bvalidrg(2)
+      integer*1 bvalidrg(2)
 
 c     variable ids
       integer  bid, sid, lid, fid, did, cid, chid
@@ -883,7 +883,7 @@
       integer itime, ilev, ilat, ilon
 
 c     arrays of data values to be read
-      byte barray(times), byval(times)
+      integer*1 barray(times), byval(times)
       integer*2 sarray(times), shval(times)
       integer larray(lats)
       real farray(levels, lats, lons, times)
@@ -1009,7 +1009,7 @@
       integer bid, sid, lid, fid, did, cid, chid
       common /vars/bid, sid, lid, fid, did, cid, chid
 
-      byte bvalue
+      integer*1 bvalue
       integer*2 svalue
       integer lvalue
       real fvalue
@@ -1097,7 +1097,7 @@
       integer count(MAXNCDIM)
 
 c     arrays of data values to be written
-      byte barray(times)
+      integer*1 barray(times)
       integer*2 sarray(times)
       integer larray(lats)
       real farray(levels, lats, lons, times)
@@ -1184,7 +1184,7 @@
 
       integer lvalue
       integer*2 svalue
-      byte bvalue
+      integer*1 bvalue
       double precision onethird
       integer bid, sid, lid, fid, did, cid, chid
       common /vars/bid, sid, lid, fid, did, cid, chid


--- NEW FILE hdf.spec ---
Name: hdf
Version: 4.2r1
Release: 2%{?dist}
Summary: A general purpose library and file format for storing scientific data
License: BSD-ish
Group: System Environment/Libraries
URL: http://hdf.ncsa.uiuc.edu/HDF/
Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
Source1: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/patches/4.2r1-hrepack-patch.tar
Patch0: hdf-4.2r1-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel
BuildRequires: gcc-gfortran

%description
HDF is a general purpose library and file format for storing scientific data.
HDF can store two primary objects: datasets and groups. A dataset is 
essentially a multidimensional array of data elements, and a group is a 
structure for organizing objects in an HDF file. Using these two basic 
objects, one can create and store almost any kind of scientific data 
structure, such as images, arrays of vectors, and structured and unstructured 
grids. You can also mix and match them in HDF files according to your needs.

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

%description devel
HDF development headers and libraries.

%prep
%setup -q -n HDF%{version}
tar xf %{SOURCE1} --directory mfhdf/hrepack 
mv mfhdf/hrepack/4.2r1-hrepack-patch/*.[ch] mfhdf/hrepack
rm -r mfhdf/hrepack/4.2r1-hrepack-patch
%patch0 -p1 -b .orig

%build
autoconf
%configure F77=gfortran FFLAGS=-ffixed-line-length-none
make

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall includedir=${RPM_BUILD_ROOT}%{_includedir}/%{name} \
             libdir=$RPM_BUILD_ROOT%{_libdir}/%{name}
#Don't conflict with netcdf
rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc*

%check
make check

%clean
rm -rf $RPM_BUILD_ROOT

%post

%postun

%files
%defattr(-,root,root,0755)
%doc COPYING MANIFEST README release_notes/*.txt
%{_bindir}/*
%{_mandir}/man1/*.gz

%files devel
%defattr(-,root,root,0755)
%{_includedir}/%{name}/
%{_libdir}/%{name}/

%changelog
* Wed Jul 20 2005 Orion Poplawski  4.2r1-2
- Fix BuildRequires to have autoconf

* Fri Jul 15 2005 Orion Poplawski  4.2r1-1
- inital package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jul 2005 18:00:27 -0000	1.1
+++ .cvsignore	25 Jul 2005 18:07:39 -0000	1.2
@@ -0,0 +1,2 @@
+4.2r1-hrepack-patch.tar
+HDF4.2r1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jul 2005 18:00:27 -0000	1.1
+++ sources	25 Jul 2005 18:07:39 -0000	1.2
@@ -0,0 +1,2 @@
+d172631b6e6f32c4f93f647a09862011  4.2r1-hrepack-patch.tar
+9082c6fa913b9188452fa6c5217e1573  HDF4.2r1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 18:12:24 2005
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Mon, 25 Jul 2005 14:12:24 -0400
Subject: common tobuild,1.2060,1.2061
Message-ID: <200507251812.j6PICO50023950@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23933

Modified Files:
	tobuild 
Log Message:
remove splint


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2060
retrieving revision 1.2061
diff -u -r1.2060 -r1.2061
--- tobuild	25 Jul 2005 17:57:51 -0000	1.2060
+++ tobuild	25 Jul 2005 18:12:22 -0000	1.2061
@@ -43,7 +43,6 @@
 thias	rpms/gkrellm-freq/FC-4	gkrellm-freq-0_1_1-1_fc4	fc4
 oliver	rpms/bwm-ng/devel	bwm-ng-0_5-5_fc5	devel
 ixs	rpms/perl-Crypt-Blowfish/devel	perl-Crypt-Blowfish-2_09-2_fc5	devel
-pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 mfleming	rpms/mod_security/devel	mod_security-1_8_7-4_fc5	devel
 thias	rpms/gkrellm-freq/devel	gkrellm-freq-0_1_1-2_fc5	devel
 bpepple	rpms/freeciv/devel	freeciv-2_0_3-2_fc5	devel
@@ -66,7 +65,6 @@
 thias	rpms/lighttpd/FC-3	lighttpd-1_3_15-1_fc3	fc3
 roland	rpms/monotone/devel	monotone-0_21-1_fc5	devel
 thomasvs	rpms/liboggz/devel	liboggz-0_9_2-1_fc5	devel
-pnasrat	rpms/splint/devel	splint-3_1_1-9_fc5	devel
 tagoh	rpms/apel/devel	apel-10_6-8_fc5	devel
 qspencer	rpms/umfpack/devel	umfpack-4_4-1	devel
 mfleming	rpms/mod_security/FC-3	mod_security-1_8_7-4_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 18:15:42 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 14:15:42 -0400
Subject: common tobuild,1.2061,1.2062
Message-ID: <200507251815.j6PIFgiR024024@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24007

Modified Files:
	tobuild 
Log Message:
request build of rpms/hdf/devel hdf-4_2r1-2_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2061
retrieving revision 1.2062
diff -u -r1.2061 -r1.2062
--- tobuild	25 Jul 2005 18:12:22 -0000	1.2061
+++ tobuild	25 Jul 2005 18:15:40 -0000	1.2062
@@ -131,3 +131,4 @@
 gemi	rpms/TeXmacs/devel	TeXmacs-1_0_5_6-2_fc5	devel
 ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel
 jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4
+orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 18:22:11 2005
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 25 Jul 2005 14:22:11 -0400
Subject: rpms/flumotion/FC-4 .cvsignore, 1.3, 1.4 flumotion.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200507251822.j6PIMBUQ024076@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	.cvsignore flumotion.spec sources 
Log Message:
update to new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 May 2005 13:45:56 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:22:09 -0000	1.4
@@ -1 +1 @@
-flumotion-0.1.8.tar.bz2
+flumotion-0.1.9.tar.bz2


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/flumotion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flumotion.spec	20 May 2005 13:48:47 -0000	1.3
+++ flumotion.spec	25 Jul 2005 18:22:09 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           flumotion
-Version:        0.1.8
+Version:        0.1.9{%dist}
 Release:        1
 Summary:        Flumotion - the Fluendo Streaming Server
 
@@ -188,6 +188,11 @@
 %{_datadir}/applications/fedora-flumotion-admin.desktop
 
 %changelog
+* Mon Jul 25 2005 Thomas Vander Stichele 
+- 0.1.9-1
+- new upstream release
+- add dist var
+
 * Fri May 20 2005 Thomas Vander Stichele 
 - 0.1.8-1
 - new upstream release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 May 2005 13:45:56 -0000	1.3
+++ sources	25 Jul 2005 18:22:09 -0000	1.4
@@ -1 +1 @@
-33367676b24fe3af328ae6cfca8b63ec  flumotion-0.1.8.tar.bz2
+7f2b4abbabd7756d1d689b38fd477d3e  flumotion-0.1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:22:36 2005
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 25 Jul 2005 14:22:36 -0400
Subject: rpms/flumotion/FC-4 flumotion.spec,1.4,1.5
Message-ID: <200507251822.j6PIMaGD024103@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	flumotion.spec 
Log Message:
update to new version


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-4/flumotion.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flumotion.spec	25 Jul 2005 18:22:09 -0000	1.4
+++ flumotion.spec	25 Jul 2005 18:22:34 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           flumotion
-Version:        0.1.9{%dist}
+Version:        0.1.9%{?dist}
 Release:        1
 Summary:        Flumotion - the Fluendo Streaming Server
 



From fedora-extras-commits at redhat.com  Mon Jul 25 18:23:09 2005
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Mon, 25 Jul 2005 14:23:09 -0400
Subject: common tobuild,1.2062,1.2063
Message-ID: <200507251823.j6PIN9IW024165@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24148

Modified Files:
	tobuild 
Log Message:
request build of rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2062
retrieving revision 1.2063
diff -u -r1.2062 -r1.2063
--- tobuild	25 Jul 2005 18:15:40 -0000	1.2062
+++ tobuild	25 Jul 2005 18:23:07 -0000	1.2063
@@ -132,3 +132,4 @@
 ensc	rpms/clamav/devel	clamav-0_86_2-2_fc5	devel
 jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4
 orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel
+thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 18:32:05 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:32:05 -0400
Subject: owners owners.list,1.28,1.29
Message-ID: <200507251832.j6PIW6QZ024204@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
Add component: splint


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- owners.list	25 Jul 2005 16:29:09 -0000	1.28
+++ owners.list	25 Jul 2005 18:32:03 -0000	1.29
@@ -749,6 +749,7 @@
 Fedora Extras|soundtracker|Sound module composer/player|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
+Fedora Extras|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|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 18:54:44 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:54:44 -0400
Subject: rpms/galculator/devel .cvsignore, 1.3, 1.4 galculator.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200507251854.j6PIsiNc024369@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore galculator.spec sources 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
- Update to 1.2.5 (also fixes #162018).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2004 00:42:15 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:54:42 -0000	1.4
@@ -1 +1 @@
-galculator-1.2.4.tar.bz2
+galculator-1.2.5.tar.bz2


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/galculator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galculator.spec	6 Apr 2005 22:11:37 -0000	1.5
+++ galculator.spec	25 Jul 2005 18:54:42 -0000	1.6
@@ -1,13 +1,12 @@
 Name:           galculator
-Version:        1.2.4
-Release:        3
-
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-1.2.4.tar.bz2
+Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
+- Update to 1.2.5 (also fixes #162018).
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galculator/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Nov 2004 00:42:15 -0000	1.3
+++ sources	25 Jul 2005 18:54:42 -0000	1.4
@@ -1 +1 @@
-a011a3d7063fab63ca371afa3bbde3df  galculator-1.2.4.tar.bz2
+0f58963a7fd99c7aa7cb9900d4645f59  galculator-1.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:54:38 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:54:38 -0400
Subject: rpms/galculator/FC-3 .cvsignore, 1.3, 1.4 galculator.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200507251855.j6PIt9ds024374@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore galculator.spec sources 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
- Update to 1.2.5 (also fixes #162018).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2004 00:42:15 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:54:36 -0000	1.4
@@ -1 +1 @@
-galculator-1.2.4.tar.bz2
+galculator-1.2.5.tar.bz2


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/galculator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- galculator.spec	29 Nov 2004 00:42:15 -0000	1.3
+++ galculator.spec	25 Jul 2005 18:54:36 -0000	1.4
@@ -1,22 +1,22 @@
 Name:           galculator
-Version:        1.2.4
-Release:        2
-Summary:        GTK 2 based scientific calculator.
+Version:        1.2.5
+Release:        1%{?dist}
+Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-1.2.4.tar.bz2
+Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  libglade2-devel
-BuildRequires:	perl-XML-Parser
+BuildRequires:  perl(XML::Parser)
 
 %description
-galculator is a GTK 2 based scientific calculator with "ordinary" and reverse 
+galculator is a GTK 2 based scientific calculator with "ordinary" and reverse
 polish notation.
 
 
@@ -54,6 +54,12 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
+- Update to 1.2.5 (also fixes #162018).
+
+* Fri Apr  7 2005 Michael Schwendt 
+- rebuilt
+
 * Sun Nov 28 2004 Phillip Compton  - 1.2.4-2
 - Spec cleanup, bump release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Nov 2004 00:42:15 -0000	1.3
+++ sources	25 Jul 2005 18:54:36 -0000	1.4
@@ -1 +1 @@
-a011a3d7063fab63ca371afa3bbde3df  galculator-1.2.4.tar.bz2
+0f58963a7fd99c7aa7cb9900d4645f59  galculator-1.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:54:39 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:54:39 -0400
Subject: rpms/galculator/FC-4 .cvsignore, 1.3, 1.4 galculator.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200507251855.j6PIt9r6024379@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	.cvsignore galculator.spec sources 
Log Message:
* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
- Update to 1.2.5 (also fixes #162018).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2004 00:42:15 -0000	1.3
+++ .cvsignore	25 Jul 2005 18:54:37 -0000	1.4
@@ -1 +1 @@
-galculator-1.2.4.tar.bz2
+galculator-1.2.5.tar.bz2


Index: galculator.spec
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/galculator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- galculator.spec	6 Apr 2005 22:11:37 -0000	1.5
+++ galculator.spec	25 Jul 2005 18:54:37 -0000	1.6
@@ -1,13 +1,12 @@
 Name:           galculator
-Version:        1.2.4
-Release:        3
-
+Version:        1.2.5
+Release:        1%{?dist}
 Summary:        GTK 2 based scientific calculator
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://galculator.sourceforge.net/
-Source0:        http://download.sf.net/sourceforge/galculator/galculator-1.2.4.tar.bz2
+Source0:        http://download.sf.net/sourceforge/galculator/galculator-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -55,6 +54,9 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.2.5-1
+- Update to 1.2.5 (also fixes #162018).
+
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/galculator/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Nov 2004 00:42:15 -0000	1.3
+++ sources	25 Jul 2005 18:54:37 -0000	1.4
@@ -1 +1 @@
-a011a3d7063fab63ca371afa3bbde3df  galculator-1.2.4.tar.bz2
+0f58963a7fd99c7aa7cb9900d4645f59  galculator-1.2.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 18:56:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:56:20 -0400
Subject: common tobuild,1.2063,1.2064
Message-ID: <200507251856.j6PIuKaK024499@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24482

Modified Files:
	tobuild 
Log Message:
request build of rpms/galculator/devel galculator-1_2_5-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2063
retrieving revision 1.2064
diff -u -r1.2063 -r1.2064
--- tobuild	25 Jul 2005 18:23:07 -0000	1.2063
+++ tobuild	25 Jul 2005 18:56:18 -0000	1.2064
@@ -133,3 +133,4 @@
 jfontain	rpms/moodss/FC-4	moodss-20_3-1_fc4	fc4
 orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel
 thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4
+mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 18:56:46 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:56:46 -0400
Subject: common tobuild,1.2064,1.2065
Message-ID: <200507251856.j6PIukMj024532@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24515

Modified Files:
	tobuild 
Log Message:
request build of rpms/galculator/FC-4 galculator-1_2_5-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2064
retrieving revision 1.2065
diff -u -r1.2064 -r1.2065
--- tobuild	25 Jul 2005 18:56:18 -0000	1.2064
+++ tobuild	25 Jul 2005 18:56:44 -0000	1.2065
@@ -134,3 +134,4 @@
 orion	rpms/hdf/devel	hdf-4_2r1-2_fc5	devel
 thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4
 mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel
+mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 18:57:11 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 14:57:11 -0400
Subject: common tobuild,1.2065,1.2066
Message-ID: <200507251857.j6PIvBLI024565@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24548

Modified Files:
	tobuild 
Log Message:
request build of rpms/galculator/FC-3 galculator-1_2_5-1_fc3 for fc3


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2065
retrieving revision 1.2066
diff -u -r1.2065 -r1.2066
--- tobuild	25 Jul 2005 18:56:44 -0000	1.2065
+++ tobuild	25 Jul 2005 18:57:09 -0000	1.2066
@@ -135,3 +135,4 @@
 thomasvs	rpms/flumotion/FC-4	flumotion-0_1_9_fc4-1	fc4
 mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel
 mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4
+mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3



From fedora-extras-commits at redhat.com  Mon Jul 25 19:07:06 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:07:06 -0400
Subject: web/html/docs/beta/yum-software-management - New directory
Message-ID: <200507251907.j6PJ76eo025703@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25689/yum-software-management

Log Message:
Directory /cvs/fedora/web/html/docs/beta/yum-software-management added to the repository




From fedora-extras-commits at redhat.com  Mon Jul 25 19:11:13 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:11:13 -0400
Subject: web/html/docs/beta/yum-software-management/stylesheet-images - New
	directory
Message-ID: <200507251911.j6PJBDVR025755@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741/stylesheet-images

Log Message:
Directory /cvs/fedora/web/html/docs/beta/yum-software-management/stylesheet-images added to the repository




From fedora-extras-commits at redhat.com  Mon Jul 25 19:12:48 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:12:48 -0400
Subject: web/html/docs/beta/yum-software-management generated-index.php, NONE,
	1.1 index.php, NONE, 1.1 ln-legalnotice.php, NONE,
	1.1 sn-managing-packages.php, NONE,
	1.1 sn-searching-packages.php, NONE,
	1.1 sn-software-management-concepts.php, NONE,
	1.1 sn-software-management-tools.php, NONE,
	1.1 sn-updating-your-system.php, NONE,
	1.1 sn-using-repositories.php, NONE,
	1.1 sn-yum-installing-frompackage.php, NONE,
	1.1 sn-yum-maintenance.php, NONE, 1.1 sn-yum-proxy-server.php,
	NONE, 1.1
Message-ID: <200507251912.j6PJCmPh025834@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25780

Added Files:
	generated-index.php index.php ln-legalnotice.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:
Beta version for review.


***** Error reading new file: [Errno 2] No such file or directory: 'generated-index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'index.php'

***** Error reading new file: [Errno 2] No such file or directory: 'ln-legalnotice.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-managing-packages.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-searching-packages.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-software-management-concepts.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-software-management-tools.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-updating-your-system.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-using-repositories.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-installing-frompackage.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-maintenance.php'

***** Error reading new file: [Errno 2] No such file or directory: 'sn-yum-proxy-server.php'



From fedora-extras-commits at redhat.com  Mon Jul 25 19:12:48 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 15:12:48 -0400
Subject: web/html/docs/beta/yum-software-management/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: <200507251912.j6PJCm62025839@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management/stylesheet-images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25780/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:
Beta version for review.



From fedora-extras-commits at redhat.com  Mon Jul 25 19:24:26 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:24:26 -0400
Subject: extras-buildsys/server ArchJob.py,1.7,1.8
Message-ID: <200507251924.j6PJOQlY025922@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25905/server

Modified Files:
	ArchJob.py 
Log Message:
Fix comment wording


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ArchJob.py	22 Jul 2005 21:35:27 -0000	1.7
+++ ArchJob.py	25 Jul 2005 19:24:24 -0000	1.8
@@ -138,7 +138,7 @@
         if self.status == 'done':
             return
         elif self.status == 'running':
-            # Clients pause before they enter the 'prep' state (which accesses
+            # Builders pause before they enter the 'prep' state (which accesses
             # the repo for this target), and wait for the server to allow them
             # to proceed when the repo is unlocked.
             if self.builder_status == 'downloaded':



From fedora-extras-commits at redhat.com  Mon Jul 25 19:26:56 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:26:56 -0400
Subject: extras-buildsys/server BuildMaster.py,1.19,1.20
Message-ID: <200507251926.j6PJQuRS025953@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25936/server

Modified Files:
	BuildMaster.py 
Log Message:
Tighten up the SQL a bit


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BuildMaster.py	22 Jul 2005 21:35:27 -0000	1.19
+++ BuildMaster.py	25 Jul 2005 19:26:54 -0000	1.20
@@ -136,7 +136,7 @@
 
     def _restart_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize")')
+        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize") ORDER BY uid')
         self.dbcx.commit()
         jobs = self.curs.fetchall()
 
@@ -260,7 +260,7 @@
         self.dbcx.commit()
 
     def _write_archjob_status_to_db(self, uid, attrdict):
-        self.curs.execute('SELECT * FROM archjobs WHERE jobid="%s"' % uid)
+        self.curs.execute('SELECT uid FROM archjobs WHERE jobid="%s"' % uid)
         self.dbcx.commit()
         if len(self.curs.fetchall()) == 0:
             try:



From fedora-extras-commits at redhat.com  Mon Jul 25 19:37:00 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 15:37:00 -0400
Subject: devel/meld meld-1.0.0-po_fr.patch, NONE, 1.1 .cvsignore, 1.5,
	1.6 meld.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200507251937.j6PJb0Gs026029@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/meld
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26003

Modified Files:
	.cvsignore meld.spec sources 
Added Files:
	meld-1.0.0-po_fr.patch 
Log Message:
Updating to non-beta release while investigating #161223.

* Mon Jul 25 2005 Michael Schwendt  - 1.0.0-1
- Update to 1.0.0.
- Include fix for upstream bug #309408.



meld-1.0.0-po_fr.patch:

--- NEW FILE meld-1.0.0-po_fr.patch ---
--- meld-1.0.0.old/po/fr.po	2005-07-03 18:41:20.000000000 -0400
+++ meld-1.0.0/po/fr.po	2005-07-03 18:40:45.000000000 -0400
@@ -15,6 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../meld.desktop.in.h:1
 msgid "Compare and merge your files."


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/meld/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jun 2005 20:21:36 -0000	1.5
+++ .cvsignore	25 Jul 2005 19:36:58 -0000	1.6
@@ -1 +1 @@
-meld-0.9.6.tar.bz2
+meld-1.0.0.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/devel/meld/meld.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- meld.spec	8 Jun 2005 20:21:36 -0000	1.9
+++ meld.spec	25 Jul 2005 19:36:58 -0000	1.10
@@ -1,13 +1,14 @@
 Name:             meld
-Version:          0.9.6
+Version:          1.0.0
 Release:          1%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
-Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/0.9/meld-%{version}.tar.bz2
+Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
+Patch1:           meld-1.0.0-po_fr.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1 -b .po_fr
 
 
 %build
@@ -82,6 +84,10 @@
 
 
 %changelog
+* Mon Jul 25 2005 Michael Schwendt  - 1.0.0-1
+- Update to 1.0.0.
+- Include fix for upstream bug #309408.
+
 * Wed Jun  8 2005 Michael Schwendt  - 0.9.6-1
 - Remove unused meld shell script from src.rpm.
 - Add scriptlets for scrollkeeper-update.


Index: sources
===================================================================
RCS file: /cvs/extras/devel/meld/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jun 2005 20:21:36 -0000	1.5
+++ sources	25 Jul 2005 19:36:58 -0000	1.6
@@ -1 +1 @@
-73419987b125c0cfbb1f04cfe454a8e5  meld-0.9.6.tar.bz2
+ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jul 25 19:37:33 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:37:33 -0400
Subject: extras-buildsys/server BuildMaster.py,1.20,1.21
Message-ID: <200507251937.j6PJbXZY026091@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26073/server

Modified Files:
	BuildMaster.py 
Log Message:
Fix SQL


Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- BuildMaster.py	25 Jul 2005 19:26:54 -0000	1.20
+++ BuildMaster.py	25 Jul 2005 19:37:31 -0000	1.21
@@ -260,7 +260,7 @@
         self.dbcx.commit()
 
     def _write_archjob_status_to_db(self, uid, attrdict):
-        self.curs.execute('SELECT uid FROM archjobs WHERE jobid="%s"' % uid)
+        self.curs.execute('SELECT parent_uid FROM archjobs WHERE jobid="%s"' % uid)
         self.dbcx.commit()
         if len(self.curs.fetchall()) == 0:
             try:



From fedora-extras-commits at redhat.com  Mon Jul 25 19:37:48 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 15:37:48 -0400
Subject: devel/common tobuild,1.2066,1.2067
Message-ID: <200507251937.j6PJbmEG026121@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26101

Modified Files:
	tobuild 
Log Message:
request build of devel/meld meld-1_0_0-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/devel/common/tobuild,v
retrieving revision 1.2066
retrieving revision 1.2067
diff -u -r1.2066 -r1.2067
--- tobuild	25 Jul 2005 18:57:09 -0000	1.2066
+++ tobuild	25 Jul 2005 19:37:45 -0000	1.2067
@@ -136,3 +136,4 @@
 mschwendt	rpms/galculator/devel	galculator-1_2_5-1_fc5	devel
 mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4
 mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3
+mschwendt	devel/meld	meld-1_0_0-1_fc5	devel



From fedora-extras-commits at redhat.com  Mon Jul 25 19:47:17 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:47:17 -0400
Subject: extras-buildsys ChangeLog,1.72,1.73
Message-ID: <200507251947.j6PJllwU026191@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26150

Modified Files:
	ChangeLog 
Log Message:
2005-07-25  Dan Williams 

    * server/CONFIG.py
        - Move stuff around, two new options for admin_emails and success_emails

    * server/BuildMaster.py
      server/PackageJob.py
        - Set endtime when all builds complete or fail, to not include all
            the repo time in the job's build time

    * server/PackageJob.py
      server/UserInterface.py
      server/BuilderManager.py
      server/EmailUtils.py
        - Notify admins when a builder times out
        - Consolidate email sending into one place
        - Notify success_emails when a build job succeeds




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog	23 Jul 2005 00:55:25 -0000	1.72
+++ ChangeLog	25 Jul 2005 19:47:15 -0000	1.73
@@ -1,3 +1,21 @@
+2005-07-25  Dan Williams 
+
+    * server/CONFIG.py
+        - Move stuff around, two new options for admin_emails and success_emails
+
+    * server/BuildMaster.py
+      server/PackageJob.py
+        - Set endtime when all builds complete or fail, to not include all
+            the repo time in the job's build time
+
+    * server/PackageJob.py
+      server/UserInterface.py
+      server/BuilderManager.py
+      server/EmailUtils.py
+        - Notify admins when a builder times out
+        - Consolidate email sending into one place
+        - Notify success_emails when a build job succeeds
+
 2005-07-22  Dan Williams 
 
     * server/UserInterface.py



From fedora-extras-commits at redhat.com  Mon Jul 25 19:47:17 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 15:47:17 -0400
Subject: extras-buildsys/server EmailUtils.py, NONE, 1.1 BuildMaster.py, 1.21,
	1.22 BuilderManager.py, 1.7, 1.8 CONFIG.py, 1.20,
	1.21 Makefile, 1.5, 1.6 PackageJob.py, 1.13,
	1.14 UserInterface.py, 1.27, 1.28
Message-ID: <200507251947.j6PJlmHo026196@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26150/server

Modified Files:
	BuildMaster.py BuilderManager.py CONFIG.py Makefile 
	PackageJob.py UserInterface.py 
Added Files:
	EmailUtils.py 
Log Message:
2005-07-25  Dan Williams 

    * server/CONFIG.py
        - Move stuff around, two new options for admin_emails and success_emails

    * server/BuildMaster.py
      server/PackageJob.py
        - Set endtime when all builds complete or fail, to not include all
            the repo time in the job's build time

    * server/PackageJob.py
      server/UserInterface.py
      server/BuilderManager.py
      server/EmailUtils.py
        - Notify admins when a builder times out
        - Consolidate email sending into one place
        - Notify success_emails when a build job succeeds




--- NEW FILE EmailUtils.py ---
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU Library General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Copyright 2005 Dan Williams  and Red Hat, Inc.


import smtplib
from email.MIMEText import MIMEText

# Load in the config
CONFIG_LOCATION = "/etc/plague/server/"
execfile(CONFIG_LOCATION + "CONFIG.py")


def email_result(to, resultstring, subject=None):
    msg = MIMEText(resultstring)
    msg['Subject'] = subject
    msg['From'] = config_opts['email_from']
    msg['To'] = to
    s = smtplib.SMTP()
    s.connect()
    s.sendmail(config_opts['email_from'], [to], msg.as_string())
    s.close()



Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- BuildMaster.py	25 Jul 2005 19:37:31 -0000	1.21
+++ BuildMaster.py	25 Jul 2005 19:47:15 -0000	1.22
@@ -223,7 +223,7 @@
 
             # Update job end time
             try:
-                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (time.time(), uid))
+                self.curs.execute('UPDATE jobs SET endtime=%d WHERE uid=%d' % (job.endtime, uid))
             except sqlite.OperationalError, e:
                 print "DB Error: could not access jobs database. Reason: '%s'" % e
             self.dbcx.commit()


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BuilderManager.py	20 Jul 2005 20:50:07 -0000	1.7
+++ BuilderManager.py	25 Jul 2005 19:47:15 -0000	1.8
@@ -22,6 +22,7 @@
 import os
 import threading
 import Builder
+import EmailUtils
 
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")
@@ -147,6 +148,14 @@
         for builder in self.running_builders:
             if not builder.alive():
                 print "Removing builder '%s' because it timed out." % builder.address()
+
+                # Notify admins
+                subject = "Builder Timeout: %s" % builder.address()
+                msg = "The builder '%s' timed out and was removed from the active builder list." % builder.address()
+                for addr in config_opts['admin_emails']:
+                    EmailUtils.email_result(addr, msg, subject)
+
+                # Forget about the builder
                 builder.stop()
                 self.running_builders.remove(builder)
 


Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CONFIG.py	22 Jul 2005 02:54:07 -0000	1.20
+++ CONFIG.py	25 Jul 2005 19:47:15 -0000	1.21
@@ -1,24 +1,52 @@
 # Configuration file for build system server
 
 config_opts = {}
-config_opts['email_from'] = "buildsys at fedoraproject.org"
 config_opts['pkg_cvs_root'] = ":pserver:anonymous at cvs.fedora.redhat.com:/cvs/dist"
 config_opts['pkg_cvs_rsh'] = ""
 config_opts['cvs_cmd'] = "/usr/bin/cvs"
 config_opts['make_cmd'] = "/usr/bin/make"
-config_opts['tmpdir'] = "/tmp"
 config_opts['log_url'] = "http://foo.foo.org/logs/"
 config_opts['guest_allowed'] = True
 
+
+#
+# Directories
+#
+
+# server_work_dir: where logs and finished RPMs are stored
+config_opts['server_work_dir'] = "/rpmbuild"
+
+# repo_dir: repository dir of built RPMs
+config_opts['repo_dir'] = "/repodir"
+
+# tmpdir: where to store temporary stuff, like CVS checkout directories
+config_opts['tmpdir'] = "/tmp"
+
+
+#
+# Email options
+#
+
+# email_from: the address emails from the build server should appear to come from
+config_opts['email_from'] = "buildsys at fedoraproject.org"
+
+# admin_emails: who to email when things go wrong
+config_opts['admin_emails'] = []
+
+# success_email: addresses to send notification of build successes to
+config_opts['success_emails'] = []
+
+
+#
 # SSL options
 #
+
 # ssl_frontend: True = package submitters need SSL to connect to the server
 config_opts['ssl_frontend'] = True
 # ssl_buildclients: True = all communication between server & build client
 # be over an SSL connecction
 config_opts['ssl_builders'] = True
 
-
 SERVER_BASE_DIR = "/etc/plague/server"
 
 # SSL Cert and key bits
@@ -32,14 +60,6 @@
 config_opts['ui_ca_cert'] = SERVER_BASE_DIR + "/certs/fedora-upload-ca.pem"
 
 
-# server_work_dir
-#   - Where logs and finished RPMs are stored
-config_opts['server_work_dir'] = "/rpmbuild"
-
-# repo_dir
-#   - Repository dir of up-to-date RPMs
-config_opts['repo_dir'] = "/repodir"
-
 
 # This option disables pulling from CVS.  Allowing jobs to be submitted
 # as unknown SRPMs from random people may be a security risk, so don't
@@ -55,6 +75,10 @@
 # Further architectures on a per-package basis are configured in each target's
 # package file.  See the config option 'addl_package_arches_dir'.
 #
+# Mapping - our_target: [list of base arches]
+#
+# ex: { 'development' : ['i386', 'x86_64'], '5' : ['i386'] }
+#
 config_opts['targets'] = {  'development' :	['i386'] }
 
 
@@ -86,9 +110,13 @@
 
 # Target Optional Arches
 #
-# These are arches that submitters _may_ build packages on, but packages won't
+# These are arches that packages may build on, but won't
 # be built on these arches by default.
 #
+# Mapping - our_target: [list of optional arches]
+#
+# ex: { 'development' : ['i486', 'i586', 'i686', 'ppc32'] }
+#
 config_opts['target_optional_arches'] = { }
 
 
@@ -113,7 +141,7 @@
 config_opts['addl_package_arches_dir'] = SERVER_BASE_DIR + "/addl_pkg_arches"
 
 
-# Builder Clients
+# Builders
 config_opts['builders'] = [ 'https://127.0.0.1:8888' ]
 
 


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	5 Jul 2005 21:08:03 -0000	1.5
+++ Makefile	25 Jul 2005 19:47:15 -0000	1.6
@@ -10,11 +10,12 @@
 	rm -f *.pyc *.pyo *~ *.bak
 
 FILES = \
-    ArchJob.py \
-    BuilderManager.py \
-    Builder.py \
+	ArchJob.py \
+	BuilderManager.py \
+	Builder.py \
 	BuildMaster.py \
-    PackageJob.py \
+	EmailUtils.py \
+	PackageJob.py \
 	Repo.py \
 	UserInterface.py \
 	User.py


Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PackageJob.py	22 Jul 2005 21:35:27 -0000	1.13
+++ PackageJob.py	25 Jul 2005 19:47:15 -0000	1.14
@@ -21,15 +21,12 @@
 import commands
 import threading
 import time
-import popen2
 import rpmUtils
 import exceptions
 import shutil
-import tempfile
-import smtplib
 import copy
-from email.MIMEText import MIMEText
 import string
+import EmailUtils
 import SimpleXMLRPCServer
 import xmlrpclib
 import socket
@@ -124,6 +121,7 @@
         self.hostname = hostname
         self.username = username
         self.starttime = time.time()
+        self.endtime = 0
         self.target = repo.target()
         self.repo = repo
         self.no_cvs = config_opts['use_srpm_not_cvs']
@@ -196,15 +194,14 @@
 
         # Remove arches we don't support from addl_arches
         for arch in addl_arches:
-            # arch_utils is only used to determine which arches to build on by default,
+            # ArchUtils.sub_arches is only used to determine which arches to build on by default,
             # so that if we have an Additional Package Arches file that specifies
             # 'sparcv9' for a package that we don't try to build sparcv9 for that
             # package unless 'sparc' is also listed in our 'targets' config option.
             if ArchUtils.sub_arches.has_key(arch):
                 master_addl_arch = ArchUtils.sub_arches[arch]
                 if master_addl_arch not in buildable_arches:
-                    if master_addl_arch not in opt_arches:
-                        addl_arches.remove(arch)
+                    addl_arches.remove(arch)
 
         ba = hdr['buildarchs']
         exclusive = hdr['exclusivearch'] 
@@ -433,7 +430,7 @@
         resultstring = "%s (%s): Build on target %s was killed by %s." % (self.uid, self.name, self.target, username)
 
         self._set_cur_stage('killed', resultstring)
-        self.email_result(resultstring)
+        self.email_result(self.username, resultstring)
 
         self._archjobs_lock.acquire()
         for job in self.archjobs.values():
@@ -442,6 +439,7 @@
         self.archjobs = {}
         self._archjobs_lock.release()
 
+        self.endtime = time.time()
         self.bm.notify_job_done(self)
 
     def wake(self):
@@ -471,7 +469,7 @@
             if not self.no_cvs:
                 shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
             subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
-            self.email_result(resultstring=e.args, subject=subj)
+            self.email_result(self.username, resultstring=e.args, subject=subj)
             self._failed(e.args)
         except BuildError, e:
             subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
@@ -479,7 +477,7 @@
             msg = "%s\n\n         Build logs may be found at %s\n\n" % (e.msg, log_url)
             logtail = self._get_log_tail(e.arch)
             msg = "%s\n-------------------------------------------------\n\n%s\n" % (msg, logtail)
-            self.email_result(resultstring=msg, subject=subj)
+            self.email_result(self.username, resultstring=msg, subject=subj)
             # Kill remaining jobs on other arches
             self._archjobs_lock.acquire()
             for job in self.archjobs.values():
@@ -523,6 +521,7 @@
 
     def _failed(self, msg=None):
         self._set_cur_stage('failed', msg)
+        self.endtime = time.time()
         self.bm.notify_job_done(self)
         
     def _add_to_repo(self):
@@ -552,6 +551,8 @@
         if len(self.repofiles):
             self.repo.request_copy(self)
 
+        self.endtime = time.time()
+
     def repo_add_callback(self):
         self._set_cur_stage('repodone')
         self.wake()
@@ -562,7 +563,11 @@
 
         log_url = make_job_log_url(self.target, self.uid, self.name, self.ver, self.release)
         resultstring = resultstring + "\n     Build logs may be found at %s\n" % (log_url)
-        self.email_result(resultstring)
+        self.email_result(self.username, resultstring)
+
+        # Notify everyone else who might want to know that the build succeeded
+        for addr in config_opts['success_emails']:
+            self.email_result(addr, resultstring)
 
         self.bm.notify_job_done(self)
 
@@ -610,20 +615,13 @@
         f.close()
         return "".join(lines)
 
-    def email_result(self, resultstring, subject=None):
-        """send 'resultstring' to self.email from self.email_from"""
-        
-        msg = MIMEText(resultstring)
+    def email_result(self, to, resultstring, subject=None):
+        """send 'resultstring' to self.username"""
+
         if not subject:
             name = self.name
             if not name:
                 name = self.package
             subject = 'Build Result: %d - %s on %s' % (self.uid, name, self.target)
-        msg['Subject'] = subject
-        msg['From'] = config_opts['email_from']
-        msg['To'] = self.username
-        s = smtplib.SMTP()
-        s.connect()
-        s.sendmail(config_opts['email_from'], [self.username], msg.as_string())
-        s.close()
+        EmailUtils.email_result(to, resultstring, subject)
 


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- UserInterface.py	23 Jul 2005 00:55:26 -0000	1.27
+++ UserInterface.py	25 Jul 2005 19:47:15 -0000	1.28
@@ -16,8 +16,7 @@
 
 
 import sqlite
-import smtplib
-from email.MIMEText import MIMEText
+import EmailUtils
 import time
 import sys
 import os
@@ -32,21 +31,6 @@
 execfile(CONFIG_LOCATION + "CONFIG.py")
 
 
-def email_result(email, cvs_tag, resultstring, subject=None):
-    """send 'resultstring' to email"""
-    
-    msg = MIMEText(resultstring)
-    if not subject:
-        subject = 'Build Result: %s' % cvs_tag
-    msg['Subject'] = subject
-    msg['From'] = config_opts['email_from']
-    msg['To'] = email
-    s = smtplib.SMTP()
-    s.connect()
-    s.sendmail(config_opts['email_from'], [email], msg.as_string())
-    s.close()
-
-
 def get_dbcx():
     dbcx = None
     dbcx = sqlite.connect(CONFIG_LOCATION + "jobdb", encoding="utf-8", timeout=3)
@@ -102,6 +86,12 @@
     raise InvalidTargetError()
 
 
+def email_result(email, source, resultstring):
+    """send 'resultstring' to email"""
+    
+    subject = 'Enqueue Result: %s' % source
+    EmailUtils.email_result(email, resultstring, subject)
+
 
 class UserInterface:
     """



From fedora-extras-commits at redhat.com  Mon Jul 25 19:59:19 2005
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 25 Jul 2005 15:59:19 -0400
Subject: owners owners.list,1.29,1.30
Message-ID: <200507251959.j6PJxJTS026507@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Fix my email address.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- owners.list	25 Jul 2005 18:32:03 -0000	1.29
+++ owners.list	25 Jul 2005 19:59:17 -0000	1.30
@@ -489,7 +489,7 @@
 Fedora Extras|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|openslp|OpenSLP implementation of Service Location Protocol V2|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at kspei.com|extras-qa at fedoraproject.org|
+Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 20:16:35 2005
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 25 Jul 2005 16:16:35 -0400
Subject: owners owners.list,1.30,1.31
Message-ID: <200507252016.j6PKGZAd027710@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	owners.list 
Log Message:
Add hdf



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- owners.list	25 Jul 2005 19:59:17 -0000	1.30
+++ owners.list	25 Jul 2005 20:16:32 -0000	1.31
@@ -273,6 +273,7 @@
 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|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|
 Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jul 25 21:10:02 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Mon, 25 Jul 2005 17:10:02 -0400
Subject: rpms/gcfilms/FC-4 sources,1.5,1.6
Message-ID: <200507252110.j6PLA27H028971@cvs-int.fedora.redhat.com>

Author: Tian

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

Modified Files:
	sources 
Log Message:
Fixed upstream



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcfilms/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Jul 2005 13:15:58 -0000	1.5
+++ sources	25 Jul 2005 21:10:00 -0000	1.6
@@ -1 +1 @@
-91a9c544d1c904928ea0744755078fa8  gcfilms-5.3.tar.gz
+58743009cb2d5a821f33205efa8d4346  gcfilms-5.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jul 25 21:10:57 2005
From: fedora-extras-commits at redhat.com (Christian Jodar (Tian))
Date: Mon, 25 Jul 2005 17:10:57 -0400
Subject: common tobuild,1.2067,1.2068
Message-ID: <200507252110.j6PLAvRY029007@cvs-int.fedora.redhat.com>

Author: Tian

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28990

Modified Files:
	tobuild 
Log Message:
request build of rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 for fc4


Index: tobuild
===================================================================
RCS file: /cvs/extras/common/tobuild,v
retrieving revision 1.2067
retrieving revision 1.2068
diff -u -r1.2067 -r1.2068
--- tobuild	25 Jul 2005 19:37:45 -0000	1.2067
+++ tobuild	25 Jul 2005 21:10:54 -0000	1.2068
@@ -137,3 +137,4 @@
 mschwendt	rpms/galculator/FC-4	galculator-1_2_5-1_fc4	fc4
 mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3
 mschwendt	devel/meld	meld-1_0_0-1_fc5	devel
+Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4



From fedora-extras-commits at redhat.com  Mon Jul 25 21:44:53 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 17:44:53 -0400
Subject: extras-buildsys ChangeLog,1.73,1.74
Message-ID: <200507252144.j6PLircI029176@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29134

Modified Files:
	ChangeLog 
Log Message:
2005-07-25  Dan Williams 

    * client/client.py
      server/UserInterface.py
      server/BuildMaster.py
        - Add a "requeue" command to restart a failed or killed job




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	25 Jul 2005 19:47:15 -0000	1.73
+++ ChangeLog	25 Jul 2005 21:44:51 -0000	1.74
@@ -1,5 +1,12 @@
 2005-07-25  Dan Williams 
 
+    * client/client.py
+      server/UserInterface.py
+      server/BuildMaster.py
+        - Add a "requeue" command to restart a failed or killed job
+
+2005-07-25  Dan Williams 
+
     * server/CONFIG.py
         - Move stuff around, two new options for admin_emails and success_emails
 



From fedora-extras-commits at redhat.com  Mon Jul 25 21:44:54 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 17:44:54 -0400
Subject: extras-buildsys/server BuildMaster.py, 1.22, 1.23 UserInterface.py,
	1.28, 1.29
Message-ID: <200507252144.j6PLis4Y029189@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29134/server

Modified Files:
	BuildMaster.py UserInterface.py 
Log Message:
2005-07-25  Dan Williams 

    * client/client.py
      server/UserInterface.py
      server/BuildMaster.py
        - Add a "requeue" command to restart a failed or killed job




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BuildMaster.py	25 Jul 2005 19:47:15 -0000	1.22
+++ BuildMaster.py	25 Jul 2005 21:44:52 -0000	1.23
@@ -111,6 +111,9 @@
         self._done_queue_lock = threading.Lock()
         self._new_queue = []
         self._new_queue_lock = threading.Lock()
+        self._restart_queue = []
+        self._restart_queue_lock = threading.Lock()
+
         self._status_updates = {}
         self._status_updates_lock = threading.Lock()
         self._archjob_status_updates = {}
@@ -127,16 +130,45 @@
         self.curs = self.dbcx.cursor()
         ensure_job_db_tables(self.dbcx)
 
-        self._restart_interrupted_jobs()
+        self._requeue_interrupted_jobs()
 
         threading.Thread.__init__(self)
 
     def __del__(self):
         self.dbcx.close()
 
-    def _restart_interrupted_jobs(self):
+    def _requeue_interrupted_jobs(self):
         """ Restart interrupted jobs from our db. """
-        self.curs.execute('SELECT * FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize") ORDER BY uid')
+        self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed" AND status!="initialize") ORDER BY uid')
+        self.dbcx.commit()
+        uids = self.curs.fetchall()
+
+        if len(uids) == 0:
+            return
+
+        for item in uids:
+            self.requeue_job(item[0])
+
+    def requeue_job(self, uid):
+        self._restart_queue_lock.acquire()
+        self._restart_queue.append(int(uid))
+        self._restart_queue_lock.release()
+
+    def _start_requeued_jobs(self):
+        uids = ''
+        self._restart_queue_lock.acquire()
+        for uid in self._restart_queue:
+            if len(uids) == 0:
+                uids = uids + "uid=%d" % uid
+            else:
+                uids = uids + " OR uid=%d" % uid
+        self._restart_queue = []
+        self._restart_queue_lock.release()
+
+        if len(uids) == 0:
+            return
+
+        self.curs.execute('SELECT * FROM jobs WHERE %s ORDER BY uid' % uids)
         self.dbcx.commit()
         jobs = self.curs.fetchall()
 
@@ -310,13 +342,13 @@
                     ' cvs_tag, target, buildreq, starttime, endtime, status)' \
                     ' VALUES (NULL, "%s", "%s", "%s", "%s", "%s", %d, 0, "%s")' \
                     % (item['email'], item['package'], locator, item['target'], \
-                    item['buildreq'], item['time'], 'waiting'))
+                    item['buildreq'], item['time'], 'initialize'))
             self.dbcx.commit()
 
             # Find the UID
             self.curs.execute('SELECT uid FROM jobs WHERE username="%s" AND' \
                     ' package="%s" AND cvs_tag="%s" AND target="%s" AND' \
-                    ' buildreq="%s" AND starttime=%d AND status="waiting"' \
+                    ' buildreq="%s" AND starttime=%d AND status="initialize"' \
                     % (item['email'], item['package'], locator, item['target'], \
                     item['buildreq'], item['time']))
             self.dbcx.commit()
@@ -349,6 +381,13 @@
         if have_work:
             return True
 
+        self._restart_queue_lock.acquire()
+        if len(self._restart_queue) > 0:
+            have_work = True
+        self._restart_queue_lock.release()
+        if have_work:
+            return True
+
         self._status_updates_lock.acquire()
         if len(self._status_updates) > 0:
             have_work = True
@@ -390,6 +429,7 @@
 
             # Start any new jobs
             self._start_new_jobs()
+            self._start_requeued_jobs()
 
             last_time = time.time()
             while not self._have_work() and time.time() <= last_time + 5:


Index: UserInterface.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- UserInterface.py	25 Jul 2005 19:47:15 -0000	1.28
+++ UserInterface.py	25 Jul 2005 21:44:52 -0000	1.29
@@ -153,6 +153,35 @@
             self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time())
             return (0, "Success: package has been queued.")
 
+    def requeue(self, email, uid):
+        uid = validate_uid(uid)
+        if not uid:
+            return (-1, "Error: Invalid job UID.")
+
+        sql = 'SELECT uid, username, status 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.")
+        curs.execute(sql)
+        job = curs.fetchone()
+        if not job:
+            return (-1, "Error: Invalid job UID.")
+
+        # Ensure matching usernames
+        if job[1] != email:
+            return (-1, "Error: You are not the original submitter for Job %d." % uid)
+
+        # Ensure the job failed or was killed
+        if job[2] != 'failed' and job[2] != 'killed':
+            return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid)
+
+        self._bm.requeue_job(uid)
+        return (0, "Success: Job %d has been requeued." % uid)
+        
+
     def _kill_job(self, email, job, jobid):
         if not job:
             return (-1, "Job %s does not exist." % jobid)
@@ -373,6 +402,11 @@
             return (-1, "Insufficient privileges.")
         return UserInterface.enqueue_srpm(self, user.email, package, srpm_file, target, buildreq)
 
+    def requeue(self, uid):
+        user = AuthedXMLRPCServer.get_authinfo()
+        if not user or not user.own_jobs:
+            return (-1, "Insufficient privileges.")
+        return UserInterface.requeue(self, user.email, uid)
 
     def kill_job(self, email, jobid):
         user = AuthedXMLRPCServer.get_authinfo()



From fedora-extras-commits at redhat.com  Mon Jul 25 21:44:54 2005
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 25 Jul 2005 17:44:54 -0400
Subject: extras-buildsys/client client.py,1.15,1.16
Message-ID: <200507252144.j6PLisqd029182@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29134/client

Modified Files:
	client.py 
Log Message:
2005-07-25  Dan Williams 

    * client/client.py
      server/UserInterface.py
      server/BuildMaster.py
        - Add a "requeue" command to restart a failed or killed job




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- client.py	22 Jul 2005 21:35:27 -0000	1.15
+++ client.py	25 Jul 2005 21:44:52 -0000	1.16
@@ -89,6 +89,20 @@
         print "Package %s enqueued." % package
 
 
+def requeue_job(server, email, uid):
+    try:
+        use_ssl = config.get('Server', 'use_ssl')
+        if use_ssl.lower() == 'true':
+            (err, msg) = server.requeue(uid)
+        else:
+            (err, msg) = server.requeue(email, uid)
+    except socket.error, e:
+        print "Error connecting to build server: '%s'" % e
+        return
+
+    print msg
+
+
 def validate_arg(arg):
     if arg == 'email' or arg == 'status' or arg == 'uid' or arg == 'uid_gt' or arg == 'uid_lt':
         return True
@@ -305,6 +319,9 @@
                 enqueue(server, email, sys.argv[2:])
         except CommandException, e:
             print e.message
+    elif cmd == 'requeue':
+        jobid = sys.argv[2]
+        requeue_job(server, email, jobid)
     elif cmd == 'list':
         list_jobs(server, sys.argv[2:])
     elif cmd == 'detail':



From fedora-extras-commits at redhat.com  Mon Jul 25 22:22:34 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 18:22:34 -0400
Subject: devel/lcms lcms.spec,1.8,1.9
Message-ID: <200507252222.j6PMMYJ8030430@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/lcms
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413

Modified Files:
	lcms.spec 
Log Message:
* Tue Jul 26 2005 Michael Schwendt  - 1.14-4
- Change licence to MIT, since that is was recent README.1ST says.



Index: lcms.spec
===================================================================
RCS file: /cvs/extras/devel/lcms/lcms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lcms.spec	22 May 2005 17:22:38 -0000	1.8
+++ lcms.spec	25 Jul 2005 22:22:32 -0000	1.9
@@ -2,11 +2,11 @@
 
 Name:           lcms
 Version:        1.14
-Release:        3
+Release:        4
 Summary:        Color Management System
 
 Group:          Applications/Productivity
-License:        LGPL
+License:        MIT
 URL:            http://www.littlecms.com/
 Source0:        http://www.littlecms.com/lcms-1.14.tar.gz
 Patch0:         lcms-1.14-fc4-swigtype.patch
@@ -98,6 +98,9 @@
 
 
 %changelog
+* Tue Jul 26 2005 Michael Schwendt  - 1.14-4
+- Change licence to MIT, since that is was recent README.1ST says.
+
 * Sun May 22 2005 Michael Schwendt  - 1.14-3
 - Fix FC4 build (#114146).
 



From Christian.Iseli at licr.org  Mon Jul 25 22:51:03 2005
From: Christian.Iseli at licr.org (Christian.Iseli at licr.org)
Date: Tue, 26 Jul 2005 00:51:03 +0200
Subject: APPROVED: scmxx
Message-ID: <200507252251.j6PMp3T2020328@mx3.redhat.com>

Name: scmxx
Summary: Exchange data with Siemens mobile phones
Description:
SCMxx is a console program that allows you to exchange certain types of
data with mobile phones made by Siemens. Some of the data types that can be
exchanged are logos, ring tones, vCalendars, phonebook entries, and short
messages. Other actions like setting the time and dialling a number are also
possible.

Reviewer: Christian Iseli
Maintainer: Andreas Thienemann




From fedora-extras-commits at redhat.com  Tue Jul 26 00:31:20 2005
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Mon, 25 Jul 2005 20:31:20 -0400
Subject: owners owners.list,1.31,1.32
Message-ID: <200507260031.j6Q0VKXr000572@cvs-int.fedora.redhat.com>

Author: icon

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

Modified Files:
	owners.list 
Log Message:
Taking over from Panu for libxml++



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- owners.list	25 Jul 2005 20:16:32 -0000	1.31
+++ owners.list	26 Jul 2005 00:31:17 -0000	1.32
@@ -400,7 +400,7 @@
 Fedora Extras|libxfce4mcs|Multi-channel settings management support for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfce4util|Utility library for the Xfce4 desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfcegui4|GTK widgets for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
-Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|pmatilai at laiskiainen.org|extras-qa at fedoraproject.org|
+Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|icon at linux.duke.edu|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Tue Jul 26 00:46:47 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 20:46:47 -0400
Subject: rpms/leafnode/FC-4 leafnode.spec,1.10,1.11
Message-ID: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	leafnode.spec 
Log Message:
Fix non-UTF-8 in German description (#159587) and modify it a little bit.


Index: leafnode.spec
===================================================================
RCS file: /cvs/extras/rpms/leafnode/FC-4/leafnode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- leafnode.spec	13 Jul 2005 22:35:23 -0000	1.10
+++ leafnode.spec	26 Jul 2005 00:46:45 -0000	1.11
@@ -23,10 +23,10 @@
 newsserver of the ISP.
 
 %description -l de
-Leafnode ist ein offline-Newsserver, der vor allem fr den typischen
-Einzelnutzer-Rechner ohne permanente Internetanbindung geeignet ist.
-Leafnode bezieht automatisch die Newsgroups, die der oder die Nutzer
-regelm???ig lesen, vom Newsserver des Providers.
+Leafnode ist ein offline NNTP Server, der vor allem f??r den typischen
+Einzelnutzerrechner ohne permanente Internetanbindung geeignet ist.
+Leafnode bezieht automatisch die Newsgroups, die vom Nutzer regelm??ssig
+gelesen werden, vom Newsserver des Internet Providers.
 
 %prep
 
@@ -107,7 +107,6 @@
 * Fri Apr  7 2005 Michael Schwendt 
 - rebuilt
 
-
 * Thu May 06 2004 Andreas Pfaffeneder  0:1.9.53-0.fdr1
 - Bugfix release
 



From fedora-extras-commits at redhat.com  Tue Jul 26 01:09:20 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 21:09:20 -0400
Subject: devel/inkscape inkscape-0.41-dgettext.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 inkscape.spec, 1.12, 1.13 sources, 1.5,
	1.6 inkscape-0.41-64bit.patch, 1.2, NONE inkscape-gcc4.patch,
	1.1, NONE
Message-ID: <200507260109.j6Q19Kgb001831@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/inkscape
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1807

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	inkscape-0.41-dgettext.patch 
Removed Files:
	inkscape-0.41-64bit.patch inkscape-gcc4.patch 
Log Message:
* Tue Jul 26 2005 Michael Schwendt  - 0.42-1
- update to 0.42 (also fixes #160326)
- BR gnome-vfs2-devel
- no files left in %_libdir/inkscape
- include French manual page
- GCC4 patch obsolete, 64-bit patch obsolete, dgettext split off


inkscape-0.41-dgettext.patch:

--- NEW FILE inkscape-0.41-dgettext.patch ---
diff -Nur inkscape-0.41-orig/configure inkscape-0.41/configure
--- inkscape-0.41-orig/configure	2005-02-09 04:55:31.000000000 +0100
+++ inkscape-0.41/configure	2005-05-31 14:50:00.000000000 +0200
@@ -20218,7 +20218,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return (int) (long)dgettext ("","")
   ;
   return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/inkscape/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2005 04:46:16 -0000	1.5
+++ .cvsignore	26 Jul 2005 01:09:18 -0000	1.6
@@ -1 +1,2 @@
-inkscape-0.41.tar.bz2
+inkscape-0.42.tar.bz2
+inkscape-0.42.tar.bz2.sig


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/devel/inkscape/inkscape.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- inkscape.spec	31 May 2005 12:56:25 -0000	1.12
+++ inkscape.spec	26 Jul 2005 01:09:18 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           inkscape
-Version:        0.41
-Release:        7
-Summary:        A vector-based drawing program using SVG.
+Version:        0.42
+Release:        1%{?dist}
+Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
-Source0:        http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2
-Patch0: inkscape-gcc4.patch
-Patch1: inkscape-0.41-64bit.patch
+Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
+Patch0:         inkscape-0.41-dgettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -19,6 +18,7 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
+BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libxml2-devel >= 2.4.24
@@ -50,8 +50,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .64bit
+%patch0 -p1 -b .dgettext
 
 
 %build
@@ -96,13 +95,20 @@
 %doc AUTHORS COPYING ChangeLog NEWS README HACKING
 %doc %{_mandir}/man1/*
 %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-%{_libdir}/inkscape/
+%{_mandir}/fr/man1/*
 
 
 %changelog
+* Tue Jul 26 2005 Michael Schwendt  - 0.42-1
+- update to 0.42 (also fixes #160326)
+- BR gnome-vfs2-devel
+- no files left in %%_libdir/inkscape
+- include French manual page
+- GCC4 patch obsolete, 64-bit patch obsolete, dgettext split off
+
 * Tue May 31 2005 Michael Schwendt  - 0.41-7
 - append another 64-bit related patch (dgettext configure check failed)
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/inkscape/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2005 04:46:16 -0000	1.5
+++ sources	26 Jul 2005 01:09:18 -0000	1.6
@@ -1 +1,2 @@
-9b4bbfaae688127dca4c3d816a42b21a  inkscape-0.41.tar.bz2
+4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
+e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig


--- inkscape-0.41-64bit.patch DELETED ---


--- inkscape-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jul 26 01:10:21 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 21:10:21 -0400
Subject: devel/common tobuild,1.2068,1.2069
Message-ID: <200507260110.j6Q1ALJl001917@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1900

Modified Files:
	tobuild 
Log Message:
request build of devel/inkscape inkscape-0_42-1_fc5 for devel


Index: tobuild
===================================================================
RCS file: /cvs/extras/devel/common/tobuild,v
retrieving revision 1.2068
retrieving revision 1.2069
diff -u -r1.2068 -r1.2069
--- tobuild	25 Jul 2005 21:10:54 -0000	1.2068
+++ tobuild	26 Jul 2005 01:10:19 -0000	1.2069
@@ -138,3 +138,4 @@
 mschwendt	rpms/galculator/FC-3	galculator-1_2_5-1_fc3	fc3
 mschwendt	devel/meld	meld-1_0_0-1_fc5	devel
 Tian	rpms/gcfilms/FC-4	gcfilms-5_3-1_fc4	fc4
+mschwendt	devel/inkscape	inkscape-0_42-1_fc5	devel



From fedora-extras-commits at redhat.com  Tue Jul 26 01:24:43 2005
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon, 25 Jul 2005 21:24:43 -0400
Subject: rpms/inkscape/devel inkscape.spec,1.13,1.14
Message-ID: <200507260124.j6Q1OhuH001950@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	inkscape.spec 
Log Message:
typo


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- inkscape.spec	26 Jul 2005 01:09:18 -0000	1.13
+++ inkscape.spec	26 Jul 2005 01:24:41 -0000	1.14
@@ -107,7 +107,7 @@
 - BR gnome-vfs2-devel
 - no files left in %%_libdir/inkscape
 - include French manual page
-- GCC4 patch obsolete, 64-bit patch obsolete, dgettext split off
+- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off
 
 * Tue May 31 2005 Michael Schwendt  - 0.41-7
 - append another 64-bit related patch (dgettext configure check failed)



From fedora-extras-commits at redhat.com  Tue Jul 26 01:42:05 2005
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Mon, 25 Jul 2005 21:42:05 -0400
Subject: web/html/docs/beta/yum-software-management generated-index.php, 1.1,
	1.2 index.php, 1.1, 1.2 ln-legalnotice.php, 1.1,
	1.2 sn-managing-packages.php, 1.1,
	1.2 sn-searching-packages.php, 1.1,
	1.2 sn-software-management-concepts.php, 1.1,
	1.2 sn-software-management-tools.php, 1.1,
	1.2 sn-updating-your-system.php, 1.1,
	1.2 sn-using-repositories.php, 1.1,
	1.2 sn-yum-installing-frompackage.php, 1.1,
	1.2 sn-yum-maintenance.php, 1.1, 1.2 sn-yum-proxy-server.php,
	1.1, 1.2
Message-ID: <200507260142.j6Q1g5PC002029@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/web/html/docs/beta/yum-software-management
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999

Modified Files:
	generated-index.php index.php ln-legalnotice.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:
Updates to beta, style and usage mainly.




Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	25 Jul 2005 19:12:46 -0000	1.1
+++ index.php	26 Jul 2005 01:42:03 -0000	1.2
@@ -7,9 +7,9 @@
 
 ?>
 
-
    Software Management with yum -
-    BETA DOCUMENT
       Next
    Software Management with yum -
-    BETA DOCUMENT
    Stuart Ellis
    Copyright © 2005 Stuart Ellis
    Revision History
    Revision 0.42005-06-01StuartEllis
    
+
    Software Management with yum - BETA
+      DOCUMENT
       Next
    Software Management with yum - BETA
+      DOCUMENT
    Stuart Ellis
    Copyright © 2005 Stuart Ellis
    Revision History
    Revision 0.42005-06-01StuartEllis
    
           
    
             Initial import into CVS.
           
    
@@ -17,6 +17,10 @@
           
    
             Updated for Fedora Core 4.
           
    
+        
    Revision 0.62005-07-25PaulWFrields
    
+          
    
+            Edited for style and usage; BETA publication.
+          
    
         
    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 Repositor!
 ies
    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 f!
 or Pac
es 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
    1. I!
 ntrodu
on
    [Note]DRAFT
    
     This is a draft version of the document. It is subject to change at any time
     and may not have been tested for technical accuracy yet. If you find any
@@ -59,7 +63,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
@@ -68,11 +72,11 @@
       
     man yum
 man yum.conf
-
    
+

    Other useful yum resources on the Internet include:

    - Web home page + Project web site

    http://linux.duke.edu/projects/yum/

    Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/ln-legalnotice.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ln-legalnotice.php 25 Jul 2005 19:12:46 -0000 1.1 +++ ln-legalnotice.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

    - yum-software-management-0.5.0 (2005-07-19) + yum-software-management-0.6 (2005-07-25)

    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: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-managing-packages.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-managing-packages.php 25 Jul 2005 19:12:46 -0000 1.1 +++ sn-managing-packages.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -7,35 +7,25 @@ ?> -

    4. Managing Software with yum
    Prev   Next

    4. Managing Software with yum

    - The yum utility may modify the software on your - system in three ways: +

    4. Managing Software with yum
    Prev   Next

    4. Managing Software with yum

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

    • - It may install new software from repositories or a package - file. + To install new software from repositories or a package file

    • - It may update existing software on your system. + To update existing software on your system

    • - It may remove unwanted software from your system. + To remove unwanted software from your system

    To use yum, specify a function and one or more packages or package groups. Each section below gives some examples. -

    [Tip]Package Names

    - You may use any of the following formats to specify a package in - a yum operation: name, - name.architecture, - name-version, - name-version-release, - name-version-release.architecture, and - epoch:name-version-release.architecture. -

    - To use the repositories yum downloads data - files from each of the configured repositories. On a slow - connection, it may take several seconds to download the required - files for each package. +

    + yum downloads data files from each of the + configured repositories. On a slow connection, it may take several + seconds to download the required files for each package.

    During operation, yum first determines the best set of actions to produce the required result, and displays the @@ -44,8 +34,8 @@ additional packages in addition to the package that you specified. These actions may be necessary to resolve software dependencies.

    - This is an example of the transaction for installing - tsclient: + This is an example of the transaction for installing + tsclient: 

     =============================================================================
  Package                 Arch       Version          Repository        Size
@@ -63,24 +53,27 @@
 Total download size: 355 k
 Is this ok [y/N]:

    Example 1. Format of yum Transaction Reports

    - Review the list of changes, and then press y to - accept and begin the process. If you press N or - Enter, yum does not download - or change any packages. + Review the list of changes, and then press + y + to accept and begin the process. If you press + N + or + Enter + , yum does not download or change any packages.

    [Note]Package Versions

    The yum utility only displays and uses the - newest version of each package, unless you specify an older - version. + newest version of each package, unless you specify an older + version.

    [Tip]Downloads are Cached

    The yum utility keeps Downloaded data files - and packages for reuse. You may copy packages from the - repository cache directories under - /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

    + and packages for reuse. You may copy packages from the + repository cache directories under + /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

    To install the package tsclient, enter the - command: + command: 

     su -c 'yum install tsclient'

    @@ -98,10 +91,12 @@ prompted.

    [Important]New Services Require Activation

    When you install a service, Fedora does not activate or start - it. To configure a new service to run on bootup, choose - Desktop->System Settings->Server Settings->Services, or use the chkconfig - and service command-line utilities. -

    4.2. Updating Software with yum

    + it. To configure a new service to run on bootup, choose + Desktop->System + Settings->Server Settings->Services, or use the + chkconfig and service + command-line utilities. +

    4.2. Updating Software with yum

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

    @@ -112,8 +107,8 @@
         prompted.
       
    [Important]New Software Versions Require Reloading
    
           If a piece of software is in use when you update it, the old
-	  version remains active until the software is restarted. Kernel
-	  updates take effect when you reboot the system.
+          version remains active until the software is restarted. Kernel
+          updates take effect when you reboot the system.
         
    
         To update all of the packages in the package group
         MySQL Database, enter the command:
@@ -125,9 +120,9 @@
         prompted.
       
    [Note]Updating the Entire System
    
           To update all of the packages on your Fedora system, use the
-	  commands described in
+          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. Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-searching-packages.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-searching-packages.php 25 Jul 2005 19:12:46 -0000 1.1 +++ sn-searching-packages.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -7,24 +7,24 @@ ?> -

    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 installed and available packages.

    [Note]Searches are not Case-sensitive

    The search and list options of - yum are not case-sensitive. A query for - palmpilot automatically finds - PalmPilot packages. + yum are not case-sensitive. A query for + palmpilot automatically finds + PalmPilot packages.

    The format of the results depends upon the option. If the query produces no information, there are no packages matching the criteria.

    5.1. Searching by Package Name and Attributes

    To search for a specific package by name, use the - list function. To search for the package - tsclient, use the command: + list function. To search for the package + tsclient, use the command: 

     su -c 'yum list tsclient'

    @@ -33,8 +33,8 @@ prompted.

    To make your queries more specific, add other package - attributes. To search for version 0.132 of the application, use - the command: + attributes. To search for version 0.132 of the application, use + the command: 

     su -c 'yum list tsclient-0.132'

    5.2. Advanced Searches

    @@ -42,9 +42,9 @@ search or provides options.

    The search option checks the names, - descriptions, summaries and listed package maintainers of all of - the available packages to find those that match. For example, to - search for all packages that relate to PalmPilots, type: + descriptions, summaries and listed package maintainers of all of + the available packages to find those that match. For example, to + search for all packages that relate to PalmPilots, type: 

     su -c 'yum search PalmPilot'

    @@ -64,8 +64,8 @@ su -c 'yum provides libneon'

    To search for all packages that either provide a MTA (Mail - Transport Agent) service, or include files with - mta in their name: + Transport Agent) service, or include files with + mta in their name: 

     su -c 'yum provides MTA'

    @@ -73,22 +73,22 @@ root account.

    [Tip]Wildcards and Regular Expressions

    You may use the standard wildcard characters in search - criteria: ? to represent any one character, - and * to mean zero or more characters. Use - Perl or Python regular expressions to carry out more complex - queries. + criteria: ? to represent any one character, + and * to mean zero or more characters. Use + Perl or Python regular expressions to carry out more complex + queries.

    5.3. Understanding Matches

    Searches with yum show all of the packages - that match your criteria. Packages must meet the terms of the - search exactly to be considered matches, unless you use - wildcards or a regular expression. + that match your criteria. Packages must meet the terms of the + search exactly to be considered matches, unless you use + wildcards or a regular expression.

    For example, a search query for shadowutils - or shadow-util would not produce the - package shadow-utils. This package would - match and be shown if the query was either - shadow-util? or - Shadow*. + or shadow-util would not produce the + package shadow-utils. This package would + match and be shown if the query was either + shadow-util? or + Shadow*.

    Prev Up Next
    4. Managing Software with yum Home 6. Updating Your System with yum
    -
    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 - files, icons, documentation and management scripts. Management - applications use these files to safely locate, install, update - and remove software. For example, the Fedora installation process - uses the packages supplied with Fedora Core to build or upgrade a - system to your requirements. + files called RPM packages. Each package + is a compressed archive containing product information, program + files, icons, documentation and management scripts. Management + applications use these files to safely locate, install, update + and remove software. For example, the Fedora installation process + uses the packages supplied with Fedora Core to build or upgrade a + system to your requirements.

    Packages also include a digital signature to prove their source. - Software management utilities verify this digital signature by - using a GPG public key. The - yum and rpm utilities - 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

    + Software management utilities verify this digital signature by + using a GPG public key. The + yum and rpm utilities + 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

    A repository is a prepared directory or web site that contains software packages and index files. Software management utilities such as yum automatically locate and obtain the correct RPM packages from these repositories. This method frees you from having to - manually find and install new applications or updates. You may + manually find and install new applications or updates. You may use a single command to update all system software, or search for new software by specifying criteria. In each case the management utility connects to the configured repositories and checks their indexes to find the correct packages.

    The package management utilities in Fedora Core are already configured - to use the network of repositories maintained by the Fedora Project. These - repositories contain the software included with Fedora Core and a large - selection of additional software known as Fedora Extras. Third-party - software developers also provide repositories for their Fedora - compatible packages. + to use the network of repositories maintained by the Fedora Project. These + repositories contain the software included with Fedora Core and a large + selection of additional software known as Fedora Extras. Third-party + software developers also provide repositories for their Fedora + compatible packages.

    [Note]All Fedora Packages are Open Source Software

    All of the software provided by the Fedora Project is open source - software. You may download and install software from the Fedora Project - network of repositories on as many systems as desired. -

    + software. You may download and install software from the Fedora Project + network of repositories on as many systems as desired. +

    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 - groups, or provide their packages as additional groups. + provided by the Fedora repositories to manage related packages as + sets. Some third-party repositories add packages to these + groups, or provide their packages as additional groups.

    [Note]Available Package Groups

    To view a list of all of the available package groups for your - Fedora system, run the command yum - grouplist. + Fedora system, run the command su -c 'yum + grouplist'.

    Use repositories to ensure that you always receive current - versions of software. If several versions of the same package - are available, your management utility automatically selects the - latest version. + versions of software. If several versions of the same package + are available, your management utility automatically selects the + latest version.

    [Caution]Installing Software not from a Repository

    - Install software using manual methods only when you are - confident there is no repository which can currently provide - it. You may have to manage that software with manual methods, - instead of with Fedora software management utilities. -

    + Install software using manual methods only when you are + confident there is no repository which can currently provide + it. You may have to manage that software with manual methods, + instead of with Fedora software management utilities. +

    The yum commands shown in this document use - repositories as package sources. Refer to + repositories as package sources. Refer to Section 9, “Manually Installing Software” for details of - using yum to install software from a - package file. -

    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 - library, the package which contains that library is a - dependency. To properly install a - package, Fedora must first satisfy its dependencies. The - dependency information for a RPM package is stored within the - RPM file. + using yum to install software from a + package file. +

    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 + library, the package which contains that library is a + dependency. To properly install a + package, Fedora must first satisfy its dependencies. The + dependency information for a RPM package is stored within the + RPM file.

    The yum utility uses package dependency data - to ensure all its requirements are met during installation. The - yum utility automatically installs packages - for any required software not already present on your system. If - a new application has requirements that conflict with existing - software, yum aborts without making any - changes to your system. -

    2.4. Understanding Package Names

    + to ensure that all of requirements for an application are met + during installation. It automatically installs the packages for + any dependencies not already present on your system. If a new + application has requirements that conflict with existing + software, yum aborts without making any + changes to your system. +

    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: + pieces of information. This is the full name of the + tsclient package supplied with Fedora Core: 

     tsclient-0.132-4.i386.rpm

    - These naming conventions are valid for the file shown above: + Management utilities refer to packages with one of three + formats:

    • Package name: tsclient

    • Package name with version and release numbers: - tsclient-0.132-4 + tsclient-0.132-4

    • Package name with hardware architecture: - tsclient.i386 + tsclient.i386

    - Use only the name of the package with yum, - except when the exact version or type is necessary. When exactly is that required? I fixed the - sentence structure but the meaning is obscure here. Tell the - reader the full story here. [PWF] For example, use - name-version to specify the exact version - of the application. The package listings provided by - yum use the format - name.architecture to specify the type of - computer for which the package is intended. + For clarity, yum itself lists packages in the + format name.architecture. Repositories also + commonly store packages in separate directories by architecture. + In each case, the hardware architecture specified for the + package is the minimum type of machine + required to use the package. +

    + i386 +

    + Suitable for any current Intel-compatible computer +

    + noarch +

    + Compatible with all computer architectures +

    + ppc +

    + Suitable for PowerPC systems, such as Apple Power + Macintosh +

    + x86_64 +

    + Suitable for 64-bit Intel-compatible processors, such as + Opterons +

    + Some software may be optimized for particular types of + Intel-compatible machine. Separate packages may be provided for + i386, i586, + i686 and x86_64 computers. A + machine with at least an Intel Pentium, VIA C3 or compatible CPU + may use i586 packages. Computers with an Intel + Pentium Pro and above, or a current model of AMD chip, may use + i686 packages.

    - The hardware architecture is the minimum - type of machine required for that specific package. Packages - with architecture i386 run on any current - Intel-compatible computer. Packages for PowerPC systems, such as - Apple Power Macintosh, are indicated with ppc. - Packages for systems with 64-bit processors such as Opterons are - indicated with x86_64. Packages specified as - noarch have no architecture requirement. + Use the short name of the package for yum + commands. This causes yum to automatically + select the most recent package in the repositories that matches + the hardware architecture of your computer.

    - Some software may be optimized for particular types of - Intel-compatible machine. Separate packages may be provided for - i386, i586, - i686 and x86_64 computers. A - machine with at least an Intel Pentium, VIA C3 or compatible CPU - may use i586 packages. Computers with an Intel - Pentium Pro and above, or a current model of AMD chip, may use - i686 packages. -

    Prev Up Next
    Software Management with yum - - BETA DOCUMENT Home 3. Software Management Tools in Fedora Core
    + Specify a package with other name formats to override the + default behavior and force yum to use the + package that matches that version or architecture. Only override + yum when you know that the default package + selection has a bug or other fault that makes it unsuitable for + installation. +

    [Tip]Package Names

    + You may use any of the following formats to specify a package + in a yum operation: + name, + name.architecture, + name-version, + name-version-release, + name-version-release.architecture, + and + epoch:name-version-release.architecture. +

    Prev Up Next
    Software Management with yum - BETA + DOCUMENT Home 3. Software Management Tools in Fedora Core
    -
    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. @@ -21,9 +21,10 @@

    Fedora Core also includes system-config-packages. To run this - application from the graphical interface, select - Desktop->System Settings->Add/Remove Applications. Unlike up2date and - yum, + application from the graphical interface, select Desktop->System + Settings->Add/Remove + Applications. Unlike + up2date and yum, system-config-packages installs software packages from your Fedora Core installation discs only, and does not use repositories. This application is used on systems that do @@ -38,9 +39,9 @@ software.

    [Caution]Current Package Versions

    The up2date and - yum utilities ensure that you have the most - recent version of software packages. Other methods do not - guarantee that the packages are current. + yum utilities ensure that you have the most + recent version of software packages. Other methods do not + guarantee that the packages are current.

    Prev Up Next
    2. Software Management Concepts Home 4. Managing Software with yum
    -
    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.

    @@ -15,11 +15,12 @@ 

     su -c 'yum update'

    - At the prompt, enter the root password. -

    6.1. Automatically Updating Your System

    + At the prompt, enter the + root password. +

    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: + scripts to perform full system updates every day. To activate + automatic daily updates, enter this command: 

     su -c '/sbin/chkconfig --level 345 yum on; /sbin/service yum start'

    @@ -27,12 +28,12 @@ root account.

    [Note]How Daily Updates are Run

    There is no separate yum service that runs - on your system. The command given above enables the control - script /etc/rc.d/init.d/yum. This control - script activates the script - /etc/cron.daily/yum.cron, which causes - the cron service to perform the system - update automatically each day. + on your system. The command given above enables the control + script /etc/rc.d/init.d/yum. This control + script activates the script + /etc/cron.daily/yum.cron, which causes + the cron service to perform the system + update automatically each day.

    Prev Up Next
    5. Searching for Packages with yum Home 7. Using Other Software Repositories
    -
    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.

    [Note]Fedora Extras Repositories for Previous Versions of Fedora Core

    You must manually configure Fedora 3 systems to use Fedora Extras, using - the instructions at http://fedora.redhat.com/projects/extras/. For - additional packages for Fedora 1 and Fedora 2, refer to http://www.fedora.us/. + the instructions at + http://fedora.redhat.com/projects/extras/. For + additional packages for Fedora 1 and Fedora 2, refer to + http://www.fedora.us/.

    If the Fedora Project does not provide a specific software package, the manufacturer of the software may provide or recommend a separate repository. Members of the community also maintain repositories to provide packages for Fedora systems. Third-party repositories provide information on their web sites. -

    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 @@ -31,9 +33,9 @@ .repo.

    You must have root - access to add a file to the definitions directory. To copy the - definition file example.repo, type this - command: + access to add a file to the definitions directory. To copy the + definition file example.repo, type this + command: 

     su -c 'cp example.repo /etc/yum.repos.d/'

    @@ -41,25 +43,25 @@ root account.

    The configuration file for each repository should include a - gpgkey setting. This setting specifies the - location of a public key that verifies the packages provided by - that repository. This public key is automatically imported the - first time you install software from the repository. If the - configuration file provided does not include this setting, refer - to Section 7.2, “Manually Authorizing Package Sources”. + gpgkey setting. This setting specifies the + location of a public key that verifies the packages provided by + that repository. This public key is automatically imported the + first time you install software from the repository. If the + configuration file provided does not include this setting, refer + to Section 7.2, “Manually Authorizing Package Sources”.

    [Note]Repositories and up2date Channels

    Starting with Fedora 4, yum repositories are - automatically used as up2date - channels. On Fedora 3 and earlier systems, you must manually - configure up2date to use these - channels. To do so, edit the - /etc/sysconfig/rhn/sources file. -

    7.2. Manually Authorizing Package Sources

    + automatically used as up2date + channels. On Fedora 3 and earlier systems, you must manually + configure up2date to use these + channels. To do so, edit the + /etc/sysconfig/rhn/sources file. +

    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 - GPG-PUB-KEY.asc, type the following - command: + keyring, use the import feature of the + rpm utility. To import the file + GPG-PUB-KEY.asc, type the following + command: 

     su -c 'rpm --import GPG-PUB-KEY.asc'

    @@ -72,33 +74,33 @@ use this command: 

     su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc'
-

    7.3. Understanding Repository Compatibility

    +

    7.3. Understanding Repository Compatibility

    The Fedora Extras project provides packages which are built to the same - standards as Fedora Core packages. Third-party packages should be - compatible with these official packages, unless the provider - specifically states otherwise. + standards as Fedora Core packages. Third-party packages should be + compatible with these official packages, unless the provider + specifically states otherwise.

    Refer to the web site of the repository for information on - package compatibility before you add it as a package source. - Repositories often provide packages specifically intended for - use with packages supplied by other repositories. In some cases, - separate third-party repository providers may each offer - different versions of the same software. This situation may - prevent you from safely using those repositories together on - your Fedora system. + package compatibility before you add it as a package source. + Repositories often provide packages specifically intended for + use with packages supplied by other repositories. In some cases, + separate third-party repository providers may each offer + different versions of the same software. This situation may + prevent you from safely using those repositories together on + your Fedora system.

    Packages built for one version of Fedora are usually not - compatible with other versions of Fedora. The web site of the - provider should specifically state which versions of Fedora they - support. + compatible with other versions of Fedora. The web site of the + provider should specifically state which versions of Fedora they + support.

    [Tip]Old Versions of yum and Current Repositories

    The data format for repository indexes changed with version - 2.1 of yum. This was the version supplied - with Fedora 3. Repository providers should specify the versions - of Fedora that they support. To confirm that an unlabeled - repository is compatible with current versions of - yum, check that it has a sub-directory - called repodata/. + 2.1 of yum. This was the version supplied + with Fedora 3. Repository providers should specify the versions + of Fedora that they support. To confirm that an unlabeled + repository is compatible with current versions of + yum, check that it has a sub-directory + called repodata/.

    Prev Up Next
    6. Updating Your System with yum Home 8. Maintaining yum
    -
    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 install new software, unless the software is only available as a package. In these cases, use the localinstall @@ -24,7 +24,8 @@ 

     su -c 'yum localinstall tsclient-0.132-4.i386.rpm'

    - At the prompt, enter the root password. + At the prompt, enter the + root password.

    [Important]Meeting Dependencies

    You must ensure that all of the dependencies are already installed on your system, because yum cannot Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-yum-maintenance.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sn-yum-maintenance.php 25 Jul 2005 19:12:46 -0000 1.1 +++ sn-yum-maintenance.php 26 Jul 2005 01:42:03 -0000 1.2 @@ -14,24 +14,24 @@ 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 - this setting. + yum from using that repository. The + yum utility ignores any definition file with + this setting.

    To completely remove access to a repository:

    1. Delete the relevant file from - /etc/yum.repos.d/. + /etc/yum.repos.d/.

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

    8.2. Clearing the yum Caches

    + /var/cache/yum/. +

    8.2. Clearing the yum Caches

    By design, yum does not automatically delete - any of the packages or package data files it downloads, so they - may be reused in future operations. To purge the header files, - use this command: + any of the packages or package data files it downloads, so they + may be reused in future operations. To purge the header files, + use this command: 

     su -c 'yum clean headers'

    @@ -41,11 +41,11 @@ su -c 'yum clean packages'

    When using these commands, at the prompt, enter the password for - the root account. + the root account.

    [Note]Purged Files

    Package management operations download header files and - packages as required, and automatically replace any deleted - files needed for the operation. + packages as required, and automatically replace any deleted + files needed for the operation.

    Prev Up Next
    7. Using Other Software Repositories Home 9. Manually Installing Software
    -
    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 is connected to the Internet through a web proxy server, specify the proxy server details in /etc/yum.conf. The proxy setting must specify the proxy server as a complete URL, including the TCP port number. If your proxy server requires a username and - password, specify these by adding - proxy_username and - proxy_password settings. + password, specify these by adding proxy_username + and proxy_password settings.

    The settings below enable yum to use the proxy - server mycache.mydomain.com, connecting - to port 3128, with the username yum-user and the password - qwerty. + server + mycache.mydomain.com, + connecting to port 3128, with the username + yum-user and the + password qwerty. 

     # The proxy server - proxy server:port number
 proxy=http://mycache.mydomain.com:3128
@@ -30,16 +31,17 @@
 proxy_password=qwerty

    Example 2. Configuration File Settings for Using A Proxy Server

    [Note]Global Settings

    If you define a proxy server in - /etc/yum.conf, all - users connect to the proxy server with those details when using - yum. + /etc/yum.conf, all + users connect to the proxy server with those details when using + yum.

    To enable proxy access for a specific user, add the lines in the example box below to the user's shell profile. For the default bash shell, the profile is the file ~/.bash_profile. The settings below enable - yum to use the proxy server mycache.mydomain.com, connecting - to port 3128. + yum to use the proxy server + mycache.mydomain.com, + connecting to port 3128. 

     # The Web proxy server used by this account
 http_proxy="http://mycache.mydomain.com:3128"
@@ -47,21 +49,19 @@

    Example 3. Profile Settings for Using a Proxy Server

    If the proxy server requires a username and password, add these to the URL. To include the username - yum-user and the password - qwerty, add these settings: + yum-user and the + password qwerty, add these settings: 

     # The Web proxy server, with the username and password for this account
 http_proxy="http://yum-user:qwerty at mycache.mydomain.com:3128"
 export http_proxy
-

    Example 4. Profile Settings for a Secured Proxy Server

    From fedora-extras-commits at redhat.com Wed Jul 27 06:18:00 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 02:18:00 -0400 Subject: common tobuild,1.2088,1.2089 Message-ID: <200507270618.j6R6I0xl011888@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11871 Modified Files: tobuild Log Message: remove more completed builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2088 retrieving revision 1.2089 diff -u -r1.2088 -r1.2089 --- tobuild 27 Jul 2005 06:11:24 -0000 1.2088 +++ tobuild 27 Jul 2005 06:17:58 -0000 1.2089 @@ -74,7 +74,6 @@ mschwendt devel/freeze freeze-2_5_0-4 devel mschwendt devel/tetex-lgrind tetex-lgrind-3_67-7 devel mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 -mschwendt rpms/tetex-lgrind/FC-3 tetex-lgrind-3_67-4_1 fc3 Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel @@ -107,8 +106,6 @@ nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel -ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel -oliver rpms/fish/FC-3 fish-1_12_0-1_fc3 fc3 oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 06:21:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 02:21:38 -0400 Subject: extras-buildsys/server UserInterface.py,1.30,1.31 Message-ID: <200507270621.j6R6Lc2S011918@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11901/server Modified Files: UserInterface.py Log Message: Don't require admin bit to list builders Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- UserInterface.py 26 Jul 2005 17:47:24 -0000 1.30 +++ UserInterface.py 27 Jul 2005 06:21:36 -0000 1.31 @@ -467,8 +467,6 @@ def list_builders(self): user = AuthedXMLRPCServer.get_authinfo() - if not user or not user.server_admin: - return (-1, "Insufficient privileges.") return UserInterface.list_builders(self) From fedora-extras-commits at redhat.com Wed Jul 27 06:59:35 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 02:59:35 -0400 Subject: extras-buildsys/www job.psp,1.1,1.2 Message-ID: <200507270659.j6R6xZlk012417@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12400/www Modified Files: job.psp Log Message: Beautify log display Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- job.psp 23 Jul 2005 00:55:31 -0000 1.1 +++ job.psp 27 Jul 2005 06:59:33 -0000 1.2 @@ -67,6 +67,7 @@ if job.has_key('result_msg') and job['result_msg'] and len(job['result_msg']): import urllib result_msg = urllib.unquote(str(job['result_msg'])) + result_msg = result_msg.replace("\n", "
    ") %>     <% From fedora-extras-commits at redhat.com Wed Jul 27 07:25:37 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 03:25:37 -0400 Subject: extras-buildsys/www job.psp,1.2,1.3 Message-ID: <200507270726.j6R7Q86W013664@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13632 Modified Files: job.psp Log Message: More pretty printing of log messages, patch from Ignacio Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- job.psp 27 Jul 2005 06:59:33 -0000 1.2 +++ job.psp 27 Jul 2005 07:25:35 -0000 1.3 @@ -67,7 +67,7 @@ if job.has_key('result_msg') and job['result_msg'] and len(job['result_msg']): import urllib result_msg = urllib.unquote(str(job['result_msg'])) - result_msg = result_msg.replace("\n", "
    ") + result_msg = "

    "+result_msg.replace("\n", "

    ")+"

    " %>     <% From fedora-extras-commits at redhat.com Wed Jul 27 07:25:38 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Wed, 27 Jul 2005 03:25:38 -0400 Subject: extras-buildsys/www/css style.css,1.3,1.4 Message-ID: <200507270726.j6R7Q8eI013667@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/css In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13632/css Modified Files: style.css Log Message: More pretty printing of log messages, patch from Ignacio Index: style.css =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/css/style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- style.css 23 Jul 2005 00:55:32 -0000 1.3 +++ style.css 27 Jul 2005 07:25:36 -0000 1.4 @@ -314,3 +314,8 @@ font-weight: normal; } +p.result { + margin-left: 2em; + text-indent: -2em; + margin-bottom: -1em; +} From fedora-extras-commits at redhat.com Wed Jul 27 07:54:57 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 27 Jul 2005 03:54:57 -0400 Subject: rpms/libcdio/FC-4 libcdio.spec,1.10,1.11 Message-ID: <200507270754.j6R7svSB013723@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13706 Modified Files: libcdio.spec Log Message: building without dependency on libcddb Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcdio.spec 26 Jul 2005 11:58:19 -0000 1.10 +++ libcdio.spec 27 Jul 2005 07:54:55 -0000 1.11 @@ -1,6 +1,6 @@ Name: libcdio Version: 0.75 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia @@ -10,7 +10,7 @@ Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.75.tar.gz.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libcddb-devel >= 0.9.4 +#BuildRequires: libcddb-devel >= 0.9.4 BuildRequires: pkgconfig BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig @@ -93,6 +93,9 @@ %changelog +* Wed Jul 27 2005 Adrian Reber - 0.75-3 +- Rebuilt without libcddb dependency (#164270) + * Tue Jul 26 2005 Adrian Reber - 0.75-2 - Rebuilt From fedora-extras-commits at redhat.com Wed Jul 27 07:55:24 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 27 Jul 2005 03:55:24 -0400 Subject: common tobuild,1.2089,1.2090 Message-ID: <200507270755.j6R7tONA013790@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13773 Modified Files: tobuild Log Message: request build of rpms/libcdio/FC-4 libcdio-0_75-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2089 retrieving revision 1.2090 diff -u -r1.2089 -r1.2090 --- tobuild 27 Jul 2005 06:17:58 -0000 1.2089 +++ tobuild 27 Jul 2005 07:55:22 -0000 1.2090 @@ -109,3 +109,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 +adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 08:02:23 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:02:23 -0400 Subject: common tobuild,1.2090,1.2091 Message-ID: <200507270802.j6R82roR015160@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15131 Modified Files: tobuild Log Message: request build of rpms/scim/FC-3 scim-1_4_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2090 retrieving revision 1.2091 diff -u -r1.2090 -r1.2091 --- tobuild 27 Jul 2005 07:55:22 -0000 1.2090 +++ tobuild 27 Jul 2005 08:02:16 -0000 1.2091 @@ -110,3 +110,4 @@ mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 +ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 08:05:04 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:05:04 -0400 Subject: common tobuild,1.2091,1.2092 Message-ID: <200507270805.j6R85RBi015201@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15178 Modified Files: tobuild Log Message: request build of rpms/scim/FC-4 scim-1_4_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2091 retrieving revision 1.2092 diff -u -r1.2091 -r1.2092 --- tobuild 27 Jul 2005 08:02:16 -0000 1.2091 +++ tobuild 27 Jul 2005 08:05:00 -0000 1.2092 @@ -111,3 +111,4 @@ oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 +ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 08:08:05 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:08:05 -0400 Subject: rpms/scim-tables/FC-3 scim-tables.spec,1.2,1.3 Message-ID: <200507270808.j6R88ZLw015352@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15335 Modified Files: scim-tables.spec Log Message: Rebuild for scim-1.4.0 Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-3/scim-tables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tables.spec 25 Jun 2005 15:11:53 -0000 1.2 +++ scim-tables.spec 27 Jul 2005 08:08:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -158,10 +158,13 @@ %changelog +* 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 - Fix download URL -* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 +* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 - Initial packaging for Fedora Extras. * Wed Jan 5 2005 James Su From fedora-extras-commits at redhat.com Wed Jul 27 08:09:40 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:09:40 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.2,1.3 Message-ID: <200507270809.j6R89eLj015385@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15363 Modified Files: scim-tables.spec Log Message: Rebuild for scim-1.4.0 Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tables.spec 25 Jun 2005 15:10:43 -0000 1.2 +++ scim-tables.spec 27 Jul 2005 08:09:38 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -158,10 +158,13 @@ %changelog +* 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 - Fix download URL -* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 +* Fri Jun 3 2005 Ryo Dairiki 0.5.1-1 - Initial packaging for Fedora Extras. * Wed Jan 5 2005 James Su From fedora-extras-commits at redhat.com Wed Jul 27 08:12:50 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:12:50 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.2,1.3 Message-ID: <200507270813.j6R8DVOD015686@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15669 Modified Files: scim-pinyin.spec Log Message: Rebuild for scim-1.4.0 Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-pinyin.spec 21 Jun 2005 01:34:49 -0000 1.2 +++ scim-pinyin.spec 27 Jul 2005 08:12:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -57,7 +57,10 @@ %changelog -* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 +* Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 +- Rebuild for scim-1.4.0 + +* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 - minor change on the files section * Mon Jun 20 2005 Jens Petersen - 0.5.0-2 From fedora-extras-commits at redhat.com Wed Jul 27 08:14:22 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 04:14:22 -0400 Subject: rpms/scim-pinyin/FC-3 scim-pinyin.spec,1.2,1.3 Message-ID: <200507270814.j6R8EMvp015740@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15723 Modified Files: scim-pinyin.spec Log Message: Rebuild for scim-1.4.0 Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-3/scim-pinyin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-pinyin.spec 21 Jun 2005 01:34:22 -0000 1.2 +++ scim-pinyin.spec 27 Jul 2005 08:14:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -57,7 +57,10 @@ %changelog -* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 +* Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 +- Rebuild for scim-1.4.0 + +* Tue Jun 21 2005 Ryo Dairiki -0.5.0-3 - minor change on the files section * Mon Jun 20 2005 Jens Petersen - 0.5.0-2 From fedora-extras-commits at redhat.com Wed Jul 27 08:30:04 2005 From: fedora-extras-commits at redhat.com (Karsten Hopp (karsten)) Date: Wed, 27 Jul 2005 04:30:04 -0400 Subject: devel/lincvs lincvs.spec,1.9,1.10 Message-ID: <200507270830.j6R8U4JJ015854@cvs-int.fedora.redhat.com> Author: karsten Update of /cvs/extras/devel/lincvs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15837 Modified Files: lincvs.spec Log Message: fix minor typo Index: lincvs.spec =================================================================== RCS file: /cvs/extras/devel/lincvs/lincvs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lincvs.spec 25 May 2005 21:32:12 -0000 1.9 +++ lincvs.spec 27 Jul 2005 08:30:02 -0000 1.10 @@ -17,7 +17,7 @@ Requires: cvs >= 0:1.9.0 %description -LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows ato load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible. +LinCVS is a graphical Interface for the cvs client commandline tool on the Unix and Windows platform. It allows to load modules from a server (checkout), create modules on the server (import), as well as checking the state of directories and individual files or updating them. Basic operations like add, remove and commit are supported as matter of course, just like showing the actual differences between the server version and the local sandbox, graphical display of the version tree, and manifoldy graphical support of project maintenance. All actions are logged on the cvs server (configurable via history), and are therewith comprehensible. To keep LinCVS independant of the cvs version, LinCVS uses the local but separat installed cvs and therewith always should work with the latest version. From fedora-extras-commits at redhat.com Wed Jul 27 08:42:01 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:42:01 -0400 Subject: rpms/nedit - New directory Message-ID: <200507270842.j6R8g13R015924@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15904/nedit Log Message: Directory /cvs/extras/rpms/nedit added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 08:42:02 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:42:02 -0400 Subject: rpms/nedit/devel - New directory Message-ID: <200507270842.j6R8g2ao015929@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15904/nedit/devel Log Message: Directory /cvs/extras/rpms/nedit/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 08:43:14 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:43:14 -0400 Subject: rpms/nedit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507270843.j6R8hEXg015985@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15954 Added Files: Makefile import.log Log Message: Setup of module nedit --- NEW FILE Makefile --- # Top level Makefile for module nedit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 27 08:43:14 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:43:14 -0400 Subject: rpms/nedit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507270843.j6R8hEOr015990@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15954/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nedit --- NEW 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 Jul 27 08:46:31 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:46:31 -0400 Subject: rpms/nedit import.log,1.1,1.2 Message-ID: <200507270847.j6R8l1Be016107@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16055 Modified Files: import.log Log Message: auto-import nedit-5.5-3 on branch devel from nedit-5.5-3.src.rpm initial nedit Fedora Extras import Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nedit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jul 2005 08:43:12 -0000 1.1 +++ import.log 27 Jul 2005 08:46:29 -0000 1.2 @@ -0,0 +1 @@ +nedit-5_5-3:HEAD:nedit-5.5-3.src.rpm:1122453723 From fedora-extras-commits at redhat.com Wed Jul 27 08:46:31 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:46:31 -0400 Subject: rpms/nedit/devel nedit-5.4-makefiles.patch, NONE, 1.1 nedit-5.4-security.patch, NONE, 1.1 nedit-5.5-motif223.patch, NONE, 1.1 nedit-5.5-utf8.patch, NONE, 1.1 nedit-5.5-varfix.patch, NONE, 1.1 nedit-icon.png, NONE, 1.1 nedit.desktop, NONE, 1.1 nedit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507270846.j6R8kV4c016098@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16055/devel Modified Files: .cvsignore sources Added Files: nedit-5.4-makefiles.patch nedit-5.4-security.patch nedit-5.5-motif223.patch nedit-5.5-utf8.patch nedit-5.5-varfix.patch nedit-icon.png nedit.desktop nedit.spec Log Message: auto-import nedit-5.5-3 on branch devel from nedit-5.5-3.src.rpm initial nedit Fedora Extras import nedit-5.4-makefiles.patch: --- NEW FILE nedit-5.4-makefiles.patch --- --- nedit-5.4/makefiles/Makefile.linux.makefiles 2003-05-20 02:27:56.000000000 +0200 +++ nedit-5.4/makefiles/Makefile.linux 2004-03-17 15:28:40.000000000 +0100 @@ -1,5 +1,5 @@ # $Id: Makefile.linux,v 1.11 2003/05/20 00:27:56 n8gray Exp $ -CC=cc +CC=gcc AR=ar # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS @@ -17,11 +17,11 @@ # To test if the Motif library exports the runtime version # add -DHAVE__XMVERSIONSTRING to CFLAGS # -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD +CFLAGS=$(RPM_OPT_FLAGS) -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD ARFLAGS=-urs -LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm +LIBS= -L/usr/X11R6/$(LIB) -lXm -Xmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm include Makefile.common nedit-5.4-security.patch: --- NEW FILE nedit-5.4-security.patch --- --- nedit-5.4/source/file.c.security 2003-09-28 16:18:12.000000000 +0200 +++ nedit-5.4/source/file.c 2004-03-17 15:25:31.000000000 +0100 @@ -1218,7 +1218,7 @@ */ void PrintString(const char *string, int length, Widget parent, const char *jobName) { - char tmpFileName[L_tmpnam]; /* L_tmpnam defined in stdio.h */ + char *tmpFileName=strdup("/tmp/neditXXXXXX"); FILE *fp; int fd; @@ -1229,14 +1229,10 @@ 1. Create a filename 2. Open the file with the O_CREAT|O_EXCL flags So all an attacker can do is a DoS on the print function. */ - tmpnam(tmpFileName); + fd = mkstemp(tmpFileName); /* open the temporary file */ -#ifdef VMS - if ((fp = fopen(tmpFileName, "w", "rfm = stmlf")) == NULL) -#else - if ((fd = open(tmpFileName, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR)) < 0 || (fp = fdopen(fd, "w")) == NULL) -#endif /* VMS */ + if ((fp = fdopen(fd, "w")) == NULL) { DialogF(DF_WARN, parent, 1, "Error while Printing", "Unable to write file for printing:\n%s", "Dismiss", @@ -1250,7 +1246,7 @@ /* write to the file */ #ifdef IBM_FWRITE_BUG - write(fileno(fp), string, length); + write(fd, string, length); #else fwrite(string, sizeof(char), length, fp); #endif @@ -1260,6 +1256,7 @@ "%s not printed:\n%s", "Dismiss", jobName, errorString()); fclose(fp); /* should call close(fd) in turn! */ remove(tmpFileName); + free(tmpFileName); return; } @@ -1270,6 +1267,7 @@ "Error closing temp. print file:\n%s", "Dismiss", errorString()); remove(tmpFileName); + free(tmpFileName); return; } @@ -1281,6 +1279,7 @@ PrintFile(parent, tmpFileName, jobName); remove(tmpFileName); #endif /*VMS*/ + free(tmpFileName); return; } nedit-5.5-motif223.patch: --- NEW FILE nedit-5.5-motif223.patch --- --- nedit-5.5/util/check_lin_tif.c.motif223 2004-07-21 13:32:07.000000000 +0200 +++ nedit-5.5/util/check_lin_tif.c 2004-12-27 10:06:36.378060568 +0100 @@ -255,6 +255,11 @@ int main() { exit(0); } + /* Check for Open Motif 2.2.3 and up */ + if (!force_bad && XmVERSION == 2 && XmREVISION == 2 && XmUPDATE_LEVEL > 2) { + exit(0); + } + /* Check for the dreaded Open Motif 2.2.2 (some variants of which claim to be 2.2.3, but the version string gives them away). */ if (force_bad || nedit-5.5-utf8.patch: --- NEW FILE nedit-5.5-utf8.patch --- --- nedit-5.5/source/nedit.c.utf8 2004-09-02 10:49:56.000000000 +0200 +++ nedit-5.5/source/nedit.c 2004-12-27 09:59:40.997208056 +0100 @@ -90,6 +90,7 @@ static int checkDoMacroArg(const char *m static String neditLanguageProc(Display *dpy, String xnl, XtPointer closure); static void maskArgvKeywords(int argc, char **argv, const char **maskArgs); static void unmaskArgvKeywords(int argc, char **argv, const char **maskArgs); +static void changeLocaleIfUTF8(void); static void patchResourcesForVisual(void); static void patchResourcesForKDEbug(void); static void patchLocaleForMotif(void); @@ -392,6 +393,8 @@ int main(int argc, char **argv) /* Save the command which was used to invoke nedit for restart command */ ArgV0 = argv[0]; + changeLocaleIfUTF8(); + /* Set locale for C library, X, and Motif input functions. Reverts to "C" if requested locale not available. */ XtSetLanguageProc(NULL, neditLanguageProc, NULL); @@ -1035,6 +1038,32 @@ static String neditLanguageProc(Display return setlocale(LC_ALL, NULL); /* re-query in case overwritten */ } +static void changeLocaleIfUTF8(void) +{ + char *locale; + + locale = getenv("LANG"); + if (!locale) { + locale = setlocale(LC_ALL, NULL); + } + + if (locale) { + char *ptr; + + ptr = strstr(locale, ".UTF-8"); + if (ptr) { + fprintf(stderr, "nedit: the current locale is utf8 (%s)\n", locale); + + ptr[0] = '\0'; + + setenv("LC_ALL", locale, 1); + locale = setlocale(LC_ALL, locale); + + fprintf(stderr, "nedit: changed locale to non-utf8 (%s)\n", locale); + } + } +} + static int sortAlphabetical(const void* k1, const void* k2) { const char* key1 = *(const char**)k1; nedit-5.5-varfix.patch: --- NEW FILE nedit-5.5-varfix.patch --- --- nedit-5.5/source/server.c.varfix 2004-07-21 13:32:05.000000000 +0200 +++ nedit-5.5/source/server.c 2005-01-12 11:12:08.989922248 +0100 @@ -340,7 +340,7 @@ static void processServerCommandString(c char *fullname, filename[MAXPATHLEN], pathname[MAXPATHLEN]; char *doCommand, *geometry, *langMode, *inPtr; int editFlags, stringLen = strlen(string); - int lineNum, createFlag, readFlag, iconicFlag, lastIconic = 0, tabbed; + int lineNum, createFlag, readFlag, iconicFlag, lastIconic = 0, tabbed = 0; int fileLen, doLen, lmLen, geomLen, charsRead, itemsRead; WindowInfo *window, *lastFile = NULL; long currentDesktop = QueryCurrentDesktop(TheDisplay, --- NEW FILE nedit.desktop --- [Desktop Entry] Encoding=UTF-8 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Comment=Text Editor Comment[bg]=Nedit ???????????????? Comment[ca]=Editor Nedit Comment[cs]=Editor Nedit Comment[eo]=redaktilo Nedit Comment[et]=Tekstiredaktor Nedit Comment[fi]=Nedit-editori Comment[fr]=??diteur Nedit Comment[hu]=Nedit sz??vegszerkeszt?? Comment[is]=Nedit-ritill Comment[mk]=Nedit - ?????????? ?? ?????????? ???????????????? Comment[pt]=Editor Nedit Comment[ro]=Editorul Nedit Comment[ru]=???????????????? Nedit Comment[sk]=Editor Nedit Comment[sl]=Urejevalnik Nedit Comment[uk]=???????????????? Nedit Name=Nedit Name[et]=Tekstiredaktor Nedit Name[ru]=NEdit Exec=nedit %f Icon=nedit-icon.png Path= Type=Application Terminal=false --- NEW FILE nedit.spec --- %define desktop_file 1 %if %{desktop_file} %define desktop_file_utils_version 0.2.93 %endif Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 Release: 3 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png Patch0: nedit-5.4-security.patch Patch1: nedit-5.4-makefiles.patch Patch2: nedit-5.5-utf8.patch Patch3: nedit-5.5-motif223.patch Patch4: nedit-5.5-varfix.patch URL: http://nedit.org License: distributable Group: Applications/Editors BuildRoot: %{_tmppath}/%{name}-root BuildRequires: openmotif-devel >= 2.2.3 %if %{desktop_file} BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version} %endif %description NEdit is a GUI text editor for the X Window System and Motif. NEdit is very easy to use, especially if you are familiar with the Macintosh(TM) or Microsoft(TM) Windows(TM) style of interface. %prep %setup -q %patch0 -p1 -b .security %patch1 -p1 -b .makefiles %patch2 -p1 -b .utf8 %patch3 -p1 -b .motif223 %patch4 -p1 -b .varfix %build make linux LIB=%{_lib} %install rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1 install -s -m 755 source/nedit source/nc $RPM_BUILD_ROOT%{_prefix}/X11R6/bin install -m 644 doc/nedit.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/nedit.1x install -m 644 doc/nc.man $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1/nc.1x mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/applnk/Applications %if %{desktop_file} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/applications desktop-file-install --vendor fedora --delete-original \ --dir $RPM_BUILD_ROOT%{_prefix}/share/applications \ --add-category "Application;Development;X-Fedora" \ $RPM_BUILD_ROOT/etc/X11/applnk/Applications/nedit.desktop %endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc doc/nedit.doc README ReleaseNotes %{_prefix}/X11R6/man/*/* %{_prefix}/X11R6/bin/* %if %{desktop_file} %{_prefix}/share/applications/* %{_datadir}/pixmaps/nedit-icon.png %else %config /etc/X11/applnk/Applications/nedit.desktop %endif %changelog * Mon Jan 20 2005 Jindrich Novy 5.5-3 - prepare the spec and desktop file for Extras inclusion * Wed Jan 12 2005 Jindrich Novy 5.5-2 - fix usage of uninitialized variable (#144790) * Mon Dec 27 2004 Jindrich Novy 5.5-1 - new version 5.5 * Mon Sep 20 2004 Jindrich Novy - added nedit icon to be present in menus #131601 - updated spec to put it to the right place - icon made by Joor Loohuis (joor at users.sourceforge.net) - the icon processed by Peter Vrabec (pvrabec at usu.cz) * Tue Jun 15 2004 Elliot Lee - rebuilt * Wed Mar 17 2004 Thomas Woerner 5.4-1 - new version 5.4 * Fri Feb 13 2004 Elliot Lee - rebuilt * Fri Dec 5 2003 Tim Waugh - Don't explicitly require openmotif, since rpm does library dependencies automatically. - Binary package doesn't require desktop-file-install. * Fri Dec 5 2003 Tim Waugh 5.3-6 - Add ugly hack to work around openmotif's lack of UTF-8 support (bug #75189). - Back-port 5.4RC2 fix for uninitialized variable (bug #110898). * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed Jan 22 2003 Tim Powers - rebuilt * Fri Nov 8 2002 Tim Waugh 5.3-3 - Handle X11 libdir issue. * Tue Oct 22 2002 Tim Waugh 5.3-2 - Remove original desktop file when installing. - Fix desktop file icon (bug #61677). * Wed Jul 24 2002 Karsten Hopp - 5.3 - use desktop-file-utils (#69461) - redo all patches * Fri Jun 21 2002 Tim Powers - automated rebuild * Thu May 23 2002 Tim Powers - automated rebuild * Fri Mar 22 2002 Tim Powers - rebuilt against openmotif-2.2.2 * Fri Mar 1 2002 Than Ngo 1.2-1 - update to 1.2 - cleanup patch files * Thu Jan 17 2002 Than Ngo 5.1.1-13 - rebuild against openmotif * Wed Jan 09 2002 Tim Powers - automated rebuild * Thu Oct 25 2001 Bill Nottingham - 0 != NULL. lather, rinse, repeat. (#54943) * Mon Aug 20 2001 Bernhard Rosenkraenzer - Fix crash while printing (#45149) I still think removing the package would be the better fix, though. * Sun Jun 10 2001 Than Ngo - requires lesstif-devel * Tue May 22 2001 Tim Powers - patched to use lesstif * Fri Apr 27 2001 Bernhard Rosenkraenzer - Fix security bug, use mkstemp() * Fri Oct 13 2000 Preston Brown - .desktop file added * Mon Jul 24 2000 Prospector - rebuilt * Mon Jul 10 2000 Tim Powers - rebuilt * Sat Jun 17 2000 Than Ngo - rebuilt against openmotif-2.1.30 - use PRM macros * Tue May 16 2000 Tim Powers - updated to 5.1.1 - updated URL and source location * Wed Aug 18 1999 Tim Powers - excludearch alpha * Mon Jul 19 1999 Tim Powers - rebuilt for 6.1 * Thu Apr 15 1999 Michael Maher - built package for 6.0 * Wed Oct 14 1998 Michael Maher - built package for 5.2 * Thu May 21 1998 Cristian Gafton - upgraded to 5.0.2 * Thu Nov 20 1997 Otto Hammersmith - added wmconfig * Mon Nov 17 1997 Otto Hammersmith - added changelog - fixed src url - added URL tag Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Jul 2005 08:43:12 -0000 1.1 +++ .cvsignore 27 Jul 2005 08:46:29 -0000 1.2 @@ -0,0 +1 @@ +nedit-5.5-src.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Jul 2005 08:43:12 -0000 1.1 +++ sources 27 Jul 2005 08:46:29 -0000 1.2 @@ -0,0 +1 @@ +48cb3dce52d44988f3a4d7c6f47b6bbe nedit-5.5-src.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 27 08:47:20 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 27 Jul 2005 04:47:20 -0400 Subject: fedora-security/audit fc4,1.31,1.32 Message-ID: <200507270847.j6R8lLfa016135@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16118 Modified Files: fc4 Log Message: Updates from Mitre Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- fc4 25 Jul 2005 08:38:06 -0000 1.31 +++ fc4 27 Jul 2005 08:47:18 -0000 1.32 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20050714 -Up to date FC4 as of 20050714 +Up to date CVE as of CVE email 20050726 +Up to date FC4 as of 20050726 ** are items that need attention +2005-2370 backport (kdenetwork) [since FEDORA-2005-624] +2005-2369 backport (kdenetwork) [since FEDORA-2005-624] +2005-2368 VULNERABLE (vim) 2005-2355 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] From fedora-extras-commits at redhat.com Wed Jul 27 08:51:29 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:51:29 -0400 Subject: rpms/nedit/devel nedit.spec,1.1,1.2 Message-ID: <200507270851.j6R8pTbn016190@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16173 Modified Files: nedit.spec Log Message: initial extras build Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nedit.spec 27 Jul 2005 08:46:29 -0000 1.1 +++ nedit.spec 27 Jul 2005 08:51:27 -0000 1.2 @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 3 +Release: 4 Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -76,6 +76,9 @@ %endif %changelog +* Wed Jul 27 2005 Jindrich Novy 5.5-4 +- initial Extras built + * Mon Jan 20 2005 Jindrich Novy 5.5-3 - prepare the spec and desktop file for Extras inclusion From fedora-extras-commits at redhat.com Wed Jul 27 08:52:10 2005 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Wed, 27 Jul 2005 04:52:10 -0400 Subject: common tobuild,1.2092,1.2093 Message-ID: <200507270852.j6R8qALD016254@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16237 Modified Files: tobuild Log Message: request build of rpms/nedit/devel nedit-5_5-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2092 retrieving revision 1.2093 diff -u -r1.2092 -r1.2093 --- tobuild 27 Jul 2005 08:05:00 -0000 1.2092 +++ tobuild 27 Jul 2005 08:52:08 -0000 1.2093 @@ -112,3 +112,4 @@ adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 +jnovy rpms/nedit/devel nedit-5_5-4 devel From fedora-extras-commits at redhat.com Wed Jul 27 09:25:41 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 27 Jul 2005 05:25:41 -0400 Subject: rpms/flumotion/FC-4 flumotion.spec,1.5,1.6 Message-ID: <200507270925.j6R9PfPH017437@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17420 Modified Files: flumotion.spec Log Message: geez, could I be any more stupid ? Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-4/flumotion.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flumotion.spec 25 Jul 2005 18:22:34 -0000 1.5 +++ flumotion.spec 27 Jul 2005 09:25:39 -0000 1.6 @@ -1,6 +1,6 @@ Name: flumotion -Version: 0.1.9%{?dist} -Release: 1 +Version: 0.1.9 +Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet From fedora-extras-commits at redhat.com Wed Jul 27 09:26:39 2005 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 27 Jul 2005 05:26:39 -0400 Subject: common tobuild,1.2093,1.2094 Message-ID: <200507270926.j6R9Qd9N017499@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17482 Modified Files: tobuild Log Message: request build of rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2093 retrieving revision 1.2094 diff -u -r1.2093 -r1.2094 --- tobuild 27 Jul 2005 08:52:08 -0000 1.2093 +++ tobuild 27 Jul 2005 09:26:37 -0000 1.2094 @@ -113,3 +113,4 @@ ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 jnovy rpms/nedit/devel nedit-5_5-4 devel +thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 12:05:12 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 08:05:12 -0400 Subject: devel/common tobuild,1.2094,1.2095 Message-ID: <200507271205.j6RC5hwg021144@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21127 Modified Files: tobuild Log Message: modify build requests to appear like they were done from within an rpms/ module checkout Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2094 retrieving revision 1.2095 diff -u -r1.2094 -r1.2095 --- tobuild 27 Jul 2005 09:26:37 -0000 1.2094 +++ tobuild 27 Jul 2005 12:04:48 -0000 1.2095 @@ -36,7 +36,7 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 -mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel +mschwendt rpms/sylpheed/devel sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel @@ -70,9 +70,9 @@ bpepple rpms/liferea/FC-4 liferea-0_9_4-1_fc4 fc4 orion rpms/pytz/devel pytz-2005i-2 devel scop rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 fc4 -mschwendt devel/cksfv cksfv-1_3-4 devel -mschwendt devel/freeze freeze-2_5_0-4 devel -mschwendt devel/tetex-lgrind tetex-lgrind-3_67-7 devel +mschwendt rpms/cksfv/devel cksfv-1_3-4 devel +mschwendt rpms/freeze/devel freeze-2_5_0-4 devel +mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 @@ -100,14 +100,14 @@ thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 -mschwendt devel/meld meld-1_0_0-1_fc5 devel +mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 -mschwendt devel/inkscape inkscape-0_42-1_fc5 devel +mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 -mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel +mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 13:18:16 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 27 Jul 2005 09:18:16 -0400 Subject: rpms/umfpack/devel umfpack.spec,1.1,1.2 Message-ID: <200507271318.j6RDIGXs022469@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/umfpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22452 Modified Files: umfpack.spec Log Message: Add missing build requirement. Index: umfpack.spec =================================================================== RCS file: /cvs/extras/rpms/umfpack/devel/umfpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- umfpack.spec 20 Jul 2005 16:57:00 -0000 1.1 +++ umfpack.spec 27 Jul 2005 13:18:14 -0000 1.2 @@ -1,6 +1,6 @@ Name: umfpack Version: 4.4 -Release: 1 +Release: 2 Summary: Routines for solving unsymmetric sparse linear systems Group: System Environment/Libraries @@ -25,6 +25,7 @@ Summary: Development headers and files for UMFPACK Group: Development/Libraries Requires: %{name} = %{version}-%{release} +BuildRequires: blas %description devel The umfpack-devel package contains files needed for developing @@ -97,5 +98,8 @@ %{_libdir}/lib*.so %changelog +* Wed Jul 27 2005 Quentin Spencer 4.4-2 +- Add blas to BuildRequires. + * Wed Jul 20 2005 Quentin Spencer 4.4-1 - First version. From fedora-extras-commits at redhat.com Wed Jul 27 13:21:42 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 27 Jul 2005 09:21:42 -0400 Subject: common tobuild,1.2095,1.2096 Message-ID: <200507271321.j6RDLgrS022542@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22524 Modified Files: tobuild Log Message: request build of rpms/umfpack/devel umfpack-4_4-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2095 retrieving revision 1.2096 diff -u -r1.2095 -r1.2096 --- tobuild 27 Jul 2005 12:04:48 -0000 1.2095 +++ tobuild 27 Jul 2005 13:21:40 -0000 1.2096 @@ -114,3 +114,4 @@ ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 jnovy rpms/nedit/devel nedit-5_5-4 devel thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 +qspencer rpms/umfpack/devel umfpack-4_4-2 devel From fedora-extras-commits at redhat.com Wed Jul 27 13:28:20 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 09:28:20 -0400 Subject: owners owners.list,1.34,1.35 Message-ID: <200507271328.j6RDSKbX022581@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22564 Modified Files: owners.list Log Message: Transfer kphone and ktrack to dgilmore Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- owners.list 27 Jul 2005 01:43:49 -0000 1.34 +++ owners.list 27 Jul 2005 13:28:17 -0000 1.35 @@ -327,9 +327,9 @@ Fedora Extras|koffice|A set of office applications for KDE|than at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|konversation|An easy to use irc client for KDE|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|kover|WYSIWYG CD cover printer with CDDB support|adrian at lisas.de|extras-qa at fedoraproject.org| -Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at dgilmore.net|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|ivazquez at ivazquez.net|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| Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Jul 27 14:42:19 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 27 Jul 2005 10:42:19 -0400 Subject: rpms/mhonarc/devel .cvsignore, 1.5, 1.6 mhonarc.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507271442.j6REgJS3023905@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/mhonarc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23884 Modified Files: .cvsignore mhonarc.spec sources Log Message: - version 2.5.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Jul 2005 15:09:00 -0000 1.5 +++ .cvsignore 27 Jul 2005 14:42:16 -0000 1.6 @@ -1 +1 @@ -MHonArc-2.6.14.tar.bz2 +MHonArc-2.6.15.tar.bz2 Index: mhonarc.spec =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mhonarc.spec 23 Jul 2005 15:09:00 -0000 1.9 +++ mhonarc.spec 27 Jul 2005 14:42:16 -0000 1.10 @@ -1,12 +1,12 @@ Name: mhonarc -Version: 2.6.14 +Version: 2.6.15 Release: 1%{?dist} Summary: Perl mail-to-HTML converter Group: Applications/Internet License: GPL URL: http://www.mhonarc.org/ -Source: http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.14.tar.bz2 +Source: http://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.15.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -50,6 +50,9 @@ %changelog +* Wed Jul 27 2005 Aurelien Bompard 2.6.15-1 +- version 2.6.15 + * Sat Jul 23 2005 Aurelien Bompard 2.6.14-1 - version 2.6.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Jul 2005 15:09:00 -0000 1.5 +++ sources 27 Jul 2005 14:42:16 -0000 1.6 @@ -1 +1 @@ -c0565ec34a4cfaaee9cbfa76fe817539 MHonArc-2.6.14.tar.bz2 +4617930d593288d1714c3b1f91029314 MHonArc-2.6.15.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 27 14:43:43 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 27 Jul 2005 10:43:43 -0400 Subject: rpms/mhonarc/devel mhonarc.spec,1.10,1.11 Message-ID: <200507271443.j6REhhLp023960@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/mhonarc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23943 Modified Files: mhonarc.spec Log Message: - rebuild to fix make tag mistake Index: mhonarc.spec =================================================================== RCS file: /cvs/extras/rpms/mhonarc/devel/mhonarc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mhonarc.spec 27 Jul 2005 14:42:16 -0000 1.10 +++ mhonarc.spec 27 Jul 2005 14:43:41 -0000 1.11 @@ -1,6 +1,6 @@ Name: mhonarc Version: 2.6.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl mail-to-HTML converter Group: Applications/Internet @@ -50,6 +50,9 @@ %changelog +* Wed Jul 27 2005 Aurelien Bompard 2.6.15-2 +- rebuild + * Wed Jul 27 2005 Aurelien Bompard 2.6.15-1 - version 2.6.15 From fedora-extras-commits at redhat.com Wed Jul 27 14:44:45 2005 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Wed, 27 Jul 2005 10:44:45 -0400 Subject: common tobuild,1.2096,1.2097 Message-ID: <200507271444.j6REijsU024043@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24026 Modified Files: tobuild Log Message: request build of rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2096 retrieving revision 1.2097 diff -u -r1.2096 -r1.2097 --- tobuild 27 Jul 2005 13:21:40 -0000 1.2096 +++ tobuild 27 Jul 2005 14:44:43 -0000 1.2097 @@ -115,3 +115,4 @@ jnovy rpms/nedit/devel nedit-5_5-4 devel thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 qspencer rpms/umfpack/devel umfpack-4_4-2 devel +abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 16:30:42 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Wed, 27 Jul 2005 12:30:42 -0400 Subject: common tobuild,1.2097,1.2098 Message-ID: <200507271630.j6RGUgCB026525@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26503 Modified Files: tobuild Log Message: cleanup of my failed builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2097 retrieving revision 1.2098 diff -u -r1.2097 -r1.2098 --- tobuild 27 Jul 2005 14:44:43 -0000 1.2097 +++ tobuild 27 Jul 2005 16:30:39 -0000 1.2098 @@ -3,15 +3,12 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 -adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 18:07:25 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 27 Jul 2005 14:07:25 -0400 Subject: extras-buildsys ChangeLog,1.76,1.77 Message-ID: <200507271807.j6RI7Pfk028990@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28937 Modified Files: ChangeLog Log Message: 2005-07-27 Jeremy Katz * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ChangeLog 26 Jul 2005 23:38:51 -0000 1.76 +++ ChangeLog 27 Jul 2005 18:07:23 -0000 1.77 @@ -1,3 +1,7 @@ +2005-07-27 Jeremy Katz + + * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 + 2005-07-26 Dan Williams - www/config.psp From fedora-extras-commits at redhat.com Wed Jul 27 18:07:06 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 27 Jul 2005 14:07:06 -0400 Subject: extras-buildsys/builder builder.py,1.25,1.26 Message-ID: <200507271807.j6RI7ZNX028995@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28937/builder Modified Files: builder.py Log Message: 2005-07-27 Jeremy Katz * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- builder.py 22 Jul 2005 21:35:26 -0000 1.25 +++ builder.py 27 Jul 2005 18:06:46 -0000 1.26 @@ -425,7 +425,7 @@ def __init__(self, uniqid, target, buildarch, srpm_url): self.buildroot = resolve_buildroot_name(target, 'ppc') self.buildarch = buildarch - self.arch_command = '' + self.arch_command = '/usr/bin/setarch ppc32' BuilderMock.__init__(self, uniqid, target, srpm_url) class PPC64Arch(BuilderMock): From fedora-extras-commits at redhat.com Wed Jul 27 18:13:14 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 14:13:14 -0400 Subject: common tobuild,1.2098,1.2099 Message-ID: <200507271813.j6RIDE9u029240@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29223 Modified Files: tobuild Log Message: clean up succeeded or bad builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2098 retrieving revision 1.2099 diff -u -r1.2098 -r1.2099 --- tobuild 27 Jul 2005 16:30:39 -0000 1.2098 +++ tobuild 27 Jul 2005 18:13:12 -0000 1.2099 @@ -5,8 +5,6 @@ anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel -scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 -scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 @@ -45,11 +43,8 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel -tagoh rpms/apel/devel apel-10_6-8_fc5 devel qspencer rpms/umfpack/devel umfpack-4_4-1 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 -thias rpms/cdlabelgen/FC-4 cdlabelgen-3_5_0-1_fc4 fc4 -thias rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 devel icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel @@ -94,7 +89,6 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel -thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 18:27:17 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 27 Jul 2005 14:27:17 -0400 Subject: common tobuild,1.2099,1.2100 Message-ID: <200507271827.j6RIRHBe029730@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29713 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2099 retrieving revision 1.2100 diff -u -r1.2099 -r1.2100 --- tobuild 27 Jul 2005 18:13:12 -0000 1.2099 +++ tobuild 27 Jul 2005 18:27:15 -0000 1.2100 @@ -43,7 +43,6 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel -qspencer rpms/umfpack/devel umfpack-4_4-1 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 18:46:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 14:46:26 -0400 Subject: common tobuild,1.2100,1.2101 Message-ID: <200507271846.j6RIkQS5029786@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29767 Modified Files: tobuild Log Message: gcfiles source not updated - removing Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2100 retrieving revision 1.2101 diff -u -r1.2100 -r1.2101 --- tobuild 27 Jul 2005 18:27:15 -0000 1.2100 +++ tobuild 27 Jul 2005 18:46:24 -0000 1.2101 @@ -65,7 +65,6 @@ mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 -Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 19:38:16 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 15:38:16 -0400 Subject: common tobuild,1.2101,1.2102 Message-ID: <200507271938.j6RJcGai031056@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31039 Modified Files: tobuild Log Message: remove failed build Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2101 retrieving revision 1.2102 diff -u -r1.2101 -r1.2102 --- tobuild 27 Jul 2005 18:46:24 -0000 1.2101 +++ tobuild 27 Jul 2005 19:38:14 -0000 1.2102 @@ -41,7 +41,6 @@ byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 -roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 19:38:55 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 15:38:55 -0400 Subject: rpms/monotone/devel monotone.spec,1.1,1.2 Message-ID: <200507271938.j6RJctjR031084@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/monotone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31067 Modified Files: monotone.spec Log Message: - Include monotone-nav.el too. - Add BuildRequires on cvs so the test suite can run. Index: monotone.spec =================================================================== RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- monotone.spec 18 Jul 2005 23:53:09 -0000 1.1 +++ monotone.spec 27 Jul 2005 19:38:53 -0000 1.2 @@ -1,6 +1,6 @@ Name: monotone Version: 0.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -21,6 +21,9 @@ %define bundled_sqlite no %endif +# The test suite needs cvs. +BuildRequires: cvs + BuildRequires: emacs Requires(post): /sbin/install-info @@ -52,8 +55,8 @@ lispdir=%{buildroot}/%{_datadir}/emacs/site-lisp mkdir -p ${lispdir} -%{__install} -c -m 0444 contrib/monotone.el ${lispdir}/monotone.el -emacs -batch -f batch-byte-compile ${lispdir}/monotone.el +%{__install} -c -m 0444 contrib/monotone*.el ${lispdir} +emacs -batch -f batch-byte-compile ${lispdir} %clean rm -rf %{buildroot} @@ -78,9 +81,13 @@ %{_bindir}/monotone %{_infodir}/monotone.info* %{_mandir}/man1/monotone.1* -%{_datadir}/emacs/site-lisp/monotone.el* +%{_datadir}/emacs/site-lisp/monotone*.el* %changelog +* Wed Jul 27 2005 Roland McGrath - 0.21-2 +- Include monotone-nav.el too. +- Add BuildRequires on cvs so the test suite can run. + * Mon Jul 18 2005 Roland McGrath - 0.21-1 - Updated for 0.21 release. - Install Emacs support. From fedora-extras-commits at redhat.com Wed Jul 27 19:39:43 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 15:39:43 -0400 Subject: common tobuild,1.2102,1.2103 Message-ID: <200507271939.j6RJdhG0031153@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31136 Modified Files: tobuild Log Message: request build of rpms/monotone/devel monotone-0_21-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2102 retrieving revision 1.2103 diff -u -r1.2102 -r1.2103 --- tobuild 27 Jul 2005 19:38:14 -0000 1.2102 +++ tobuild 27 Jul 2005 19:39:41 -0000 1.2103 @@ -104,3 +104,4 @@ thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel +roland rpms/monotone/devel monotone-0_21-2_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 20:11:43 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:11:43 -0400 Subject: rpms/wesnoth/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wesnoth.spec, 1.5, 1.6 Message-ID: <200507272012.j6RKCD4k000455@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397/FC-3 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jul 2005 17:22:31 -0000 1.4 +++ .cvsignore 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -wesnoth-0.9.3.tar.gz +wesnoth-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jul 2005 17:22:31 -0000 1.4 +++ sources 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz +b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-3/wesnoth.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wesnoth.spec 22 Jul 2005 17:22:31 -0000 1.5 +++ wesnoth.spec 27 Jul 2005 20:11:41 -0000 1.6 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 +- update to 0.9.4 + * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 From fedora-extras-commits at redhat.com Wed Jul 27 20:11:44 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:11:44 -0400 Subject: rpms/wesnoth/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wesnoth.spec, 1.9, 1.10 Message-ID: <200507272012.j6RKCEY1000460@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397/FC-4 Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Jul 2005 17:21:31 -0000 1.4 +++ .cvsignore 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -wesnoth-0.9.3.tar.gz +wesnoth-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Jul 2005 17:21:31 -0000 1.4 +++ sources 27 Jul 2005 20:11:41 -0000 1.5 @@ -1 +1 @@ -833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz +b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/FC-4/wesnoth.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wesnoth.spec 22 Jul 2005 17:21:31 -0000 1.9 +++ wesnoth.spec 27 Jul 2005 20:11:41 -0000 1.10 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 +- update to 0.9.4 + * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 From fedora-extras-commits at redhat.com Wed Jul 27 20:11:44 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:11:44 -0400 Subject: rpms/wesnoth/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wesnoth.spec, 1.13, 1.14 Message-ID: <200507272012.j6RKCEvr000463@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wesnoth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv397/devel Modified Files: .cvsignore sources wesnoth.spec Log Message: * Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 - update to 0.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Jul 2005 10:07:50 -0000 1.5 +++ .cvsignore 27 Jul 2005 20:11:42 -0000 1.6 @@ -1 +1 @@ -wesnoth-0.9.3.tar.gz +wesnoth-0.9.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Jul 2005 10:07:50 -0000 1.5 +++ sources 27 Jul 2005 20:11:42 -0000 1.6 @@ -1 +1 @@ -833bd6995a26c873485750875607f127 wesnoth-0.9.3.tar.gz +b27115df93298a8ee192a85499f26ef2 wesnoth-0.9.4.tar.gz Index: wesnoth.spec =================================================================== RCS file: /cvs/extras/rpms/wesnoth/devel/wesnoth.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wesnoth.spec 22 Jul 2005 17:20:06 -0000 1.13 +++ wesnoth.spec 27 Jul 2005 20:11:42 -0000 1.14 @@ -1,5 +1,5 @@ Name: wesnoth -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} Summary: Battle for Wesnoth, a fantasy turn-based strategy game @@ -145,6 +145,9 @@ %ghost /var/run/wesnothd/socket %changelog +* Wed Jul 27 2005 Michael Schwendt - 0.9.4-1 +- update to 0.9.4 + * Fri Jul 8 2005 Michael Schwendt - 0.9.3-1 - update to 0.9.3 From fedora-extras-commits at redhat.com Wed Jul 27 20:15:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:15:08 -0400 Subject: common tobuild,1.2103,1.2104 Message-ID: <200507272015.j6RKF8PV000763@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv744 Modified Files: tobuild Log Message: request build of rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2103 retrieving revision 1.2104 diff -u -r1.2103 -r1.2104 --- tobuild 27 Jul 2005 19:39:41 -0000 1.2103 +++ tobuild 27 Jul 2005 20:15:06 -0000 1.2104 @@ -105,3 +105,4 @@ qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel +mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 20:15:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 16:15:32 -0400 Subject: common tobuild,1.2104,1.2105 Message-ID: <200507272015.j6RKFWfN000796@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv779 Modified Files: tobuild Log Message: request build of rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2104 retrieving revision 1.2105 diff -u -r1.2104 -r1.2105 --- tobuild 27 Jul 2005 20:15:06 -0000 1.2104 +++ tobuild 27 Jul 2005 20:15:30 -0000 1.2105 @@ -106,3 +106,4 @@ abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 +mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 20:51:08 2005 From: fedora-extras-commits at redhat.com (Christian Jodar (Tian)) Date: Wed, 27 Jul 2005 16:51:08 -0400 Subject: rpms/gcfilms/devel sources,1.3,1.4 Message-ID: <200507272051.j6RKp8s4001507@cvs-int.fedora.redhat.com> Author: Tian Update of /cvs/extras/rpms/gcfilms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1478 Modified Files: sources Log Message: New upstream Index: sources =================================================================== RCS file: /cvs/extras/rpms/gcfilms/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Jun 2005 16:58:41 -0000 1.3 +++ sources 27 Jul 2005 20:51:06 -0000 1.4 @@ -1 +1 @@ -5b8954427e264998b8078bc0a0b1be6f gcfilms-5.2.tar.gz +58743009cb2d5a821f33205efa8d4346 gcfilms-5.3.tar.gz From fedora-extras-commits at redhat.com Wed Jul 27 22:18:12 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:18:12 -0400 Subject: rpms/scim/FC-4 scim.spec,1.5,1.6 Message-ID: <200507272218.j6RMICLH004370@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4337 Modified Files: scim.spec Log Message: Fix the permission of %{_libdir}/scim-1.0 Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim.spec 26 Jul 2005 08:15:19 -0000 1.5 +++ scim.spec 27 Jul 2005 22:18:10 -0000 1.6 @@ -43,7 +43,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm @@ -137,6 +137,7 @@ %changelog * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release +- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 22:18:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:18:02 -0400 Subject: rpms/scim/FC-3 scim.spec,1.5,1.6 Message-ID: <200507272218.j6RMIW3e004406@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4335 Modified Files: scim.spec Log Message: Fix the permission of %{_libdir}/scim-1.0 Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim.spec 26 Jul 2005 06:34:08 -0000 1.5 +++ scim.spec 27 Jul 2005 22:17:53 -0000 1.6 @@ -43,7 +43,7 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm @@ -137,6 +137,7 @@ %changelog * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release +- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 22:20:10 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:20:10 -0400 Subject: rpms/scim/FC-3 scim.spec,1.6,1.7 Message-ID: <200507272220.j6RMKAE2004433@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4416 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim.spec 27 Jul 2005 22:17:53 -0000 1.6 +++ scim.spec 27 Jul 2005 22:20:08 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -135,9 +135,11 @@ #-------------------------------------------------- %changelog +* Thr Jul 28 2005 Jens Petersen -1.4.0-2 +- create scim-1.0 dirs to be accessible (Jens Petersen) + * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release -- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 22:21:12 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:21:12 -0400 Subject: rpms/scim/FC-3 scim.spec,1.7,1.8 Message-ID: <200507272221.j6RMLCY8004458@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4441 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim.spec 27 Jul 2005 22:20:08 -0000 1.7 +++ scim.spec 27 Jul 2005 22:21:10 -0000 1.8 @@ -135,7 +135,7 @@ #-------------------------------------------------- %changelog -* Thr Jul 28 2005 Jens Petersen -1.4.0-2 +* Thu Jul 28 2005 Jens Petersen -1.4.0-2 - create scim-1.0 dirs to be accessible (Jens Petersen) * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 From fedora-extras-commits at redhat.com Wed Jul 27 22:21:53 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 27 Jul 2005 18:21:53 -0400 Subject: rpms/scim/FC-4 scim.spec,1.6,1.7 Message-ID: <200507272221.j6RMLrDV004511@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim.spec 27 Jul 2005 22:18:10 -0000 1.6 +++ scim.spec 27 Jul 2005 22:21:51 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -135,9 +135,11 @@ #-------------------------------------------------- %changelog +* Thu Jul 28 2005 Jens Petersen -1.4.0-2 +- create scim-1.0 dirs to be accessible (Jens Petersen) + * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 - update to 1.4.0 release -- create scim-1.0 dirs to be accessible (Jens Petersen) * Sat Jul 9 2005 Jens Petersen - 1.3.3-1 - update to 1.3.3 release From fedora-extras-commits at redhat.com Wed Jul 27 23:16:01 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:16:01 -0400 Subject: common tobuild,1.2105,1.2106 Message-ID: <200507272316.j6RNG1Pm006161@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6144 Modified Files: tobuild Log Message: request build of rpms/notecase/FC-3 notecase-1_0_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2105 retrieving revision 1.2106 diff -u -r1.2105 -r1.2106 --- tobuild 27 Jul 2005 20:15:30 -0000 1.2105 +++ tobuild 27 Jul 2005 23:15:58 -0000 1.2106 @@ -107,3 +107,4 @@ roland rpms/monotone/devel monotone-0_21-2_fc5 devel mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 +ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 23:16:12 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:16:12 -0400 Subject: common tobuild,1.2106,1.2107 Message-ID: <200507272316.j6RNGCqH006194@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6177 Modified Files: tobuild Log Message: request build of rpms/notecase/FC-4 notecase-1_0_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2106 retrieving revision 1.2107 diff -u -r1.2106 -r1.2107 --- tobuild 27 Jul 2005 23:15:58 -0000 1.2106 +++ tobuild 27 Jul 2005 23:16:09 -0000 1.2107 @@ -108,3 +108,4 @@ mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 +ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 23:16:21 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:16:21 -0400 Subject: common tobuild,1.2107,1.2108 Message-ID: <200507272316.j6RNGLO9006227@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6210 Modified Files: tobuild Log Message: request build of rpms/notecase/devel notecase-1_0_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2107 retrieving revision 1.2108 diff -u -r1.2107 -r1.2108 --- tobuild 27 Jul 2005 23:16:09 -0000 1.2107 +++ tobuild 27 Jul 2005 23:16:19 -0000 1.2108 @@ -109,3 +109,4 @@ mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 +ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 23:17:45 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:17:45 -0400 Subject: common tobuild,1.2108,1.2109 Message-ID: <200507272317.j6RNHj92006268@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6251 Modified Files: tobuild Log Message: request build of rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2108 retrieving revision 1.2109 diff -u -r1.2108 -r1.2109 --- tobuild 27 Jul 2005 23:16:19 -0000 1.2108 +++ tobuild 27 Jul 2005 23:17:42 -0000 1.2109 @@ -110,3 +110,4 @@ ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel +ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 23:17:55 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 27 Jul 2005 19:17:55 -0400 Subject: common tobuild,1.2109,1.2110 Message-ID: <200507272317.j6RNHtGB006301@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6284 Modified Files: tobuild Log Message: request build of rpms/leafpad/devel leafpad-0_8_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2109 retrieving revision 1.2110 diff -u -r1.2109 -r1.2110 --- tobuild 27 Jul 2005 23:17:42 -0000 1.2109 +++ tobuild 27 Jul 2005 23:17:52 -0000 1.2110 @@ -111,3 +111,4 @@ ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 +ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 23:38:32 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Wed, 27 Jul 2005 19:38:32 -0400 Subject: common tobuild,1.2110,1.2111 Message-ID: <200507272338.j6RNcWfv006344@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327 Modified Files: tobuild Log Message: request build of rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2110 retrieving revision 1.2111 diff -u -r1.2110 -r1.2111 --- tobuild 27 Jul 2005 23:17:52 -0000 1.2110 +++ tobuild 27 Jul 2005 23:38:30 -0000 1.2111 @@ -112,3 +112,4 @@ ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel +mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 23:47:00 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 27 Jul 2005 19:47:00 -0400 Subject: rpms/abiword/devel .cvsignore, 1.5, 1.6 abiword.spec, 1.8, 1.9 sources, 1.5, 1.6 abiword-2.2.8-mailmerge.patch, 1.1, NONE Message-ID: <200507272347.j6RNl15l006417@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6396 Modified Files: .cvsignore abiword.spec sources Removed Files: abiword-2.2.8-mailmerge.patch Log Message: Update to 2.2.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2005 18:45:27 -0000 1.5 +++ .cvsignore 27 Jul 2005 23:46:58 -0000 1.6 @@ -1 +1 @@ -abiword-2.2.8.tar.bz2 +abiword-2.2.9.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abiword.spec 6 Jun 2005 20:32:04 -0000 1.8 +++ abiword.spec 27 Jul 2005 23:46:58 -0000 1.9 @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.8 -Release: 2 +Version: 2.2.9 +Release: 1 Epoch: 1 Group: Applications/Editors License: GPL @@ -40,7 +40,6 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.2.6-desktop.patch -Patch2: abiword-2.2.8-mailmerge.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -50,7 +49,6 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .mailmerge %build cd abi @@ -129,6 +127,10 @@ %{_datadir}/icons/*png %changelog +* Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1 +- Update to 2.2.9 +- Drop the mailmerge patch again + * Sun Jun 6 2005 Marc Maurer - 1:2.2.8-2 - Fix build with mailmerge patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2005 18:45:27 -0000 1.5 +++ sources 27 Jul 2005 23:46:58 -0000 1.6 @@ -1 +1 @@ -f6f58e6ea4720ca635ede7b7f13cf156 abiword-2.2.8.tar.bz2 +17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 --- abiword-2.2.8-mailmerge.patch DELETED --- From fedora-extras-commits at redhat.com Wed Jul 27 23:54:03 2005 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Wed, 27 Jul 2005 19:54:03 -0400 Subject: common tobuild,1.2111,1.2112 Message-ID: <200507272354.j6RNs3aK006631@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6614 Modified Files: tobuild Log Message: request build of rpms/monotone/FC-4 monotone-0_21-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2111 retrieving revision 1.2112 diff -u -r1.2111 -r1.2112 --- tobuild 27 Jul 2005 23:38:30 -0000 1.2111 +++ tobuild 27 Jul 2005 23:54:01 -0000 1.2112 @@ -113,3 +113,4 @@ ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel +roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 23:55:11 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 27 Jul 2005 19:55:11 -0400 Subject: common tobuild,1.2112,1.2113 Message-ID: <200507272355.j6RNtBvU006677@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6660 Modified Files: tobuild Log Message: request build of rpms/abiword/devel abiword-2_2_9-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2112 retrieving revision 1.2113 diff -u -r1.2112 -r1.2113 --- tobuild 27 Jul 2005 23:54:01 -0000 1.2112 +++ tobuild 27 Jul 2005 23:55:09 -0000 1.2113 @@ -114,3 +114,4 @@ ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 +uwog rpms/abiword/devel abiword-2_2_9-1 devel From fedora-extras-commits at redhat.com Thu Jul 28 00:01:27 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Wed, 27 Jul 2005 20:01:27 -0400 Subject: common tobuild,1.2113,1.2114 Message-ID: <200507280001.j6S01Rwk007854@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7828 Modified Files: tobuild Log Message: request build of rpms/istanbul/devel istanbul-0_1_1-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2113 retrieving revision 1.2114 diff -u -r1.2113 -r1.2114 --- tobuild 27 Jul 2005 23:55:09 -0000 1.2113 +++ tobuild 28 Jul 2005 00:01:25 -0000 1.2114 @@ -115,3 +115,4 @@ mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel +jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel From fedora-extras-commits at redhat.com Thu Jul 28 00:53:42 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Wed, 27 Jul 2005 20:53:42 -0400 Subject: web/html/docs/beta/yum-software-management generated-index.php, 1.2, 1.3 index.php, 1.2, 1.3 ln-legalnotice.php, 1.2, 1.3 sn-managing-packages.php, 1.2, 1.3 sn-searching-packages.php, 1.2, 1.3 sn-software-management-concepts.php, 1.2, 1.3 sn-software-management-tools.php, 1.2, 1.3 sn-updating-your-system.php, 1.2, 1.3 sn-using-repositories.php, 1.2, 1.3 sn-yum-installing-frompackage.php, 1.2, 1.3 sn-yum-maintenance.php, 1.2, 1.3 sn-yum-proxy-server.php, 1.2, 1.3 Message-ID: <200507280053.j6S0rg3f007972@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/beta/yum-software-management In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7940 Modified Files: generated-index.php index.php ln-legalnotice.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: New beta version, - Clarify wording on effect of purging caches - Explicitly list Fedora repositories - Amended explanation of use of wildcards in searches - Revised section on Repository Compatibility. - Style fix in Advanced Search section. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.php 26 Jul 2005 01:42:03 -0000 1.2 +++ index.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -63,7 +63,7 @@ root password. The example terminal commands use su -c to provide this facility. -

    [Note]The http_proxy Environment - Variable

    +

    Example 4. Profile Settings for a Secured Proxy Server

    [Note]The http_proxy Environment Variable

    The http_proxy environment variable is also - used by curl and other utilities. Although - yum itself may use - http_proxy in either upper-case or - lower-case, curl requires the name of the - variable to be in lower-case. + used by curl and other utilities. Although + yum itself may use + http_proxy in either upper-case or + lower-case, curl requires the name of the + variable to be in lower-case.

    Prev Up Next
    9. Manually Installing Software Home Index
    Author: ryo Update of /cvs/extras/rpms/scim-anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8075 Modified Files: .cvsignore scim-anthy.spec sources Log Message: Update to 0.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Jul 2005 03:29:30 -0000 1.4 +++ .cvsignore 26 Jul 2005 06:15:43 -0000 1.5 @@ -1 +1 @@ -scim-anthy-0.5.1.tar.gz +scim-anthy-0.5.2.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-anthy.spec 9 Jul 2005 03:53:16 -0000 1.6 +++ scim-anthy.spec 26 Jul 2005 06:15:43 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,6 +45,9 @@ %changelog +* Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 +- update to 0.5.2 release + * Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jul 2005 03:53:16 -0000 1.5 +++ sources 26 Jul 2005 06:15:43 -0000 1.6 @@ -1 +1 @@ -53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz +f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 06:24:12 2005 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Tue, 26 Jul 2005 02:24:12 -0400 Subject: common tobuild,1.2069,1.2070 Message-ID: <200507260624.j6Q6OCuD008138@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8121 Modified Files: tobuild Log Message: Remove obsolete build requests. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2069 retrieving revision 1.2070 diff -u -r1.2069 -r1.2070 --- tobuild 26 Jul 2005 01:10:19 -0000 1.2069 +++ tobuild 26 Jul 2005 06:24:10 -0000 1.2070 @@ -34,7 +34,6 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 -corsepiu rpms/SoQt/devel SoQt-1_2_0-7_fc5 devel oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 06:34:10 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 02:34:10 -0400 Subject: rpms/scim/FC-3 .cvsignore, 1.3, 1.4 scim.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200507260634.j6Q6YAkb008406@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8385 Modified Files: .cvsignore scim.spec sources Log Message: Update to 1.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 May 2005 02:34:31 -0000 1.3 +++ .cvsignore 26 Jul 2005 06:34:08 -0000 1.4 @@ -1 +1 @@ -scim-1.2.3.tar.gz +scim-1.4.0.tar.gz Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim.spec 20 Jun 2005 14:33:06 -0000 1.4 +++ scim.spec 26 Jul 2005 06:34:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -36,17 +36,17 @@ %build -%configure +%configure --disable-static --disable-ld-version-script make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la -find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f +find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel desktop-file-install \ @@ -132,13 +132,24 @@ %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc +#-------------------------------------------------- %changelog -* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 -- Remove one of doubled capplets for setup. +* Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 +- update to 1.4.0 release -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 -- Update packaging for Fedora Extras +* Sat Jul 9 2005 Jens Petersen - 1.3.3-1 +- update to 1.3.3 release +- disable linking with version-scripts for now since they cause some problems +- disable building of static libs + +* Tue Jul 5 2005 Jens Petersen - 1.3.2-1 +- update to 1.3.2 test release +- don't set xinput.d script executable +- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +- update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 - Initial packaging for Fedora Extras @@ -159,3 +170,120 @@ * Sat Jun 19 2004 James Su - Added /usr/libexec/scim-launcher. - Remove setup module for SocketFrontEnd and SocketIMEngine. + +* Mon Mar 8 2004 James Su +- Added scim-config-agent. + +* Thu Oct 30 2003 James Su +- Added Simplified Chinese User Manual. + +* Wed Sep 03 2003 James Su +- cleanup spec. + +* Tue Sep 02 2003 James Su +- upto 0.8.0 + +* Tue Jul 29 2003 James Su +- updated to include scim-panel-gtk. + +* Thu Jun 19 2003 James Su +- updated to include scim-setup and its modules. + +* Thu Apr 3 2003 James Su +- added suite package, which includes all necessary components of SCIM. + +* Tue Mar 25 2003 James Su +- updated to v0.4.0 + +* Wed Feb 26 2003 James Su +- implemented dynamic adjust feature for generic table module. +- fixed key handling bug in generic table module. + +* Mon Feb 10 2003 James Su +- Replaced highlight_start and highlight_end in scim_server + and scim_frontend with AttributeList (scim_attributes.h) +- Moved icons/* to data/icons and gtkstringview.* to + utils/ + +* Thu Jan 2 2003 James Su +- updated configure.ac and Makefile.am +- ready to release 0.3.0 + +* Tue Nov 12 2002 James Su +- merged signal system from libinti. +- implemented namespace scim. +- implemented referenced object. +- version 0.3.0 + +* Tue Nov 05 2002 James Su +- minor fixes for table IM module. + +* Mon Nov 04 2002 James Su +- More IMdkit memory leak fixes. +- Table input method bugfixes. +- version 0.2.2 + +* Fri Nov 01 2002 James Su +- improved table input method. +- actually fixed the memleaks within IMdkit. +- pumped the version to 0.2.1 + +* Thu Oct 31 2002 James Su +- fixed some memory leaks in IMdkit +- reduced memory usage. +- upgraded to libtool-1.4.3 + +* Tue Oct 29 2002 James Su +- finished Generic Table input server module. +- fixed several bugs in scim-lib. + +* Thu Oct 10 2002 James Su +- used gettext to support i18n message. +- added release info to lib name. + +* Mon Sep 30 2002 James Su +- version 0.1.4 +- added Embedded Lookup Table style into X11 FrontEnd. +- use wchar_t instead of unsigned long if __STDC_ISO_10646__ defined. + +* Sun Sep 22 2002 James Su +- version 0.1.3 +- config button of X11 FrontEnd was disabled. + +* Fri Sep 6 2002 James Su +- simplified the utilities and lookup table interface. + +* Wed Aug 21 2002 James Su +- version 0.1.2 +- added configuration options to disable modules. +- enhanced X11 FrontEnd. + +* Sun Aug 11 2002 James Su +- version 0.1.1 +- X11 FrontEnd was enhanced. + +* Sat Aug 10 2002 James Su +- version 0.1.0 +- many bugfixes. +- Help window of X11 FrontEnd was implemented. +- scim can exit cleanly. + +* Fri Aug 2 2002 James Su +- SCIM 0.0.13. +- Minor bugfixes. + +* Mon Jul 29 2002 James Su +- SCIM 0.0.12. +- Minor bugfixes. + +* Sun Jul 28 2002 James Su +- SCIM 0.0.11. +- Minor bugfixes. + +* Sun Jul 21 2002 James Su +- SCIM 0.0.10. +- Added Simple Config module. + +* Sat Jun 22 2002 James Su +- first public release of SCIM. + Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 May 2005 02:34:31 -0000 1.3 +++ sources 26 Jul 2005 06:34:08 -0000 1.4 @@ -1 +1 @@ -9031648718cbeb10aea879726f0e9d5b scim-1.2.3.tar.gz +9af14f5dc73435affb36b116ad77b53e scim-1.4.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 06:34:48 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 02:34:48 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.4,1.5 Message-ID: <200507260634.j6Q6YmOB008429@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8412 Modified Files: scim-anthy.spec Log Message: Update to 0.5.2 Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-anthy.spec 30 Jun 2005 13:15:35 -0000 1.4 +++ scim-anthy.spec 26 Jul 2005 06:34:46 -0000 1.5 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.5.0 +Version: 0.5.2 Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input @@ -45,6 +45,12 @@ %changelog +* Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 +- update to 0.5.2 release + +* Sat Jul 9 2005 Jens Petersen - 0.5.1-2 +- update to 0.5.1 release + * Thu Jun 30 2005 Jens Petersen - 0.5.0-1 - update to 0.5.0 release From fedora-extras-commits at redhat.com Tue Jul 26 06:35:15 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 02:35:15 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.6,1.7 Message-ID: <200507260635.j6Q6ZFqe008452@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8435 Modified Files: scim-anthy.spec Log Message: Update to 0.5.2 Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-anthy.spec 9 Jul 2005 03:51:00 -0000 1.6 +++ scim-anthy.spec 26 Jul 2005 06:35:12 -0000 1.7 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -45,6 +45,9 @@ %changelog +* Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 +- update to 0.5.2 release + * Sat Jul 9 2005 Jens Petersen - 0.5.1-2 - update to 0.5.1 release From fedora at tqmcube.com Tue Jul 26 02:54:05 2005 From: fedora at tqmcube.com (David Cary Hart) Date: Mon, 25 Jul 2005 22:54:05 -0400 Subject: rpms/leafnode/FC-4 leafnode.spec,1.10,1.11 In-Reply-To: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com> References: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com> Message-ID: <1122346445.11458.62.camel@dch.TQMcube.com> On Mon, 2005-07-25 at 20:46 -0400, Michael Schwendt wrote: > Author: mschwendt > > Update of /cvs/extras/rpms/leafnode/FC-4 > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv596 > > Modified Files: > leafnode.spec > Log Message: > Fix non-UTF-8 in German description (#159587) and modify it a little bit. > > > Index: leafnode.spec Vielen Dank Sir. I received a successful build notice and removed it from "tobuild." Do I now "make build" again? BTW, I requested a review on a new package (bld) today. I sure hope that I'm following the procedure correctly. -- Tired of spam? Do YOUR part: http://www.BoulderPledge.org Our DNSRBL - Eliminate Spam: http://www.TQMcube.com/spam_trap.htm RBLDNSD HowTo: http://www.TQMcube.com/rbldnsd.htm Multi-RBL Check: http://www.TQMcube.com/rblcheck.htm From skvidal at phy.duke.edu Tue Jul 26 07:28:36 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Tue, 26 Jul 2005 03:28:36 -0400 Subject: rpms/leafnode/FC-4 leafnode.spec,1.10,1.11 In-Reply-To: <1122346445.11458.62.camel@dch.TQMcube.com> References: <200507260046.j6Q0klbY000613@cvs-int.fedora.redhat.com> <1122346445.11458.62.camel@dch.TQMcube.com> Message-ID: <1122362916.9641.19.camel@cutter> On Mon, 2005-07-25 at 22:54 -0400, David Cary Hart wrote: > On Mon, 2005-07-25 at 20:46 -0400, Michael Schwendt wrote: > > Author: mschwendt > > > > Update of /cvs/extras/rpms/leafnode/FC-4 > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv596 > > > > Modified Files: > > leafnode.spec > > Log Message: > > Fix non-UTF-8 in German description (#159587) and modify it a little bit. > > > > > > Index: leafnode.spec > > Vielen Dank Sir. > > I received a successful build notice and removed it from "tobuild." Do I > now "make build" again? > > BTW, I requested a review on a new package (bld) today. I sure hope that > I'm following the procedure correctly. requesting a new build is fine. And thank you for removing your completed build from the queue. The procedure is in flux for the moment so don't worry about it too much. -sv From fedora-extras-commits at redhat.com Tue Jul 26 08:15:21 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:15:21 -0400 Subject: rpms/scim/FC-4 scim.spec,1.4,1.5 Message-ID: <200507260815.j6Q8FL63011380@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11363 Modified Files: scim.spec Log Message: Update to 1.4.0 Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim.spec 21 Jun 2005 00:10:42 -0000 1.4 +++ scim.spec 26 Jul 2005 08:15:19 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim -Version: 1.2.3 -Release: 2%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -36,17 +36,17 @@ %build -%configure +%configure --disable-static --disable-ld-version-script make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install -mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} +mkdir -pm 644 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} # Kill all .a and .la -find ${RPM_BUILD_ROOT} -name "*.a" -o -name '*.la' | xargs rm -f +find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel desktop-file-install \ @@ -132,13 +132,24 @@ %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc +#-------------------------------------------------- %changelog -* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 -- Remove one of doubled capplets for setup. +* Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 +- update to 1.4.0 release -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 -- Update packaging for Fedora Extras +* Sat Jul 9 2005 Jens Petersen - 1.3.3-1 +- update to 1.3.3 release +- disable linking with version-scripts for now since they cause some problems +- disable building of static libs + +* Tue Jul 5 2005 Jens Petersen - 1.3.2-1 +- update to 1.3.2 test release +- don't set xinput.d script executable +- no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +- update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 - Initial packaging for Fedora Extras @@ -159,3 +170,120 @@ * Sat Jun 19 2004 James Su - Added /usr/libexec/scim-launcher. - Remove setup module for SocketFrontEnd and SocketIMEngine. + +* Mon Mar 8 2004 James Su +- Added scim-config-agent. + +* Thu Oct 30 2003 James Su +- Added Simplified Chinese User Manual. + +* Wed Sep 03 2003 James Su +- cleanup spec. + +* Tue Sep 02 2003 James Su +- upto 0.8.0 + +* Tue Jul 29 2003 James Su +- updated to include scim-panel-gtk. + +* Thu Jun 19 2003 James Su +- updated to include scim-setup and its modules. + +* Thu Apr 3 2003 James Su +- added suite package, which includes all necessary components of SCIM. + +* Tue Mar 25 2003 James Su +- updated to v0.4.0 + +* Wed Feb 26 2003 James Su +- implemented dynamic adjust feature for generic table module. +- fixed key handling bug in generic table module. + +* Mon Feb 10 2003 James Su +- Replaced highlight_start and highlight_end in scim_server + and scim_frontend with AttributeList (scim_attributes.h) +- Moved icons/* to data/icons and gtkstringview.* to + utils/ + +* Thu Jan 2 2003 James Su +- updated configure.ac and Makefile.am +- ready to release 0.3.0 + +* Tue Nov 12 2002 James Su +- merged signal system from libinti. +- implemented namespace scim. +- implemented referenced object. +- version 0.3.0 + +* Tue Nov 05 2002 James Su +- minor fixes for table IM module. + +* Mon Nov 04 2002 James Su +- More IMdkit memory leak fixes. +- Table input method bugfixes. +- version 0.2.2 + +* Fri Nov 01 2002 James Su +- improved table input method. +- actually fixed the memleaks within IMdkit. +- pumped the version to 0.2.1 + +* Thu Oct 31 2002 James Su +- fixed some memory leaks in IMdkit +- reduced memory usage. +- upgraded to libtool-1.4.3 + +* Tue Oct 29 2002 James Su +- finished Generic Table input server module. +- fixed several bugs in scim-lib. + +* Thu Oct 10 2002 James Su +- used gettext to support i18n message. +- added release info to lib name. + +* Mon Sep 30 2002 James Su +- version 0.1.4 +- added Embedded Lookup Table style into X11 FrontEnd. +- use wchar_t instead of unsigned long if __STDC_ISO_10646__ defined. + +* Sun Sep 22 2002 James Su +- version 0.1.3 +- config button of X11 FrontEnd was disabled. + +* Fri Sep 6 2002 James Su +- simplified the utilities and lookup table interface. + +* Wed Aug 21 2002 James Su +- version 0.1.2 +- added configuration options to disable modules. +- enhanced X11 FrontEnd. + +* Sun Aug 11 2002 James Su +- version 0.1.1 +- X11 FrontEnd was enhanced. + +* Sat Aug 10 2002 James Su +- version 0.1.0 +- many bugfixes. +- Help window of X11 FrontEnd was implemented. +- scim can exit cleanly. + +* Fri Aug 2 2002 James Su +- SCIM 0.0.13. +- Minor bugfixes. + +* Mon Jul 29 2002 James Su +- SCIM 0.0.12. +- Minor bugfixes. + +* Sun Jul 28 2002 James Su +- SCIM 0.0.11. +- Minor bugfixes. + +* Sun Jul 21 2002 James Su +- SCIM 0.0.10. +- Added Simple Config module. + +* Sat Jun 22 2002 James Su +- first public release of SCIM. + From fedora-extras-commits at redhat.com Tue Jul 26 08:16:08 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:16:08 -0400 Subject: rpms/scim-anthy/FC-3 sources,1.3,1.4 Message-ID: <200507260816.j6Q8G8Yj011437@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11386 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Jun 2005 13:15:35 -0000 1.3 +++ sources 26 Jul 2005 08:16:06 -0000 1.4 @@ -1 +1 @@ -1e220a07404668f876d727b6e23a9ae0 scim-anthy-0.5.0.tar.gz +f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 08:17:16 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:17:16 -0400 Subject: rpms/scim-anthy/FC-4 sources,1.5,1.6 Message-ID: <200507260817.j6Q8HGUr011460@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11443 Modified Files: sources Log Message: Modify "sources" (I've forgetten to change this) Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jul 2005 03:51:00 -0000 1.5 +++ sources 26 Jul 2005 08:17:14 -0000 1.6 @@ -1 +1 @@ -53896a8eda739048191398bde268177b scim-anthy-0.5.1.tar.gz +f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 08:18:11 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 04:18:11 -0400 Subject: rpms/scim/FC-4 sources,1.3,1.4 Message-ID: <200507260818.j6Q8IBDN011486@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11469 Modified Files: sources Log Message: Modify "sources" Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 May 2005 01:35:21 -0000 1.3 +++ sources 26 Jul 2005 08:18:09 -0000 1.4 @@ -1 +1 @@ -9031648718cbeb10aea879726f0e9d5b scim-1.2.3.tar.gz +9af14f5dc73435affb36b116ad77b53e scim-1.4.0.tar.gz From fedora-extras-commits at redhat.com Tue Jul 26 10:07:48 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 06:07:48 -0400 Subject: devel/common tobuild,1.2070,1.2071 Message-ID: <200507261007.j6QA7ns3013970@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13953 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2070 retrieving revision 1.2071 diff -u -r1.2070 -r1.2071 --- tobuild 26 Jul 2005 06:24:10 -0000 1.2070 +++ tobuild 26 Jul 2005 10:07:46 -0000 1.2071 @@ -1,6 +1,8 @@ # this is the build control file. the format is # user repo tag target status # +ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel +anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 @@ -80,7 +82,6 @@ scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel scop rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 fc4 scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder-0_27-2_fc3 fc3 scop rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel @@ -128,7 +129,6 @@ s4504kr rpms/inadyn/devel inadyn-1_95-1 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel -ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 11:43:34 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:43:34 -0400 Subject: rpms/cd-discid/devel cd-discid.spec,1.3,1.4 Message-ID: <200507261143.j6QBhYqc015184@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/cd-discid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15167 Modified Files: cd-discid.spec Log Message: install proper man page (#164105, fix by Paul W. Frields) Index: cd-discid.spec =================================================================== RCS file: /cvs/extras/rpms/cd-discid/devel/cd-discid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cd-discid.spec 6 Apr 2005 22:11:33 -0000 1.3 +++ cd-discid.spec 26 Jul 2005 11:43:32 -0000 1.4 @@ -1,7 +1,7 @@ Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 -Release: 3 +Release: 4 Group: Applications/Multimedia License: GPL @@ -24,7 +24,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 cd-discid.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 26 2005 Nils Philippsen +- install proper man page (#164105, fix by Paul W. Frields) + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 26 11:46:38 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:46:38 -0400 Subject: common tobuild,1.2071,1.2072 Message-ID: <200507261146.j6QBkcP7015256@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15239 Modified Files: tobuild Log Message: request build of rpms/cd-discid/devel cd-discid-0_9-4 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2071 retrieving revision 1.2072 diff -u -r1.2071 -r1.2072 --- tobuild 26 Jul 2005 10:07:46 -0000 1.2071 +++ tobuild 26 Jul 2005 11:46:36 -0000 1.2072 @@ -138,3 +138,4 @@ mschwendt devel/meld meld-1_0_0-1_fc5 devel Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/inkscape inkscape-0_42-1_fc5 devel +nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel From fedora-extras-commits at redhat.com Tue Jul 26 11:55:46 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:55:46 -0400 Subject: rpms/cd-discid/FC-4 cd-discid.spec,1.3,1.4 Message-ID: <200507261155.j6QBtkZA015329@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/cd-discid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15307 Modified Files: cd-discid.spec Log Message: install proper man page (#164105, fix by Paul W. Frields) Index: cd-discid.spec =================================================================== RCS file: /cvs/extras/rpms/cd-discid/FC-4/cd-discid.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cd-discid.spec 6 Apr 2005 22:11:33 -0000 1.3 +++ cd-discid.spec 26 Jul 2005 11:55:44 -0000 1.4 @@ -1,7 +1,7 @@ Summary: utility to get CDDB discid information Name: cd-discid Version: 0.9 -Release: 3 +Release: 3.fc4.1 Group: Applications/Multimedia License: GPL @@ -24,7 +24,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 cd-discid $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 0644 cd-discid $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 0644 cd-discid.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,9 @@ %{_mandir}/man1/* %changelog +* Tue Jul 26 2005 Nils Philippsen +- install proper man page (#164105, fix by Paul W. Frields) + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 26 11:56:15 2005 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Tue, 26 Jul 2005 07:56:15 -0400 Subject: common tobuild,1.2072,1.2073 Message-ID: <200507261156.j6QBuFRo015393@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15376 Modified Files: tobuild Log Message: request build of rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2072 retrieving revision 1.2073 diff -u -r1.2072 -r1.2073 --- tobuild 26 Jul 2005 11:46:36 -0000 1.2072 +++ tobuild 26 Jul 2005 11:56:13 -0000 1.2073 @@ -139,3 +139,4 @@ Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/inkscape inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel +nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 11:56:24 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:56:24 -0400 Subject: rpms/libcdio/devel libcdio.spec,1.11,1.12 Message-ID: <200507261156.j6QBuOQA015416@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15399 Modified Files: libcdio.spec Log Message: * Tue Jul 26 2005 Adrian Reber - 0.75-2 - Rebuilt Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcdio.spec 15 Jul 2005 06:30:22 -0000 1.11 +++ libcdio.spec 26 Jul 2005 11:56:22 -0000 1.12 @@ -1,6 +1,6 @@ Name: libcdio Version: 0.75 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia @@ -93,6 +93,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 0.75-2 +- Rebuilt + * Thu Jul 14 2005 Adrian Reber - 0.75-1 - Updated to 0.75. From fedora-extras-commits at redhat.com Tue Jul 26 11:56:55 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:56:55 -0400 Subject: common tobuild,1.2073,1.2074 Message-ID: <200507261156.j6QButYs015478@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15461 Modified Files: tobuild Log Message: request build of rpms/libcdio/devel libcdio-0_75-2_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2073 retrieving revision 1.2074 diff -u -r1.2073 -r1.2074 --- tobuild 26 Jul 2005 11:56:13 -0000 1.2073 +++ tobuild 26 Jul 2005 11:56:52 -0000 1.2074 @@ -140,3 +140,4 @@ mschwendt devel/inkscape inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 +adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 26 11:58:21 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:58:21 -0400 Subject: rpms/libcdio/FC-4 .cvsignore, 1.5, 1.6 libcdio.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507261158.j6QBwLeZ015516@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15495 Modified Files: .cvsignore libcdio.spec sources Log Message: * Tue Jul 26 2005 Adrian Reber - 0.75-2 - Rebuilt Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 5 Jun 2005 11:23:51 -0000 1.5 +++ .cvsignore 26 Jul 2005 11:58:19 -0000 1.6 @@ -1,2 +1,2 @@ -libcdio-0.74.tar.gz -libcdio-0.74.tar.gz.sig +libcdio-0.75.tar.gz +libcdio-0.75.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libcdio.spec 5 Jun 2005 11:23:51 -0000 1.9 +++ libcdio.spec 26 Jul 2005 11:58:19 -0000 1.10 @@ -1,13 +1,13 @@ Name: libcdio -Version: 0.74 +Version: 0.75 Release: 2%{?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.74.tar.gz -Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.74.tar.gz.sig +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libcddb-devel >= 0.9.4 @@ -93,6 +93,12 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 0.75-2 +- Rebuilt + +* Thu Jul 14 2005 Adrian Reber - 0.75-1 +- Updated to 0.75. + * Fri Jun 03 2005 Adrian Reber - 0.74-2 - Updated to 0.74. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 5 Jun 2005 11:23:51 -0000 1.5 +++ sources 26 Jul 2005 11:58:19 -0000 1.6 @@ -1,2 +1,2 @@ -2b1b03d96a992d171ebf2b13bcdcd866 libcdio-0.74.tar.gz -8dddd44a78d1eda7bdeac0afc30d6ba8 libcdio-0.74.tar.gz.sig +628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz +3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig From fedora-extras-commits at redhat.com Tue Jul 26 11:58:51 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 07:58:51 -0400 Subject: common tobuild,1.2074,1.2075 Message-ID: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15561 Modified Files: tobuild Log Message: request build of rpms/libcdio/FC-4 libcdio-0_75-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2074 retrieving revision 1.2075 diff -u -r1.2074 -r1.2075 --- tobuild 26 Jul 2005 11:56:52 -0000 1.2074 +++ tobuild 26 Jul 2005 11:58:48 -0000 1.2075 @@ -141,3 +141,4 @@ nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 12:08:31 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:08:31 -0400 Subject: rpms/scmxx - New directory Message-ID: <200507261208.j6QC8Vx5016839@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16815/scmxx Log Message: Directory /cvs/extras/rpms/scmxx added to the repository From fedora-extras-commits at redhat.com Tue Jul 26 12:08:32 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:08:32 -0400 Subject: rpms/scmxx/devel - New directory Message-ID: <200507261208.j6QC8WlZ016842@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16815/scmxx/devel Log Message: Directory /cvs/extras/rpms/scmxx/devel added to the repository From fedora-extras-commits at redhat.com Tue Jul 26 12:09:03 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:03 -0400 Subject: rpms/scmxx Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507261209.j6QC937Y016890@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863 Added Files: Makefile import.log Log Message: Setup of module scmxx --- NEW FILE Makefile --- # Top level Makefile for module scmxx all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 26 12:09:04 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:04 -0400 Subject: rpms/scmxx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507261209.j6QC94ZX016895@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16863/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module scmxx --- NEW 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 Jul 26 12:09:46 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:46 -0400 Subject: rpms/scmxx import.log,1.1,1.2 Message-ID: <200507261210.j6QCAHMF016967@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932 Modified Files: import.log Log Message: auto-import scmxx-0.8.0-1 on branch devel from scmxx-0.8.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/scmxx/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 26 Jul 2005 12:09:01 -0000 1.1 +++ import.log 26 Jul 2005 12:09:44 -0000 1.2 @@ -0,0 +1 @@ +scmxx-0_8_0-1:HEAD:scmxx-0.8.0-1.src.rpm:1122379768 From fedora-extras-commits at redhat.com Tue Jul 26 12:09:47 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:09:47 -0400 Subject: rpms/scmxx/devel scmxx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507261209.j6QC9lgo016962@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932/devel Modified Files: .cvsignore sources Added Files: scmxx.spec Log Message: auto-import scmxx-0.8.0-1 on branch devel from scmxx-0.8.0-1.src.rpm --- NEW FILE scmxx.spec --- Summary: exchange data with Siemens mobile phones Summary(de): Datenaustausch mit Siemens-Handys Summary(it): Scambia dati con telefonini Siemens Name: scmxx Version: 0.8.0 Release: 1 Group: console Copyright: GPL Vendor: Hendrik Sattler Url: http://www.hendrik-sattler.de/scmxx Packager: Hendrik Sattler Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description SCMxx is a console program that allows you to exchange certain types of data with mobile phones made by Siemens. Some of the data types that can be exchanged are logos, ring tones, vCalendars, phonebook entries, and short messages. Other actions like setting the time and dialling a number are also possible. SCMxx works with the following models: S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 and probably others. It basically uses the AT command set published by Siemens (with some other, additional resources). See the website %{url} for details. %description -l de SCMxx ist ein Konsolenprogramm das es erm?glicht, bestimmte Daten mit Handys von Siemens auszutauschen. Einige der Daten, die transferiert werden k?nnen, sind Logos, Klingelt?ne, vCalendars, Telefonbucheintr?ge, und Kurznachrichten. Andere Aktionen wie das Setzen der Zeit und da W?hlen von Rufnummer ist ebenso m?glich. SCMxx kann mit folgenden Modellen umgehen: S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 und eventuell anderen. Es wird haupts?chlich das von Siemens ver?ffentlichte AT-Kommando-Set (zusammen mit anderen, zus?tzlichen Resourcen) verwendet. Weitere Details finden man auf der Webseite %{url}. %description -l it SCMxx ?? un programma da console che ti permette di scambiare alcuti tipi di dati con telefonini Siemens. Questi dati possono essere loghi, suonerie, vCalendars, record dell'agenda telefonica e sms. E' anche possibile modificare l'ora o comporre un numero. SCMxx funziona con i modelli seguenti: S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 e probabilmente altri. Si basa sul set di comandi AT pubblicati da Siemens (e su altre risorse aggiuntive). Visita il sito %{url} per dettagli. %prep %setup -q %build %configure %{__make} %install %{__make} install DESTDIR=$RPM_BUILD_ROOT %clean %{__make} distclean %files %defattr(-,root,root) %doc AUTHORS BUGS CHANGELOG INSTALL README TODO TRANSLATION examples docs/*.txt %attr(0755,-,-) %{_bindir}/%{name} %attr(0644,-,-) %{_mandir}/man1/%{name}.1* %attr(0644,-,-) %{_mandir}/*/man1/%{name}.1* %attr(0644,-,-) %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo %changelog * Tue Aug 24 2004 Hendrik Sattler - install all translation of the manpage - install all gettext files - reformat and extend description - add german summary and german description - use default configure command instead of custom invocation - remove x-flag from all non-executable files - remove old url from Source0 field * Mon Nov 18 2002 Hendrik Sattler - added manpage to package * Sat Jul 1 2002 Hendrik Sattler - changed defattr, so dirs get their x-flag * Sat May 14 2002 Hendrik Sattler - extensive usage of environment variables in the spec file - moved/renamed files in docdir * Sat Feb 9 2002 Petr Kri?tof - RPM spec update * Sat Nov 17 2001 Hendrik Sattler - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scmxx/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 26 Jul 2005 12:09:02 -0000 1.1 +++ .cvsignore 26 Jul 2005 12:09:45 -0000 1.2 @@ -0,0 +1 @@ +scmxx-0.8.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scmxx/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 26 Jul 2005 12:09:02 -0000 1.1 +++ sources 26 Jul 2005 12:09:45 -0000 1.2 @@ -0,0 +1 @@ +21de1f98864e296da2cb6b424112361c scmxx-0.8.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:11:20 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:11:20 -0400 Subject: rpms/libcddb/FC-3 libcddb.spec,1.7,1.8 sources,1.4,1.5 Message-ID: <200507261211.j6QCBK1T017064@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018/FC-3 Modified Files: libcddb.spec sources Log Message: libcddb: updated to 1.2.0 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libcddb.spec 21 Jul 2005 18:24:32 -0000 1.7 +++ libcddb.spec 26 Jul 2005 12:11:18 -0000 1.8 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ -Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.gz +Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig libcdio-devel >= 0.67 @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-1 +- Updated to 1.2.0 + * Thu Jul 21 2005 Dams - 1.1.0-1 - Updated to 1.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 18:24:32 -0000 1.4 +++ sources 26 Jul 2005 12:11:18 -0000 1.5 @@ -1 +1 @@ -c15ee69fcb9459c9450e8140cdef0952 libcddb-1.1.0.tar.gz +1a3e46d2f0691d1308614ad494bb9e62 libcddb-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:11:21 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:11:21 -0400 Subject: rpms/libcddb/FC-4 .cvsignore, 1.4, 1.5 libcddb.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <200507261211.j6QCBLvZ017072@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018/FC-4 Modified Files: .cvsignore libcddb.spec sources Log Message: libcddb: updated to 1.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 21 Jul 2005 18:24:32 -0000 1.4 +++ .cvsignore 26 Jul 2005 12:11:19 -0000 1.5 @@ -1 +1 @@ -libcddb-1.1.0.tar.gz +libcddb-1.2.0.tar.bz2 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcddb.spec 21 Jul 2005 18:24:32 -0000 1.11 +++ libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ -Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.gz +Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig libcdio-devel >= 0.67 @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-1 +- Updated to 1.2.0 + * Thu Jul 21 2005 Dams - 1.1.0-1 - Updated to 1.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 18:24:32 -0000 1.4 +++ sources 26 Jul 2005 12:11:19 -0000 1.5 @@ -1 +1 @@ -c15ee69fcb9459c9450e8140cdef0952 libcddb-1.1.0.tar.gz +1a3e46d2f0691d1308614ad494bb9e62 libcddb-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:11:21 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:11:21 -0400 Subject: rpms/libcddb/devel libcddb.spec,1.11,1.12 sources,1.4,1.5 Message-ID: <200507261211.j6QCBLI2017079@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17018/devel Modified Files: libcddb.spec sources Log Message: libcddb: updated to 1.2.0 Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libcddb.spec 21 Jul 2005 18:24:33 -0000 1.11 +++ libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 @@ -1,12 +1,12 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://libcddb.sourceforge.net/ -Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.gz +Source0: http://download.sourceforge.net/libcddb/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: pkgconfig libcdio-devel >= 0.67 @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-1 +- Updated to 1.2.0 + * Thu Jul 21 2005 Dams - 1.1.0-1 - Updated to 1.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 21 Jul 2005 18:24:33 -0000 1.4 +++ sources 26 Jul 2005 12:11:19 -0000 1.5 @@ -1 +1 @@ -c15ee69fcb9459c9450e8140cdef0952 libcddb-1.1.0.tar.gz +1a3e46d2f0691d1308614ad494bb9e62 libcddb-1.2.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 12:13:01 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Tue, 26 Jul 2005 08:13:01 -0400 Subject: common tobuild,1.2075,1.2076 Message-ID: <200507261213.j6QCD121017189@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17172 Modified Files: tobuild Log Message: request build of rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2075 retrieving revision 1.2076 diff -u -r1.2075 -r1.2076 --- tobuild 26 Jul 2005 11:58:48 -0000 1.2075 +++ tobuild 26 Jul 2005 12:12:59 -0000 1.2076 @@ -142,3 +142,4 @@ nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 12:13:06 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:13:06 -0400 Subject: rpms/scmxx/devel scmxx.spec,1.1,1.2 Message-ID: <200507261213.j6QCD6Cc017208@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/scmxx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17168 Modified Files: scmxx.spec Log Message: checked in correct specfile Index: scmxx.spec =================================================================== RCS file: /cvs/extras/rpms/scmxx/devel/scmxx.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scmxx.spec 26 Jul 2005 12:09:45 -0000 1.1 +++ scmxx.spec 26 Jul 2005 12:13:04 -0000 1.2 @@ -1,93 +1,47 @@ -Summary: exchange data with Siemens mobile phones -Summary(de): Datenaustausch mit Siemens-Handys -Summary(it): Scambia dati con telefonini Siemens -Name: scmxx -Version: 0.8.0 -Release: 1 -Group: console -Copyright: GPL -Vendor: Hendrik Sattler -Url: http://www.hendrik-sattler.de/scmxx -Packager: Hendrik Sattler -Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Summary: Exchange data with Siemens mobile phones +Name: scmxx +Version: 0.8.0 +Release: 1%{?dist} +Group: Applications/Communications +License: GPL +URL: http://www.hendrik-sattler.de/scmxx +Source0: http://dl.sourceforge.net/scmxx/scmxx-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libxslt-devel %description - SCMxx is a console program that allows you to exchange certain types of - data with mobile phones made by Siemens. Some of the data types that can be - exchanged are logos, ring tones, vCalendars, phonebook entries, and short - messages. Other actions like setting the time and dialling a number are also - possible. SCMxx works with the following models: - S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 and probably others. - It basically uses the AT command set published by Siemens (with some other, - additional resources). - See the website %{url} for details. - -%description -l de - SCMxx ist ein Konsolenprogramm das es erm?glicht, bestimmte Daten mit Handys - von Siemens auszutauschen. Einige der Daten, die transferiert werden k?nnen, - sind Logos, Klingelt?ne, vCalendars, Telefonbucheintr?ge, und - Kurznachrichten. Andere Aktionen wie das Setzen der Zeit und da W?hlen von - Rufnummer ist ebenso m?glich. SCMxx kann mit folgenden Modellen umgehen: - S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 und eventuell anderen. - Es wird haupts?chlich das von Siemens ver?ffentlichte AT-Kommando-Set - (zusammen mit anderen, zus?tzlichen Resourcen) verwendet. - Weitere Details finden man auf der Webseite %{url}. - -%description -l it - SCMxx ?? un programma da console che ti permette di scambiare alcuti tipi di - dati con telefonini Siemens. Questi dati possono essere loghi, suonerie, - vCalendars, record dell'agenda telefonica e sms. E' anche possibile modificare - l'ora o comporre un numero. SCMxx funziona con i modelli seguenti: - S25, S35i, M35i, C35i, SL4x, S45, ME45, C45, M50, MT50 e probabilmente altri. - Si basa sul set di comandi AT pubblicati da Siemens (e su altre risorse - aggiuntive). - Visita il sito %{url} per dettagli. - +SCMxx is a console program that allows you to exchange certain types of +data with mobile phones made by Siemens. Some of the data types that can be +exchanged are logos, ring tones, vCalendars, phonebook entries, and short +messages. Other actions like setting the time and dialling a number are also +possible. %prep %setup -q %build -%configure +%configure \ + --with-device=/dev/ttyS0 \ + --with-baudrate=115200 %{__make} %install -%{__make} install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +%find_lang %{name} %clean -%{__make} distclean +rm -rf %{buildroot} -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS BUGS CHANGELOG INSTALL README TODO TRANSLATION examples docs/*.txt -%attr(0755,-,-) %{_bindir}/%{name} -%attr(0644,-,-) %{_mandir}/man1/%{name}.1* -%attr(0644,-,-) %{_mandir}/*/man1/%{name}.1* -%attr(0644,-,-) %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo +%doc AUTHORS BUGS LICENSE CHANGELOG README +%{_bindir}/scmxx +%{_mandir}/man1/scmxx.1.gz +%lang(de) %{_mandir}/de/man1/scmxx.1.gz +%lang(it) %{_mandir}/it/man1/scmxx.1.gz +%lang(ru) %{_mandir}/ru/man1/scmxx.1.gz %changelog -* Tue Aug 24 2004 Hendrik Sattler -- install all translation of the manpage -- install all gettext files -- reformat and extend description -- add german summary and german description -- use default configure command instead of custom invocation -- remove x-flag from all non-executable files -- remove old url from Source0 field - -* Mon Nov 18 2002 Hendrik Sattler -- added manpage to package - -* Sat Jul 1 2002 Hendrik Sattler -- changed defattr, so dirs get their x-flag - -* Sat May 14 2002 Hendrik Sattler -- extensive usage of environment variables in the spec file -- moved/renamed files in docdir - -* Sat Feb 9 2002 Petr Kri?tof -- RPM spec update - -* Sat Nov 17 2001 Hendrik Sattler -- Initial RPM release +* Tue Jul 14 2005 Andreas Thienemann 0.8.0-1 +- Initial specfile From fedora-extras-commits at redhat.com Tue Jul 26 12:13:49 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:13:49 -0400 Subject: owners owners.list,1.32,1.33 Message-ID: <200507261213.j6QCDovZ017231@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17214 Modified Files: owners.list Log Message: Added scmxx Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- owners.list 26 Jul 2005 00:31:17 -0000 1.32 +++ owners.list 26 Jul 2005 12:13:47 -0000 1.33 @@ -722,6 +722,7 @@ Fedora Extras|scim-pinyin|Chinese input method for SCIM|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|scim|Smart Common Input Method|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|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|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Jul 26 12:16:49 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Tue, 26 Jul 2005 08:16:49 -0400 Subject: common tobuild,1.2076,1.2077 Message-ID: <200507261216.j6QCGoGv017300@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17283 Modified Files: tobuild Log Message: request build of rpms/scmxx/devel scmxx-0_8_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2076 retrieving revision 1.2077 diff -u -r1.2076 -r1.2077 --- tobuild 26 Jul 2005 12:12:59 -0000 1.2076 +++ tobuild 26 Jul 2005 12:16:47 -0000 1.2077 @@ -143,3 +143,4 @@ adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 +ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel From rc040203 at freenet.de Tue Jul 26 12:23:03 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Tue, 26 Jul 2005 14:23:03 +0200 Subject: rpms/scmxx/devel scmxx.spec,1.1,1.2 In-Reply-To: <200507261213.j6QCD6Cc017208@cvs-int.fedora.redhat.com> References: <200507261213.j6QCD6Cc017208@cvs-int.fedora.redhat.com> Message-ID: <1122380583.4264.245.camel@mccallum.corsepiu.local> On Tue, 2005-07-26 at 08:13 -0400, Andreas Thienemann wrote: > Author: ixs > Index: scmxx.spec > -%configure > +%configure \ > + --with-device=/dev/ttyS0 \ > + --with-baudrate=115200 Why these deviations from the defaults? I would prefer not to mess around with them, because any deviation from defaults causes more troubles than they help. Ralf From paul at city-fan.org Tue Jul 26 12:31:21 2005 From: paul at city-fan.org (Paul Howarth) Date: Tue, 26 Jul 2005 13:31:21 +0100 Subject: common tobuild,1.2074,1.2075 In-Reply-To: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> References: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> Message-ID: <42E62D19.6070904@city-fan.org> Adrian Reber (adrian) wrote: > Author: adrian > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15561 > > Modified Files: > tobuild > Log Message: > request build of rpms/libcdio/FC-4 libcdio-0_75-2_fc4 for fc4 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2074 > retrieving revision 1.2075 > diff -u -r1.2074 -r1.2075 > --- tobuild 26 Jul 2005 11:56:52 -0000 1.2074 > +++ tobuild 26 Jul 2005 11:58:48 -0000 1.2075 > @@ -141,3 +141,4 @@ > nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel > nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 > adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel > +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 You might need to bump and rebuild again if builds are going in-order now, as a build of libcddb 1.2.0 has just been requested by anvil. Paul. From bugs.michael at gmx.net Tue Jul 26 12:42:56 2005 From: bugs.michael at gmx.net (Michael Schwendt) Date: Tue, 26 Jul 2005 14:42:56 +0200 Subject: libcddb/libcdio (was: Re: common tobuild,1.2074,1.2075) In-Reply-To: <42E62D19.6070904@city-fan.org> References: <200507261158.j6QBwpeq015578@cvs-int.fedora.redhat.com> <42E62D19.6070904@city-fan.org> Message-ID: <20050726144256.23d65c9e.bugs.michael@gmx.net> On Tue, 26 Jul 2005 13:31:21 +0100, Paul Howarth wrote: > Adrian Reber (adrian) wrote: > > --- tobuild 26 Jul 2005 11:56:52 -0000 1.2074 > > +++ tobuild 26 Jul 2005 11:58:48 -0000 1.2075 > > @@ -141,3 +141,4 @@ > > nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel > > nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 > > adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel > > +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 > > You might need to bump and rebuild again if builds are going in-order > now, as a build of libcddb 1.2.0 has just been requested by anvil. Only if libcddb 1.1.0 and 1.2.0 are ABI-incompatible (or if libcdio 0.75 strictly requires the API of libcddb 1.2.0). Because libcddb 1.1.0 has been built and published before. The FE4 repository seems to be broken currently, so a build libcddb/libcdio ought to get some priority. From rc040203 at freenet.de Tue Jul 26 13:24:06 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Tue, 26 Jul 2005 15:24:06 +0200 Subject: rpms/libcdio/FC-4 .cvsignore, 1.5, 1.6 libcdio.spec, 1.9, 1.10 sources, 1.5, 1.6 In-Reply-To: <200507261158.j6QBwLeZ015516@cvs-int.fedora.redhat.com> References: <200507261158.j6QBwLeZ015516@cvs-int.fedora.redhat.com> Message-ID: <1122384246.4264.247.camel@mccallum.corsepiu.local> On Tue, 2005-07-26 at 07:58 -0400, Adrian Reber wrote: > Author: adrian > Index: libcdio.spec > =================================================================== > RCS file: /cvs/extras/rpms/libcdio/FC-4/libcdio.spec,v > retrieving revision 1.9 > retrieving revision 1.10 > diff -u -r1.9 -r1.10 > --- libcdio.spec 5 Jun 2005 11:23:51 -0000 1.9 > +++ libcdio.spec 26 Jul 2005 11:58:19 -0000 1.10 > @@ -1,13 +1,13 @@ > Name: libcdio > -Version: 0.74 > +Version: 0.75 > Release: 2%{?dist} You should reset %release when incrementing %version. Ralf From fedora-extras-commits at redhat.com Tue Jul 26 13:38:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:38:02 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.5,1.6 Message-ID: <200507261338.j6QDc2AN018781@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18764 Modified Files: scim-anthy.spec Log Message: Add "anthy" in the requires section Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-anthy.spec 26 Jul 2005 06:34:46 -0000 1.5 +++ scim-anthy.spec 26 Jul 2005 13:38:00 -0000 1.6 @@ -9,6 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Reqires: anthy BuildRequires: scim-devel anthy-devel %description From fedora-extras-commits at redhat.com Tue Jul 26 13:38:43 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:38:43 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.6,1.7 Message-ID: <200507261338.j6QDch37018825@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-anthy.spec 26 Jul 2005 13:38:00 -0000 1.6 +++ scim-anthy.spec 26 Jul 2005 13:38:41 -0000 1.7 @@ -9,7 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Reqires: anthy +Requires: anthy BuildRequires: scim-devel anthy-devel %description From fedora-extras-commits at redhat.com Tue Jul 26 13:39:41 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:39:41 -0400 Subject: rpms/scim-anthy/FC-3 scim-anthy.spec,1.7,1.8 Message-ID: <200507261339.j6QDdfjv018879@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18861 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-anthy.spec 26 Jul 2005 13:38:41 -0000 1.7 +++ scim-anthy.spec 26 Jul 2005 13:39:39 -0000 1.8 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries From fedora-extras-commits at redhat.com Tue Jul 26 13:40:52 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 26 Jul 2005 09:40:52 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.7,1.8 Message-ID: <200507261340.j6QDeqOu018936@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18919 Modified Files: scim-anthy.spec Log Message: Add "anthy" into the requires section Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-anthy.spec 26 Jul 2005 06:35:12 -0000 1.7 +++ scim-anthy.spec 26 Jul 2005 13:40:50 -0000 1.8 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,6 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: anthy BuildRequires: scim-devel anthy-devel %description From fedora-extras-commits at redhat.com Tue Jul 26 14:53:03 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 10:53:03 -0400 Subject: devel/common tobuild,1.2077,1.2078 Message-ID: <200507261453.j6QEr3Kh022083@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22053 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2077 retrieving revision 1.2078 diff -u -r1.2077 -r1.2078 --- tobuild 26 Jul 2005 12:16:47 -0000 1.2077 +++ tobuild 26 Jul 2005 14:53:01 -0000 1.2078 @@ -3,6 +3,9 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 +adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 @@ -74,7 +77,6 @@ thias rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 devel icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel -anvil rpms/libcddb/FC-4 libcddb-1_1_0-1_fc4 fc4 scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel @@ -140,7 +142,4 @@ mschwendt devel/inkscape inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 -adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel -adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel From fedora-extras-commits at redhat.com Tue Jul 26 14:57:42 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 10:57:42 -0400 Subject: devel/common tobuild,1.2078,1.2079 Message-ID: <200507261457.j6QEvg4A022174@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22154 Modified Files: tobuild Log Message: Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2078 retrieving revision 1.2079 diff -u -r1.2078 -r1.2079 --- tobuild 26 Jul 2005 14:53:01 -0000 1.2078 +++ tobuild 26 Jul 2005 14:57:39 -0000 1.2079 @@ -3,8 +3,8 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 +adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 15:29:28 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 26 Jul 2005 11:29:28 -0400 Subject: common tobuild,1.2079,1.2080 Message-ID: <200507261529.j6QFTSYX023382@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23365 Modified Files: tobuild Log Message: better order Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2079 retrieving revision 1.2080 diff -u -r1.2079 -r1.2080 --- tobuild 26 Jul 2005 14:57:39 -0000 1.2079 +++ tobuild 26 Jul 2005 15:29:26 -0000 1.2080 @@ -3,8 +3,8 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 adrian rpms/libcdio/FC-4 libcdio-0_75-2_fc4 fc4 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 15:45:35 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Tue, 26 Jul 2005 11:45:35 -0400 Subject: common tobuild,1.2080,1.2081 Message-ID: <200507261545.j6QFjZqK023477@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23460 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-3 clamav-0_86_2-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2080 retrieving revision 1.2081 diff -u -r1.2080 -r1.2081 --- tobuild 26 Jul 2005 15:29:26 -0000 1.2080 +++ tobuild 26 Jul 2005 15:45:33 -0000 1.2081 @@ -143,3 +143,4 @@ nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel +ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 15:46:05 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Tue, 26 Jul 2005 11:46:05 -0400 Subject: common tobuild,1.2081,1.2082 Message-ID: <200507261546.j6QFk5bQ023539@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23522 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-4 clamav-0_86_2-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2081 retrieving revision 1.2082 diff -u -r1.2081 -r1.2082 --- tobuild 26 Jul 2005 15:45:33 -0000 1.2081 +++ tobuild 26 Jul 2005 15:46:03 -0000 1.2082 @@ -144,3 +144,4 @@ nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 +ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 From johnp at redhat.com Tue Jul 26 15:10:25 2005 From: johnp at redhat.com (John (J5) Palmieri) Date: Tue, 26 Jul 2005 11:10:25 -0400 Subject: APPROVED: istanbul Message-ID: <1122390625.15788.27.camel@remedyz.boston.redhat.com> Name: istanbul Summary: Desktop Session Recorder Description: Istanbul is a desktop session recorder. You can use it to record your desktop session and then play it back for demos, tutorials and presentations. Sessions are recorded to ogg theora files for later playback. Reviewer: John (J5) Palmieri Maintainer:Jeff Spaleta From fedora-extras-commits at redhat.com Tue Jul 26 16:28:08 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 12:28:08 -0400 Subject: devel/hping2 hping2-cflags.patch, NONE, 1.1 hping2-getifnamedebug.patch, NONE, 1.1 hping2.spec, 1.6, 1.7 Message-ID: <200507261628.j6QGS8gT024824@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/hping2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24801 Modified Files: hping2.spec Added Files: hping2-cflags.patch hping2-getifnamedebug.patch Log Message: * Tue Jul 26 2005 Michael Schwendt - 2.0.0-0.5.rc3 - Fix "local variable used before set" (#149776). - Use rpm optflags. hping2-cflags.patch: --- NEW FILE hping2-cflags.patch --- diff -Nur hping2-rc3-orig/Makefile.in hping2-rc3/Makefile.in --- hping2-rc3-orig/Makefile.in 2004-05-03 11:29:39.000000000 +0200 +++ hping2-rc3/Makefile.in 2005-07-26 18:26:15.000000000 +0200 @@ -9,7 +9,7 @@ CC= gcc AR=/usr/bin/ar RANLIB=/usr/bin/ranlib -CCOPT= -O2 -Wall @PCAP_INCLUDE@ +CCOPT= $(CFLAGS) -Wall @PCAP_INCLUDE@ DEBUG= -g #uncomment the following if you need libpcap based build under linux #(not raccomanded) hping2-getifnamedebug.patch: --- NEW FILE hping2-getifnamedebug.patch --- diff -Nur hping2-rc3-orig/getifname.c hping2-rc3/getifname.c --- hping2-rc3-orig/getifname.c 2004-05-03 10:55:53.000000000 +0200 +++ hping2-rc3/getifname.c 2005-07-26 18:23:34.000000000 +0200 @@ -60,7 +60,7 @@ known_output_if = 1; if (opt_debug) printf("DEBUG: Output interface address: %s\n", - inet_ntoa(sa.sin_addr)); + inet_ntoa(output_if_addr.sin_addr)); } else { fprintf(stderr, "Warning: Unable to guess the output " "interface\n"); Index: hping2.spec =================================================================== RCS file: /cvs/extras/devel/hping2/hping2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hping2.spec 6 Apr 2005 22:12:01 -0000 1.6 +++ hping2.spec 26 Jul 2005 16:28:06 -0000 1.7 @@ -1,7 +1,6 @@ Name: hping2 Version: 2.0.0 -Release: 0.4.rc3 - +Release: 0.5.rc3 Summary: TCP/IP stack auditing and much more Group: Applications/Internet @@ -10,6 +9,8 @@ Source0: http://www.hping.org/hping2.0.0-rc3.tar.gz Patch0: hping2-include.patch Patch1: hping2-x86_64.patch +Patch2: hping2-getifnamedebug.patch +Patch3: hping2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpcap @@ -23,6 +24,8 @@ %setup -q -n hping2-rc3 %patch0 -p0 %patch1 -p0 +%patch2 -p1 -b .getifnamedebug +%patch3 -p1 -b .cflags %build %configure --force-libpcap @@ -49,6 +52,10 @@ %{_mandir}/man8/* %changelog +* Tue Jul 26 2005 Michael Schwendt - 2.0.0-0.5.rc3 +- Fix "local variable used before set" (#149776). +- Use rpm optflags. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Tue Jul 26 16:28:59 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 26 Jul 2005 12:28:59 -0400 Subject: devel/common tobuild,1.2082,1.2083 Message-ID: <200507261628.j6QGSx4M024883@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24866 Modified Files: tobuild Log Message: request build of devel/hping2 hping2-2_0_0-0_5_rc3 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2082 retrieving revision 1.2083 diff -u -r1.2082 -r1.2083 --- tobuild 26 Jul 2005 15:46:03 -0000 1.2082 +++ tobuild 26 Jul 2005 16:28:56 -0000 1.2083 @@ -145,3 +145,4 @@ ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 +mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel From fedora-extras-commits at redhat.com Tue Jul 26 17:22:48 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:22:48 -0400 Subject: rpms/fish/FC-3 .cvsignore, 1.2, 1.3 fish.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507261722.j6QHMmWM027288@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267 Modified Files: .cvsignore fish.spec sources Log Message: * Upload Axels latest fish Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 +++ .cvsignore 26 Jul 2005 17:22:46 -0000 1.3 @@ -1 +1 @@ -fish-1.11.1.tar.bz2 +fish-1.12.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/fish.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fish.spec 1 Jul 2005 11:11:11 -0000 1.3 +++ fish.spec 26 Jul 2005 17:22:46 -0000 1.4 @@ -1,17 +1,17 @@ -Summary: A friendly interactive shell -Name: fish +Summary: A friendly interactive shell +Name: fish -Version: 1.11.1 -Release: 10%{?dist} +Version: 1.12.0 +Release: 1%{?dist} -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -65,20 +65,19 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 -- Added dist macro to the release -- Small spec beautifying +* Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 +- 1.12.0 -* Thu Jun 30 2005 Michael Schwendt - 1.11.1-9 +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way -* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 11:03:18 -0000 1.2 +++ sources 26 Jul 2005 17:22:46 -0000 1.3 @@ -1 +1 @@ -b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 +8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 17:23:11 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:23:11 -0400 Subject: common tobuild,1.2083,1.2084 Message-ID: <200507261723.j6QHNBYK027351@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27334 Modified Files: tobuild Log Message: request build of rpms/fish/FC-3 fish-1_12_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2083 retrieving revision 1.2084 diff -u -r1.2083 -r1.2084 --- tobuild 26 Jul 2005 16:28:56 -0000 1.2083 +++ tobuild 26 Jul 2005 17:23:09 -0000 1.2084 @@ -146,3 +146,4 @@ ensc rpms/clamav/FC-3 clamav-0_86_2-2_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel +oliver rpms/fish/FC-3 fish-1_12_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Tue Jul 26 17:23:48 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:23:48 -0400 Subject: rpms/fish/FC-4 .cvsignore, 1.2, 1.3 fish.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507261724.j6QHOIMI027399@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27375 Modified Files: .cvsignore fish.spec sources Log Message: * Upload Axels latest fish Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jul 2005 11:03:18 -0000 1.2 +++ .cvsignore 26 Jul 2005 17:23:45 -0000 1.3 @@ -1 +1 @@ -fish-1.11.1.tar.bz2 +fish-1.12.0.tar.bz2 Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/fish.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fish.spec 1 Jul 2005 11:11:11 -0000 1.3 +++ fish.spec 26 Jul 2005 17:23:45 -0000 1.4 @@ -1,17 +1,17 @@ -Summary: A friendly interactive shell -Name: fish +Summary: A friendly interactive shell +Name: fish -Version: 1.11.1 -Release: 10%{?dist} +Version: 1.12.0 +Release: 1%{?dist} -License: GPL -Group: System Environment/Shells -URL: http://roo.no-ip.org/fish/ +License: GPL +Group: System Environment/Shells +URL: http://roo.no-ip.org/fish/ -Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen ncurses-devel xorg-x11-devel %description fish is a shell geared towards interactive use. It's features are @@ -65,20 +65,19 @@ %config %_sysconfdir/fish.d/fish_*.fish %changelog -* Fri Jul 01 2005 Oliver Falk - 1.11.1-10 -- Added dist macro to the release -- Small spec beautifying +* Fri Jul 15 2005 Axel Liljencrantz 1.12.0-1 +- 1.12.0 -* Thu Jun 30 2005 Michael Schwendt - 1.11.1-9 +* Thu Jun 30 2005 Michael Schwendt 1.11.1-9 - Set CFLAGS the proper way -* Thu Jun 30 2005 Axel Liljencrantz - 1.11.1-8 +* Thu Jun 30 2005 Axel Liljencrantz 1.11.1-8 - Fix revision number in changelog -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-7 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-7 - Send post-script output to /dev/null -* Wed Jun 29 2005 Axel Liljencrantz - 1.11.1-6 +* Wed Jun 29 2005 Axel Liljencrantz 1.11.1-6 - Add changelog section to spec file - Add macros to source tags - Add smp_mflags to 'make all' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fish/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jul 2005 11:03:18 -0000 1.2 +++ sources 26 Jul 2005 17:23:45 -0000 1.3 @@ -1 +1 @@ -b76e676c63b61d4e037c690e425a4435 fish-1.11.1.tar.bz2 +8980e6dd1a41d699a44c2579c9b1e36c fish-1.12.0.tar.bz2 From fedora-extras-commits at redhat.com Tue Jul 26 17:24:36 2005 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Tue, 26 Jul 2005 13:24:36 -0400 Subject: common tobuild,1.2084,1.2085 Message-ID: <200507261724.j6QHOaH2027461@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27444 Modified Files: tobuild Log Message: request build of rpms/fish/FC-4 fish-1_12_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2084 retrieving revision 1.2085 diff -u -r1.2084 -r1.2085 --- tobuild 26 Jul 2005 17:23:09 -0000 1.2084 +++ tobuild 26 Jul 2005 17:24:34 -0000 1.2085 @@ -147,3 +147,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt devel/hping2 hping2-2_0_0-0_5_rc3 devel oliver rpms/fish/FC-3 fish-1_12_0-1_fc3 fc3 +oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Tue Jul 26 17:47:26 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 13:47:26 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.23, 1.24 PackageJob.py, 1.14, 1.15 UserInterface.py, 1.29, 1.30 Message-ID: <200507261747.j6QHlQxb027560@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510/server Modified Files: BuildMaster.py PackageJob.py UserInterface.py Log Message: 2005-07-26 Dan Williams - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- BuildMaster.py 25 Jul 2005 21:44:52 -0000 1.23 +++ BuildMaster.py 26 Jul 2005 17:47:24 -0000 1.24 @@ -97,6 +97,9 @@ class BuildMaster(threading.Thread): + + MAX_CHECKOUT_JOBS = 5 + def __init__(self, hostname, builder_manager): self.builder_manager = builder_manager self.hostname = hostname @@ -113,6 +116,9 @@ self._new_queue_lock = threading.Lock() self._restart_queue = [] self._restart_queue_lock = threading.Lock() + self._checkout_wait_queue = [] + self._checkout_num = 0 + self._checkout_wait_queue_lock = threading.Lock() self._status_updates = {} self._status_updates_lock = threading.Lock() @@ -139,7 +145,7 @@ 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!="killed" AND status!="initialize") ORDER BY uid') + self.curs.execute('SELECT uid FROM jobs WHERE (status!="needsign" AND status!="failed" AND status!="killed") ORDER BY uid') self.dbcx.commit() uids = self.curs.fetchall() @@ -239,6 +245,28 @@ self._archjob_status_updates[lcl_uid] = lcl_attrdict self._archjob_status_updates_lock.release() + def queue_checkout_wait(self, job): + self._checkout_wait_queue_lock.acquire() + self._checkout_wait_queue.append(job) + self._checkout_wait_queue_lock.release() + + def notify_checkout_done(self, job): + self._checkout_wait_queue_lock.acquire() + self._checkout_num = self._checkout_num - 1 + self._checkout_wait_queue_lock.release() + + def _process_checkout_wait_jobs(self): + self._checkout_wait_queue_lock.acquire() + + # We allow only 5 jobs at a time in checkout stage + allowed_jobs = min(self.MAX_CHECKOUT_JOBS - self._checkout_num, len(self._checkout_wait_queue)) + for i in range(allowed_jobs): + job = self._checkout_wait_queue[i] + self._checkout_num = self._checkout_num + 1 + job.checkout_wait_done_callback() + self._checkout_wait_queue = self._checkout_wait_queue[allowed_jobs:] + self._checkout_wait_queue_lock.release() + def notify_job_done(self, job): self._done_queue_lock.acquire() self._done_queue.append(job) @@ -374,38 +402,41 @@ def _have_work(self): have_work = False - self._new_queue_lock.acquire() - if len(self._new_queue) > 0: - have_work = True - self._new_queue_lock.release() - if have_work: - return True - self._restart_queue_lock.acquire() - if len(self._restart_queue) > 0: - have_work = True - self._restart_queue_lock.release() - if have_work: - return True + if not have_work: + self._new_queue_lock.acquire() + if len(self._new_queue) > 0: + have_work = True + self._new_queue_lock.release() + + if not have_work: + self._restart_queue_lock.acquire() + if len(self._restart_queue) > 0: + have_work = True + self._restart_queue_lock.release() + + if not have_work: + self._checkout_wait_queue_lock.acquire() + if (self._checkout_num < self.MAX_CHECKOUT_JOBS) and len(self._checkout_wait_queue) > 0: + have_work = True + self._checkout_wait_queue_lock.release() - self._status_updates_lock.acquire() - if len(self._status_updates) > 0: - have_work = True - self._status_updates_lock.release() - if have_work: - return True + if not have_work: + self._status_updates_lock.acquire() + if len(self._status_updates) > 0: + have_work = True + self._status_updates_lock.release() - self._archjob_status_updates_lock.acquire() - if len(self._archjob_status_updates) > 0: - have_work = True - self._archjob_status_updates_lock.release() - if have_work: - return True + if not have_work: + self._archjob_status_updates_lock.acquire() + if len(self._archjob_status_updates) > 0: + have_work = True + self._archjob_status_updates_lock.release() - if self.builder_manager.have_work(): - return True + if not have_work and self.builder_manager.have_work(): + have_work = True - return False + return have_work def get_job(self, uid): self._building_jobs_lock.acquire() @@ -427,6 +458,9 @@ # Clean up jobs that have finished self._process_finished_jobs() + # Let a few jobs through the checkout_wait gate if needed + self._process_checkout_wait_jobs() + # Start any new jobs self._start_new_jobs() self._start_requeued_jobs() Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PackageJob.py 25 Jul 2005 19:47:15 -0000 1.14 +++ PackageJob.py 26 Jul 2005 17:47:24 -0000 1.15 @@ -91,7 +91,7 @@ Validate a job stage. """ - stages = ['initialize', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] + stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'finished', 'addtorepo', 'repodone', 'needsign', 'failed', 'killed'] if stage in stages: return True return False @@ -116,7 +116,6 @@ self.epoch = None self.ver = None self.release = None - pjc = PackageJobController(self, 'initialize', 'waiting') self.hostname = hostname self.username = username @@ -129,13 +128,15 @@ self.stage_dir = None self.srpm_path = None self.srpm_http_path = None - # Deal with straight SRPM builds - if self.no_cvs and self.curstage is 'initialize': - self._set_cur_stage('make_srpm') self.repofiles = {} self.archjobs = {} self._archjobs_lock = threading.Lock() self._event = threading.Event() + + first_stage = 'initialize' + if self.no_cvs == True: + first_stage = 'make_srpm' + pjc = PackageJobController(self, first_stage, 'waiting') pjc.start() def get_cur_stage(self): @@ -259,9 +260,13 @@ os.makedirs(stage_dir) return stage_dir - + def checkout_wait_done_callback(self): + self._set_cur_stage('checkout_wait_done') + self.wake() + def _checkout(self): self._set_cur_stage('checkout') + err_msg = None # Create the temporary checkout directory dirname = "%s-%s-%d" % (self.uid, self.cvs_tag, time.time()) @@ -275,19 +280,23 @@ debugprint("%d: Running %s" % (self.uid, cmd)) s, o = commands.getstatusoutput(cmd) if s != 0: - msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) - raise PrepError(msg) - - # Just in case the 'common' directory didn't come along for the ride, - # get it from CVS - pkg_path = os.path.join(self.checkout_tmpdir, self.package) - if not os.path.exists(os.path.join(pkg_path, "common")): - cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd']) - debugprint("%d: Running %s" % (self.uid, cmd)) - s, o = commands.getstatusoutput(cmd) - if s != 0: - msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) - raise PrepError(msg) + err_msg = "could not check out %s from %s - output was:\n %s" % (self.cvs_tag, self.target, o) + else: + # Just in case the 'common' directory didn't come along for the ride, + # get it from CVS + pkg_path = os.path.join(self.checkout_tmpdir, self.package) + if not os.path.exists(os.path.join(pkg_path, "common")): + cmd = 'cd %s; %s co common' % (pkg_path, config_opts['cvs_cmd']) + debugprint("%d: Running %s" % (self.uid, cmd)) + s, o = commands.getstatusoutput(cmd) + if s != 0: + err_msg = "could not check out common directory - output was:\n %s" % (self.cvs_tag, self.target, o) + + self.bm.notify_checkout_done(self) + + if err_msg: + raise PrepError(err_msg) + def _make_srpm(self): self._set_cur_stage('make_srpm') @@ -450,6 +459,11 @@ try: wait = False if self.curstage == 'initialize': + self.bm.queue_checkout_wait(self) + self._set_cur_stage('checkout_wait') + elif self.curstage == 'checkout_wait': + wait = True + elif self.curstage == 'checkout_wait_done': self._checkout() elif self.curstage == 'checkout': self._make_srpm() Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- UserInterface.py 25 Jul 2005 21:44:52 -0000 1.29 +++ UserInterface.py 26 Jul 2005 17:47:24 -0000 1.30 @@ -39,12 +39,10 @@ def validate_email(email): + safe_list = ['@', '_', '-', '.', '+'] for c in email: # For now, legal characters are '@_-.+' plus alphanumeric - if (c == '@') or (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): - pass - else: - print "Bad char is '%s'" % c + if not (c in safe_list) and not c.isalnum(): return False return True @@ -59,6 +57,20 @@ return None return uid +def validate_package_name(name): + safe_list = ['_', '-', '+'] + for c in name: + if not (c in safe_list) and not c.isalnum(): + return False + return True + +def validate_cvs_tag(tag): + safe_list = ['-', '_', '.', ':', '~', '[', ']'] + for c in tag: + if not (c in safe_list) and not c.isalnum(): + return False + return True + class InvalidTargetError(exceptions.Exception): pass @@ -111,6 +123,16 @@ "%s: this server builds SRPMs, not CVS checkouts." % (cvs_tag, target)) return (-1, "This build server is set up for building SRPMS only. Use the 'enqueue_srpm' command instead.") + if not validate_package_name(package): + email_result(email, cvs_tag, "Error setting up build for %s on "\ + "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (cvs_tag, target, package)) + return (-1, "The package name contained an illegal character.") + + if not validate_cvs_tag(cvs_tag): + email_result(email, cvs_tag, "Error setting up build for %s on "\ + "%s: The CVS tag '%s' contained an illegal character. Submit a bug report?" % (package, target, cvs_tag)) + return (-1, "The CVS tag contained an illegal character.") + try: real_target = resolve_target(target) except InvalidTargetError: @@ -130,6 +152,11 @@ "%s: this server builds CVS checkouts, not SRPMS." % (srpm_file, target)) return (-1, "This build server is set up for building from CVS. Use the 'enqueue' command instead.") + if not validate_package_name(package): + email_result(email, srpm_file, "Error setting up build for %s on "\ + "%s: Package name '%s' contained an illegal character. Submit a bug report?" % (package, target, package)) + return (-1, "The package name contained an illegal character.") + # We limit the database field to 255 chars if len(srpm_file) > 255: email_result(email, srpm_file, "Error setting up build for %s on "\ From fedora-extras-commits at redhat.com Tue Jul 26 17:47:20 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 13:47:20 -0400 Subject: extras-buildsys ChangeLog,1.74,1.75 Message-ID: <200507261747.j6QHloZX027564@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510 Modified Files: ChangeLog Log Message: 2005-07-26 Dan Williams - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- ChangeLog 25 Jul 2005 21:44:51 -0000 1.74 +++ ChangeLog 26 Jul 2005 17:47:18 -0000 1.75 @@ -1,3 +1,9 @@ +2005-07-26 Dan Williams + + - Throttle CVS checkouts to 5 jobs at a time + - Validate package and cvs_tag inputs to enqueue functions since they + get passed directly to commands.getstatusoutput() + 2005-07-25 Dan Williams * client/client.py From fedora-extras-commits at redhat.com Tue Jul 26 17:47:21 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 13:47:21 -0400 Subject: extras-buildsys/common FileDownloader.py,1.13,1.14 Message-ID: <200507261747.j6QHlpY2027567@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27510/common Modified Files: FileDownloader.py Log Message: 2005-07-26 Dan Williams - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- FileDownloader.py 21 Jul 2005 14:36:49 -0000 1.13 +++ FileDownloader.py 26 Jul 2005 17:47:19 -0000 1.14 @@ -70,9 +70,10 @@ raise FileNameError("Extension was not allowed.") # FIXME: what other validation can we do here? + safe_list = ['_', '-', '.', '+'] for c in filename: # For now, legal characters are '_-.' plus alphanumeric - if (c == '_') or (c == '-') or (c == '.') or (c == '+') or c.isalnum(): + if c in safe_list or c.isalnum(): pass else: raise FileNameError("Illegal character '%s' encountered." % c) From fedora-extras-commits at redhat.com Tue Jul 26 20:12:18 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:12:18 -0400 Subject: mock Makefile,1.4,1.5 Message-ID: <200507262012.j6QKCm8h031267@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31235 Modified Files: Makefile Log Message: fix Makefile Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 14 Jul 2005 18:00:26 -0000 1.4 +++ Makefile 26 Jul 2005 20:12:16 -0000 1.5 @@ -20,6 +20,7 @@ install: mkdir -p $(DESTDIR)/usr/bin/ + mkdir -p $(DESTDIR)/usr/libexec install -m 755 mock.py $(DESTDIR)/usr/bin/mock install -m 755 mock-yum $(DESTDIR)/usr/libexec/mock-yum mkdir -p $(DESTDIR)/var/lib/mock From fedora-extras-commits at redhat.com Tue Jul 26 20:12:19 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:12:19 -0400 Subject: mock/etc Makefile,1.2,1.3 Message-ID: <200507262012.j6QKCnC9031270@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31235/etc Modified Files: Makefile Log Message: fix Makefile Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/etc/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 12 Jun 2005 23:23:47 -0000 1.2 +++ Makefile 26 Jul 2005 20:12:16 -0000 1.3 @@ -10,6 +10,6 @@ install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \ done for arch in i386 ppc x86_64 ; do \ - ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-development-$$arch-core.cfg; \ + ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-devel-$$arch-core.cfg; \ done From fedora-extras-commits at redhat.com Tue Jul 26 20:16:23 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:16:23 -0400 Subject: mock mock.spec,1.10,1.11 Message-ID: <200507262016.j6QKGN9b031308@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279 Modified Files: mock.spec Log Message: make file fix and update spec file Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mock.spec 27 Jun 2005 03:43:11 -0000 1.10 +++ mock.spec 26 Jul 2005 20:16:21 -0000 1.11 @@ -46,6 +46,7 @@ %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} +%{_libexecdir}/mock-yum %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so From fedora-extras-commits at redhat.com Tue Jul 26 20:16:24 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:16:24 -0400 Subject: mock/etc Makefile,1.3,1.4 Message-ID: <200507262016.j6QKGOdK031314@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279/etc Modified Files: Makefile Log Message: make file fix and update spec file Index: Makefile =================================================================== RCS file: /cvs/fedora/mock/etc/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile 26 Jul 2005 20:12:16 -0000 1.3 +++ Makefile 26 Jul 2005 20:16:22 -0000 1.4 @@ -10,6 +10,6 @@ install -m 644 $$item $(DESTDIR)/etc/mock/$$item; \ done for arch in i386 ppc x86_64 ; do \ - ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-devel-$$arch-core.cfg; \ + ln -sv fedora-5-$$arch-core.cfg $(DESTDIR)/etc/mock/fedora-development-$$arch-core.cfg; \ done From fedora-extras-commits at redhat.com Tue Jul 26 20:17:31 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:17:31 -0400 Subject: mock mock.py,1.22,1.23 mock.spec,1.11,1.12 Message-ID: <200507262017.j6QKHVZm031345@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31326 Modified Files: mock.py mock.spec Log Message: bump version number to 0.4 Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mock.py 21 Jul 2005 14:40:44 -0000 1.22 +++ mock.py 26 Jul 2005 20:17:29 -0000 1.23 @@ -28,7 +28,7 @@ from optparse import OptionParser -__VERSION__ = '0.3' +__VERSION__ = '0.4' def error(msg): print >> sys.stderr, msg Index: mock.spec =================================================================== RCS file: /cvs/fedora/mock/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 26 Jul 2005 20:16:21 -0000 1.11 +++ mock.spec 26 Jul 2005 20:17:29 -0000 1.12 @@ -1,6 +1,6 @@ Summary: Builds packages inside chroots Name: mock -Version: 0.3 +Version: 0.4 Release: 1 License: GPL Group: Development/Tools From fedora-extras-commits at redhat.com Tue Jul 26 20:36:43 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 26 Jul 2005 16:36:43 -0400 Subject: mock mock.py,1.23,1.24 Message-ID: <200507262036.j6QKahZZ031384@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31367 Modified Files: mock.py Log Message: fix exception handling Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mock.py 26 Jul 2005 20:17:29 -0000 1.23 +++ mock.py 26 Jul 2005 20:36:41 -0000 1.24 @@ -25,6 +25,7 @@ import shutil import types import grp +from exceptions import Exception from optparse import OptionParser @@ -36,31 +37,31 @@ class Error(Exception): def __init__(self, msg): - exceptions.Exception.__init__(self) + Exception.__init__(self) self.msg = msg self.resultcode = 1 class YumError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 30 class PkgError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 40 class BuildError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 10 class RootError(Error): def __init__(self, msg): - Error.__init__(self) + Error.__init__(self, msg) self.msg = msg self.resultcode = 20 From fedora-extras-commits at redhat.com Tue Jul 26 21:12:35 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 26 Jul 2005 17:12:35 -0400 Subject: web/html/docs/release-notes/fc4/errata index.php, 1.5, 1.6 ld-txt-fedora-desktop-screenshot.php, 1.4, 1.5 Message-ID: <200507262112.j6QLCZ2b032614@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes/fc4/errata In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32595 Modified Files: index.php ld-txt-fedora-desktop-screenshot.php Log Message: Language more inline with project goals. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/fc4/errata/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.php 22 Jul 2005 09:08:09 -0000 1.5 +++ index.php 26 Jul 2005 21:12:33 -0000 1.6 @@ -30,35 +30,35 @@
    3. Introduction and Technical Release Notes
    4. Hardware Requirements
    -
    4.1. CPU Requirements
    -
    4.2. Hard Disk Space Requirements
    -
    4.3. Memory Requirements
    +
    4.1. CPU Requirements
    +
    4.2. Hard Disk Space Requirements
    +
    4.3. Memory Requirements
    4.4. PPC Hardware Requirements
    5. Overview of This Release
    6. Installation-Related Notes
    6.1. PPC Installation Notes
    -
    6.2. Anaconda Notes
    -
    6.3. Installation-Related Issues
    +
    6.2. Anaconda Notes
    +
    6.3. Installation-Related Issues
    -
    7. Package-Specific Notes
    +
    7. Package-Specific Notes
    7.1. Basic Components
    -
    7.1.1. Fedora Extras Repository
    +
    7.1.1. Fedora Extras Repository
    7.1.2. Audit Daemon auditd and Log Files
    7.1.3. LinuxThreads versus NPTL
    -
    7.1.4. Enabling the slocate Database
    -
    7.1.5. Stricter Controls in openssh
    +
    7.1.4. Enabling the slocate Database
    +
    7.1.5. Stricter Controls in openssh
    7.1.6. Perl Binary Compat Symlinks
    7.1.7. Server and System Configuration Tools
    -
    7.1.8. Java Package Recommendations
    +
    7.1.8. Java Package Recommendations
    7.2. Core
    -
    7.2.1. yum
    +
    7.2.1. yum
    7.2.2. Linux Kernel
    @@ -68,8 +68,8 @@ Development Tools
    7.3.1. GCC Compiler Collection
    -
    7.4. Language Support
    -
    7.4.1. The IIIMF Input System
    +
    7.4. Language Support
    +
    7.4.1. The IIIMF Input System
    7.5. Web Servers
    7.5.1. mod_perl
    @@ -346,8 +346,8 @@

    The unofficial http://fedorafaq.org provides useful answers on commonly asked questions. However, these are - completely unsupported by the Fedora Project. The Fedora Project recommends using free - and open source software alternatives whenever possible. + completely unsupported by the Fedora Project. The Fedora Project encourages using free + and open source software..

    The binary only drivers can be acquired from the vendors. You can @@ -383,7 +383,7 @@ produced for the Fedora Project.

    - RELEASE-NOTES-FC4 (2005-07-22-T04:20-0700) + RELEASE-NOTES-FC4 (2005-07-26-T16:20-0700)

    Red Hat, Red Hat Network, the Red Hat "Shadow Man" logo, RPM, Maximum RPM, the RPM logo, Linux @@ -488,7 +488,7 @@

    -4.1.??CPU Requirements

    +4.1.??CPU Requirements

    This section lists the CPU specifications required by Fedora Core @@ -532,7 +532,7 @@

    -4.2.??Hard Disk Space Requirements

    +4.2.??Hard Disk Space Requirements

    This section lists the disk space required to install Fedora Core @@ -595,7 +595,7 @@

    -4.3.??Memory Requirements

    +4.3.??Memory Requirements

    This section lists the memory required to install Fedora Core @@ -1078,7 +1078,7 @@

    -6.2.??Anaconda Notes

    +6.2.??Anaconda Notes
      @@ -1141,7 +1141,7 @@

      -6.3.??Installation-Related Issues

      +6.3.??Installation-Related Issues
      @@ -1241,7 +1241,7 @@

      -7.??Package-Specific Notes

      +7.??Package-Specific Notes

    @@ -1263,7 +1263,7 @@

    -7.1.1.??Fedora Extras Repository

    +7.1.1.??Fedora Extras Repository

    @@ -1405,7 +1405,7 @@

    -7.1.4.??Enabling the slocate Database

    +7.1.4.??Enabling the slocate Database

    @@ -1419,7 +1419,7 @@

    -7.1.5.??Stricter Controls in openssh

    +7.1.5.??Stricter Controls in openssh

    @@ -1505,7 +1505,7 @@

    -7.1.8.??Java Package Recommendations

    +7.1.8.??Java Package Recommendations

    @@ -1536,7 +1536,7 @@

    -7.2.1.??yum

    +7.2.1.??yum

    @@ -2030,7 +2030,7 @@

    -7.4.??Language Support

    +7.4.??Language Support

    @@ -2040,7 +2040,7 @@

    -7.4.1.??The IIIMF Input System

    +7.4.1.??The IIIMF Input System

    From fedora-extras-commits at redhat.com Tue Jul 26 21:13:37 2005 From: fedora-extras-commits at redhat.com (Karsten Wade (kwade)) Date: Tue, 26 Jul 2005 17:13:37 -0400 Subject: web/html/docs/release-notes index.php,1.6,1.7 Message-ID: <200507262113.j6QLDbX1032682@cvs-int.fedora.redhat.com> Author: kwade Update of /cvs/fedora/web/html/docs/release-notes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32665 Modified Files: index.php Log Message: Updating date for errata update. Index: index.php =================================================================== RCS file: /cvs/fedora/web/html/docs/release-notes/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.php 24 Jul 2005 15:52:56 -0000 1.6 +++ index.php 26 Jul 2005 21:13:35 -0000 1.7 @@ -24,7 +24,7 @@

  • Fedora Core 4
  • Fedora Core 3
    • From fedora-extras-commits at redhat.com Tue Jul 26 23:38:59 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:38:59 -0400 Subject: extras-buildsys/www/template main.psp,1.1,1.2 Message-ID: <200507262338.j6QNcx76002843@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/www/template Modified Files: main.psp Log Message: 2005-07-26 Dan Williams - www/config.psp www/templates/main.psp - Move config-type stuff for SSL to config.psp Index: main.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- main.psp 21 Jul 2005 04:07:55 -0000 1.1 +++ main.psp 26 Jul 2005 23:38:57 -0000 1.2 @@ -5,11 +5,12 @@ from OpenSSL import SSL certs = {} -certs['key_and_cert'] = "/var/www/certs/fedora.cert" -certs['ca_cert'] = "/var/www/certs/fedora-upload-ca.cert" -certs['peer_ca_cert'] = "/var/www/certs/fedora-server-ca.cert" +certs['key_and_cert'] = config_opts['user_cert'] +certs['ca_cert'] = config_opts['user_ca_cert'] +certs['peer_ca_cert'] = config_opts['server_ca_cert'] -server = XMLRPCServerProxy.PlgXMLRPCServerProxy("https://flare.boston.redhat.com:8887", certs) +hostname_string = "https://%s:8887" % config_opts['server'] +server = XMLRPCServerProxy.PlgXMLRPCServerProxy(hostname_string, certs) action = 'status' user_email = '' From fedora-extras-commits at redhat.com Tue Jul 26 23:38:53 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:38:53 -0400 Subject: extras-buildsys ChangeLog,1.75,1.76 Message-ID: <200507262339.j6QNdNpk002846@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796 Modified Files: ChangeLog Log Message: 2005-07-26 Dan Williams - www/config.psp www/templates/main.psp - Move config-type stuff for SSL to config.psp Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ChangeLog 26 Jul 2005 17:47:18 -0000 1.75 +++ ChangeLog 26 Jul 2005 23:38:51 -0000 1.76 @@ -1,5 +1,11 @@ 2005-07-26 Dan Williams + - www/config.psp + www/templates/main.psp + - Move config-type stuff for SSL to config.psp + +2005-07-26 Dan Williams + - Throttle CVS checkouts to 5 jobs at a time - Validate package and cvs_tag inputs to enqueue functions since they get passed directly to commands.getstatusoutput() From fedora-extras-commits at redhat.com Tue Jul 26 23:38:54 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:38:54 -0400 Subject: extras-buildsys/www config.psp,1.1,1.2 Message-ID: <200507262339.j6QNdOlC002849@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/www Modified Files: config.psp Log Message: 2005-07-26 Dan Williams - www/config.psp www/templates/main.psp - Move config-type stuff for SSL to config.psp Index: config.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/config.psp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config.psp 21 Jul 2005 04:07:54 -0000 1.1 +++ config.psp 26 Jul 2005 23:38:52 -0000 1.2 @@ -1,6 +1,13 @@ <% config_opts = {} config_opts['system_name'] = "Fedora Extras Build System" -config_opts['base_url'] = "http://127.0.0.1/" +config_opts['server'] = "127.0.0.1" + +# SSL Cert and key bits +# MUST be full path to cert +CERT_BASE_DIR = '/var/www/certs/' +config_opts['user_cert'] = CERT_BASE_DIR + "fedora.cert" +config_opts['user_ca_cert'] = CERT_BASE_DIR + "fedora-upload-ca.cert" +config_opts['server_ca_cert'] = CERT_BASE_DIR + "fedora-server-ca.cert" %> From fedora-extras-commits at redhat.com Tue Jul 26 23:42:19 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 26 Jul 2005 19:42:19 -0400 Subject: extras-buildsys/www/template head.psp,1.3,1.4 main.psp,1.2,1.3 Message-ID: <200507262342.j6QNgJSV002879@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www/template In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2860/www/template Modified Files: head.psp main.psp Log Message: Include config.psp earlier Index: head.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- head.psp 23 Jul 2005 00:55:37 -0000 1.3 +++ head.psp 26 Jul 2005 23:42:17 -0000 1.4 @@ -1,4 +1,3 @@ -<%@ include file="config.psp"%> <% import time Index: main.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- main.psp 26 Jul 2005 23:38:57 -0000 1.2 +++ main.psp 26 Jul 2005 23:42:17 -0000 1.3 @@ -1,3 +1,4 @@ +<%@ include file="config.psp"%> <% import time import os From fedora-extras-commits at redhat.com Wed Jul 27 01:28:26 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:26 -0400 Subject: rpms/istanbul - New directory Message-ID: <200507270128.j6R1SQhd005369@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349/istanbul Log Message: Directory /cvs/extras/rpms/istanbul added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 01:28:26 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:26 -0400 Subject: rpms/istanbul/devel - New directory Message-ID: <200507270128.j6R1SQIN005374@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349/istanbul/devel Log Message: Directory /cvs/extras/rpms/istanbul/devel added to the repository From fedora-extras-commits at redhat.com Wed Jul 27 01:28:40 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:40 -0400 Subject: rpms/istanbul Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507270128.j6R1SejI005425@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394 Added Files: Makefile import.log Log Message: Setup of module istanbul --- NEW FILE Makefile --- # Top level Makefile for module istanbul all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 27 01:28:40 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:28:40 -0400 Subject: rpms/istanbul/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507270128.j6R1SeY5005430@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5394/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module istanbul --- NEW 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 Jul 27 01:29:13 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:29:13 -0400 Subject: rpms/istanbul import.log,1.1,1.2 Message-ID: <200507270129.j6R1TDIo005489@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5458 Modified Files: import.log Log Message: auto-import istanbul-0.1.1-4 on branch devel from istanbul-0.1.1-4.src.rpm initial import of istanbul Index: import.log =================================================================== RCS file: /cvs/extras/rpms/istanbul/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Jul 2005 01:28:37 -0000 1.1 +++ import.log 27 Jul 2005 01:29:11 -0000 1.2 @@ -0,0 +1 @@ +istanbul-0_1_1-4:HEAD:istanbul-0.1.1-4.src.rpm:1122427747 From fedora-extras-commits at redhat.com Wed Jul 27 01:29:13 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:29:13 -0400 Subject: rpms/istanbul/devel istanbul.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507270129.j6R1TD2f005495@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5458/devel Modified Files: .cvsignore sources Added Files: istanbul.spec Log Message: auto-import istanbul-0.1.1-4 on branch devel from istanbul-0.1.1-4.src.rpm initial import of istanbul --- NEW FILE istanbul.spec --- %define gstreamer_version 0.8.7 %define gstreamer_plugins_version 0.8.9 %define pygtk2_version 2.6.0 %define pyver %(python -c 'import sys ; print sys.version[:3]') %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")} Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 Release: 4 License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul Source: http://http://live.hujjat.org/istanbul-%{version}.tar.bz2 #Patch0: istanbul-0.1.0-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pygtk2 >= %{pygtk2_version} Requires: gnome-desktop >= 2.6.0 Requires: gstreamer >= %gstreamer_version Requires: gstreamer-plugins >= %gstreamer_plugins_version Requires: gstreamer-python BuildRequires: python, python-devel BuildRequires: desktop-file-utils BuildRequires: gstreamer-plugins-devel >= %gstreamer_plugins_version BuildRequires: gstreamer-python-devel, gtk2-devel #BuildRequires: gstreamer-devel >= %gstreamer_version #BuildRequires: automake, autoconf #BuildRequires: gnome-common %description Istanbul is a desktop session recorder. You can use it to record your desktop session and then play it back for demos, tutorials and presentations. Sessions are recorded to ogg theora files for later playback. #%package devel #Summary: Libraries/include files for Istanbul. #Group: Development/Libraries #Requires: %{name} = %{version}-%{release} %prep %setup -q %build #aclocal #automake #autoconf %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/istanbul/extern/pytrayicon/*.la desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora-Extra \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop #%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT #%post #%postun #%files -f %{name}.lang %files %defattr(-,root,root,-) #%doc AUTHORS COPYING ChangeLog NEWS README %doc COPYING ChangeLog %{_bindir}/%{name} %{_datadir}/applications/gnome-%{name}.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/prefs.glade %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* %dir %{python_sitelib}/%{name}/extern %{python_sitelib}/%{name}/extern/*.py* %dir %{python_sitelib}/%{name}/extern/pytrayicon %{python_sitelib}/%{name}/extern/pytrayicon/*.py* %{python_sitelib}/%{name}/extern/pytrayicon/*.so* %dir %{python_sitelib}/%{name}/main %{python_sitelib}/%{name}/main/*.py* %dir %{python_sitelib}/%{name}/configure %{python_sitelib}/%{name}/configure/*.py* %changelog * Thu Jul 21 2005 Jef Spaleta - 0.1.1-4 - minor specfile cleanup * Wed Jul 20 2005 Jef Spaleta - 0.1.1-3 - minor specfile cleanup * Tue Jul 19 2005 Jef Spaleta - 0.1.1-2 - added gtk2-devel and python-devel BuildRequires - removed the python-abi requires because rpm in fc4+ catches this now * Fri Jul 01 2005 John (J5) Palmieri - 0.1.1-1 - upgrade to upstream 0.1.1 - remove pythondir patch * Wed Jun 29 2005 John (J5) Palmieri - 0.1.0-2 - Cleanup the spec file * Wed Jun 29 2005 John (J5) Palmieri - 0.1.0-1 - Initial packaging Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Jul 2005 01:28:38 -0000 1.1 +++ .cvsignore 27 Jul 2005 01:29:11 -0000 1.2 @@ -0,0 +1 @@ +istanbul-0.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Jul 2005 01:28:38 -0000 1.1 +++ sources 27 Jul 2005 01:29:11 -0000 1.2 @@ -0,0 +1 @@ +360f0225c916e81eed459e9915caf317 istanbul-0.1.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Jul 27 01:43:51 2005 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Tue, 26 Jul 2005 21:43:51 -0400 Subject: owners owners.list,1.33,1.34 Message-ID: <200507270143.j6R1hpcD005574@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5557 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- owners.list 26 Jul 2005 12:13:47 -0000 1.33 +++ owners.list 27 Jul 2005 01:43:49 -0000 1.34 @@ -305,6 +305,7 @@ Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| 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|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| From fedora-extras-commits at redhat.com Wed Jul 27 05:48:14 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 01:48:14 -0400 Subject: common tobuild,1.2085,1.2086 Message-ID: <200507270548.j6R5mEFq010620@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10603 Modified Files: tobuild Log Message: cleanup successful builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2085 retrieving revision 1.2086 diff -u -r1.2085 -r1.2086 --- tobuild 26 Jul 2005 17:24:34 -0000 1.2085 +++ tobuild 27 Jul 2005 05:48:12 -0000 1.2086 @@ -7,43 +7,29 @@ anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 adrian rpms/libcdio/devel libcdio-0_75-2_fc5 devel ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel -jspaleta rpms/glabels/FC-3 glabels-2_0_3-2_fc3 fc3 -scop rpms/fedora-rpmdevtools/FC-3 fedora-rpmdevtools-1_1-1_fc3 fc3 scop rpms/fedora-rpmdevtools/FC-4 fedora-rpmdevtools-1_1-1_fc4 fc4 scop rpms/fedora-rpmdevtools/devel fedora-rpmdevtools-1_1-1_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -adrian rpms/jhead/FC-3 jhead-2_4-3_fc3 fc3 adrian rpms/jhead/FC-4 jhead-2_4-3_fc4 fc4 petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 -ensc rpms/ip-sentinel/FC-3 ip-sentinel-0_12-5_fc3 fc3 ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel -ixs rpms/mod_suphp/FC-3 mod_suphp-0_5_2-8_fc3 fc3 ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel -ensc rpms/gif2png/FC-3 gif2png-2_5_1-1_fc3 fc3 ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 -oliver rpms/libstatgrab/FC-3 libstatgrab-0_11_1-3_fc3 fc3 -awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel -tagoh rpms/uim/FC-3 uim-0_4_7-1_fc3 fc3 thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel -awjb rpms/perl-Tk/FC-3 perl-Tk-804_027-6_fc3 fc3 corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 -oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 -thias rpms/gkrellm-aclock/FC-3 gkrellm-aclock-0_3_3-1_fc3 fc3 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 -thias rpms/gkrellm-freq/FC-3 gkrellm-freq-0_1_1-1_fc3 fc3 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel @@ -52,26 +38,21 @@ bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel -jfontain rpms/moodss/FC-3 moodss-20_2-1_fc3 fc3 smccann rpms/proj/devel proj-4_4_9-1_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 -mschwendt rpms/id3lib/FC-3 id3lib-3_8_3-12_fc3 fc3 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 -oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 -thias rpms/lighttpd/FC-3 lighttpd-1_3_15-1_fc3 fc3 roland rpms/monotone/devel monotone-0_21-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel tagoh rpms/apel/devel apel-10_6-8_fc5 devel qspencer rpms/umfpack/devel umfpack-4_4-1 devel -mfleming rpms/mod_security/FC-3 mod_security-1_8_7-4_fc3 fc3 mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 thias rpms/cdlabelgen/FC-4 cdlabelgen-3_5_0-1_fc4 fc4 thias rpms/cdlabelgen/devel cdlabelgen-3_5_0-1_fc5 devel @@ -84,7 +65,6 @@ scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel scop rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 fc4 scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -scop rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder-0_27-2_fc3 fc3 scop rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 @@ -100,12 +80,10 @@ mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 mschwendt rpms/tetex-lgrind/FC-3 tetex-lgrind-3_67-4_1 fc3 Tian rpms/gcfilms/devel gcfilms-5_3-1_fc5 devel -jfontain rpms/moodss/FC-3 moodss-20_3-1_fc3 fc3 abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 fc4 abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel -ixs rpms/perl-Crypt-CBC/FC-3 perl-Crypt-CBC-2_14-2_fc3 fc3 ixs rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC-2_14-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel @@ -113,17 +91,11 @@ bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel -oliver rpms/icmpdn/FC-3 icmpdn-0_3-2 fc3 -oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 -oliver rpms/icmpdn/devel icmpdn-0_3-2 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel -oliver rpms/bwm-ng/FC-3 bwm-ng-0_5-5_fc3 fc3 oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/libdnet/FC-4 libdnet-1_10-2_fc4 fc4 -oliver rpms/libdnet/FC-3 libdnet-1_10-2_fc3 fc3 oliver rpms/fish/devel fish-1_12_0-1_fc5 devel -oliver rpms/fish/FC-3 fish-1_11_1-10_fc3 fc3 oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel adalloz rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 fc3 From fedora-extras-commits at redhat.com Wed Jul 27 05:50:06 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 01:50:06 -0400 Subject: common tobuild,1.2086,1.2087 Message-ID: <200507270550.j6R5o6Rx010653@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10636 Modified Files: tobuild Log Message: remove duplicated builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2086 retrieving revision 1.2087 diff -u -r1.2086 -r1.2087 --- tobuild 27 Jul 2005 05:48:12 -0000 1.2086 +++ tobuild 27 Jul 2005 05:50:04 -0000 1.2087 @@ -31,7 +31,6 @@ oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 -oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel @@ -39,12 +38,10 @@ bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt devel/sylpheed sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel -oliver rpms/fish/devel fish-1_12_0-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 -oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel @@ -73,7 +70,6 @@ bpepple rpms/liferea/FC-4 liferea-0_9_4-1_fc4 fc4 orion rpms/pytz/devel pytz-2005i-2 devel scop rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 fc4 -Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/cksfv cksfv-1_3-4 devel mschwendt devel/freeze freeze-2_5_0-4 devel mschwendt devel/tetex-lgrind tetex-lgrind-3_67-7 devel @@ -92,7 +88,6 @@ mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel -oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/libdnet/FC-4 libdnet-1_10-2_fc4 fc4 oliver rpms/fish/devel fish-1_12_0-1_fc5 devel @@ -100,7 +95,6 @@ adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel adalloz rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 fc3 adalloz rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 fc4 -s4504kr rpms/inadyn/devel inadyn-1_95-1 devel gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Wed Jul 27 06:11:26 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 02:11:26 -0400 Subject: common tobuild,1.2087,1.2088 Message-ID: <200507270611.j6R6BQKc011824@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11807 Modified Files: tobuild Log Message: remove more completed builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2087 retrieving revision 1.2088 diff -u -r1.2087 -r1.2088 --- tobuild 27 Jul 2005 05:50:04 -0000 1.2087 +++ tobuild 27 Jul 2005 06:11:24 -0000 1.2088 @@ -93,7 +93,6 @@ oliver rpms/fish/devel fish-1_12_0-1_fc5 devel oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel -adalloz rpms/pam_abl/FC-3 pam_abl-0_2_2-2_fc3 fc3 adalloz rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 fc4 gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel @@ -102,7 +101,6 @@ thomasvs rpms/flumotion/FC-4 flumotion-0_1_9_fc4-1 fc4 mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 -mschwendt rpms/galculator/FC-3 galculator-1_2_5-1_fc3 fc3 mschwendt devel/meld meld-1_0_0-1_fc5 devel Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt devel/inkscape inkscape-0_42-1_fc5 devel From fedora-extras-commits at redhat.com Wed Jul 27 06:14:02 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Wed, 27 Jul 2005 02:14:02 -0400 Subject: extras-buildsys/www index.psp,1.3,1.4 Message-ID: <200507270614.j6R6E2UG011848@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11831 Modified Files: index.psp Log Message: fix joblinks for waiting jobs following building jobs Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- index.psp 23 Jul 2005 00:55:31 -0000 1.3 +++ index.psp 27 Jul 2005 06:14:00 -0000 1.4 @@ -91,6 +91,8 @@ import os source = os.path.basename(source) # endif + + joblink = job_link(job['uid']) %>
    <%=job['uid']%>
    Result:"<%=result_msg%>"
    Result:"<%=result_msg%>"

    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 @@ -72,7 +72,7 @@ 

     man yum
 man yum.conf
-

    +

    Other useful yum resources on the Internet include:

    Index: ln-legalnotice.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/ln-legalnotice.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ln-legalnotice.php 26 Jul 2005 01:42:03 -0000 1.2 +++ ln-legalnotice.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -26,7 +26,7 @@ They all may be freely redistributed with documentation produced for the Fedora Project.

    - yum-software-management-0.6 (2005-07-25) + yum-software-management-0.6.1 (2005-07-27)

    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: sn-managing-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-managing-packages.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-managing-packages.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-managing-packages.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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 three ways:

    @@ -23,16 +23,11 @@ packages or package groups. Each section below gives some examples.

    - yum downloads data files from each of the - configured repositories. On a slow connection, it may take several - seconds to download the required files for each package. -

    During operation, yum first determines the best set of actions to produce the required result, and displays the transaction for you to approve. The yum utility - may prompt you to approve installation, update, or removal of - additional packages in addition to the package that you specified. - These actions may be necessary to resolve software dependencies. + may prompt you to approve the installation, update, or removal of + additional packages, in order to resolve software dependencies.

    This is an example of the transaction for installing tsclient: @@ -65,13 +60,13 @@ newest version of each package, unless you specify an older version.

    [Tip]Downloads are Cached

    - The yum utility keeps Downloaded data files + The yum utility keeps downloaded data files and packages for reuse. You may copy packages from the repository cache directories under /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: 

    @@ -96,7 +91,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: 

    @@ -122,7 +117,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. Index: sn-searching-packages.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-searching-packages.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-searching-packages.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-searching-packages.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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 @@ -32,14 +32,20 @@ root account when prompted.

    - To make your queries more specific, add other package - attributes. To search for version 0.132 of the application, use - the command: + To make your queries more precise, specify packages with a name + that include other attributes, such as version or hardware + architecture. To search for version 0.132 of the application, + use the command: 

     su -c 'yum list tsclient-0.132'
-

    5.2. Advanced Searches

    - If you do not know the name of the package, use either the +

    [Note]Valid Package Attributes

    + Refer to Section 2.4, “Understanding Package Names” for information + on package name formats and the attributes that they include. +

    5.2. Advanced Searches

    + If you do not know the name of the package, use the search or provides options. + Alternatively, you may use wild cards and regular expressions + with any yum search option.

    The search option checks the names, descriptions, summaries and listed package maintainers of all of @@ -71,12 +77,20 @@

    For each command, at the prompt enter the password for the root account. -

    [Tip]Wildcards and Regular Expressions

    - You may use the standard wildcard characters in search - criteria: ? to represent any one character, - and * to mean zero or more characters. Use - Perl or Python regular expressions to carry out more complex - queries. +

    + Use the standard wildcard characters to run any search option + with a partial word or name: ? to represent any + one character, and * to mean zero or more + characters. Always add the escape character (\) + before wildcards. +

    + To list all packages with names that begin with + tsc, type: + 

    +su -c 'yum list tsc\*'
+
    [Tip]Regular Expressions

    + Use Perl or Python regular expressions to carry out more + complex queries.

    5.3. Understanding Matches

    Searches with yum show all of the packages that match your criteria. Packages must meet the terms of the @@ -87,8 +101,8 @@ or shadow-util would not produce the package shadow-utils. This package would match and be shown if the query was either - shadow-util? or - Shadow*. + shadow-util\? or + Shadow\*.

    Prev Up Next
    4. Managing Software with yum Home 6. Updating Your System with yum
    -
    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 @@ -37,16 +37,23 @@ checks their indexes to find the correct packages.

    The package management utilities in Fedora Core are already configured - to use the network of repositories maintained by the Fedora Project. These - repositories contain the software included with Fedora Core and a large - selection of additional software known as Fedora Extras. Third-party - software developers also provide repositories for their Fedora - compatible packages. -

    [Note]All Fedora Packages are Open Source Software

    + to use a network of servers that provide three repositories: +

    • + The packages that make up Fedora Core, as it is released on disc +

    • + Updated versions of Fedora Core software +

    • + A large selection of additional software, known as Fedora Extras +

    [Note]All Fedora Packages are Open Source Software

    All of the software provided by the Fedora Project is open source software. You may download and install software from the Fedora Project network of repositories on as many systems as desired. -

    +

    + Third-party software developers also provide repositories for + 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 @@ -71,7 +78,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 @@ -88,15 +95,15 @@ 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: 

     tsclient-0.132-4.i386.rpm

    - Management utilities refer to packages with one of three - formats: + Management utilities commonly refer to packages with one of + three formats:

    • Package name: tsclient

    • Index: sn-software-management-tools.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-software-management-tools.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-software-management-tools.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-software-management-tools.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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/beta/yum-software-management/sn-updating-your-system.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-updating-your-system.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-updating-your-system.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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/beta/yum-software-management/sn-using-repositories.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-using-repositories.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-using-repositories.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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. @@ -23,7 +23,7 @@ repository. Members of the community also maintain repositories to provide packages for Fedora systems. Third-party repositories provide information on their web sites. -

      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 @@ -56,7 +56,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 @@ -74,21 +74,23 @@ use this command: 

       su -c 'rpm --import http://www.therepository.com/GPG-PUB-KEY.asc'
-

      7.3. Understanding Repository Compatibility

      - The Fedora Extras project provides packages which are built to the same - standards as Fedora Core packages. Third-party packages should be - compatible with these official packages, unless the provider +

      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 specifically states otherwise.

      - Refer to the web site of the repository for information on + Always read the web site of the repository for information on package compatibility before you add it as a package source. - Repositories often provide packages specifically intended for - use with packages supplied by other repositories. In some cases, - separate third-party repository providers may each offer - different versions of the same software. This situation may - prevent you from safely using those repositories together on - your Fedora system. -

      + Separate repository providers may offer different and + incompatible versions of the same software. In some cases, + third-party repositories may also include alternative packages + for software provided by Fedora Project repositories that are not + compatible with other Fedora packages. +

      [Caution]Incompatible Repositories

      + If you use incompatible repositories yum + operations may fail. +

      Packages built for one version of Fedora are usually not compatible with other versions of Fedora. The web site of the provider should specifically state which versions of Fedora they Index: sn-yum-installing-frompackage.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-yum-installing-frompackage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-yum-installing-frompackage.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-yum-installing-frompackage.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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 install new software, unless the software is only available as a package. In these cases, use the localinstall Index: sn-yum-maintenance.php =================================================================== RCS file: /cvs/fedora/web/html/docs/beta/yum-software-management/sn-yum-maintenance.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sn-yum-maintenance.php 26 Jul 2005 01:42:03 -0000 1.2 +++ sn-yum-maintenance.php 28 Jul 2005 00:53:40 -0000 1.3 @@ -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,11 +27,11 @@

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

    8.2. Clearing the yum Caches

    - By design, yum does not automatically delete - any of the packages or package data files it downloads, so they - may be reused in future operations. To purge the header files, - use this command: +

    8.2. Clearing the yum Caches

    + By default, yum retains the packages and + package data files that it downloads, so they may be reused in + future operations without being downloaded again. To purge the + package data files, use this command: 

     su -c 'yum clean headers'

    @@ -42,11 +42,11 @@

    When using these commands, at the prompt, enter the password for the root account. -

    [Note]Purged Files

    - Package management operations download header files and - packages as required, and automatically replace any deleted - files needed for the operation. -

    Prev Up Next
    7. Using Other Software Repositories Home 9. Manually Installing Software
    +

    + Purging cached files causes those files to downloaded again the + next time that they are required. This increases the amount of + time required to complete the operation. +

    Prev Up Next
    7. Using Other Software Repositories Home 9. Manually Installing Software
    -
    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 is connected to the Internet through a web proxy server, specify the proxy server details in From fedora-extras-commits at redhat.com Thu Jul 28 02:09:38 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Wed, 27 Jul 2005 22:09:38 -0400 Subject: common tobuild,1.2114,1.2115 Message-ID: <200507280209.j6S29ctE010428@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10391 Modified Files: tobuild Log Message: cleanup successful build Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2114 retrieving revision 1.2115 diff -u -r1.2114 -r1.2115 --- tobuild 28 Jul 2005 00:01:25 -0000 1.2114 +++ tobuild 28 Jul 2005 02:09:36 -0000 1.2115 @@ -81,7 +81,6 @@ oliver rpms/fish/devel fish-1_12_0-1_fc5 devel oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel -adalloz rpms/pam_abl/FC-4 pam_abl-0_2_2-2_fc4 fc4 gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 02:29:34 2005 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Wed, 27 Jul 2005 22:29:34 -0400 Subject: common tobuild,1.2115,1.2116 Message-ID: <200507280229.j6S2TYLc010511@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10491 Modified Files: tobuild Log Message: libxml++ built on fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2115 retrieving revision 1.2116 diff -u -r1.2115 -r1.2116 --- tobuild 28 Jul 2005 02:09:36 -0000 1.2115 +++ tobuild 28 Jul 2005 02:29:32 -0000 1.2116 @@ -43,7 +43,6 @@ thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 -icon rpms/libxml++/FC-4 libxml++-2_10_0-1_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel From jpo at di.uminho.pt Thu Jul 28 04:23:43 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Thu, 28 Jul 2005 05:23:43 +0100 Subject: APPROVED: perl-Test-MockModule Message-ID: <42E85DCF.5050108@di.uminho.pt> Name : perl-Test-MockModule Version : 0.05 Release : 3 Summary : Override subroutines in a module for unit testing Maintainer: Tom Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Thu Jul 28 04:24:58 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Thu, 28 Jul 2005 05:24:58 +0100 Subject: APPROVED: perl-SQL-Abstract Message-ID: <42E85E1A.1000900@di.uminho.pt> Name : perl-SQL-Abstract Version : 1.19 Release : 2 Summary : Generate SQL from Perl data structures Maintainer: Tom Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Thu Jul 28 04:26:07 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Thu, 28 Jul 2005 05:26:07 +0100 Subject: APPROVED: perl-Exporter-Lite Message-ID: <42E85E5F.4060106@di.uminho.pt> Name : perl-Exporter-Lite Version : 0.01 Release : 2 Summary : Lightweight exporting of variables Maintainer: Tom Callaway Reviewer: Jose Pedro Oliveira -- 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 Thu Jul 28 05:29:19 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 28 Jul 2005 01:29:19 -0400 Subject: common tobuild,1.2116,1.2117 Message-ID: <200507280529.j6S5TJnq014188@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2116 retrieving revision 1.2117 diff -u -r1.2116 -r1.2117 --- tobuild 28 Jul 2005 02:29:32 -0000 1.2116 +++ tobuild 28 Jul 2005 05:29:17 -0000 1.2117 @@ -18,7 +18,6 @@ oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel -tagoh rpms/kinput2/FC-4 kinput2-v3_1-26_fc4 fc4 tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 05:31:15 2005 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Thu, 28 Jul 2005 01:31:15 -0400 Subject: common tobuild,1.2117,1.2118 Message-ID: <200507280531.j6S5VF5M014226@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14209 Modified Files: tobuild Log Message: Removing successful builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2117 retrieving revision 1.2118 diff -u -r1.2117 -r1.2118 --- tobuild 28 Jul 2005 05:29:17 -0000 1.2117 +++ tobuild 28 Jul 2005 05:31:13 -0000 1.2118 @@ -26,7 +26,6 @@ thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel -mfleming rpms/mod_security/devel mod_security-1_8_7-4_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 @@ -41,7 +40,6 @@ thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel -mfleming rpms/mod_security/FC-4 mod_security-1_8_7-4_fc4 fc4 icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 07:06:11 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:06:11 -0400 Subject: rpms/libcddb/devel libcddb.spec,1.12,1.13 Message-ID: <200507280706.j6S76BJr016620@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570/devel Modified Files: libcddb.spec Log Message: libcddb: release bumped for rebuild against new libcdio Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 +++ libcddb.spec 28 Jul 2005 07:06:09 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-2 +- Rebuild against new libcdio + * Tue Jul 26 2005 Dams - 1.2.0-1 - Updated to 1.2.0 From fedora-extras-commits at redhat.com Thu Jul 28 07:05:48 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:05:48 -0400 Subject: rpms/libcddb/FC-3 libcddb.spec,1.8,1.9 Message-ID: <200507280706.j6S76MIh016623@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570/FC-3 Modified Files: libcddb.spec Log Message: libcddb: release bumped for rebuild against new libcdio Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libcddb.spec 26 Jul 2005 12:11:18 -0000 1.8 +++ libcddb.spec 28 Jul 2005 07:05:30 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-2 +- Rebuild against new libcdio + * Tue Jul 26 2005 Dams - 1.2.0-1 - Updated to 1.2.0 From fedora-extras-commits at redhat.com Thu Jul 28 07:05:54 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:05:54 -0400 Subject: rpms/libcddb/FC-4 libcddb.spec,1.12,1.13 Message-ID: <200507280706.j6S76cPp016626@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16570/FC-4 Modified Files: libcddb.spec Log Message: libcddb: release bumped for rebuild against new libcdio Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libcddb.spec 26 Jul 2005 12:11:19 -0000 1.12 +++ libcddb.spec 28 Jul 2005 07:05:49 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Dams - 1.2.0-2 +- Rebuild against new libcdio + * Tue Jul 26 2005 Dams - 1.2.0-1 - Updated to 1.2.0 From fedora-extras-commits at redhat.com Thu Jul 28 07:08:00 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:08:00 -0400 Subject: common tobuild,1.2118,1.2119 Message-ID: <200507280708.j6S780Ev016719@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16702 Modified Files: tobuild Log Message: request build of rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2118 retrieving revision 1.2119 diff -u -r1.2118 -r1.2119 --- tobuild 28 Jul 2005 05:31:13 -0000 1.2118 +++ tobuild 28 Jul 2005 07:07:58 -0000 1.2119 @@ -111,3 +111,4 @@ roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel +anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 07:08:25 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 28 Jul 2005 03:08:25 -0400 Subject: common tobuild,1.2119,1.2120 Message-ID: <200507280708.j6S78PPj016781@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16764 Modified Files: tobuild Log Message: request build of rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2119 retrieving revision 1.2120 diff -u -r1.2119 -r1.2120 --- tobuild 28 Jul 2005 07:07:58 -0000 1.2119 +++ tobuild 28 Jul 2005 07:08:23 -0000 1.2120 @@ -112,3 +112,4 @@ uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 +anvil rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 07:09:53 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 28 Jul 2005 03:09:53 -0400 Subject: common tobuild,1.2120,1.2121 Message-ID: <200507280709.j6S79rBM016814@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16797 Modified Files: tobuild Log Message: cleanup old entries Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2120 retrieving revision 1.2121 diff -u -r1.2120 -r1.2121 --- tobuild 28 Jul 2005 07:08:23 -0000 1.2120 +++ tobuild 28 Jul 2005 07:09:51 -0000 1.2121 @@ -3,68 +3,44 @@ # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-1_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel -petersen rpms/scim-anthy/FC-4 scim-anthy-0_5_1-2_fc4 fc4 -ensc rpms/ip-sentinel/FC-4 ip-sentinel-0_12-5_fc4 fc4 ensc rpms/ip-sentinel/devel ip-sentinel-0_12-5_fc5 devel ixs rpms/mod_suphp/devel mod_suphp-0_5_2-8_fc5 devel -ixs rpms/mod_suphp/FC-4 mod_suphp-0_5_2-8_fc4 fc4 oliver rpms/icmpdn/devel icmpdn-0_3-2 devel -ensc rpms/gif2png/FC-4 gif2png-2_5_1-1_fc4 fc4 ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel -oliver rpms/libstatgrab/FC-4 libstatgrab-0_11_1-3_fc4 fc4 tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel -corsepiu rpms/Coin2/FC-4 Coin2-2_4_3-1_fc4 fc4 -oliver rpms/icmpdn/FC-4 icmpdn-0_3-2 fc4 -thias rpms/gkrellm-aclock/FC-4 gkrellm-aclock-0_3_3-1_fc4 fc4 -thias rpms/gkrellm-freq/FC-4 gkrellm-freq-0_1_1-1_fc4 fc4 ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel -bpepple rpms/freeciv/FC-4 freeciv-2_0_3-1_fc4 fc4 mschwendt rpms/sylpheed/devel sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel -mschwendt rpms/id3lib/FC-4 id3lib-3_8_3-12_fc4 fc4 -oliver rpms/bwm-ng/FC-4 bwm-ng-0_5-5_fc4 fc4 -byte rpms/MagicPoint/FC-4 MagicPoint-1_11b-2 fc4 thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel -thias rpms/lighttpd/FC-4 lighttpd-1_3_15-1_fc4 fc4 thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel scop rpms/lft/devel lft-2_31-3 devel scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel -scop rpms/rpmlint/FC-4 rpmlint-0_70-4_fc4 fc4 scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel -scop rpms/bash-completion/FC-4 bash-completion-20050721-1_fc4 fc4 scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -scop rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder-0_27-2_fc4 fc4 scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -bpepple rpms/liferea/FC-4 liferea-0_9_4-1_fc4 fc4 orion rpms/pytz/devel pytz-2005i-2 devel -scop rpms/xemacs-sumo/FC-4 xemacs-sumo-20050715-1 fc4 mschwendt rpms/cksfv/devel cksfv-1_3-4 devel mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel -mschwendt rpms/tetex-lgrind/FC-4 tetex-lgrind-3_67-6_1 fc4 -abompard rpms/ulogd/FC-4 ulogd-1_23-2_fc4 fc4 abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel -abompard rpms/showimg/FC-4 showimg-0_9_4_1-4_fc4 fc4 abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel -ixs rpms/perl-Crypt-CBC/FC-4 perl-Crypt-CBC-2_14-2_fc4 fc4 jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel @@ -73,30 +49,17 @@ pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel -oliver rpms/libdnet/FC-4 libdnet-1_10-2_fc4 fc4 oliver rpms/fish/devel fish-1_12_0-1_fc5 devel -oliver rpms/fish/FC-4 fish-1_11_1-10_fc4 fc4 adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel -gemi rpms/TeXmacs/FC-4 TeXmacs-1_0_5_6-2_fc4 fc4 gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel -jfontain rpms/moodss/FC-4 moodss-20_3-1_fc4 fc4 orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel -mschwendt rpms/galculator/FC-4 galculator-1_2_5-1_fc4 fc4 mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel -Tian rpms/gcfilms/FC-4 gcfilms-5_3-1_fc4 fc4 mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel -nphilipp rpms/cd-discid/FC-4 cd-discid-0_9-3_fc4_1 fc4 ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel -ensc rpms/clamav/FC-4 clamav-0_86_2-2_fc4 fc4 mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel -oliver rpms/fish/FC-4 fish-1_12_0-1_fc4 fc4 -adrian rpms/libcdio/FC-4 libcdio-0_75-3_fc4 fc4 -ryo rpms/scim/FC-3 scim-1_4_0-1_fc3 fc3 -ryo rpms/scim/FC-4 scim-1_4_0-1_fc4 fc4 jnovy rpms/nedit/devel nedit-5_5-4 devel -thomasvs rpms/flumotion/FC-4 flumotion-0_1_9-1_fc4 fc4 qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 07:39:15 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 03:39:15 -0400 Subject: rpms/libcdio/FC-3 .cvsignore, 1.4, 1.5 libcdio.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200507280739.j6S7dFe1016902@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16881 Modified Files: .cvsignore libcdio.spec sources Log Message: update to 0.75 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Apr 2005 18:49:42 -0000 1.4 +++ .cvsignore 28 Jul 2005 07:39:13 -0000 1.5 @@ -1 +1,2 @@ -libcdio-0.73.tar.gz +libcdio-0.75.tar.gz +libcdio-0.75.tar.gz.sig Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/libcdio.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libcdio.spec 24 Apr 2005 18:49:42 -0000 1.5 +++ libcdio.spec 28 Jul 2005 07:39:13 -0000 1.6 @@ -1,16 +1,16 @@ Name: libcdio -Version: 0.73 -Release: 1 -Epoch: 0 +Version: 0.75 +Release: 3%{?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.73.tar.gz +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libcddb-devel >= 0:0.9.4 +#BuildRequires: libcddb-devel >= 0.9.4 BuildRequires: pkgconfig BuildRequires: ncurses-devel Requires(post): /sbin/ldconfig @@ -25,7 +25,7 @@ %package devel Summary: Header files and static libraries for %{name} Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: pkgconfig %description devel @@ -93,11 +93,28 @@ %changelog -* Sun Apr 24 2005 Ville Skytt?? - 0:0.73-1 -- Updated to 0.73 (Adrian Reber). +* Wed Jul 27 2005 Adrian Reber - 0.75-3 +- Rebuilt without libcddb dependency (#164270) + +* Tue Jul 26 2005 Adrian Reber - 0.75-2 +- Rebuilt + +* Thu Jul 14 2005 Adrian Reber - 0.75-1 +- Updated to 0.75. + +* Fri Jun 03 2005 Adrian Reber - 0.74-2 +- Updated to 0.74. + +* Sun Apr 24 2005 Ville Skytt?? - 0.73-2 - BuildRequire ncurses-devel (for cdda-player and cd-paranoia). - Run test suite during build. - Install Japanese man pages. + +* Sun Apr 24 2005 Adrian Reber - 0.73-1 +- Updated to 0.73. + +* Fri Mar 18 2005 Ville Skytt?? - 0.70-2 +- Fix FC4 build (#151468). - Build with dependency tracking disabled. * Sun Sep 5 2004 Marius L. J??hndal - 0:0.70-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcdio/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Apr 2005 18:49:42 -0000 1.4 +++ sources 28 Jul 2005 07:39:13 -0000 1.5 @@ -1 +1,2 @@ -50eae24f732232c28d391a4dd563321f libcdio-0.73.tar.gz +628bd9e6d62747ff6a2b14f976673ea0 libcdio-0.75.tar.gz +3a861ce2e430451107d923127c64cf77 libcdio-0.75.tar.gz.sig From fedora-extras-commits at redhat.com Thu Jul 28 07:40:11 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 03:40:11 -0400 Subject: common tobuild,1.2121,1.2122 Message-ID: <200507280740.j6S7eBom016964@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16947 Modified Files: tobuild Log Message: request build of rpms/libcdio/FC-3 libcdio-0_75-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2121 retrieving revision 1.2122 diff -u -r1.2121 -r1.2122 --- tobuild 28 Jul 2005 07:09:51 -0000 1.2121 +++ tobuild 28 Jul 2005 07:40:09 -0000 1.2122 @@ -76,3 +76,4 @@ jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 anvil rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 fc4 +adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 08:20:05 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 28 Jul 2005 04:20:05 -0400 Subject: common tobuild,1.2122,1.2123 Message-ID: <200507280820.j6S8K5Nw018753@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18736 Modified Files: tobuild Log Message: remove finished builds Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2122 retrieving revision 1.2123 diff -u -r1.2122 -r1.2123 --- tobuild 28 Jul 2005 07:40:09 -0000 1.2122 +++ tobuild 28 Jul 2005 08:20:03 -0000 1.2123 @@ -66,14 +66,10 @@ mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 -ivazquez rpms/notecase/FC-4 notecase-1_0_0-1_fc4 fc4 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel -ivazquez rpms/leafpad/FC-4 leafpad-0_8_3-1_fc4 fc4 ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel -anvil rpms/libcddb/FC-3 libcddb-1_2_0-2_fc3 fc3 -anvil rpms/libcddb/FC-4 libcddb-1_2_0-2_fc4 fc4 adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 09:30:23 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 28 Jul 2005 05:30:23 -0400 Subject: fedora-security/audit fc4,1.32,1.33 Message-ID: <200507280930.j6S9UNTK020063@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20046 Modified Files: fc4 Log Message: Correct CVE name and add Firefox issue from yesterdays CVE batch Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- fc4 27 Jul 2005 08:47:18 -0000 1.32 +++ fc4 28 Jul 2005 09:30:21 -0000 1.33 @@ -1,12 +1,13 @@ -Up to date CVE as of CVE email 20050726 -Up to date FC4 as of 20050726 +Up to date CVE as of CVE email 20050727 +Up to date FC4 as of 20050727 ** are items that need attention +2005-2395 ** firefox 2005-2370 backport (kdenetwork) [since FEDORA-2005-624] 2005-2369 backport (kdenetwork) [since FEDORA-2005-624] 2005-2368 VULNERABLE (vim) -2005-2355 backport (fetchmail) [since FEDORA-2005-613] +2005-2335 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] 2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606] From fedora-extras-commits at redhat.com Thu Jul 28 10:12:49 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 28 Jul 2005 06:12:49 -0400 Subject: common tobuild,1.2123,1.2124 Message-ID: <200507281012.j6SACnrS021335@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21318 Modified Files: tobuild Log Message: request build of rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2123 retrieving revision 1.2124 diff -u -r1.2123 -r1.2124 --- tobuild 28 Jul 2005 08:20:03 -0000 1.2123 +++ tobuild 28 Jul 2005 10:12:47 -0000 1.2124 @@ -73,3 +73,4 @@ uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 +ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 10:13:14 2005 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 28 Jul 2005 06:13:14 -0400 Subject: common tobuild,1.2124,1.2125 Message-ID: <200507281013.j6SADECF021397@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21380 Modified Files: tobuild Log Message: request build of rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2124 retrieving revision 1.2125 diff -u -r1.2124 -r1.2125 --- tobuild 28 Jul 2005 10:12:47 -0000 1.2124 +++ tobuild 28 Jul 2005 10:13:12 -0000 1.2125 @@ -74,3 +74,4 @@ jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 +ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 10:50:31 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 06:50:31 -0400 Subject: rpms/libcddb/FC-3 libcddb.spec,1.9,1.10 Message-ID: <200507281050.j6SAoVNw021511@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcddb/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21494 Modified Files: libcddb.spec Log Message: Rebuild against new libcdio (again) Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-3/libcddb.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libcddb.spec 28 Jul 2005 07:05:30 -0000 1.9 +++ libcddb.spec 28 Jul 2005 10:50:29 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 1.2.0-3 +- Rebuild against new libcdio (again) + * Tue Jul 26 2005 Dams - 1.2.0-2 - Rebuild against new libcdio From fedora-extras-commits at redhat.com Thu Jul 28 10:57:36 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 06:57:36 -0400 Subject: rpms/libcddb/FC-4 libcddb.spec,1.13,1.14 Message-ID: <200507281057.j6SAvaOm021583@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcddb/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21566 Modified Files: libcddb.spec Log Message: Rebuild against new libcdio (again) Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/FC-4/libcddb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libcddb.spec 28 Jul 2005 07:05:49 -0000 1.13 +++ libcddb.spec 28 Jul 2005 10:57:34 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 1.2.0-3 +- Rebuild against new libcdio (again) + * Tue Jul 26 2005 Dams - 1.2.0-2 - Rebuild against new libcdio From fedora-extras-commits at redhat.com Thu Jul 28 10:58:01 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 06:58:01 -0400 Subject: rpms/libcddb/devel libcddb.spec,1.13,1.14 Message-ID: <200507281058.j6SAw1oX021635@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21618 Modified Files: libcddb.spec Log Message: Rebuild against new libcdio (again) Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libcddb.spec 28 Jul 2005 07:06:09 -0000 1.13 +++ libcddb.spec 28 Jul 2005 10:57:59 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Tue Jul 26 2005 Adrian Reber - 1.2.0-3 +- Rebuild against new libcdio (again) + * Tue Jul 26 2005 Dams - 1.2.0-2 - Rebuild against new libcdio From fedora-extras-commits at redhat.com Thu Jul 28 12:06:53 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 08:06:53 -0400 Subject: rpms/clamav/devel freshclam-sleep,1.1,1.2 Message-ID: <200507281206.j6SC6rlm024028@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24002 Modified Files: freshclam-sleep Log Message: Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] Index: freshclam-sleep =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/freshclam-sleep,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freshclam-sleep 25 Jul 2005 17:17:06 -0000 1.1 +++ freshclam-sleep 28 Jul 2005 12:06:36 -0000 1.2 @@ -44,7 +44,8 @@ ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac From fedora-extras-commits at redhat.com Thu Jul 28 12:10:30 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 08:10:30 -0400 Subject: rpms/clamav/devel clamav-notify-servers,1.1,1.2 Message-ID: <200507281210.j6SCAURn024102@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24085 Modified Files: clamav-notify-servers Log Message: added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav-notify-servers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-notify-servers 8 Nov 2004 04:10:52 -0000 1.1 +++ clamav-notify-servers 28 Jul 2005 12:10:28 -0000 1.2 @@ -23,6 +23,9 @@ ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue From fedora-extras-commits at redhat.com Thu Jul 28 12:47:15 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 28 Jul 2005 08:47:15 -0400 Subject: devel/common tobuild,1.2125,1.2126 Message-ID: <200507281247.j6SClF4T024235@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24218 Modified Files: tobuild Log Message: clean up successful builds Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2125 retrieving revision 1.2126 diff -u -r1.2125 -r1.2126 --- tobuild 28 Jul 2005 10:13:12 -0000 1.2125 +++ tobuild 28 Jul 2005 12:47:12 -0000 1.2126 @@ -63,8 +63,6 @@ qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel -mschwendt rpms/wesnoth/FC-4 wesnoth-0_9_4-1_fc4 fc4 -mschwendt rpms/wesnoth/FC-3 wesnoth-0_9_4-1_fc3 fc3 ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 12:50:30 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 28 Jul 2005 08:50:30 -0400 Subject: common tobuild,1.2126,1.2127 Message-ID: <200507281250.j6SCoUD8024264@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24247 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2126 retrieving revision 1.2127 diff -u -r1.2126 -r1.2127 --- tobuild 28 Jul 2005 12:47:12 -0000 1.2126 +++ tobuild 28 Jul 2005 12:50:28 -0000 1.2127 @@ -70,6 +70,5 @@ roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel -adrian rpms/libcdio/FC-3 libcdio-0_75-3_fc3 fc3 ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 14:03:01 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 28 Jul 2005 10:03:01 -0400 Subject: mock/etc fedora-3-i386-core.cfg, 1.2, 1.3 fedora-3-x86_64-core.cfg, 1.2, 1.3 fedora-4-i386-core.cfg, 1.2, 1.3 fedora-4-ppc-core.cfg, 1.2, 1.3 fedora-4-x86_64-core.cfg, 1.2, 1.3 fedora-5-i386-core.cfg, 1.1, 1.2 fedora-5-ppc-core.cfg, 1.1, 1.2 fedora-5-x86_64-core.cfg, 1.1, 1.2 Message-ID: <200507281403.j6SE3W4T026804@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26774 Modified Files: fedora-3-i386-core.cfg fedora-3-x86_64-core.cfg fedora-4-i386-core.cfg fedora-4-ppc-core.cfg fedora-4-x86_64-core.cfg fedora-5-i386-core.cfg fedora-5-ppc-core.cfg fedora-5-x86_64-core.cfg Log Message: update the local path Index: fedora-3-i386-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-3-i386-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-3-i386-core.cfg 19 May 2005 14:24:40 -0000 1.2 +++ fedora-3-i386-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -50,7 +50,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/3/ +baseurl=http://extras64.linux.duke.edu/plague-results/3/ """ Index: fedora-3-x86_64-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-3-x86_64-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-3-x86_64-core.cfg 19 May 2005 14:24:40 -0000 1.2 +++ fedora-3-x86_64-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -51,7 +51,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/3/ +baseurl=http://extras64.linux.duke.edu/plague-results/3/ """ Index: fedora-4-i386-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-i386-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-4-i386-core.cfg 16 Jun 2005 20:07:52 -0000 1.2 +++ fedora-4-i386-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -53,7 +53,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/4/ +baseurl=http://extras64.linux.duke.edu/plague-results/4/ """ Index: fedora-4-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-4-ppc-core.cfg 16 Jun 2005 20:07:52 -0000 1.2 +++ fedora-4-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -51,7 +51,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/4/ +baseurl=http://extras64.linux.duke.edu/plague-results/4/ """ Index: fedora-4-x86_64-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-x86_64-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-4-x86_64-core.cfg 16 Jun 2005 20:07:52 -0000 1.2 +++ fedora-4-x86_64-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 @@ -54,7 +54,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/4/ +baseurl=http://extras64.linux.duke.edu/plague-results/4/ """ Index: fedora-5-i386-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-5-i386-core.cfg 12 Jun 2005 23:23:47 -0000 1.1 +++ fedora-5-i386-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 @@ -47,7 +47,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/development/ +baseurl=http://extras64.linux.duke.edu/plague-results/development/ """ Index: fedora-5-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-5-ppc-core.cfg 12 Jun 2005 23:23:47 -0000 1.1 +++ fedora-5-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 @@ -46,7 +46,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/development/ +baseurl=http://extras64.linux.duke.edu/plague-results/development/ """ Index: fedora-5-x86_64-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-5-x86_64-core.cfg 12 Jun 2005 23:23:47 -0000 1.1 +++ fedora-5-x86_64-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 @@ -48,7 +48,7 @@ [local] name=local -baseurl=http://extras64.linux.duke.edu/needsign/development/ +baseurl=http://extras64.linux.duke.edu/plague-results/development/ """ From fedora-extras-commits at redhat.com Thu Jul 28 14:19:56 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 28 Jul 2005 10:19:56 -0400 Subject: rpms/notecase/FC-3 notecase.spec,1.10,1.11 Message-ID: <200507281419.j6SEJun8026931@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/notecase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26914 Modified Files: notecase.spec Log Message: Minor fix Index: notecase.spec =================================================================== RCS file: /cvs/extras/rpms/notecase/FC-3/notecase.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- notecase.spec 23 Jul 2005 07:53:24 -0000 1.10 +++ notecase.spec 28 Jul 2005 14:19:54 -0000 1.11 @@ -8,7 +8,7 @@ URL: http://notecase.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/notecase/notecase-%{version}_src.zip Patch: notecase-0.8.9-unix2dos.patch -Patch1: notecase-0.8.9-paths.patch +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 From jamatos at fc.up.pt Thu Jul 28 14:36:27 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:36:27 +0100 Subject: APPROVED: pytz Message-ID: <200507281536.28110.jamatos@fc.up.pt> Name: pytz Summary: World Timezone Definitions for Python pytz brings the Olson tz database into Python. This library allows accurate and cross platform timezone calculations using Python 2.3 or higher. It also solves the issue of ambiguous times at the end of daylight savings, which you can read more about in the Python Library Reference (datetime.tzinfo). -- Jos? Ab?lio From jamatos at fc.up.pt Thu Jul 28 14:38:44 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:38:44 +0100 Subject: APPROVED: python-dateutil Message-ID: <200507281538.44891.jamatos@fc.up.pt> Name: python-dateutil Summary: Powerful extensions to the standard datetime module The dateutil module provides powerful extensions to the standard datetime module available in Python 2.3+. [I thought I sent this before but I never saw it here...] -- Jos? Ab?lio From jamatos at fc.up.pt Thu Jul 28 14:42:06 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:42:06 +0100 Subject: APPROVED: python-dateutil In-Reply-To: <200507281538.44891.jamatos@fc.up.pt> References: <200507281538.44891.jamatos@fc.up.pt> Message-ID: <200507281542.06241.jamatos@fc.up.pt> On Thursday 28 July 2005 15:38, Jose' Matos wrote: > Name: python-dateutil > Summary: Powerful extensions to the standard datetime module > > The dateutil module provides powerful extensions to the standard datetime > module available in Python 2.3+. > > [I thought I sent this before but I never saw it here...] Reviewer: Jos? Matos Packager: Orion Poplawski -- Jos? Ab?lio From jamatos at fc.up.pt Thu Jul 28 14:42:08 2005 From: jamatos at fc.up.pt (Jose' Matos) Date: Thu, 28 Jul 2005 15:42:08 +0100 Subject: APPROVED: pytz In-Reply-To: <200507281536.28110.jamatos@fc.up.pt> References: <200507281536.28110.jamatos@fc.up.pt> Message-ID: <200507281542.08248.jamatos@fc.up.pt> On Thursday 28 July 2005 15:36, Jose' Matos wrote: > Name: pytz > Summary: World Timezone Definitions for Python > > pytz brings the Olson tz database into Python. This library allows > accurate and cross platform timezone calculations using Python 2.3 or > higher. It also solves the issue of ambiguous times at the end of > daylight savings, which you can read more about in the Python Library > Reference > (datetime.tzinfo). Reviewer: Jos? Matos Packager: Orion Poplawski -- Jos? Ab?lio From fedora-extras-commits at redhat.com Thu Jul 28 14:54:05 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Thu, 28 Jul 2005 10:54:05 -0400 Subject: common tobuild,1.2127,1.2128 Message-ID: <200507281454.j6SEs5sE027104@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27087 Modified Files: tobuild Log Message: request build of rpms/scim/FC-3 scim-1_4_0-2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2127 retrieving revision 1.2128 diff -u -r1.2127 -r1.2128 --- tobuild 28 Jul 2005 12:50:28 -0000 1.2127 +++ tobuild 28 Jul 2005 14:54:03 -0000 1.2128 @@ -72,3 +72,4 @@ jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 +ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 14:54:35 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Thu, 28 Jul 2005 10:54:35 -0400 Subject: common tobuild,1.2128,1.2129 Message-ID: <200507281454.j6SEsZnm027141@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27124 Modified Files: tobuild Log Message: request build of rpms/scim/FC-4 scim-1_4_0-2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2128 retrieving revision 1.2129 diff -u -r1.2128 -r1.2129 --- tobuild 28 Jul 2005 14:54:03 -0000 1.2128 +++ tobuild 28 Jul 2005 14:54:33 -0000 1.2129 @@ -73,3 +73,4 @@ ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 +ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 15:26:12 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:26:12 -0400 Subject: rpms/pptp/devel pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE Message-ID: <200507281526.j6SFQCZk028439@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28418 Modified Files: pptp.spec sources .cvsignore Removed Files: pptp-cvs20050331.patch Log Message: * Thu Jul 28 2005 Paul Howarth 1.7.0-1 - new upstream version 1.7.0 - remove patch, included upstream - edit Makefile to prevent attempted chown in %install - remove redundant %attr tag in %files - honour $RPM_OPT_FLAGS - ensure directories have correct permissions Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/pptp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pptp.spec 27 May 2005 14:49:16 -0000 1.3 +++ pptp.spec 28 Jul 2005 15:26:10 -0000 1.4 @@ -1,13 +1,12 @@ Name: pptp -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPL URL: http://pptpclient.sourceforge.net/ Source0: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-cvs20050331.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2 @@ -19,10 +18,10 @@ %prep %setup -q -%patch0 -p1 +%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile %build -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install %{__rm} -rf $RPM_BUILD_ROOT @@ -32,26 +31,34 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP -%attr(755,root,root) %{_sbindir}/pptp +%{_sbindir}/pptp %{_mandir}/man8/pptp.8* # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog -* Fri May 27 2005 Paul Howarth 1.6.0-5%{?dist} +* Thu Jul 28 2005 Paul Howarth 1.7.0-1 +- new upstream version 1.7.0 +- remove patch, included upstream +- edit Makefile to prevent attempted chown in %%install +- remove redundant %%attr tag in %%files +- honour $RPM_OPT_FLAGS +- ensure directories have correct permissions + +* Fri May 27 2005 Paul Howarth 1.6.0-5 - bump and rebuild -* Tue May 17 2005 Paul Howarth 1.6.0-4%{?dist} +* Tue May 17 2005 Paul Howarth 1.6.0-4 - rebuild with dist tags -* Tue May 10 2005 Paul Howarth 1.6.0-3%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-3 - fix URL for SOURCE0 not to point to a specific sf.net mirror -* Tue May 10 2005 Paul Howarth 1.6.0-2%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-2 - Weed out documentation useful only to developers - Add dist tag - Use full URL for SOURCE0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 May 2005 14:29:42 -0000 1.2 +++ sources 28 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz +0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pptp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 May 2005 14:29:42 -0000 1.2 +++ .cvsignore 28 Jul 2005 15:26:10 -0000 1.3 @@ -1 +1 @@ -pptp-1.6.0.tar.gz +pptp-1.7.0.tar.gz --- pptp-cvs20050331.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 28 15:35:12 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:35:12 -0400 Subject: rpms/clamav/devel clamav.spec,1.25,1.26 Message-ID: <200507281535.j6SFZCB7028572@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28555 Modified Files: clamav.spec Log Message: - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] - added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- clamav.spec 25 Jul 2005 17:56:56 -0000 1.25 +++ clamav.spec 28 Jul 2005 15:35:10 -0000 1.26 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists From fedora-extras-commits at redhat.com Thu Jul 28 15:37:18 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 28 Jul 2005 11:37:18 -0400 Subject: common tobuild,1.2129,1.2130 Message-ID: <200507281537.j6SFbIWP028640@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28623 Modified Files: tobuild Log Message: request build of rpms/pygsl/devel pygsl-0_3_2-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2129 retrieving revision 1.2130 diff -u -r1.2129 -r1.2130 --- tobuild 28 Jul 2005 14:54:33 -0000 1.2129 +++ tobuild 28 Jul 2005 15:37:16 -0000 1.2130 @@ -74,3 +74,4 @@ ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 +jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 15:37:22 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:37:22 -0400 Subject: rpms/clamav/FC-3 clamav-notify-servers, 1.1, 1.2 clamav.spec, 1.15, 1.16 freshclam-sleep, 1.1, 1.2 Message-ID: <200507281537.j6SFbqve028685@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/FC-3 Modified Files: clamav-notify-servers clamav.spec freshclam-sleep Log Message: synced with devel/ Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav-notify-servers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-notify-servers 8 Nov 2004 04:10:52 -0000 1.1 +++ clamav-notify-servers 28 Jul 2005 15:37:20 -0000 1.2 @@ -23,6 +23,9 @@ ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- clamav.spec 25 Jul 2005 17:56:55 -0000 1.15 +++ clamav.spec 28 Jul 2005 15:37:20 -0000 1.16 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists Index: freshclam-sleep =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/freshclam-sleep,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freshclam-sleep 25 Jul 2005 17:47:53 -0000 1.1 +++ freshclam-sleep 28 Jul 2005 15:37:20 -0000 1.2 @@ -44,7 +44,8 @@ ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac From fedora-extras-commits at redhat.com Thu Jul 28 15:37:23 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:37:23 -0400 Subject: rpms/clamav/FC-4 clamav-notify-servers, 1.1, 1.2 clamav.spec, 1.24, 1.25 freshclam-sleep, 1.1, 1.2 Message-ID: <200507281537.j6SFbreY028690@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28644/FC-4 Modified Files: clamav-notify-servers clamav.spec freshclam-sleep Log Message: synced with devel/ Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav-notify-servers,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clamav-notify-servers 8 Nov 2004 04:10:52 -0000 1.1 +++ clamav-notify-servers 28 Jul 2005 15:37:20 -0000 1.2 @@ -23,6 +23,9 @@ ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- clamav.spec 25 Jul 2005 17:56:56 -0000 1.24 +++ clamav.spec 28 Jul 2005 15:37:21 -0000 1.25 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists Index: freshclam-sleep =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/freshclam-sleep,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freshclam-sleep 25 Jul 2005 17:47:54 -0000 1.1 +++ freshclam-sleep 28 Jul 2005 15:37:21 -0000 1.2 @@ -44,7 +44,8 @@ ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac From fedora-extras-commits at redhat.com Thu Jul 28 15:38:10 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:38:10 -0400 Subject: common tobuild,1.2130,1.2131 Message-ID: <200507281538.j6SFcAY9028721@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28704 Modified Files: tobuild Log Message: request build of rpms/pptp/devel pptp-1_7_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2130 retrieving revision 1.2131 diff -u -r1.2130 -r1.2131 --- tobuild 28 Jul 2005 15:37:16 -0000 1.2130 +++ tobuild 28 Jul 2005 15:38:08 -0000 1.2131 @@ -75,3 +75,4 @@ ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel +pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 15:38:37 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:38:37 -0400 Subject: common tobuild,1.2131,1.2132 Message-ID: <200507281538.j6SFcbXJ028785@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28766 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-3 clamav-0_86_2-3_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2131 retrieving revision 1.2132 diff -u -r1.2131 -r1.2132 --- tobuild 28 Jul 2005 15:38:08 -0000 1.2131 +++ tobuild 28 Jul 2005 15:38:35 -0000 1.2132 @@ -76,3 +76,4 @@ ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel +ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 15:39:06 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Thu, 28 Jul 2005 11:39:06 -0400 Subject: common tobuild,1.2132,1.2133 Message-ID: <200507281539.j6SFd6Tv028853@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28834 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-4 clamav-0_86_2-3_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2132 retrieving revision 1.2133 diff -u -r1.2132 -r1.2133 --- tobuild 28 Jul 2005 15:38:35 -0000 1.2132 +++ tobuild 28 Jul 2005 15:39:04 -0000 1.2133 @@ -77,3 +77,4 @@ jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 +ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 15:40:43 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:40:43 -0400 Subject: rpms/pptp/FC-4 pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE Message-ID: <200507281540.j6SFehLj028889@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28868 Modified Files: pptp.spec sources .cvsignore Removed Files: pptp-cvs20050331.patch Log Message: resync with devel Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/pptp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pptp.spec 27 May 2005 14:49:16 -0000 1.3 +++ pptp.spec 28 Jul 2005 15:40:40 -0000 1.4 @@ -1,13 +1,12 @@ Name: pptp -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPL URL: http://pptpclient.sourceforge.net/ Source0: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-cvs20050331.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2 @@ -19,10 +18,10 @@ %prep %setup -q -%patch0 -p1 +%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile %build -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install %{__rm} -rf $RPM_BUILD_ROOT @@ -32,26 +31,34 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP -%attr(755,root,root) %{_sbindir}/pptp +%{_sbindir}/pptp %{_mandir}/man8/pptp.8* # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog -* Fri May 27 2005 Paul Howarth 1.6.0-5%{?dist} +* Thu Jul 28 2005 Paul Howarth 1.7.0-1 +- new upstream version 1.7.0 +- remove patch, included upstream +- edit Makefile to prevent attempted chown in %%install +- remove redundant %%attr tag in %%files +- honour $RPM_OPT_FLAGS +- ensure directories have correct permissions + +* Fri May 27 2005 Paul Howarth 1.6.0-5 - bump and rebuild -* Tue May 17 2005 Paul Howarth 1.6.0-4%{?dist} +* Tue May 17 2005 Paul Howarth 1.6.0-4 - rebuild with dist tags -* Tue May 10 2005 Paul Howarth 1.6.0-3%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-3 - fix URL for SOURCE0 not to point to a specific sf.net mirror -* Tue May 10 2005 Paul Howarth 1.6.0-2%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-2 - Weed out documentation useful only to developers - Add dist tag - Use full URL for SOURCE0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 May 2005 14:29:42 -0000 1.2 +++ sources 28 Jul 2005 15:40:40 -0000 1.3 @@ -1 +1 @@ -9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz +0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 May 2005 14:29:42 -0000 1.2 +++ .cvsignore 28 Jul 2005 15:40:40 -0000 1.3 @@ -1 +1 @@ -pptp-1.6.0.tar.gz +pptp-1.7.0.tar.gz --- pptp-cvs20050331.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 28 15:41:24 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:41:24 -0400 Subject: common tobuild,1.2133,1.2134 Message-ID: <200507281541.j6SFfO0K028951@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28934 Modified Files: tobuild Log Message: request build of rpms/pptp/FC-4 pptp-1_7_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2133 retrieving revision 1.2134 diff -u -r1.2133 -r1.2134 --- tobuild 28 Jul 2005 15:39:04 -0000 1.2133 +++ tobuild 28 Jul 2005 15:41:22 -0000 1.2134 @@ -78,3 +78,4 @@ pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 +pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 15:42:41 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:42:41 -0400 Subject: rpms/pptp/FC-3 pptp.spec, 1.3, 1.4 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 pptp-cvs20050331.patch, 1.1, NONE Message-ID: <200507281542.j6SFgfSx028998@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/pptp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28977 Modified Files: pptp.spec sources .cvsignore Removed Files: pptp-cvs20050331.patch Log Message: resync with devel Index: pptp.spec =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/pptp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pptp.spec 27 May 2005 14:50:34 -0000 1.3 +++ pptp.spec 28 Jul 2005 15:42:39 -0000 1.4 @@ -1,13 +1,12 @@ Name: pptp -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPL URL: http://pptpclient.sourceforge.net/ Source0: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-cvs20050331.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2 @@ -19,10 +18,10 @@ %prep %setup -q -%patch0 -p1 +%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile %build -%{__make} %{?_smp_mflags} +%{__make} %{?_smp_mflags} CFLAGS="-Wall $RPM_OPT_FLAGS" %install %{__rm} -rf $RPM_BUILD_ROOT @@ -32,26 +31,34 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) +%defattr(-,root,root,0755) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP -%attr(755,root,root) %{_sbindir}/pptp +%{_sbindir}/pptp %{_mandir}/man8/pptp.8* # /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the # Fedora Core ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog -* Fri May 27 2005 Paul Howarth 1.6.0-5%{?dist} +* Thu Jul 28 2005 Paul Howarth 1.7.0-1 +- new upstream version 1.7.0 +- remove patch, included upstream +- edit Makefile to prevent attempted chown in %%install +- remove redundant %%attr tag in %%files +- honour $RPM_OPT_FLAGS +- ensure directories have correct permissions + +* Fri May 27 2005 Paul Howarth 1.6.0-5 - bump and rebuild -* Tue May 17 2005 Paul Howarth 1.6.0-4%{?dist} +* Tue May 17 2005 Paul Howarth 1.6.0-4 - rebuild with dist tags -* Tue May 10 2005 Paul Howarth 1.6.0-3%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-3 - fix URL for SOURCE0 not to point to a specific sf.net mirror -* Tue May 10 2005 Paul Howarth 1.6.0-2%{?dist} +* Tue May 10 2005 Paul Howarth 1.6.0-2 - Weed out documentation useful only to developers - Add dist tag - Use full URL for SOURCE0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 May 2005 14:29:42 -0000 1.2 +++ sources 28 Jul 2005 15:42:39 -0000 1.3 @@ -1 +1 @@ -9a706327fb9827541d7c86d48ceb9631 pptp-1.6.0.tar.gz +0bc7dbd1c265e4263008fa7883de58dd pptp-1.7.0.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pptp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 May 2005 14:29:42 -0000 1.2 +++ .cvsignore 28 Jul 2005 15:42:39 -0000 1.3 @@ -1 +1 @@ -pptp-1.6.0.tar.gz +pptp-1.7.0.tar.gz --- pptp-cvs20050331.patch DELETED --- From fedora-extras-commits at redhat.com Thu Jul 28 15:43:18 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Thu, 28 Jul 2005 11:43:18 -0400 Subject: common tobuild,1.2134,1.2135 Message-ID: <200507281543.j6SFhI3q029060@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29043 Modified Files: tobuild Log Message: request build of rpms/pptp/FC-3 pptp-1_7_0-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2134 retrieving revision 1.2135 diff -u -r1.2134 -r1.2135 --- tobuild 28 Jul 2005 15:41:22 -0000 1.2134 +++ tobuild 28 Jul 2005 15:43:16 -0000 1.2135 @@ -79,3 +79,4 @@ ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 +pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 16:28:03 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 28 Jul 2005 12:28:03 -0400 Subject: common tobuild,1.2135,1.2136 Message-ID: <200507281628.j6SGS3aZ030464@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30447 Modified Files: tobuild Log Message: request build of rpms/moodss/devel moodss-20_3-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2135 retrieving revision 1.2136 diff -u -r1.2135 -r1.2136 --- tobuild 28 Jul 2005 15:43:16 -0000 1.2135 +++ tobuild 28 Jul 2005 16:28:01 -0000 1.2136 @@ -80,3 +80,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 +jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel From fedora-extras-commits at redhat.com Thu Jul 28 16:31:32 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Thu, 28 Jul 2005 12:31:32 -0400 Subject: common tobuild,1.2136,1.2137 Message-ID: <200507281631.j6SGVWOK030539@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30522 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2136 retrieving revision 1.2137 diff -u -r1.2136 -r1.2137 --- tobuild 28 Jul 2005 16:28:01 -0000 1.2136 +++ tobuild 28 Jul 2005 16:31:30 -0000 1.2137 @@ -81,3 +81,4 @@ pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Thu Jul 28 17:54:01 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 13:54:01 -0400 Subject: common tobuild,1.2138,1.2139 Message-ID: <200507281754.j6SHs179031823@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31804 Modified Files: tobuild Log Message: use plague for splint Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2138 retrieving revision 1.2139 diff -u -r1.2138 -r1.2139 --- tobuild 28 Jul 2005 17:51:32 -0000 1.2138 +++ tobuild 28 Jul 2005 17:53:58 -0000 1.2139 @@ -82,4 +82,3 @@ pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 -pnasrat rpms/splint/FC-4 splint-3_1_1-9_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 17:51:34 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 13:51:34 -0400 Subject: common tobuild,1.2137,1.2138 Message-ID: <200507281751.j6SHpY7q031779@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31762 Modified Files: tobuild Log Message: request build of rpms/splint/FC-4 splint-3_1_1-9_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2137 retrieving revision 1.2138 diff -u -r1.2137 -r1.2138 --- tobuild 28 Jul 2005 16:31:30 -0000 1.2137 +++ tobuild 28 Jul 2005 17:51:32 -0000 1.2138 @@ -82,3 +82,4 @@ pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +pnasrat rpms/splint/FC-4 splint-3_1_1-9_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 19:04:30 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 28 Jul 2005 15:04:30 -0400 Subject: rpms/cln/FC-4 cln-1.1.9-string.patch,NONE,1.1 cln.spec,1.8,1.9 Message-ID: <200507281905.j6SJ540G001785@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/cln/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1765 Modified Files: cln.spec Added Files: cln-1.1.9-string.patch Log Message: Patched sources to fix compile problem that appears in gcc 4.0.1. cln-1.1.9-string.patch: --- NEW FILE cln-1.1.9-string.patch --- *** include/cln/string.h.~1~ 2004-06-23 16:04:49.000000000 -0500 --- include/cln/string.h 2005-06-13 10:09:34.000000000 -0500 *************** *** 10,15 **** --- 10,17 ---- namespace cln { + class cl_string; + // General, reference counted and garbage collected strings. struct cl_heap_string : public cl_heap { private: Index: cln.spec =================================================================== RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cln.spec 27 May 2005 11:01:22 -0000 1.8 +++ cln.spec 28 Jul 2005 19:04:05 -0000 1.9 @@ -1,12 +1,13 @@ Name: cln Version: 1.1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Class Library for Numbers Group: System Environment/Libraries License: GPL URL: http://www.ginac.de/CLN/ Source0: ftp://ftpthep.physik.uni-mainz.de/pub/gnu/%{name}-%{version}.tar.bz2 +Patch0: cln-1.1.9-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -33,6 +34,7 @@ %prep %setup -q +%patch0 -p0 %build %configure @@ -78,6 +80,9 @@ %exclude %{_libdir}/*.la %changelog +* Thu Jul 28 2005 Quentin Spencer 1.1.9-4 +- Patched include/cln/string.h to correctly compile on gcc-c++-4.0.1 + * Fri May 27 2005 Quentin Spencer 1.1.9-3 - Added gmp-devel to Requires for devel From fedora-extras-commits at redhat.com Thu Jul 28 19:08:54 2005 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 28 Jul 2005 15:08:54 -0400 Subject: common tobuild,1.2139,1.2140 Message-ID: <200507281908.j6SJ8sY9001916@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1895 Modified Files: tobuild Log Message: request build of rpms/cln/FC-4 cln-1_1_9-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2139 retrieving revision 1.2140 diff -u -r1.2139 -r1.2140 --- tobuild 28 Jul 2005 17:53:58 -0000 1.2139 +++ tobuild 28 Jul 2005 19:08:52 -0000 1.2140 @@ -82,3 +82,4 @@ pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 +qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 From fedora-extras-commits at redhat.com Thu Jul 28 19:12:48 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 15:12:48 -0400 Subject: rpms/splint/FC-4 splint.spec,1.2,1.3 Message-ID: <200507281912.j6SJCmgI001950@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/splint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1933 Modified Files: splint.spec Log Message: Parallel builds seem to fail Index: splint.spec =================================================================== RCS file: /cvs/extras/rpms/splint/FC-4/splint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- splint.spec 29 Jun 2005 22:40:59 -0000 1.2 +++ splint.spec 28 Jul 2005 19:12:46 -0000 1.3 @@ -1,6 +1,6 @@ Name: splint Version: 3.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -23,7 +23,8 @@ %build %configure -make %{?_smp_mflags} +# Parallel builds seem to fail +make %install rm -rf $RPM_BUILD_ROOT @@ -42,6 +43,9 @@ %changelog +* Thu Jul 28 2005 Paul Nasrat - 3.1.1-10 +- Turn off parallel builds + * Wed Jun 29 2005 Jose Pedro Oliveira - 3.1.1-9 - Dist tag added. - Specfile reformatted (compliance with the Fedora Extras template). From fedora-extras-commits at redhat.com Thu Jul 28 19:13:22 2005 From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat)) Date: Thu, 28 Jul 2005 15:13:22 -0400 Subject: rpms/splint/devel splint.spec,1.2,1.3 Message-ID: <200507281913.j6SJDMp5002008@cvs-int.fedora.redhat.com> Author: pnasrat Update of /cvs/extras/rpms/splint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1991 Modified Files: splint.spec Log Message: sync Index: splint.spec =================================================================== RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- splint.spec 29 Jun 2005 22:40:59 -0000 1.2 +++ splint.spec 28 Jul 2005 19:13:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: splint Version: 3.1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: An implementation of the lint program Group: Development/Tools @@ -23,7 +23,8 @@ %build %configure -make %{?_smp_mflags} +# Parallel builds seem to fail +make %install rm -rf $RPM_BUILD_ROOT @@ -42,6 +43,9 @@ %changelog +* Thu Jul 28 2005 Paul Nasrat - 3.1.1-10 +- Turn off parallel builds + * Wed Jun 29 2005 Jose Pedro Oliveira - 3.1.1-9 - Dist tag added. - Specfile reformatted (compliance with the Fedora Extras template). From fedora-extras-commits at redhat.com Thu Jul 28 19:52:58 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:52:58 -0400 Subject: rpms/python-dateutil - New directory Message-ID: <200507281952.j6SJqxOQ002196@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2176/python-dateutil Log Message: Directory /cvs/extras/rpms/python-dateutil added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 19:52:59 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:52:59 -0400 Subject: rpms/python-dateutil/devel - New directory Message-ID: <200507281953.j6SJqxSj002201@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2176/python-dateutil/devel Log Message: Directory /cvs/extras/rpms/python-dateutil/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 19:53:11 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:11 -0400 Subject: rpms/python-dateutil Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507281953.j6SJrBNi002248@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2221 Added Files: Makefile import.log Log Message: Setup of module python-dateutil --- NEW FILE Makefile --- # Top level Makefile for module python-dateutil all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 28 19:53:12 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:12 -0400 Subject: rpms/python-dateutil/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507281953.j6SJrCuv002253@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2221/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-dateutil --- NEW 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 Jul 28 19:53:30 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:30 -0400 Subject: rpms/python-dateutil import.log,1.1,1.2 Message-ID: <200507281954.j6SJs0Wh002319@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2285 Modified Files: import.log Log Message: auto-import python-dateutil-1.0-1 on branch devel from python-dateutil-1.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-dateutil/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jul 2005 19:53:09 -0000 1.1 +++ import.log 28 Jul 2005 19:53:28 -0000 1.2 @@ -0,0 +1 @@ +python-dateutil-1_0-1:HEAD:python-dateutil-1.0-1.src.rpm:1122580405 From fedora-extras-commits at redhat.com Thu Jul 28 19:53:30 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 15:53:30 -0400 Subject: rpms/python-dateutil/devel python-dateutil.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507281954.j6SJs1wd002323@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-dateutil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2285/devel Modified Files: .cvsignore sources Added Files: python-dateutil.spec Log Message: auto-import python-dateutil-1.0-1 on branch devel from python-dateutil-1.0-1.src.rpm --- NEW FILE python-dateutil.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-dateutil Version: 1.0 Release: 1%{?dist} Summary: Powerful extensions to the standard datetime module Group: Development/Languages License: Python Software Foundation License URL: https://moin.conectiva.com.br/DateUtil #Source0: https://moin.conectiva.com.br/DateUtil?action=AttachFile&do=get&target=python-dateutil-%{version}.tar.bz2 Source0: python-dateutil-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python %description The dateutil module provides powerful extensions to the standard datetime module available in Python 2.3+. %prep %setup -q %build %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc example.py LICENSE NEWS README %{python_sitelib}/dateutil/ %changelog * Thu Jul 28 2005 Orion Poplawski 1.0-1 - Update to 1.0 * Tue Jul 05 2005 Orion Poplawski 0.9-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-dateutil/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2005 19:53:10 -0000 1.1 +++ .cvsignore 28 Jul 2005 19:53:28 -0000 1.2 @@ -0,0 +1 @@ +python-dateutil-1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-dateutil/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2005 19:53:10 -0000 1.1 +++ sources 28 Jul 2005 19:53:28 -0000 1.2 @@ -0,0 +1 @@ +764659b7b763fa551a5fbcec96d86d6d python-dateutil-1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Jul 28 20:09:24 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:09:24 -0400 Subject: owners owners.list,1.35,1.36 Message-ID: <200507282009.j6SK9ODA003602@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3584 Modified Files: owners.list Log Message: Add python-dateutil Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- owners.list 27 Jul 2005 13:28:17 -0000 1.35 +++ owners.list 28 Jul 2005 20:09:22 -0000 1.36 @@ -659,6 +659,7 @@ Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-crypto|A cryptography library for Python|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|python-dateutil|Powerful extensions to the standard datetime module|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-dialog|Python interface to the Unix dialog utility|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|python-docutils|A system for processing plaintext documentation|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Jul 28 20:11:07 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:11:07 -0400 Subject: rpms/pytz/devel pytz.spec,1.1,1.2 Message-ID: <200507282011.j6SKB7bx003633@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/pytz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3615 Modified Files: pytz.spec Log Message: Add %{?dist} Index: pytz.spec =================================================================== RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytz.spec 22 Jul 2005 20:58:39 -0000 1.1 +++ pytz.spec 28 Jul 2005 20:11:04 -0000 1.2 @@ -2,7 +2,7 @@ Name: pytz Version: 2005i -Release: 2 +Release: 2{%dist} Summary: World Timezone Definitions for Python Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 28 20:11:42 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:11:42 -0400 Subject: rpms/pytz/devel pytz.spec,1.2,1.3 Message-ID: <200507282011.j6SKBgrD003690@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/pytz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3673 Modified Files: pytz.spec Log Message: Fix %{?dist} typo Index: pytz.spec =================================================================== RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pytz.spec 28 Jul 2005 20:11:04 -0000 1.2 +++ pytz.spec 28 Jul 2005 20:11:40 -0000 1.3 @@ -2,7 +2,7 @@ Name: pytz Version: 2005i -Release: 2{%dist} +Release: 2%{?dist} Summary: World Timezone Definitions for Python Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 28 20:12:10 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:12:10 -0400 Subject: common tobuild,1.2140,1.2141 Message-ID: <200507282012.j6SKCAme003742@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3725/common Modified Files: tobuild Log Message: Remove pytz Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2140 retrieving revision 1.2141 diff -u -r1.2140 -r1.2141 --- tobuild 28 Jul 2005 19:08:52 -0000 1.2140 +++ tobuild 28 Jul 2005 20:12:08 -0000 1.2141 @@ -35,7 +35,6 @@ scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -orion rpms/pytz/devel pytz-2005i-2 devel mschwendt rpms/cksfv/devel cksfv-1_3-4 devel mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel From fedora-extras-commits at redhat.com Thu Jul 28 20:13:20 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:13:20 -0400 Subject: rpms/pytz/FC-4 pytz.spec,1.1,1.2 Message-ID: <200507282013.j6SKDKjx003769@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/pytz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3752 Modified Files: pytz.spec Log Message: Add %{?dist} Index: pytz.spec =================================================================== RCS file: /cvs/extras/rpms/pytz/FC-4/pytz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pytz.spec 22 Jul 2005 20:58:39 -0000 1.1 +++ pytz.spec 28 Jul 2005 20:13:18 -0000 1.2 @@ -2,7 +2,7 @@ Name: pytz Version: 2005i -Release: 2 +Release: 2%{?dist} Summary: World Timezone Definitions for Python Group: Development/Languages From fedora-extras-commits at redhat.com Thu Jul 28 20:19:52 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:19:52 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.2,1.3 Message-ID: <200507282019.j6SKJquH003843@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3825 Modified Files: python-matplotlib.spec Log Message: - BuildRequires: pytz, python-dateutil - use upstream - Don't use INSTALLED_FILES, list dirs - Fix execute permissions Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-matplotlib.spec 1 Jul 2005 16:15:16 -0000 1.2 +++ python-matplotlib.spec 28 Jul 2005 20:19:50 -0000 1.3 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.82 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel BuildRequires: python-numeric, pygtk2-devel, gtk2-devel +BuildRequires: pytz, python-dateutil %description Matplotlib is a pure python plotting library with the goal of making @@ -28,22 +29,29 @@ %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT +chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py +chmod -x $RPM_BUILD_ROOT%{_datadir}/matplotlib/*.svg %clean rm -rf $RPM_BUILD_ROOT - -%files -f INSTALLED_FILES +%files %defattr(-,root,root,-) %doc README license/LICENSE license/LICENSE_enthought.txt -%doc license/LICENSE_PAINT license/LICENSE_PIL license/PYTZ_LICENSE.txt +%doc license/LICENSE_PAINT license/LICENSE_PIL %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS %doc NUMARRAY_ISSUES PKG-INFO TODO -%dir %{python_sitearch}/matplotlib -%dir %{_datadir}/matplotlib +%{python_sitearch}/matplotlib/ +%{python_sitearch}/pylab.py* +%{_datadir}/matplotlib/ %changelog +* Tue Jul 05 2005 Orion Poplawski 0.82-4 +- BuildRequires: pytz, python-dateutil - use upstream +- Don't use INSTALLED_FILES, list dirs +- Fix execute permissions + * Fri Jul 01 2005 Orion Poplawski 0.82-3 - Use %{python_sitearch} From fedora-extras-commits at redhat.com Thu Jul 28 20:39:23 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:39:23 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.3,1.4 Message-ID: <200507282039.j6SKdN68003934@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3917 Modified Files: python-matplotlib.spec Log Message: - New upstream version matplotlib 0.83.1 Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-matplotlib.spec 28 Jul 2005 20:19:50 -0000 1.3 +++ python-matplotlib.spec 28 Jul 2005 20:39:21 -0000 1.4 @@ -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.82 -Release: 4%{?dist} +Version: 0.83.1 +Release: 1%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -47,6 +47,9 @@ %{_datadir}/matplotlib/ %changelog +* Thu Jul 28 2005 Orion Poplawski 0.83.1-1 +- New upstream version matplotlib 0.83.1 + * Tue Jul 05 2005 Orion Poplawski 0.82-4 - BuildRequires: pytz, python-dateutil - use upstream - Don't use INSTALLED_FILES, list dirs From fedora-extras-commits at redhat.com Thu Jul 28 20:40:02 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:40:02 -0400 Subject: rpms/python-matplotlib/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200507282040.j6SKe3Tq003988@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3969 Modified Files: .cvsignore sources Log Message: New source Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 Jun 2005 21:40:07 -0000 1.2 +++ .cvsignore 28 Jul 2005 20:40:00 -0000 1.3 @@ -1 +1 @@ -matplotlib-0.82.tar.gz +matplotlib-0.83.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 Jun 2005 21:40:07 -0000 1.2 +++ sources 28 Jul 2005 20:40:00 -0000 1.3 @@ -1 +1 @@ -a5ef59a9eed934708eedef5a0125d8d8 matplotlib-0.82.tar.gz +6142d63cafd8a4a2ed0c94d772c68611 matplotlib-0.83.1.tar.gz From fedora-extras-commits at redhat.com Thu Jul 28 20:54:24 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:24 -0400 Subject: rpms/at-poke - New directory Message-ID: <200507282054.j6SKsOCX004161@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4141/at-poke Log Message: Directory /cvs/extras/rpms/at-poke added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 20:54:24 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:24 -0400 Subject: rpms/at-poke/devel - New directory Message-ID: <200507282054.j6SKsOwu004166@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4141/at-poke/devel Log Message: Directory /cvs/extras/rpms/at-poke/devel added to the repository From fedora-extras-commits at redhat.com Thu Jul 28 20:54:38 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:38 -0400 Subject: rpms/at-poke/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507282054.j6SKscwV004222@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4188/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module at-poke --- NEW 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 Jul 28 20:54:38 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:54:38 -0400 Subject: rpms/at-poke Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507282054.j6SKschB004217@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4188 Added Files: Makefile import.log Log Message: Setup of module at-poke --- NEW FILE Makefile --- # Top level Makefile for module at-poke all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 28 20:54:45 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 16:54:45 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.4,1.5 Message-ID: <200507282054.j6SKsjVO004250@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4199 Modified Files: python-matplotlib.spec Log Message: Botched tag Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-matplotlib.spec 28 Jul 2005 20:39:21 -0000 1.4 +++ python-matplotlib.spec 28 Jul 2005 20:54:42 -0000 1.5 @@ -2,7 +2,7 @@ Name: python-matplotlib Version: 0.83.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python plotting library Group: Development/Libraries @@ -47,6 +47,9 @@ %{_datadir}/matplotlib/ %changelog +* Thu Jul 28 2005 Orion Poplawski 0.83.1-2 +- Bump rel to fix botched tag + * Thu Jul 28 2005 Orion Poplawski 0.83.1-1 - New upstream version matplotlib 0.83.1 From fedora-extras-commits at redhat.com Thu Jul 28 20:55:04 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:55:04 -0400 Subject: rpms/at-poke import.log,1.1,1.2 Message-ID: <200507282055.j6SKtY8M004352@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312 Modified Files: import.log Log Message: auto-import at-poke-0.2.2-1 on branch devel from at-poke-0.2.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/at-poke/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 28 Jul 2005 20:54:36 -0000 1.1 +++ import.log 28 Jul 2005 20:55:02 -0000 1.2 @@ -0,0 +1 @@ +at-poke-0_2_2-1:HEAD:at-poke-0.2.2-1.src.rpm:1122584098 From fedora-extras-commits at redhat.com Thu Jul 28 20:55:05 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 16:55:05 -0400 Subject: rpms/at-poke/devel at-poke-0.2.2-lvalue.patch, NONE, 1.1 at-poke-0.2.2-weakref.patch, NONE, 1.1 at-poke.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507282055.j6SKtZEU004356@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312/devel Modified Files: .cvsignore sources Added Files: at-poke-0.2.2-lvalue.patch at-poke-0.2.2-weakref.patch at-poke.spec Log Message: auto-import at-poke-0.2.2-1 on branch devel from at-poke-0.2.2-1.src.rpm at-poke-0.2.2-lvalue.patch: --- NEW FILE at-poke-0.2.2-lvalue.patch --- --- at-poke-0.2.2/src/accessible-tree-model.c.lvalue 2005-07-26 22:26:55.000000000 -0400 +++ at-poke-0.2.2/src/accessible-tree-model.c 2005-07-26 22:31:07.000000000 -0400 @@ -113,7 +113,7 @@ return make_iter_invalid (iter); iter->stamp = ACCESSIBLE_TREE_MODEL (model)->stamp; - ITER_NODE (iter) = node; + iter->user_data = node; iter->user_data2 = NULL; iter->user_data3 = NULL; at-poke-0.2.2-weakref.patch: --- NEW FILE at-poke-0.2.2-weakref.patch --- --- at-poke-0.2.2/src/poke.c.weakref 2005-07-26 23:46:10.000000000 -0400 +++ at-poke-0.2.2/src/poke.c 2005-07-26 23:48:31.000000000 -0400 @@ -1591,6 +1591,7 @@ poker->window = glade_xml_get_widget ( poker->xml, "poker_window"); + g_object_add_weak_pointer (G_OBJECT (poker->window), (gpointer *) &(poker->window)); closure = g_cclosure_new ( G_CALLBACK (root_died_cb), poker, NULL); --- NEW FILE at-poke.spec --- Summary: A tool for poking things Name: at-poke Version: 0.2.2 Release: 1 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch1: at-poke-0.2.2-lvalue.patch Patch2: at-poke-0.2.2-weakref.patch Requires: libgail-gnome BuildRequires: libgail-gnome-devel BuildRequires: gtk2-devel %description at-poke is a simple tool for introspecting applications using the GNOME accessibility framework. %prep %setup -q %patch1 -p1 -b .lvalue %patch2 -p1 -b .weakref %configure %build make %install rm -rf $RPM_BUILD_ROOT %makeinstall %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc %{_bindir}/at-poke %{_datadir}/at-poke/at-poke.glade2 %changelog * Tue Jul 26 2005 - poke-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/at-poke/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Jul 2005 20:54:36 -0000 1.1 +++ .cvsignore 28 Jul 2005 20:55:03 -0000 1.2 @@ -0,0 +1 @@ +at-poke-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/at-poke/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Jul 2005 20:54:36 -0000 1.1 +++ sources 28 Jul 2005 20:55:03 -0000 1.2 @@ -0,0 +1 @@ +17874a3340dfc3ec289018fb5545833f at-poke-0.2.2.tar.gz From fedora-extras-commits at redhat.com Thu Jul 28 21:31:39 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 17:31:39 -0400 Subject: common tobuild,1.2141,1.2142 Message-ID: <200507282131.j6SLVdp4005616@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5599 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2141 retrieving revision 1.2142 diff -u -r1.2141 -r1.2142 --- tobuild 28 Jul 2005 20:12:08 -0000 1.2141 +++ tobuild 28 Jul 2005 21:31:36 -0000 1.2142 @@ -82,3 +82,4 @@ jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 +jrb rpms/at-poke/devel at-poke-0_2_2-1 devel From fedora-extras-commits at redhat.com Thu Jul 28 21:43:35 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 17:43:35 -0400 Subject: extras-buildsys plague.spec,1.18,1.19 Message-ID: <200507282143.j6SLhZ86005673@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5644 Modified Files: plague.spec Log Message: fix the stuff in #164325 * add the builder user in the spec file * create /srv/plague_builder, make it owned by the builder * listen on all interfaces by default * make default cert hostname based Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- plague.spec 16 Jul 2005 16:48:05 -0000 1.18 +++ plague.spec 28 Jul 2005 21:43:33 -0000 1.19 @@ -40,6 +40,7 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(pre): /usr/sbin/useradd %description builder The Plague builder does the actual RPM package building on slave machines. @@ -79,6 +80,7 @@ install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server +mkdir -p /srv/plague_builder %clean @@ -95,6 +97,9 @@ /sbin/chkconfig --del plague-server fi +%pre builder +/usr/sbin/useradd -G mock -s /sbin/nologin -M -r -d /srv/plague_builder plague-builder 2>/dev/null || : + %post builder /sbin/chkconfig --add plague-builder /sbin/service plague-builder condrestart >> /dev/null || : @@ -131,6 +136,7 @@ %dir %{_sysconfdir}/%{name}/builder/certs %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-builder %{_initrddir}/%{name}-builder +%attr(0755, plague-builder, plague-builder) /srv/plague_builder %files client %defattr(-, root, root) From fedora-extras-commits at redhat.com Thu Jul 28 21:43:35 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 17:43:35 -0400 Subject: extras-buildsys/builder CONFIG.py,1.7,1.8 Message-ID: <200507282143.j6SLhZL0005679@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5644/builder Modified Files: CONFIG.py Log Message: fix the stuff in #164325 * add the builder user in the spec file * create /srv/plague_builder, make it owned by the builder * listen on all interfaces by default * make default cert hostname based Index: CONFIG.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CONFIG.py 22 Jul 2005 02:54:01 -0000 1.7 +++ CONFIG.py 28 Jul 2005 21:43:33 -0000 1.8 @@ -8,7 +8,7 @@ config_opts['ssl_buildserver'] = True config_opts['fileserver_port'] = 8889 config_opts['xmlrpc_port'] = 8888 -config_opts['hostname'] = 'localhost' +config_opts['hostname'] = '' # if this is blank, we bind to all interfaces # distro and repo # @@ -40,16 +40,18 @@ BUILDER_DIR = "/etc/plague/builder" +import socket +hn = socket.gethostname() # SSL Certs and keys # MUST be full path to cert -config_opts['builder_key_and_cert'] = BUILDER_DIR + "/certs/builder_key_and_cert.pem" +config_opts['builder_key_and_cert'] = "%s/certs/%s.pem" %(BUILDER_DIR, hn) config_opts['ca_cert'] = BUILDER_DIR + "/certs/ca_cert.pem" # Where to keep SRPMs to build and the finished products # and logs. # WARNING: this directory is world-readable via HTTP! -config_opts['builder_work_dir'] = "/tmp/builder_work" +config_opts['builder_work_dir'] = "/srv/plague_builder" # User to drop privilege level to since we can't run mock as root, # but we have to run the HTTP server as root so it can chroot -config_opts['builder_user'] = "builder" +config_opts['builder_user'] = "plague-builder" From fedora-extras-commits at redhat.com Thu Jul 28 21:46:07 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 17:46:07 -0400 Subject: extras-buildsys ChangeLog,1.77,1.78 plague.spec,1.19,1.20 Message-ID: <200507282146.j6SLk7FH005706@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5687 Modified Files: ChangeLog plague.spec Log Message: use rpm_build_root Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- ChangeLog 27 Jul 2005 18:07:23 -0000 1.77 +++ ChangeLog 28 Jul 2005 21:46:05 -0000 1.78 @@ -1,3 +1,10 @@ +2005-07-28 Jeremy Katz + + * plague.spec: Create builder user and work dir in -build package + + * builder/CONFIG.py: Set builder cert by hostname. + Listen on all interfaces. + 2005-07-27 Jeremy Katz * builder/builder.py (PPCArch.__init__): Use setarch for ppc32 Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plague.spec 28 Jul 2005 21:43:33 -0000 1.19 +++ plague.spec 28 Jul 2005 21:46:05 -0000 1.20 @@ -80,7 +80,7 @@ install -D -m 0755 etc/plague-builder.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-builder install -D -m 0644 etc/plague-server.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-server install -D -m 0755 etc/plague-server.init $RPM_BUILD_ROOT%{_initrddir}/%{name}-server -mkdir -p /srv/plague_builder +mkdir -p $RPM_BUILD_ROOT/srv/plague_builder %clean From fedora-extras-commits at redhat.com Thu Jul 28 21:58:23 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Thu, 28 Jul 2005 17:58:23 -0400 Subject: common tobuild,1.2142,1.2143 Message-ID: <200507282158.j6SLwNRo005773@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5755 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-1 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2142 retrieving revision 1.2143 diff -u -r1.2142 -r1.2143 --- tobuild 28 Jul 2005 21:31:36 -0000 1.2142 +++ tobuild 28 Jul 2005 21:58:21 -0000 1.2143 @@ -83,3 +83,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel +jrb rpms/at-poke/devel at-poke-0_2_2-1 development From fedora-extras-commits at redhat.com Thu Jul 28 23:06:34 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 28 Jul 2005 19:06:34 -0400 Subject: rpms/python-matplotlib/devel python-matplotlib.spec,1.5,1.6 Message-ID: <200507282306.j6SN6YXa008216@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8196 Modified Files: python-matplotlib.spec Log Message: Escape macros in changelog Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-matplotlib.spec 28 Jul 2005 20:54:42 -0000 1.5 +++ python-matplotlib.spec 28 Jul 2005 23:06:28 -0000 1.6 @@ -59,7 +59,7 @@ - Fix execute permissions * Fri Jul 01 2005 Orion Poplawski 0.82-3 -- Use %{python_sitearch} +- Use %%{python_sitearch} * Thu Jun 30 2005 Orion Poplawski 0.82-2 - Rename to python-matplotlib From fedora-extras-commits at redhat.com Thu Jul 28 23:26:50 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Thu, 28 Jul 2005 19:26:50 -0400 Subject: common tobuild,1.2143,1.2144 Message-ID: <200507282326.j6SNQok4008340@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8323/common Modified Files: tobuild Log Message: Remove devel build. I built it with plague-client instead. tobuild is dead, long live plague-client! Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2143 retrieving revision 1.2144 diff -u -r1.2143 -r1.2144 --- tobuild 28 Jul 2005 21:58:21 -0000 1.2143 +++ tobuild 28 Jul 2005 23:26:48 -0000 1.2144 @@ -40,7 +40,6 @@ mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel -jwboyer rpms/gaim-meanwhile/devel gaim-meanwhile-1_2_4-2_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 03:41:31 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 28 Jul 2005 23:41:31 -0400 Subject: devel/common Makefile.common,1.26,1.27 Message-ID: <200507290341.j6T3fVcA013378@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13361 Modified Files: Makefile.common Log Message: add a make plague target... this will be what make build does soon... Index: Makefile.common =================================================================== RCS file: /cvs/extras/devel/common/Makefile.common,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile.common 28 Jun 2005 17:02:52 -0000 1.26 +++ Makefile.common 29 Jul 2005 03:41:29 -0000 1.27 @@ -324,6 +324,14 @@ cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\ popd >/dev/null) +plague: $(COMMON_DIR)/branches + @if [ ! -x /usr/bin/plague-client ]; then echo "Must have plague-client installed"; exit 1; fi + @if [ -z "$(TARGET)" -a ! -d CVS ]; then echo "Must be in a branch subdirectory"; exit 1; fi + + @cvs status -v $(SPECFILE) 2>/dev/null | grep -q $(TAG); ret=$$? ;\ + if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1; fi + /usr/bin/plague-client build $(NAME) $(TAG) $(TARGET) + # "make new | less" to see what has changed since the last tag was assigned new: From fedora-extras-commits at redhat.com Fri Jul 29 04:42:15 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 00:42:15 -0400 Subject: rpms/seahorse import.log,1.5,1.6 Message-ID: <200507290442.j6T4gFfe014679@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14648 Modified Files: import.log Log Message: auto-import seahorse-0.7.9-1.fc4 on branch FC-4 from seahorse-0.7.9-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/seahorse/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 5 May 2005 22:37:05 -0000 1.5 +++ import.log 29 Jul 2005 04:42:13 -0000 1.6 @@ -2,3 +2,4 @@ seahorse-0_7_3-0_fdr_5_1:HEAD:seahorse-0.7.3-0.fdr.5.1.src.rpm:1099891226 seahorse-0_7_3-0_fdr_5_2:HEAD:seahorse-0.7.3-0.fdr.5.2.src.rpm:1099891232 seahorse-0_7_7-1:HEAD:seahorse-0.7.7-1.src.rpm:1115332650 +seahorse-0_7_9-1_fc4:FC-4:seahorse-0.7.9-1.fc4.src.rpm:1122612107 From fedora-extras-commits at redhat.com Fri Jul 29 04:42:16 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 00:42:16 -0400 Subject: rpms/seahorse/FC-4 .cvsignore, 1.4, 1.5 seahorse.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200507290442.j6T4gGvV014687@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14648/FC-4 Modified Files: .cvsignore seahorse.spec sources Log Message: auto-import seahorse-0.7.9-1.fc4 on branch FC-4 from seahorse-0.7.9-1.fc4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 May 2005 22:37:05 -0000 1.4 +++ .cvsignore 29 Jul 2005 04:42:14 -0000 1.5 @@ -1 +1 @@ -seahorse-0.7.7.tar.gz +seahorse-0.7.9.tar.gz Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/seahorse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- seahorse.spec 26 May 2005 01:29:00 -0000 1.12 +++ seahorse.spec 29 Jul 2005 04:42:14 -0000 1.13 @@ -1,11 +1,11 @@ Name: seahorse -Version: 0.7.7 -Release: 3 +Version: 0.7.9 +Release: 1%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.7.tar.gz +Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -99,14 +99,17 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_bindir}/* -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* %{_datadir}/applications/*.desktop %{_datadir}/control-center-2.0/capplets/*.desktop -%{_datadir}/gnome/help/%{name} +%dir %{_datadir}/gnome/help/%{name} +%{_datadir}/gnome/help/%{name}/* %{_datadir}/mime-info/seahorse.keys %{_datadir}/mime-info/seahorse.mime %{_datadir}/mime/packages/* -%{_datadir}/omf/%{name} +%dir %{_datadir}/omf/%{name} +%{_datadir}/omf/%{name}/* %{_datadir}/pixmaps/* %{_libdir}/libseahorse-internal* %{_libdir}/gedit-2/plugins/* @@ -115,6 +118,9 @@ %changelog +* Thu Jul 28 2005 Seth Vidal - 0.7.9-1 +- 0.7.9 + * Wed May 25 2005 Jeremy Katz - 0.7.7-3 - make sure all files are included - BR nautilus-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 May 2005 22:37:05 -0000 1.4 +++ sources 29 Jul 2005 04:42:14 -0000 1.5 @@ -1 +1 @@ -babee15dbe6b5652b20ae0d1b0b04962 seahorse-0.7.7.tar.gz +58d5ba77ea99b5c11fbd9feadfbd3f87 seahorse-0.7.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 05:11:15 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 29 Jul 2005 01:11:15 -0400 Subject: mock/etc fedora-4-ppc-core.cfg, 1.3, 1.4 fedora-5-ppc-core.cfg, 1.2, 1.3 Message-ID: <200507290511.j6T5BFVW016019@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/mock/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16000/etc Modified Files: fedora-4-ppc-core.cfg fedora-5-ppc-core.cfg Log Message: exclude ppc64 packages in ppc configs. this fixes building of ppc stuff on a ppc64 host Index: fedora-4-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-4-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.3 +++ fedora-4-ppc-core.cfg 29 Jul 2005 05:11:13 -0000 1.4 @@ -29,6 +29,7 @@ obsoletes=1 gpgcheck=0 assumeyes=1 +exclude=*.ppc64 # repos Index: fedora-5-ppc-core.cfg =================================================================== RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-5-ppc-core.cfg 28 Jul 2005 14:02:59 -0000 1.2 +++ fedora-5-ppc-core.cfg 29 Jul 2005 05:11:13 -0000 1.3 @@ -29,6 +29,7 @@ obsoletes=1 gpgcheck=0 assumeyes=1 +exclude=*.ppc64 # repos From fedora-extras-commits at redhat.com Fri Jul 29 05:14:33 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:14:33 -0400 Subject: extras-buildsys ChangeLog,1.78,1.79 Message-ID: <200507290514.j6T5EXDi016059@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030 Modified Files: ChangeLog Log Message: server/UserInterface.py Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- ChangeLog 28 Jul 2005 21:46:05 -0000 1.78 +++ ChangeLog 29 Jul 2005 05:14:31 -0000 1.79 @@ -1,3 +1,8 @@ +2005-07-29 Seth Vidal + * server/UserInterface.py - fix resolved target to succeed if a match + comes from the client_target_map + also simplify the function a bit. + 2005-07-28 Jeremy Katz * plague.spec: Create builder user and work dir in -build package From fedora-extras-commits at redhat.com Fri Jul 29 05:14:34 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:14:34 -0400 Subject: extras-buildsys/server UserInterface.py,1.31,1.32 Message-ID: <200507290514.j6T5EYws016065@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16030/server Modified Files: UserInterface.py Log Message: server/UserInterface.py Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- UserInterface.py 27 Jul 2005 06:21:36 -0000 1.31 +++ UserInterface.py 29 Jul 2005 05:14:31 -0000 1.32 @@ -76,28 +76,22 @@ def resolve_target(target): client_target_map = config_opts['client_target_map'] + target_dict = config_opts['targets'] - # Resolve aliases first resolved_target = target done = True for master_target in client_target_map.keys(): + if not target_dict.has_key(master_target): # make sure we build it + continue # if not, move along + for alias in client_target_map[master_target]: if resolved_target.lower() == alias.lower(): - resolved_target = master_target - done = True - break - if done: - break - - # Make sure we actually build the resolved target - target_dict = config_opts['targets'] - for master_target in target_dict.keys(): - if resolved_target.lower() == master_target.lower(): - return master_target + return master_target raise InvalidTargetError() + def email_result(email, source, resultstring): """send 'resultstring' to email""" From fedora-extras-commits at redhat.com Fri Jul 29 05:16:59 2005 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Fri, 29 Jul 2005 01:16:59 -0400 Subject: rpms/galeon/FC-4 galeon.spec,1.14,1.15 Message-ID: <200507290516.j6T5Gxg7016091@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16074 Modified Files: galeon.spec Log Message: galeon:bumped released Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- galeon.spec 24 Jul 2005 14:49:43 -0000 1.14 +++ galeon.spec 29 Jul 2005 05:16:57 -0000 1.15 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 1.3.21 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -101,6 +101,9 @@ %changelog +* Fri Jul 29 2005 Dams - 1.3.21-11 +- Bumped released + * Sun Jul 24 2005 Dams - 1.3.21-10 - Bumped release because build server didnt built my previous request From fedora-extras-commits at redhat.com Fri Jul 29 05:25:25 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:25:25 -0400 Subject: extras-buildsys ChangeLog,1.79,1.80 Message-ID: <200507290525.j6T5PPru016182@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153 Modified Files: ChangeLog Log Message: despam Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- ChangeLog 29 Jul 2005 05:14:31 -0000 1.79 +++ ChangeLog 29 Jul 2005 05:25:22 -0000 1.80 @@ -1,4 +1,7 @@ 2005-07-29 Seth Vidal + * www/index.psp - despam email addresses + +2005-07-29 Seth Vidal * server/UserInterface.py - fix resolved target to succeed if a match comes from the client_target_map also simplify the function a bit. From fedora-extras-commits at redhat.com Fri Jul 29 05:25:25 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:25:25 -0400 Subject: extras-buildsys/www index.psp,1.4,1.5 Message-ID: <200507290525.j6T5PPbr016188@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153/www Modified Files: index.psp Log Message: despam Index: index.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- index.psp 27 Jul 2005 06:14:00 -0000 1.4 +++ index.psp 29 Jul 2005 05:25:23 -0000 1.5 @@ -65,6 +65,7 @@ # endif joblink = job_link(job['uid']) + username = job['username'].replace('@', ' ') %> <%=job['uid']%> @@ -72,7 +73,7 @@ <%=source%> <%=job['status']%> <%=job['target']%> - <%=job['username']%> + <%=username%> <% i = i + 1 @@ -93,6 +94,7 @@ # endif joblink = job_link(job['uid']) + username = job['username'].replace('@', ' ') %> <%=job['uid']%> @@ -100,7 +102,7 @@ <%=source%> <%=job['status']%> <%=job['target']%> - <%=job['username']%> + <%=username%> <% i = i + 1 From fedora-extras-commits at redhat.com Fri Jul 29 05:27:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 01:27:18 -0400 Subject: extras-buildsys ChangeLog,1.80,1.81 Message-ID: <200507290527.j6T5RmCB016236@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16204 Modified Files: ChangeLog Log Message: 2005-07-29 Dan Williams * www/job.psp - Line up arch jobs - Only show build times for successful jobs Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- ChangeLog 29 Jul 2005 05:25:22 -0000 1.80 +++ ChangeLog 29 Jul 2005 05:27:16 -0000 1.81 @@ -1,3 +1,9 @@ +2005-07-29 Dan Williams + + * www/job.psp + - Line up arch jobs + - Only show build times for successful jobs + 2005-07-29 Seth Vidal * www/index.psp - despam email addresses From fedora-extras-commits at redhat.com Fri Jul 29 05:27:18 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 01:27:18 -0400 Subject: extras-buildsys/www job.psp,1.3,1.4 Message-ID: <200507290527.j6T5RmbZ016239@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16204/www Modified Files: job.psp Log Message: 2005-07-29 Dan Williams * www/job.psp - Line up arch jobs - Only show build times for successful jobs Index: job.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- job.psp 27 Jul 2005 07:25:35 -0000 1.3 +++ job.psp 29 Jul 2005 05:27:16 -0000 1.4 @@ -88,29 +88,23 @@ - - + -<% - colspan = '' - if aj['endtime'] == 0: - colspan = 'colspan="2"' - #endif -%> - + <% # endif %> From fedora-extras-commits at redhat.com Fri Jul 29 05:43:47 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:43:47 -0400 Subject: rpms/seahorse import.log,1.6,1.7 Message-ID: <200507290543.j6T5hlHm016319@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16288 Modified Files: import.log Log Message: auto-import seahorse-0.7.9-1.fc4 on branch devel from seahorse-0.7.9-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/seahorse/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 29 Jul 2005 04:42:13 -0000 1.6 +++ import.log 29 Jul 2005 05:43:45 -0000 1.7 @@ -3,3 +3,4 @@ seahorse-0_7_3-0_fdr_5_2:HEAD:seahorse-0.7.3-0.fdr.5.2.src.rpm:1099891232 seahorse-0_7_7-1:HEAD:seahorse-0.7.7-1.src.rpm:1115332650 seahorse-0_7_9-1_fc4:FC-4:seahorse-0.7.9-1.fc4.src.rpm:1122612107 +seahorse-0_7_9-1_fc4:HEAD:seahorse-0.7.9-1.fc4.src.rpm:1122615798 From fedora-extras-commits at redhat.com Fri Jul 29 05:43:47 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 01:43:47 -0400 Subject: rpms/seahorse/devel .cvsignore, 1.4, 1.5 seahorse.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200507290543.j6T5hlZk016327@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16288/devel Modified Files: .cvsignore seahorse.spec sources Log Message: auto-import seahorse-0.7.9-1.fc4 on branch devel from seahorse-0.7.9-1.fc4.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 May 2005 22:37:05 -0000 1.4 +++ .cvsignore 29 Jul 2005 05:43:45 -0000 1.5 @@ -1 +1 @@ -seahorse-0.7.7.tar.gz +seahorse-0.7.9.tar.gz Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- seahorse.spec 26 May 2005 01:29:00 -0000 1.12 +++ seahorse.spec 29 Jul 2005 05:43:45 -0000 1.13 @@ -1,11 +1,11 @@ Name: seahorse -Version: 0.7.7 -Release: 3 +Version: 0.7.9 +Release: 1%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL URL: http://seahorse.sourceforge.net/ -Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/seahorse-0.7.7.tar.gz +Source: http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.7/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -99,14 +99,17 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{_bindir}/* -%{_datadir}/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* %{_datadir}/applications/*.desktop %{_datadir}/control-center-2.0/capplets/*.desktop -%{_datadir}/gnome/help/%{name} +%dir %{_datadir}/gnome/help/%{name} +%{_datadir}/gnome/help/%{name}/* %{_datadir}/mime-info/seahorse.keys %{_datadir}/mime-info/seahorse.mime %{_datadir}/mime/packages/* -%{_datadir}/omf/%{name} +%dir %{_datadir}/omf/%{name} +%{_datadir}/omf/%{name}/* %{_datadir}/pixmaps/* %{_libdir}/libseahorse-internal* %{_libdir}/gedit-2/plugins/* @@ -115,6 +118,9 @@ %changelog +* Thu Jul 28 2005 Seth Vidal - 0.7.9-1 +- 0.7.9 + * Wed May 25 2005 Jeremy Katz - 0.7.7-3 - make sure all files are included - BR nautilus-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 May 2005 22:37:05 -0000 1.4 +++ sources 29 Jul 2005 05:43:45 -0000 1.5 @@ -1 +1 @@ -babee15dbe6b5652b20ae0d1b0b04962 seahorse-0.7.7.tar.gz +58d5ba77ea99b5c11fbd9feadfbd3f87 seahorse-0.7.9.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 05:50:55 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 01:50:55 -0400 Subject: rpms/scim/devel README, NONE, 1.1 Makefile, 1.1, NONE scim.spec, 1.8, NONE sources, 1.6, NONE xinput-scim, 1.3, NONE Message-ID: <200507290550.j6T5ot6J016468@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16452 Added Files: README Removed Files: Makefile scim.spec sources xinput-scim Log Message: scim moved to Core for FC5 --- NEW FILE README --- scim has moved to Fedora Core for FC5. --- Makefile DELETED --- --- scim.spec DELETED --- --- sources DELETED --- --- xinput-scim DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 06:05:05 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:05:05 -0400 Subject: extras-buildsys/client client.py,1.16,1.17 Message-ID: <200507290606.j6T668tB017640@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587/client Modified Files: client.py Log Message: 2005-07-29 Dan Williams * server/BuilderManager.py server/BuildMaster.py server/UserInterface.py client/client.py - Add admin-only pause/unpause commands to the server Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- client.py 25 Jul 2005 21:44:52 -0000 1.16 +++ client.py 29 Jul 2005 06:05:03 -0000 1.17 @@ -227,6 +227,18 @@ except socket.error, e: print "Error connecting to build server: '%s'" % e +def pause(server, paused): + """ + Pause or unpause the build server + """ + + try: + (e, msg) = server.pause(paused) + print msg + except socket.error, e: + print "Error connecting to build server: '%s'" % e + + def getXMLRPCServerProxy(use_ssl): """ @@ -292,6 +304,8 @@ print " kill " print " update_builders" print " list_builders" + print " pause" + print " unpause" print "" sys.exit(1) @@ -336,6 +350,10 @@ update_builders(server, email) elif cmd == 'list_builders': list_builders(server, email) + elif cmd == 'pause': + pause(server, True) + elif cmd == 'unpause': + pause(server, False) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Fri Jul 29 06:04:33 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:04:33 -0400 Subject: extras-buildsys ChangeLog,1.81,1.82 Message-ID: <200507290606.j6T668CT017641@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587 Modified Files: ChangeLog Log Message: 2005-07-29 Dan Williams * server/BuilderManager.py server/BuildMaster.py server/UserInterface.py client/client.py - Add admin-only pause/unpause commands to the server Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- ChangeLog 29 Jul 2005 05:27:16 -0000 1.81 +++ ChangeLog 29 Jul 2005 06:04:31 -0000 1.82 @@ -1,5 +1,13 @@ 2005-07-29 Dan Williams + * server/BuilderManager.py + server/BuildMaster.py + server/UserInterface.py + client/client.py + - Add admin-only pause/unpause commands to the server + +2005-07-29 Dan Williams + * www/job.psp - Line up arch jobs - Only show build times for successful jobs From fedora-extras-commits at redhat.com Fri Jul 29 06:05:39 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:05:39 -0400 Subject: extras-buildsys/server BuildMaster.py, 1.24, 1.25 BuilderManager.py, 1.8, 1.9 UserInterface.py, 1.32, 1.33 Message-ID: <200507290606.j6T66ABl017643@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17587/server Modified Files: BuildMaster.py BuilderManager.py UserInterface.py Log Message: 2005-07-29 Dan Williams * server/BuilderManager.py server/BuildMaster.py server/UserInterface.py client/client.py - Add admin-only pause/unpause commands to the server Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- BuildMaster.py 26 Jul 2005 17:47:24 -0000 1.24 +++ BuildMaster.py 29 Jul 2005 06:05:37 -0000 1.25 @@ -104,6 +104,7 @@ self.builder_manager = builder_manager self.hostname = hostname self.should_stop = False + self._paused = False self.repos = {} for target in config_opts['targets'].keys(): repo = Repo.Repo(target, builder_manager) @@ -403,23 +404,24 @@ def _have_work(self): have_work = False - if not have_work: - self._new_queue_lock.acquire() - if len(self._new_queue) > 0: - have_work = True - self._new_queue_lock.release() - - if not have_work: - self._restart_queue_lock.acquire() - if len(self._restart_queue) > 0: - have_work = True - self._restart_queue_lock.release() - - if not have_work: - self._checkout_wait_queue_lock.acquire() - if (self._checkout_num < self.MAX_CHECKOUT_JOBS) and len(self._checkout_wait_queue) > 0: - have_work = True - self._checkout_wait_queue_lock.release() + if not self._paused: + if not have_work: + self._new_queue_lock.acquire() + if len(self._new_queue) > 0: + have_work = True + self._new_queue_lock.release() + + if not have_work: + self._restart_queue_lock.acquire() + if len(self._restart_queue) > 0: + have_work = True + self._restart_queue_lock.release() + + if not have_work: + self._checkout_wait_queue_lock.acquire() + if (self._checkout_num < self.MAX_CHECKOUT_JOBS) and len(self._checkout_wait_queue) > 0: + have_work = True + self._checkout_wait_queue_lock.release() if not have_work: self._status_updates_lock.acquire() @@ -433,8 +435,8 @@ have_work = True self._archjob_status_updates_lock.release() - if not have_work and self.builder_manager.have_work(): - have_work = True + if not have_work and self.builder_manager.have_work(self._paused): + have_work = True return have_work @@ -447,23 +449,30 @@ self._building_jobs_lock.release() return ret_job + def pause(self, paused): + self._paused = paused + + def is_paused(self): + return self._paused + def run(self): while self.should_stop == False: # Write update status for jobs to the database self._save_job_status() - if self.builder_manager.have_work(): - self.builder_manager.process() + if self.builder_manager.have_work(self._paused): + self.builder_manager.process(self._paused) # Clean up jobs that have finished self._process_finished_jobs() - # Let a few jobs through the checkout_wait gate if needed - self._process_checkout_wait_jobs() - - # Start any new jobs - self._start_new_jobs() - self._start_requeued_jobs() + if not self._paused: + # Let a few jobs through the checkout_wait gate if needed + self._process_checkout_wait_jobs() + + # Start any new jobs + self._start_new_jobs() + self._start_requeued_jobs() last_time = time.time() while not self._have_work() and time.time() <= last_time + 5: Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- BuilderManager.py 25 Jul 2005 19:47:15 -0000 1.8 +++ BuilderManager.py 29 Jul 2005 06:05:37 -0000 1.9 @@ -129,19 +129,19 @@ return builder_list - def have_work(self): + def have_work(self, paused): avail = False for builder in self.running_builders: if builder.available(): avail = True - if len(self._queue) > 0 and avail: + if not paused and len(self._queue) > 0 and avail: return True return self._have_work def builder_gone(self): self._have_work = True - def process(self): + def process(self, paused): self._have_work = False # Deal with dead/unreachable builders @@ -159,6 +159,10 @@ builder.stop() self.running_builders.remove(builder) + # Don't queue any new jobs if we are paused + if paused: + return + # Deal with new arch jobs self._queue_lock.acquire() new_jobs = {} Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- UserInterface.py 29 Jul 2005 05:14:31 -0000 1.32 +++ UserInterface.py 29 Jul 2005 06:05:37 -0000 1.33 @@ -404,6 +404,16 @@ target_dict = config_opts['targets'] return target_dict.keys() + def pause(self, paused): + s = "paused" + if not paused: + s = "unpaused" + if paused == self._bm.is_paused(): + return (-1, "Error: system is already %s." % s) + else: + self._bm.pause(paused) + return (0, "Success, system %s." % s) + class UserInterfaceSSLAuth(UserInterface): """ @@ -469,6 +479,13 @@ return UserInterface.targets(self) + def pause(self, paused): + user = AuthedXMLRPCServer.get_authinfo() + if not user or not user.server_admin: + return (-1, "Insufficient privileges.") + return UserInterface.pause(self, paused) + + class UserInterfaceNoAuth(UserInterface): """ Allow all operations, NULL authentication From fedora-extras-commits at redhat.com Fri Jul 29 06:09:13 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:09:13 -0400 Subject: extras-buildsys/client client.py,1.17,1.18 Message-ID: <200507290609.j6T69D3v017724@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17695/client Modified Files: client.py Log Message: Add an is_paused command so you can actually figure out if stuff is paused or not Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- client.py 29 Jul 2005 06:05:03 -0000 1.17 +++ client.py 29 Jul 2005 06:09:11 -0000 1.18 @@ -239,6 +239,19 @@ print "Error connecting to build server: '%s'" % e +def is_paused(server): + """ + Pause or unpause the build server + """ + + try: + if server.is_paused(): + print "The build server is paused." + else: + print "The build server is _not_ paused." + except socket.error, e: + print "Error connecting to build server: '%s'" % e + def getXMLRPCServerProxy(use_ssl): """ @@ -354,6 +367,8 @@ pause(server, True) elif cmd == 'unpause': pause(server, False) + elif cmd == 'is_paused': + is_paused(server) else: print "Unknown command." sys.exit(1) From fedora-extras-commits at redhat.com Fri Jul 29 06:09:13 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:09:13 -0400 Subject: extras-buildsys/server UserInterface.py,1.33,1.34 Message-ID: <200507290609.j6T69DqM017730@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17695/server Modified Files: UserInterface.py Log Message: Add an is_paused command so you can actually figure out if stuff is paused or not Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- UserInterface.py 29 Jul 2005 06:05:37 -0000 1.33 +++ UserInterface.py 29 Jul 2005 06:09:11 -0000 1.34 @@ -414,6 +414,9 @@ self._bm.pause(paused) return (0, "Success, system %s." % s) + def is_paused(self): + return self._bm.is_paused() + class UserInterfaceSSLAuth(UserInterface): """ From fedora-extras-commits at redhat.com Fri Jul 29 06:17:46 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 02:17:46 -0400 Subject: common tobuild,1.2144,1.2145 Message-ID: <200507290618.j6T6IG9i017778@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17761 Modified Files: tobuild Log Message: remove old and wrong Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2144 retrieving revision 1.2145 diff -u -r1.2144 -r1.2145 --- tobuild 28 Jul 2005 23:26:48 -0000 1.2144 +++ tobuild 29 Jul 2005 06:17:41 -0000 1.2145 @@ -2,7 +2,6 @@ # user repo tag target status # ensc rpms/clamav/devel clamav-0_86_2-2_fc5 devel -anvil rpms/galeon/FC-4 galeon-1_3_21-9_fc4 fc4 ertzing rpms/libevent/devel libevent-1_1a-2_fc5 devel lmacken rpms/naim/devel naim-0_11_7_3_1-2_fc5 devel uwog rpms/aiksaurus/devel aiksaurus-1_2_1-9 devel @@ -65,8 +64,6 @@ ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel -roland rpms/monotone/FC-4 monotone-0_21-2_fc4 fc4 -uwog rpms/abiword/devel abiword-2_2_9-1 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 @@ -82,4 +79,3 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel -jrb rpms/at-poke/devel at-poke-0_2_2-1 development From fedora-extras-commits at redhat.com Fri Jul 29 06:55:58 2005 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 29 Jul 2005 02:55:58 -0400 Subject: extras-buildsys/www builders.psp,1.3,1.4 Message-ID: <200507290655.j6T6tw7m018747@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/www In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18730/www Modified Files: builders.psp Log Message: Don't show addtorepo jobs on builders Index: builders.psp =================================================================== RCS file: /cvs/fedora/extras-buildsys/www/builders.psp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- builders.psp 23 Jul 2005 00:55:31 -0000 1.3 +++ builders.psp 29 Jul 2005 06:55:56 -0000 1.4 @@ -68,6 +68,7 @@ for aj in archjobs: if aj['builder_addr'] == addr: joblink = job_link(job['uid']) + if aj['status'] != 'done': %> <% + # endif # endif # endfor # endfor From fedora-extras-commits at redhat.com Fri Jul 29 07:07:35 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:07:35 -0400 Subject: extras-buildsys/server UserInterface.py,1.34,1.35 Message-ID: <200507290707.j6T77ZjW019926@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19885/server Modified Files: UserInterface.py Log Message: allow server_admins to requeue anyone's jobs Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- UserInterface.py 29 Jul 2005 06:09:11 -0000 1.34 +++ UserInterface.py 29 Jul 2005 07:07:32 -0000 1.35 @@ -174,7 +174,7 @@ self._bm.enqueue_srpm(email, package, srpm_file, real_target, buildreq, time.time()) return (0, "Success: package has been queued.") - def requeue(self, email, uid): + def requeue(self, uid): uid = validate_uid(uid) if not uid: return (-1, "Error: Invalid job UID.") @@ -191,10 +191,6 @@ if not job: return (-1, "Error: Invalid job UID.") - # Ensure matching usernames - if job[1] != email: - return (-1, "Error: You are not the original submitter for Job %d." % uid) - # Ensure the job failed or was killed if job[2] != 'failed' and job[2] != 'killed': return (-1, "Error: Job %d must be either 'failed' or 'killed' to requeue." % uid) @@ -440,7 +436,28 @@ user = AuthedXMLRPCServer.get_authinfo() if not user or not user.own_jobs: return (-1, "Insufficient privileges.") - return UserInterface.requeue(self, user.email, uid) + + uid = validate_uid(uid) + if not uid: + return (-1, "Error: Invalid job UID.") + + sql = 'SELECT uid, username, status 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.") + curs.execute(sql) + job = curs.fetchone() + if not job: + return (-1, "Error: Invalid job UID.") + + # Ensure matching usernames + if job[1] != user.email and not user.server_admin: + return (-1, "Error: You are not the original submitter for Job %d." % uid) + + return UserInterface.requeue(self, user, uid) def kill_job(self, email, jobid): user = AuthedXMLRPCServer.get_authinfo() From fedora-extras-commits at redhat.com Fri Jul 29 07:13:54 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:13:54 -0400 Subject: extras-buildsys/client client.py,1.18,1.19 Message-ID: <200507290713.j6T7Dsbb020004@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19975/client Modified Files: client.py Log Message: allow admin users to requeue any job Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- client.py 29 Jul 2005 06:09:11 -0000 1.18 +++ client.py 29 Jul 2005 07:13:52 -0000 1.19 @@ -91,11 +91,7 @@ def requeue_job(server, email, uid): try: - use_ssl = config.get('Server', 'use_ssl') - if use_ssl.lower() == 'true': - (err, msg) = server.requeue(uid) - else: - (err, msg) = server.requeue(email, uid) + server.requeue(uid) except socket.error, e: print "Error connecting to build server: '%s'" % e return From fedora-extras-commits at redhat.com Fri Jul 29 07:13:55 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:13:55 -0400 Subject: extras-buildsys/server UserInterface.py,1.35,1.36 Message-ID: <200507290714.j6T7Dt9q020010@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19975/server Modified Files: UserInterface.py Log Message: allow admin users to requeue any job Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- UserInterface.py 29 Jul 2005 07:07:32 -0000 1.35 +++ UserInterface.py 29 Jul 2005 07:13:53 -0000 1.36 @@ -457,7 +457,7 @@ if job[1] != user.email and not user.server_admin: return (-1, "Error: You are not the original submitter for Job %d." % uid) - return UserInterface.requeue(self, user, uid) + return UserInterface.requeue(self, uid) def kill_job(self, email, jobid): user = AuthedXMLRPCServer.get_authinfo() From fedora-extras-commits at redhat.com Fri Jul 29 07:16:07 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Fri, 29 Jul 2005 03:16:07 -0400 Subject: extras-buildsys/client client.py,1.19,1.20 Message-ID: <200507290716.j6T7G7I7020042@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/client In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20025/client Modified Files: client.py Log Message: I'm a dumbass Index: client.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/client/client.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- client.py 29 Jul 2005 07:13:52 -0000 1.19 +++ client.py 29 Jul 2005 07:16:05 -0000 1.20 @@ -91,7 +91,7 @@ def requeue_job(server, email, uid): try: - server.requeue(uid) + (e, msg) = server.requeue(uid) except socket.error, e: print "Error connecting to build server: '%s'" % e return From fedora-extras-commits at redhat.com Fri Jul 29 08:05:55 2005 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 29 Jul 2005 04:05:55 -0400 Subject: common tobuild,1.2145,1.2146 Message-ID: <200507290806.j6T86QdI021920@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21898 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2145 retrieving revision 1.2146 diff -u -r1.2145 -r1.2146 --- tobuild 29 Jul 2005 06:17:41 -0000 1.2145 +++ tobuild 29 Jul 2005 08:05:28 -0000 1.2146 @@ -11,7 +11,6 @@ ensc rpms/gif2png/devel gif2png-2_5_1-1_fc5 devel oliver rpms/libstatgrab/devel libstatgrab-0_11_1-3_fc5 devel tagoh rpms/kinput2/devel kinput2-v3_1-26_fc5 devel -tagoh rpms/uim/devel uim-0_4_7-1_fc5 devel thias rpms/gkrellm-aclock/devel gkrellm-aclock-0_3_3-1_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 09:53:35 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 05:53:35 -0400 Subject: rpms/scim/FC-4 scim.spec,1.7,1.8 xinput-scim,1.1,1.2 Message-ID: <200507290953.j6T9rZ3D023842@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23823 Modified Files: scim.spec xinput-scim Log Message: - sync with Core - drop the old Chinese manual from docs for now - update -devel description - add doc subpackage for devel documentation - don't set xinput.d script executable - no need to set XMODIFIERS explicitly in xinput.d script Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim.spec 27 Jul 2005 22:21:51 -0000 1.7 +++ scim.spec 29 Jul 2005 09:53:33 -0000 1.8 @@ -1,5 +1,6 @@ Name: scim Version: 1.4.0 +# must be less than the release number of scim in Core Release: 2%{?dist} Summary: Smart Common Input Method platform @@ -10,7 +11,7 @@ Source1: xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: %{_bindir}/update-gtk-immodules +PreReq: %{_bindir}/update-gtk-immodules BuildRequires: gtk2-devel, desktop-file-utils %description @@ -25,10 +26,16 @@ Requires: gtk2-devel %description devel -The scim-devel package includes the static libraries and header files -for the scim package. -Install scim-devel if you want to develop programs which will use -scim. +The scim-devel package includes the header files for the scim package. +Install scim-devel if you want to develop programs which will use scim. + + +%package doc +Summary: Smart Common Input Method platform documentation +Group: Development/Libraries + +%description doc +SCIM development documentation files generated from the sourcecode. %prep @@ -43,9 +50,10 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install + mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} -# Kill all .a and .la +# remove .la files find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel @@ -59,16 +67,9 @@ # remove capplet rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop -# install user manual -mkdir -p docs/dist/manual/zh_CN/figures/ -cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ -cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ - # install xinput config file. mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d -install -pm 755 %{SOURCE1} \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim - +install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim %find_lang %{name} @@ -80,39 +81,18 @@ %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW -do - %{_sbindir}/alternatives --install \ - %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc \ - %{_sysconfdir}/X11/xinit/xinput.d/scim 85 -done - %{_bindir}/update-gtk-immodules %{_target_platform} %postun /sbin/ldconfig -if [ "$1" = "0" ] -then - for llcc in ja_JP ko_KR zh_CN zh_TW - do - %{_sbindir}/alternatives --remove \ - xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-$llcc` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] - then - %{_sbindir}/alternatives --auto xinput-$llcc - fi - done -fi - %{_bindir}/update-gtk-immodules %{_target_platform} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog TODO -%doc docs/dist/manual/zh_CN %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d/scim @@ -126,16 +106,26 @@ %files devel %defattr(-,root,root,-) -%doc docs/html %doc docs/developers %{_includedir}/scim-1.0 %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc -#-------------------------------------------------- +%files doc +%defattr(-,root,root,-) +%doc docs/html + %changelog -* Thu Jul 28 2005 Jens Petersen -1.4.0-2 +* Fri Jul 29 2005 Jens Petersen +- sync with Core + - drop the old Chinese manual from docs for now + - update -devel description + - add doc subpackage for devel documentation + - don't set xinput.d script executable + - no need to set XMODIFIERS explicitly in xinput.d script + +* Thu Jul 28 2005 Ryo Dairiki - 1.4.0-2 - create scim-1.0 dirs to be accessible (Jens Petersen) * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 @@ -151,7 +141,10 @@ - don't set xinput.d script executable - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 +- Remove one of doubled capplets for setup. + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 - update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/xinput-scim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xinput-scim 19 May 2005 08:12:37 -0000 1.1 +++ xinput-scim 29 Jul 2005 09:53:33 -0000 1.2 @@ -1,4 +1,3 @@ -XMODIFIERS=@im=SCIM XIM=SCIM XIM_PROGRAM=scim XIM_ARGS="-d" From fedora-extras-commits at redhat.com Fri Jul 29 09:55:35 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 05:55:35 -0400 Subject: devel/common tobuild,1.2146,1.2147 Message-ID: <200507290955.j6T9tZNY023875@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23858 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2146 retrieving revision 1.2147 diff -u -r1.2146 -r1.2147 --- tobuild 29 Jul 2005 08:05:28 -0000 1.2146 +++ tobuild 29 Jul 2005 09:55:33 -0000 1.2147 @@ -16,11 +16,9 @@ ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel -mschwendt rpms/sylpheed/devel sylpheed-2_0_0-0_4_beta6 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel -mschwendt rpms/id3lib/devel id3lib-3_8_3-12_fc5 devel thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel @@ -33,7 +31,6 @@ scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -mschwendt rpms/cksfv/devel cksfv-1_3-4 devel mschwendt rpms/freeze/devel freeze-2_5_0-4 devel mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel @@ -50,7 +47,6 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel -mschwendt rpms/meld/devel meld-1_0_0-1_fc5 devel mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 09:56:35 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 05:56:35 -0400 Subject: rpms/scim/FC-4 scim.spec,1.8,1.9 Message-ID: <200507290956.j6T9uZc1023900@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23881 Modified Files: scim.spec Log Message: add changelog entry for removal of xinput.d alternatives to IMEs Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim.spec 29 Jul 2005 09:53:33 -0000 1.8 +++ scim.spec 29 Jul 2005 09:56:33 -0000 1.9 @@ -119,6 +119,7 @@ %changelog * Fri Jul 29 2005 Jens Petersen - sync with Core + - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now - update -devel description - add doc subpackage for devel documentation From fedora-extras-commits at redhat.com Fri Jul 29 09:56:40 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 05:56:40 -0400 Subject: devel/common tobuild,1.2147,1.2148 Message-ID: <200507290956.j6T9ueSF023921@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23904 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2147 retrieving revision 1.2148 diff -u -r1.2147 -r1.2148 --- tobuild 29 Jul 2005 09:55:33 -0000 1.2147 +++ tobuild 29 Jul 2005 09:56:38 -0000 1.2148 @@ -31,8 +31,6 @@ scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel -mschwendt rpms/freeze/devel freeze-2_5_0-4 devel -mschwendt rpms/tetex-lgrind/devel tetex-lgrind-3_67-7 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel From fedora-extras-commits at redhat.com Fri Jul 29 10:08:05 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 06:08:05 -0400 Subject: common tobuild,1.2148,1.2149 Message-ID: <200507291008.j6TA85Ae025090@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25063 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2148 retrieving revision 1.2149 diff -u -r1.2148 -r1.2149 --- tobuild 29 Jul 2005 09:56:38 -0000 1.2148 +++ tobuild 29 Jul 2005 10:08:03 -0000 1.2149 @@ -37,7 +37,6 @@ bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel -pghmcfc rpms/bittorrent/devel bittorrent-4_1_3-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 10:24:54 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 06:24:54 -0400 Subject: devel/common tobuild,1.2149,1.2150 Message-ID: <200507291024.j6TAOsKQ025194@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25175 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2149 retrieving revision 1.2150 diff -u -r1.2149 -r1.2150 --- tobuild 29 Jul 2005 10:08:03 -0000 1.2149 +++ tobuild 29 Jul 2005 10:24:51 -0000 1.2150 @@ -44,7 +44,6 @@ gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel -mschwendt rpms/inkscape/devel inkscape-0_42-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel From fedora-extras-commits at redhat.com Fri Jul 29 10:35:01 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 06:35:01 -0400 Subject: devel/inkscape inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 inkscape.spec, 1.14, 1.15 inkscape-0.41-dgettext.patch, 1.1, NONE Message-ID: <200507291035.j6TAZ1v8025269@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/inkscape In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249 Modified Files: inkscape.spec Added Files: inkscape-0.42-gettext-x86_64.patch Removed Files: inkscape-0.41-dgettext.patch Log Message: * Fri Jul 29 2005 Michael Schwendt - 0.42-2 - Extend ngettext/dgettext patch for x86_64 build. inkscape-0.42-gettext-x86_64.patch: --- NEW FILE inkscape-0.42-gettext-x86_64.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-07-29 12:34:14.000000000 +0200 @@ -21344,7 +21344,7 @@ int main () { -return (int) ngettext ("","", 1) +return (int)(long) ngettext ("","", 1) ; return 0; } @@ -21402,7 +21402,7 @@ int main () { -return (int) dgettext ("","") +return (int)(long) dgettext ("","") ; return 0; } Index: inkscape.spec =================================================================== RCS file: /cvs/extras/devel/inkscape/inkscape.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- inkscape.spec 26 Jul 2005 01:24:41 -0000 1.14 +++ inkscape.spec 29 Jul 2005 10:34:59 -0000 1.15 @@ -1,13 +1,13 @@ Name: inkscape Version: 0.42 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 -Patch0: inkscape-0.41-dgettext.patch +Patch0: inkscape-0.42-gettext-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -102,6 +102,9 @@ %changelog +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + * Tue Jul 26 2005 Michael Schwendt - 0.42-1 - update to 0.42 (also fixes #160326) - BR gnome-vfs2-devel --- inkscape-0.41-dgettext.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 11:07:16 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 07:07:16 -0400 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.4, 1.5 scim-anthy.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200507291107.j6TB7kjb026563@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26509 Modified Files: .cvsignore scim-anthy.spec sources Log Message: update to 0.5.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Jul 2005 03:26:51 -0000 1.4 +++ .cvsignore 29 Jul 2005 11:07:13 -0000 1.5 @@ -1 +1 @@ -scim-anthy-0.5.1.tar.gz +scim-anthy-0.5.3.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-anthy.spec 26 Jul 2005 13:40:50 -0000 1.8 +++ scim-anthy.spec 29 Jul 2005 11:07:14 -0000 1.9 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,7 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anthy +Requires: anthy BuildRequires: scim-devel anthy-devel %description @@ -46,6 +46,9 @@ %changelog +* Fri Jul 29 2005 Jens Petersen - 0.5.3-1 +- update to 0.5.3 release + * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Jul 2005 08:17:14 -0000 1.6 +++ sources 29 Jul 2005 11:07:14 -0000 1.7 @@ -1 +1 @@ -f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz +ba42960652a82cd594f443d8275184f9 scim-anthy-0.5.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 11:12:18 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 07:12:18 -0400 Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.3, 1.4 scim-anthy.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200507291112.j6TBCIIP026641@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26620 Modified Files: .cvsignore scim-anthy.spec sources Log Message: - sync with FC-4 - update to 0.5.3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Jun 2005 13:15:35 -0000 1.3 +++ .cvsignore 29 Jul 2005 11:12:16 -0000 1.4 @@ -1 +1 @@ -scim-anthy-0.5.0.tar.gz +scim-anthy-0.5.3.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-anthy.spec 26 Jul 2005 13:39:39 -0000 1.8 +++ scim-anthy.spec 29 Jul 2005 11:12:16 -0000 1.9 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -9,7 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: anthy +Requires: anthy BuildRequires: scim-devel anthy-devel %description @@ -46,6 +46,9 @@ %changelog +* Fri Jul 29 2005 Jens Petersen - 0.5.3-1 +- update to 0.5.3 release + * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Jul 2005 08:16:06 -0000 1.4 +++ sources 29 Jul 2005 11:12:16 -0000 1.5 @@ -1 +1 @@ -f5ec0038096aefee391530a113ad44a6 scim-anthy-0.5.2.tar.gz +ba42960652a82cd594f443d8275184f9 scim-anthy-0.5.3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 11:17:17 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 29 Jul 2005 07:17:17 -0400 Subject: rpms/abiword/FC-4 abiword.spec, 1.8, 1.9 abiword-2.2.8-mailmerge.patch, 1.1, NONE Message-ID: <200507291117.j6TBHHvh026722@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26705 Modified Files: abiword.spec Removed Files: abiword-2.2.8-mailmerge.patch Log Message: Update to 2.2.9 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abiword.spec 6 Jun 2005 22:30:37 -0000 1.8 +++ abiword.spec 29 Jul 2005 11:17:15 -0000 1.9 @@ -2,7 +2,7 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.8 +Version: 2.2.9 Release: 1%{?dist} Epoch: 1 Group: Applications/Editors @@ -40,7 +40,6 @@ Patch0: abiword-2.0.9-windowshelppaths.patch Patch1: abiword-2.2.6-desktop.patch -Patch2: abiword-2.2.8-mailmerge.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -50,7 +49,6 @@ %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .mailmerge %build cd abi @@ -129,6 +127,10 @@ %{_datadir}/icons/*png %changelog +* Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1.fc4 +- Update to 2.2.9 +- Drop the mailmerge patch again + * Sun Jun 6 2005 Marc Maurer - 1:2.2.8-1.fc4 - Update to 2.2.8 - Fix build with mailmerge patch --- abiword-2.2.8-mailmerge.patch DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 11:31:34 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 29 Jul 2005 07:31:34 -0400 Subject: rpms/abiword/FC-4 abiword.spec,1.9,1.10 Message-ID: <200507291131.j6TBVYkj026842@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26824 Modified Files: abiword.spec Log Message: Bump build nr Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abiword.spec 29 Jul 2005 11:17:15 -0000 1.9 +++ abiword.spec 29 Jul 2005 11:31:32 -0000 1.10 @@ -4,7 +4,7 @@ Name: abiword Version: 2.2.9 Release: 1%{?dist} -Epoch: 1 +Epoch: 2 Group: Applications/Editors License: GPL Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 11:33:28 2005 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Fri, 29 Jul 2005 07:33:28 -0400 Subject: rpms/abiword/FC-4 .cvsignore, 1.5, 1.6 abiword.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200507291133.j6TBXSTS026877@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26856 Modified Files: .cvsignore abiword.spec sources Log Message: Add 2.2.9 sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Jun 2005 22:22:01 -0000 1.5 +++ .cvsignore 29 Jul 2005 11:33:26 -0000 1.6 @@ -1 +1 @@ -abiword-2.2.8.tar.bz2 +abiword-2.2.9.tar.bz2 Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- abiword.spec 29 Jul 2005 11:31:32 -0000 1.10 +++ abiword.spec 29 Jul 2005 11:33:26 -0000 1.11 @@ -3,8 +3,8 @@ Summary: The AbiWord word processor Name: abiword Version: 2.2.9 -Release: 1%{?dist} -Epoch: 2 +Release: 2%{?dist} +Epoch: 1 Group: Applications/Editors License: GPL Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2 @@ -127,7 +127,10 @@ %{_datadir}/icons/*png %changelog -* Thu Jul 28 2005 Marc Maurer - 1:2.2.9-1.fc4 +* Fri Jul 2 2005 Marc Maurer - 1:2.2.9-2.fc4 +- Bump release number + +* Fri Jul 2 2005 Marc Maurer - 1:2.2.9-1.fc4 - Update to 2.2.9 - Drop the mailmerge patch again Index: sources =================================================================== RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Jun 2005 22:22:01 -0000 1.5 +++ sources 29 Jul 2005 11:33:26 -0000 1.6 @@ -1 +1 @@ -f6f58e6ea4720ca635ede7b7f13cf156 abiword-2.2.8.tar.bz2 +17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 11:56:32 2005 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 29 Jul 2005 07:56:32 -0400 Subject: rpms/nexuiz/FC-4 nexuiz.spec,1.1,1.2 Message-ID: <200507291156.j6TBuWhZ026996@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26979 Modified Files: nexuiz.spec Log Message: added dist tag Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz.spec 9 Jul 2005 11:59:33 -0000 1.1 +++ nexuiz.spec 29 Jul 2005 11:56:29 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.1 -Release: 1 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ From fedora-extras-commits at redhat.com Fri Jul 29 13:07:36 2005 From: fedora-extras-commits at redhat.com (Alexander Dalloz (adalloz)) Date: Fri, 29 Jul 2005 09:07:36 -0400 Subject: common tobuild,1.2150,1.2151 Message-ID: <200507291307.j6TD7aks029427@cvs-int.fedora.redhat.com> Author: adalloz Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29377/common Modified Files: tobuild Log Message: cleanup successfull build Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2150 retrieving revision 1.2151 diff -u -r1.2150 -r1.2151 --- tobuild 29 Jul 2005 10:24:51 -0000 1.2150 +++ tobuild 29 Jul 2005 13:07:34 -0000 1.2151 @@ -40,7 +40,6 @@ oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel -adalloz rpms/pam_abl/devel pam_abl-0_2_2-2_fc5 devel gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 13:26:33 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 09:26:33 -0400 Subject: devel/common tobuild,1.2151,1.2152 Message-ID: <200507291326.j6TDQXjw029500@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29483 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/devel/common/tobuild,v retrieving revision 1.2151 retrieving revision 1.2152 diff -u -r1.2151 -r1.2152 --- tobuild 29 Jul 2005 13:07:34 -0000 1.2151 +++ tobuild 29 Jul 2005 13:26:31 -0000 1.2152 @@ -36,16 +36,13 @@ s4504kr rpms/inadyn/devel inadyn-1_95-1 devel bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 -mschwendt rpms/glunarclock/devel glunarclock-0_32_4-1_fc5 devel oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel gemi rpms/TeXmacs/devel TeXmacs-1_0_5_6-2_fc5 devel orion rpms/hdf/devel hdf-4_2r1-2_fc5 devel -mschwendt rpms/galculator/devel galculator-1_2_5-1_fc5 devel nphilipp rpms/cd-discid/devel cd-discid-0_9-4 devel ixs rpms/scmxx/devel scmxx-0_8_0-1_fc5 devel -mschwendt rpms/hping2/devel hping2-2_0_0-0_5_rc3 devel jnovy rpms/nedit/devel nedit-5_5-4 devel qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel @@ -53,7 +50,6 @@ ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel -mschwendt rpms/wesnoth/devel wesnoth-0_9_4-1_fc5 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 13:51:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 09:51:37 -0400 Subject: rpms/inkscape/FC-3 inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 inkscape.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200507291351.j6TDpbmT029617@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/FC-3 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.42-gettext-x86_64.patch Log Message: update -- sync with devel inkscape-0.42-gettext-x86_64.patch: --- NEW FILE inkscape-0.42-gettext-x86_64.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-07-29 12:34:14.000000000 +0200 @@ -21344,7 +21344,7 @@ int main () { -return (int) ngettext ("","", 1) +return (int)(long) ngettext ("","", 1) ; return 0; } @@ -21402,7 +21402,7 @@ int main () { -return (int) dgettext ("","") +return (int)(long) dgettext ("","") ; return 0; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Feb 2005 04:46:16 -0000 1.5 +++ .cvsignore 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -inkscape-0.41.tar.bz2 +inkscape-0.42.tar.bz2 +inkscape-0.42.tar.bz2.sig Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-3/inkscape.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- inkscape.spec 10 Feb 2005 04:14:11 -0000 1.5 +++ inkscape.spec 29 Jul 2005 13:51:35 -0000 1.6 @@ -1,12 +1,13 @@ Name: inkscape -Version: 0.41 -Release: 1 -Summary: A vector-based drawing program using SVG. +Version: 0.42 +Release: 2%{?dist} +Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2 +Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 +Patch0: inkscape-0.42-gettext-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -17,6 +18,7 @@ BuildRequires: gtkmm24-devel BuildRequires: libart_lgpl-devel >= 2.3.10 BuildRequires: libgnomeprintui22-devel >= 2.2.0 +BuildRequires: gnome-vfs2-devel BuildRequires: libpng-devel BuildRequires: libsigc++20-devel BuildRequires: libxml2-devel >= 2.4.24 @@ -43,11 +45,13 @@ It has a relatively modern display engine, giving you finely antialiased display, alpha transparencies, vector fonts and so on. Inkscape is written in -C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. +C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. %prep %setup -q +%patch0 -p1 -b .dgettext + %build %configure \ @@ -91,13 +95,44 @@ %doc AUTHORS COPYING ChangeLog NEWS README HACKING %doc %{_mandir}/man1/* %{_bindir}/* -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* -%{_libdir}/inkscape/ +%{_mandir}/fr/man1/* %changelog +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + +* Tue Jul 26 2005 Michael Schwendt - 0.42-1 +- update to 0.42 (also fixes #160326) +- BR gnome-vfs2-devel +- no files left in %%_libdir/inkscape +- include French manual page +- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off + +* Tue May 31 2005 Michael Schwendt - 0.41-7 +- append another 64-bit related patch (dgettext configure check failed) + +* Tue May 31 2005 Michael Schwendt - 0.41-6 +- remove explicit aclocal/autoconf calls in %%build as they create a + bad Makefile for FC4/i386, which causes build to fail (#156228), + and no comment explains where they were added/needed + +* Tue May 31 2005 Michael Schwendt - 0.41-5 +- bump and rebuild as 0.41-4 failed in build system setup + +* Wed May 25 2005 Jeremy Katz - 0.41-4 +- add patch for gcc4 problems (ignacio, #156228) +- fix build on 64bit boxes. sizeof(int) != sizeof(void*) + +* Sun May 22 2005 Jeremy Katz - 0.41-3 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Wed Feb 09 2005 Phillip Compton - 0.41-1 - 0.41. - enable python. @@ -110,7 +145,7 @@ * Thu Nov 11 2004 Phillip Compton - 0.39-0.fdr.2 - post/postun for new mime system. -- Dropped redundant BR XFree86-devel. +- Dropped redundant BR XFree86-devel. * Sun Aug 29 2004 Phillip Compton - 0:0.39-0.fdr.1 - 0.39. @@ -128,9 +163,9 @@ - version upgrade with many improvements and bug fixes * Fri Mar 19 2004 P Linnell 0:0.37.0.fdr.7 -- repsin - sourceforge does not allow reloading files with same name +- repsin - sourceforge does not allow reloading files with same name * Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.6 -- fix typo in provides +- fix typo in provides * Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.5 - add %{release} to provides perl(SpSVG) = %{epoch}:%{version}:%{release} only * Tue Mar 16 2004 P Linnell 0:0.37.0.fdr.4 @@ -146,10 +181,10 @@ - enable inkjar * Tue Feb 10 2004 P Linnell 0:0.37.0.fdr.1 - pgp'd tarball from inkscape.org -- clean out the cvs tweaks in spec file +- clean out the cvs tweaks in spec file - enable gnome-print - add the new tutorial files -- make sure .mo file gets packaged +- make sure .mo file gets packaged - add provides: perlSVG - submit to Fedora QA * Sat Feb 7 2004 P Linnell Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Feb 2005 04:46:16 -0000 1.5 +++ sources 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -9b4bbfaae688127dca4c3d816a42b21a inkscape-0.41.tar.bz2 +4af587b942647bf9e27861e2238844c8 inkscape-0.42.tar.bz2 +e0a299ff70044fd9a424961bd3ad8c13 inkscape-0.42.tar.bz2.sig From fedora-extras-commits at redhat.com Fri Jul 29 13:51:37 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 29 Jul 2005 09:51:37 -0400 Subject: rpms/inkscape/FC-4 inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 inkscape.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200507291351.j6TDpbfB029627@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/inkscape/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/FC-4 Modified Files: .cvsignore inkscape.spec sources Added Files: inkscape-0.42-gettext-x86_64.patch Log Message: update -- sync with devel inkscape-0.42-gettext-x86_64.patch: --- NEW FILE inkscape-0.42-gettext-x86_64.patch --- diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure --- inkscape-0.42-orig/configure 2005-07-25 07:25:35.000000000 +0200 +++ inkscape-0.42/configure 2005-07-29 12:34:14.000000000 +0200 @@ -21344,7 +21344,7 @@ int main () { -return (int) ngettext ("","", 1) +return (int)(long) ngettext ("","", 1) ; return 0; } @@ -21402,7 +21402,7 @@ int main () { -return (int) dgettext ("","") +return (int)(long) dgettext ("","") ; return 0; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Feb 2005 04:46:16 -0000 1.5 +++ .cvsignore 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -inkscape-0.41.tar.bz2 +inkscape-0.42.tar.bz2 +inkscape-0.42.tar.bz2.sig Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-4/inkscape.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- inkscape.spec 31 May 2005 12:56:25 -0000 1.12 +++ inkscape.spec 29 Jul 2005 13:51:35 -0000 1.13 @@ -1,14 +1,13 @@ Name: inkscape -Version: 0.41 -Release: 7 -Summary: A vector-based drawing program using SVG. +Version: 0.42 +Release: 2%{?dist} +Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPL URL: http://inkscape.sourceforge.net/ -Source0: http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2 -Patch0: inkscape-gcc4.patch -Patch1: inkscape-0.41-64bit.patch +Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 +Patch0: inkscape-0.42-gettext-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -19,6 +18,7 @@ BuildRequires: gtkmm24-devel BuildRequires: libart_lgpl-devel >= 2.3.10 BuildRequires: libgnomeprintui22-devel >= 2.2.0 +BuildRequires: gnome-vfs2-devel BuildRequires: libpng-devel BuildRequires: libsigc++20-devel BuildRequires: libxml2-devel >= 2.4.24 @@ -50,8 +50,7 @@ %prep %setup -q -%patch0 -p1 -b .gcc4 -%patch1 -p1 -b .64bit +%patch0 -p1 -b .dgettext %build @@ -96,13 +95,23 @@ %doc AUTHORS COPYING ChangeLog NEWS README HACKING %doc %{_mandir}/man1/* %{_bindir}/* -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* -%{_libdir}/inkscape/ +%{_mandir}/fr/man1/* %changelog +* Fri Jul 29 2005 Michael Schwendt - 0.42-2 +- Extend ngettext/dgettext patch for x86_64 build. + +* Tue Jul 26 2005 Michael Schwendt - 0.42-1 +- update to 0.42 (also fixes #160326) +- BR gnome-vfs2-devel +- no files left in %%_libdir/inkscape +- include French manual page +- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off + * Tue May 31 2005 Michael Schwendt - 0.41-7 - append another 64-bit related patch (dgettext configure check failed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/inkscape/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Feb 2005 04:46:16 -0000 1.5 +++ sources 29 Jul 2005 13:51:35 -0000 1.6 @@ -1 +1,2 @@ -9b4bbfaae688127dca4c3d816a42b21a inkscape-0.41.tar.bz2 +4af587b942647bf9e27861e2238844c8 inkscape-0.42.tar.bz2 +e0a299ff70044fd9a424961bd3ad8c13 inkscape-0.42.tar.bz2.sig From fedora-extras-commits at redhat.com Fri Jul 29 13:55:51 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 29 Jul 2005 09:55:51 -0400 Subject: rpms/scim/FC-3 scim.spec,1.8,1.9 Message-ID: <200507291355.j6TDtpqZ029717@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29700 Modified Files: scim.spec Log Message: Import Jens patch Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim.spec 27 Jul 2005 22:21:10 -0000 1.8 +++ scim.spec 29 Jul 2005 13:55:49 -0000 1.9 @@ -1,6 +1,7 @@ Name: scim Version: 1.4.0 -Release: 2%{?dist} +# must be less than the release number of scim in Core +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -10,7 +11,7 @@ Source1: xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -PreReq: %{_bindir}/update-gtk-immodules +PreReq: %{_bindir}/update-gtk-immodules BuildRequires: gtk2-devel, desktop-file-utils %description @@ -25,10 +26,16 @@ Requires: gtk2-devel %description devel -The scim-devel package includes the static libraries and header files -for the scim package. -Install scim-devel if you want to develop programs which will use -scim. +The scim-devel package includes the header files for the scim package. +Install scim-devel if you want to develop programs which will use scim. + + +%package doc +Summary: Smart Common Input Method platform documentation +Group: Development/Libraries + +%description doc +SCIM development documentation files generated from the sourcecode. %prep @@ -43,9 +50,10 @@ %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install + mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper} -# Kill all .a and .la +# remove .la files find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm # install setup panel @@ -59,16 +67,9 @@ # remove capplet rm ${RPM_BUILD_ROOT}/%{_datadir}/control-center-2.0/capplets/scim-setup.desktop -# install user manual -mkdir -p docs/dist/manual/zh_CN/figures/ -cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ -cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ - # install xinput config file. mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d -install -pm 755 %{SOURCE1} \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim - +install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim %find_lang %{name} @@ -80,39 +81,18 @@ %post /sbin/ldconfig -for llcc in ja_JP ko_KR zh_CN zh_TW -do - %{_sbindir}/alternatives --install \ - %{_sysconfdir}/X11/xinit/xinput.d/$llcc xinput-$llcc \ - %{_sysconfdir}/X11/xinit/xinput.d/scim 85 -done - %{_bindir}/update-gtk-immodules %{_target_platform} %postun /sbin/ldconfig -if [ "$1" = "0" ] -then - for llcc in ja_JP ko_KR zh_CN zh_TW - do - %{_sbindir}/alternatives --remove \ - xinput-$llcc %{_sysconfdir}/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-$llcc` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] - then - %{_sbindir}/alternatives --auto xinput-$llcc - fi - done -fi - %{_bindir}/update-gtk-immodules %{_target_platform} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog TODO -%doc docs/dist/manual/zh_CN %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* %{_sysconfdir}/X11/xinit/xinput.d/scim @@ -126,16 +106,27 @@ %files devel %defattr(-,root,root,-) -%doc docs/html %doc docs/developers %{_includedir}/scim-1.0 %{_libdir}/libscim*.so %{_libdir}/pkgconfig/*.pc -#-------------------------------------------------- +%files doc +%defattr(-,root,root,-) +%doc docs/html + %changelog -* Thu Jul 28 2005 Jens Petersen -1.4.0-2 +* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 +- sync with Core + - remove xinput alternatives settings out to IME packages + - drop the old Chinese manual from docs for now + - update -devel description + - add doc subpackage for devel documentation + - don't set xinput.d script executable + - no need to set XMODIFIERS explicitly in xinput.d script + +* Thu Jul 28 2005 Ryo Dairiki - 1.4.0-2 - create scim-1.0 dirs to be accessible (Jens Petersen) * Fri Jul 16 2005 Ryo Dairiki - 1.4.0-1 @@ -151,7 +142,10 @@ - don't set xinput.d script executable - no need to set XMODIFIERS explicitly and QT_IM_MODULE in xinput.d script -* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 +* Mon Jun 20 2005 Ryo Dairiki - 1.2.3-2 +- Remove one of doubled capplets for setup. + +* Sat May 28 2005 Ryo Dairiki - 1.2.3-1 - update to 1.2.3 release * Fri Mar 13 2005 Ryo Dairiki - 1.2.2-9 From fedora-extras-commits at redhat.com Fri Jul 29 13:56:13 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 29 Jul 2005 09:56:13 -0400 Subject: rpms/scim/FC-4 scim.spec,1.9,1.10 Message-ID: <200507291356.j6TDuDDG029740@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29723 Modified Files: scim.spec Log Message: Import Jens patch Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim.spec 29 Jul 2005 09:56:33 -0000 1.9 +++ scim.spec 29 Jul 2005 13:56:11 -0000 1.10 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 2%{?dist} +Release: 3%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -117,7 +117,7 @@ %changelog -* Fri Jul 29 2005 Jens Petersen +* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 - sync with Core - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now From fedora-extras-commits at redhat.com Fri Jul 29 14:31:29 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Fri, 29 Jul 2005 10:31:29 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.9,1.10 Message-ID: <200507291431.j6TEVTIv030980@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30963 Modified Files: scim-anthy.spec Log Message: Add xinput-scim entry Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-anthy.spec 29 Jul 2005 11:07:14 -0000 1.9 +++ scim-anthy.spec 29 Jul 2005 14:31:26 -0000 1.10 @@ -9,6 +9,7 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Provides: scim-ja_JP Requires: anthy BuildRequires: scim-devel anthy-devel @@ -38,6 +39,23 @@ rm -rf $RPM_BUILD_ROOT +%post +%{_sbindir}/alternatives --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP /etc/X11/xinit/xinput.d/scim 90 + + +%postun +if [ "$1" = 0 ] +then + if ! rpm -q --whatprovides scim-ja_JP + then + %{_sbindir}/alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/scim + if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] + then + %{_sbindir}/alternatives --auto xinput-ja_JP + fi + fi +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO @@ -48,6 +66,7 @@ %changelog * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release +- add xinput-scim entry (Ryo Diairki) * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release From fedora-extras-commits at redhat.com Fri Jul 29 14:57:27 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 29 Jul 2005 10:57:27 -0400 Subject: common tobuild,1.2152,1.2153 Message-ID: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 Modified Files: tobuild Log Message: request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2152 retrieving revision 1.2153 diff -u -r1.2152 -r1.2153 --- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 +++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 @@ -65,3 +65,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 29 15:15:02 2005 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 29 Jul 2005 11:15:02 -0400 Subject: common tobuild,1.2153,1.2154 Message-ID: <200507291515.j6TFF2w6032459@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32440 Modified Files: tobuild Log Message: Cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2153 retrieving revision 1.2154 diff -u -r1.2153 -r1.2154 --- tobuild 29 Jul 2005 14:57:25 -0000 1.2153 +++ tobuild 29 Jul 2005 15:15:00 -0000 1.2154 @@ -47,9 +47,6 @@ qspencer rpms/umfpack/devel umfpack-4_4-2 devel abompard rpms/mhonarc/devel mhonarc-2_6_15-2_fc5 devel roland rpms/monotone/devel monotone-0_21-2_fc5 devel -ivazquez rpms/notecase/FC-3 notecase-1_0_0-1_fc3 fc3 -ivazquez rpms/notecase/devel notecase-1_0_0-1_fc5 devel -ivazquez rpms/leafpad/devel leafpad-0_8_3-1_fc5 devel jspaleta rpms/istanbul/devel istanbul-0_1_1-4 devel ixs rpms/scmxx/FC-3 scmxx-0_8_0-1_fc3 fc3 ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 15:20:26 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Fri, 29 Jul 2005 11:20:26 -0400 Subject: common tobuild,1.2154,1.2155 Message-ID: <200507291520.j6TFKQU0032502@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32485 Modified Files: tobuild Log Message: removed duplicate moomps entry. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2154 retrieving revision 1.2155 diff -u -r1.2154 -r1.2155 --- tobuild 29 Jul 2005 15:15:00 -0000 1.2154 +++ tobuild 29 Jul 2005 15:20:24 -0000 1.2155 @@ -62,4 +62,3 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel -jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 From skvidal at phy.duke.edu Fri Jul 29 15:02:48 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 11:02:48 -0400 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> Message-ID: <1122649368.6197.5.camel@cutter> On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: > Author: jfontain > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 > > Modified Files: > tobuild > Log Message: > request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2152 > retrieving revision 1.2153 > diff -u -r1.2152 -r1.2153 > --- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 > +++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 > @@ -65,3 +65,4 @@ > jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 > qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 > jrb rpms/at-poke/devel at-poke-0_2_2-1 devel > +jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 Please read your fedora-maintainers email. Unless you have a very good reason there shouldn't be any need to update this file anymore. please try the 'make plague' option for now so we can get the bugs worked out. Thanks, -sv From qspencer at ieee.org Fri Jul 29 15:23:35 2005 From: qspencer at ieee.org (Quentin Spencer) Date: Fri, 29 Jul 2005 10:23:35 -0500 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <1122649368.6197.5.camel@cutter> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> Message-ID: <42EA49F7.4030305@ieee.org> seth vidal wrote: >On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: > > >>Author: jfontain >> >>Update of /cvs/extras/common >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 >> >>Modified Files: >> tobuild >>Log Message: >>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 >> >> >>Index: tobuild >>=================================================================== >>RCS file: /cvs/extras/common/tobuild,v >>retrieving revision 1.2152 >>retrieving revision 1.2153 >>diff -u -r1.2152 -r1.2153 >>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 >>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 >>@@ -65,3 +65,4 @@ >> jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >> qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 >> jrb rpms/at-poke/devel at-poke-0_2_2-1 devel >>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >> >> > >Please read your fedora-maintainers email. Unless you have a very good >reason there shouldn't be any need to update this file anymore. > >please try the 'make plague' option for now so we can get the bugs >worked out. > > Some of us aren't subscribed to that list. If this is important to people on fedora-extras, can someone please forward the appropriate messages? -Quentin From skvidal at phy.duke.edu Fri Jul 29 15:28:32 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 11:28:32 -0400 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <42EA49F7.4030305@ieee.org> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> Message-ID: <1122650912.6197.9.camel@cutter> On Fri, 2005-07-29 at 10:23 -0500, Quentin Spencer wrote: > seth vidal wrote: > > >On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: > > > > > >>Author: jfontain > >> > >>Update of /cvs/extras/common > >>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 > >> > >>Modified Files: > >> tobuild > >>Log Message: > >>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 > >> > >> > >>Index: tobuild > >>=================================================================== > >>RCS file: /cvs/extras/common/tobuild,v > >>retrieving revision 1.2152 > >>retrieving revision 1.2153 > >>diff -u -r1.2152 -r1.2153 > >>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 > >>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 > >>@@ -65,3 +65,4 @@ > >> jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 > >> qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 > >> jrb rpms/at-poke/devel at-poke-0_2_2-1 devel > >>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 > >> > >> > > > >Please read your fedora-maintainers email. Unless you have a very good > >reason there shouldn't be any need to update this file anymore. > > > >please try the 'make plague' option for now so we can get the bugs > >worked out. > > > > > > Some of us aren't subscribed to that list. If this is important to > people on fedora-extras, can someone please forward the appropriate > messages? > if you're a packager you should absolutely be on maintainers. -sv From qspencer at ieee.org Fri Jul 29 15:34:55 2005 From: qspencer at ieee.org (Quentin Spencer) Date: Fri, 29 Jul 2005 10:34:55 -0500 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <1122650912.6197.9.camel@cutter> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> <1122650912.6197.9.camel@cutter> Message-ID: <42EA4C9F.7040700@ieee.org> seth vidal wrote: >On Fri, 2005-07-29 at 10:23 -0500, Quentin Spencer wrote: > > >>seth vidal wrote: >> >> >> >>>On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: >>> >>> >>> >>> >>>>Author: jfontain >>>> >>>>Update of /cvs/extras/common >>>>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 >>>> >>>>Modified Files: >>>> tobuild >>>>Log Message: >>>>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 >>>> >>>> >>>>Index: tobuild >>>>=================================================================== >>>>RCS file: /cvs/extras/common/tobuild,v >>>>retrieving revision 1.2152 >>>>retrieving revision 1.2153 >>>>diff -u -r1.2152 -r1.2153 >>>>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 >>>>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 >>>>@@ -65,3 +65,4 @@ >>>>jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>>qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 >>>>jrb rpms/at-poke/devel at-poke-0_2_2-1 devel >>>>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>> >>>> >>>> >>>> >>>Please read your fedora-maintainers email. Unless you have a very good >>>reason there shouldn't be any need to update this file anymore. >>> >>>please try the 'make plague' option for now so we can get the bugs >>>worked out. >>> >>> >>> >>> >>Some of us aren't subscribed to that list. If this is important to >>people on fedora-extras, can someone please forward the appropriate >>messages? >> >> >> > >if you're a packager you should absolutely be on maintainers. > > OK, this keeps changing, and we need some official policies about what we're supposed to be subscribed to. Are there any? I'm happy to subscribe to yet another list that I didn't know existed if I'm supposed to, but I don't even see it on: http://fedora.redhat.com/participate/communicate/ At one time someone said we need to be subscribed to at least extras and extras-commits, so that's what I've been reading for all these months. What is different about the maintainers list that justifies the need for yet another mailing list? -Quentin From paul at city-fan.org Fri Jul 29 15:35:04 2005 From: paul at city-fan.org (Paul Howarth) Date: Fri, 29 Jul 2005 16:35:04 +0100 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <1122650912.6197.9.camel@cutter> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> <1122650912.6197.9.camel@cutter> Message-ID: <42EA4CA8.8010608@city-fan.org> seth vidal wrote: > On Fri, 2005-07-29 at 10:23 -0500, Quentin Spencer wrote: > >>seth vidal wrote: >> >> >>>On Fri, 2005-07-29 at 10:57 -0400, Jean-Luc Fontaine wrote: >>> >>> >>> >>>>Author: jfontain >>>> >>>>Update of /cvs/extras/common >>>>In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31190 >>>> >>>>Modified Files: >>>> tobuild >>>>Log Message: >>>>request build of rpms/moomps/FC-3 moomps-5_2-1_fc3 for fc3 >>>> >>>> >>>>Index: tobuild >>>>=================================================================== >>>>RCS file: /cvs/extras/common/tobuild,v >>>>retrieving revision 1.2152 >>>>retrieving revision 1.2153 >>>>diff -u -r1.2152 -r1.2153 >>>>--- tobuild 29 Jul 2005 13:26:31 -0000 1.2152 >>>>+++ tobuild 29 Jul 2005 14:57:25 -0000 1.2153 >>>>@@ -65,3 +65,4 @@ >>>>jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>>qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 >>>>jrb rpms/at-poke/devel at-poke-0_2_2-1 devel >>>>+jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 >>>> >>>> >>> >>>Please read your fedora-maintainers email. Unless you have a very good >>>reason there shouldn't be any need to update this file anymore. >>> >>>please try the 'make plague' option for now so we can get the bugs >>>worked out. >>> >>> >> >>Some of us aren't subscribed to that list. If this is important to >>people on fedora-extras, can someone please forward the appropriate >>messages? >> > > > if you're a packager you should absolutely be on maintainers. I'm on maintainers-readonly; I recall reading somewhere when I was signing up for cvs access etc. that all Extras package maintainers should be on that list and also fedora-extras-commits. I cannot for the life of me find where it said to do that now. Paul. From fedora-extras-commits at redhat.com Fri Jul 29 15:38:33 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 11:38:33 -0400 Subject: common tobuild,1.2155,1.2156 Message-ID: <200507291538.j6TFcX7p032561@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32544 Modified Files: tobuild Log Message: clean up Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2155 retrieving revision 1.2156 diff -u -r1.2155 -r1.2156 --- tobuild 29 Jul 2005 15:20:24 -0000 1.2155 +++ tobuild 29 Jul 2005 15:38:31 -0000 1.2156 @@ -53,11 +53,8 @@ ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel -pghmcfc rpms/pptp/devel pptp-1_7_0-1_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 -pghmcfc rpms/pptp/FC-4 pptp-1_7_0-1_fc4 fc4 -pghmcfc rpms/pptp/FC-3 pptp-1_7_0-1_fc3 fc3 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 From skvidal at phy.duke.edu Fri Jul 29 15:45:29 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 11:45:29 -0400 Subject: common tobuild,1.2152,1.2153 In-Reply-To: <42EA4C9F.7040700@ieee.org> References: <200507291457.j6TEvRFC031207@cvs-int.fedora.redhat.com> <1122649368.6197.5.camel@cutter> <42EA49F7.4030305@ieee.org> <1122650912.6197.9.camel@cutter> <42EA4C9F.7040700@ieee.org> Message-ID: <1122651929.6197.15.camel@cutter> > OK, this keeps changing, and we need some official policies about what > we're supposed to be subscribed to. Are there any? I'm happy to > subscribe to yet another list that I didn't know existed if I'm supposed > to, but I don't even see it on: > http://fedora.redhat.com/participate/communicate/ > > At one time someone said we need to be subscribed to at least extras and > extras-commits, so that's what I've been reading for all these months. > What is different about the maintainers list that justifies the need for > yet another mailing list? I thought all cvs committers were automatically added to -maintainers. But if it seems like you're not then add yourself, please. imo all extras maintainers should, at least, be on: - extras-commits - extras - maintainers -sv From fedora-extras-commits at redhat.com Fri Jul 29 16:00:48 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 29 Jul 2005 12:00:48 -0400 Subject: rpms/freeciv/devel .cvsignore, 1.6, 1.7 freeciv.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200507291600.j6TG0muK032626@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32605 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 28 2005 Brian Pepple - 2.0.4-2 - Update to 2.0.4. - Use new stdsounds. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Jul 2005 16:56:29 -0000 1.6 +++ .cvsignore 29 Jul 2005 16:00:46 -0000 1.7 @@ -1,2 +1,2 @@ -freeciv-2.0.3.tar.bz2 -stdsounds2.tar.gz +freeciv-2.0.4.tar.bz2 +stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeciv.spec 15 Jul 2005 14:39:45 -0000 1.11 +++ freeciv.spec 29 Jul 2005 16:00:46 -0000 1.12 @@ -1,13 +1,13 @@ Name: freeciv -Version: 2.0.3 +Version: 2.0.4 Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games License: GPL URL: http://www.freeciv.org/index.php/Freeciv -Source0: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2 -Source1: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz +Source0: ftp://freeciv.org/pub/%{name}/stable/%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz Source2: %{name}-server.desktop Source3: %{name}.xpm Patch1: %{name}-desktop.patch @@ -62,8 +62,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual # Add the sound files. -(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; ) +tar xzf %{SOURCE1} +cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +# Add pixmap. %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm %find_lang %{name} @@ -87,6 +91,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 28 2005 Brian Pepple - 2.0.4-2 +- Update to 2.0.4. +- Use new stdsounds. + * Fri Jul 15 2005 Brian Pepple - 2.0.3-2 - Bump release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jul 2005 16:56:29 -0000 1.6 +++ sources 29 Jul 2005 16:00:46 -0000 1.7 @@ -1,2 +1,2 @@ -3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 -63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz +833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 16:04:20 2005 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 29 Jul 2005 12:04:20 -0400 Subject: rpms/epiphany-extensions/devel .cvsignore, 1.2, 1.3 epiphany-extensions.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507291604.j6TG4KtI001345@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/epiphany-extensions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1324 Modified Files: .cvsignore epiphany-extensions.spec sources Log Message: * Fri Jul 29 2005 Christopher Aillon - 1.7.3-1 - Update to 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 27 Jun 2005 07:10:11 -0000 1.2 +++ .cvsignore 29 Jul 2005 16:04:18 -0000 1.3 @@ -1 +1 @@ -epiphany-extensions-1.7.1.tar.bz2 +epiphany-extensions-1.7.3.tar.bz2 Index: epiphany-extensions.spec =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- epiphany-extensions.spec 27 Jun 2005 07:10:11 -0000 1.1 +++ epiphany-extensions.spec 29 Jul 2005 16:04:18 -0000 1.2 @@ -2,8 +2,8 @@ Summary: Extensions for Epiphany, the GNOME web browser. Name: epiphany-extensions -Version: 1.7.1 -Release: 2 +Version: 1.7.3 +Release: 1 License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/extensions @@ -39,6 +39,12 @@ %{_libdir}/epiphany %changelog +* Fri Jul 29 2005 Christopher Aillon - 1.7.3-1 +- Update to 1.7.3 + +* Mon Jul 11 2005 Christopher Aillon - 1.7.2-1 +- Update to 1.7.2 + * Mon Jun 27 2005 Christopher Aillon - 1.7.1-2 - Own %%{_libdir}/epiphany - Run find-lang.sh manually since the macro doesn't help us Index: sources =================================================================== RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 27 Jun 2005 07:10:11 -0000 1.2 +++ sources 29 Jul 2005 16:04:18 -0000 1.3 @@ -1 +1 @@ -cd1bf1630ee453a08543f4e52060c75c epiphany-extensions-1.7.1.tar.bz2 +f9c7f260d1a777533b67b6f7ec475973 epiphany-extensions-1.7.3.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 16:15:26 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Fri, 29 Jul 2005 12:15:26 -0400 Subject: rpms/at-poke/devel at-poke.spec,1.1,1.2 Message-ID: <200507291615.j6TGFQfr001481@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/rpms/at-poke/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1464 Modified Files: at-poke.spec Log Message: * Fri Jul 29 2005 - 0.2.2-1 - update Requires and BuildRequires Index: at-poke.spec =================================================================== RCS file: /cvs/extras/rpms/at-poke/devel/at-poke.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-poke.spec 28 Jul 2005 20:55:03 -0000 1.1 +++ at-poke.spec 29 Jul 2005 16:15:24 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A tool for poking things Name: at-poke Version: 0.2.2 -Release: 1 +Release: 2 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ @@ -10,8 +10,11 @@ Patch1: at-poke-0.2.2-lvalue.patch Patch2: at-poke-0.2.2-weakref.patch Requires: libgail-gnome +Requires: at-spi BuildRequires: libgail-gnome-devel BuildRequires: gtk2-devel +BuildRequires: at-spi-devel +BuildRequires: libgnomeui-devel %description at-poke is a simple tool for introspecting applications using the @@ -43,6 +46,9 @@ %changelog +* Fri Jul 29 2005 - 0.2.2-1 +- update Requires and BuildRequires + * Tue Jul 26 2005 - poke-1 - Initial build. From fedora-extras-commits at redhat.com Fri Jul 29 16:16:56 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Fri, 29 Jul 2005 12:16:56 -0400 Subject: common tobuild,1.2156,1.2157 Message-ID: <200507291616.j6TGGuX2001543@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1526 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-2 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2156 retrieving revision 1.2157 diff -u -r1.2156 -r1.2157 --- tobuild 29 Jul 2005 15:38:31 -0000 1.2156 +++ tobuild 29 Jul 2005 16:16:54 -0000 1.2157 @@ -59,3 +59,4 @@ jfontain rpms/moomps/FC-3 moomps-5_2-1_fc3 fc3 qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel +jrb rpms/at-poke/devel at-poke-0_2_2-2 devel From fedora-extras-commits at redhat.com Fri Jul 29 16:17:24 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 29 Jul 2005 12:17:24 -0400 Subject: rpms/freeciv/FC-4 .cvsignore, 1.6, 1.7 freeciv.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200507291617.j6TGHO6m001577@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1556 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Jul 28 2005 Brian Pepple - 2.0.4-1 - Update to 2.0.4. - Use new stdsounds. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Jul 2005 17:00:13 -0000 1.6 +++ .cvsignore 29 Jul 2005 16:17:22 -0000 1.7 @@ -1,2 +1,2 @@ -freeciv-2.0.3.tar.bz2 -stdsounds2.tar.gz +freeciv-2.0.4.tar.bz2 +stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freeciv.spec 15 Jul 2005 14:42:18 -0000 1.11 +++ freeciv.spec 29 Jul 2005 16:17:22 -0000 1.12 @@ -1,13 +1,13 @@ Name: freeciv -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games License: GPL URL: http://www.freeciv.org/index.php/Freeciv -Source0: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2 -Source1: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz +Source0: ftp://freeciv.org/pub/%{name}/stable/%{name}-%{version}.tar.bz2 +Source1: ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz Source2: %{name}-server.desktop Source3: %{name}.xpm Patch1: %{name}-desktop.patch @@ -62,8 +62,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual # Add the sound files. -(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; ) +tar xzf %{SOURCE1} +cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +# Add pixmap. %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm %find_lang %{name} @@ -87,6 +91,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Jul 28 2005 Brian Pepple - 2.0.4-1 +- Update to 2.0.4. +- Use new stdsounds. + * Thu Jul 14 2005 Brian Pepple - 2.0.3-1 - Update to 2.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jul 2005 17:00:13 -0000 1.6 +++ sources 29 Jul 2005 16:17:22 -0000 1.7 @@ -1,2 +1,2 @@ -3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 -63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz +833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 +77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 16:17:48 2005 From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb)) Date: Fri, 29 Jul 2005 12:17:48 -0400 Subject: common tobuild,1.2157,1.2158 Message-ID: <200507291617.j6TGHmsd001639@cvs-int.fedora.redhat.com> Author: jrb Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622 Modified Files: tobuild Log Message: request build of rpms/at-poke/devel at-poke-0_2_2-2 for development Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2157 retrieving revision 1.2158 diff -u -r1.2157 -r1.2158 --- tobuild 29 Jul 2005 16:16:54 -0000 1.2157 +++ tobuild 29 Jul 2005 16:17:46 -0000 1.2158 @@ -60,3 +60,4 @@ qspencer rpms/cln/FC-4 cln-1_1_9-4_fc4 fc4 jrb rpms/at-poke/devel at-poke-0_2_2-1 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 devel +jrb rpms/at-poke/devel at-poke-0_2_2-2 development From fedora-extras-commits at redhat.com Fri Jul 29 16:28:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:28:07 -0400 Subject: rpms/clamav/devel clamav-0.86.2-timeout.patch,NONE,1.1 Message-ID: <200507291628.j6TGS7bj001693@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1675 Added Files: clamav-0.86.2-timeout.patch Log Message: this patch reverts the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration clamav-0.86.2-timeout.patch: --- NEW FILE clamav-0.86.2-timeout.patch --- --- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout +++ clamav-0.86.2/clamav-milter/clamav-milter.c @@ -373,7 +373,7 @@ static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; static volatile unsigned int n_children = 0; static unsigned int max_children = 0; -static int child_timeout = 300; /* number of seconds to wait for +static int child_timeout = 0; /* number of seconds to wait for * a child to die. Set to 0 to * wait forever */ From fedora-extras-commits at redhat.com Fri Jul 29 16:29:12 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:29:12 -0400 Subject: rpms/clamav/devel clamav.spec,1.26,1.27 Message-ID: <200507291629.j6TGTC8H001731@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1714 Modified Files: clamav.spec Log Message: - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- clamav.spec 28 Jul 2005 15:35:10 -0000 1.26 +++ clamav.spec 29 Jul 2005 16:29:09 -0000 1.27 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ 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) @@ -100,11 +101,9 @@ %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ %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; @@ -177,6 +177,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash From fedora-extras-commits at redhat.com Fri Jul 29 16:31:01 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Fri, 29 Jul 2005 12:31:01 -0400 Subject: common tobuild,1.2158,1.2159 Message-ID: <200507291631.j6TGV1sT001771@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Modified Files: tobuild Log Message: removed built packages Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2158 retrieving revision 1.2159 diff -u -r1.2158 -r1.2159 --- tobuild 29 Jul 2005 16:17:46 -0000 1.2158 +++ tobuild 29 Jul 2005 16:30:58 -0000 1.2159 @@ -15,7 +15,6 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel -bpepple rpms/freeciv/devel freeciv-2_0_3-2_fc5 devel smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel @@ -30,12 +29,9 @@ scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel -bpepple rpms/liferea/devel liferea-0_9_4-2_fc5 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel s4504kr rpms/inadyn/devel inadyn-1_95-1 devel -bpepple rpms/contact-lookup-applet/devel contact-lookup-applet-0_13-2_fc5 devel -bpepple rpms/contact-lookup-applet/FC-4 contact-lookup-applet-0_13-1_fc4 fc4 oliver rpms/bwm-ng/devel bwm-ng-0_5-5_fc5 devel oliver rpms/libdnet/devel libdnet-1_10-2_fc5 devel oliver rpms/fish/devel fish-1_12_0-1_fc5 devel From jspaleta at gmail.com Fri Jul 29 12:06:07 2005 From: jspaleta at gmail.com (Jeff Spaleta) Date: Fri, 29 Jul 2005 08:06:07 -0400 Subject: APPROVED: gxemul Message-ID: <604aa79105072905061b677da3@mail.gmail.com> gxemul: Instruction-level machine emulator GXemul is an experimental instruction-level machine emulator. It can be used to run binary code for (among others) MIPS-based machines, regardless of host platform. Several emulation modes are available. For some modes, processors and surrounding hardware components are emulated well enough to let unmodified operating systems (e.g. NetBSD) run as if they were running on a real machine. http://gavare.se/gxemul Maintainer: Tom 'spot' Callaway Reviewer: Jef Spaleta From skvidal at phy.duke.edu Fri Jul 29 16:38:09 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 12:38:09 -0400 Subject: common tobuild,1.2157,1.2158 In-Reply-To: <200507291617.j6TGHmsd001639@cvs-int.fedora.redhat.com> References: <200507291617.j6TGHmsd001639@cvs-int.fedora.redhat.com> Message-ID: <1122655089.6197.27.camel@cutter> On Fri, 2005-07-29 at 12:17 -0400, Jonathan Blandford wrote: > Author: jrb > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1622 > > Modified Files: > tobuild > Log Message: > request build of rpms/at-poke/devel at-poke-0_2_2-2 for development > Hi Jonathan, Please do not request builds using make build. Install the plague-client as per these instructions[1] and try out 'make plague'. we need to get the plague-client mechanism tested a bit more so it can become 'make build' itself. thanks, -sv [1] http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup From fedora-extras-commits at redhat.com Fri Jul 29 16:37:47 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:37:47 -0400 Subject: rpms/clamav/FC-3 clamav.spec,1.16,1.17 Message-ID: <200507291638.j6TGcHkE001875@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843/FC-3 Modified Files: clamav.spec Log Message: synced with devel/ Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- clamav.spec 28 Jul 2005 15:37:20 -0000 1.16 +++ clamav.spec 29 Jul 2005 16:37:45 -0000 1.17 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ 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) @@ -100,11 +101,9 @@ %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ %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; @@ -177,6 +177,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash From fedora-extras-commits at redhat.com Fri Jul 29 16:37:47 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:37:47 -0400 Subject: rpms/clamav/FC-4 clamav.spec,1.25,1.26 Message-ID: <200507291638.j6TGcHc6001878@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1843/FC-4 Modified Files: clamav.spec Log Message: synced with devel/ Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- clamav.spec 28 Jul 2005 15:37:21 -0000 1.25 +++ clamav.spec 29 Jul 2005 16:37:45 -0000 1.26 @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ 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) @@ -100,11 +101,9 @@ %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ %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; @@ -177,6 +177,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash From fedora-extras-commits at redhat.com Fri Jul 29 16:39:07 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:39:07 -0400 Subject: rpms/clamav/FC-3 clamav-0.86.2-timeout.patch,NONE,1.1 Message-ID: <200507291639.j6TGd78j001916@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1890/FC-3 Added Files: clamav-0.86.2-timeout.patch Log Message: synced with devel/ clamav-0.86.2-timeout.patch: --- NEW FILE clamav-0.86.2-timeout.patch --- --- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout +++ clamav-0.86.2/clamav-milter/clamav-milter.c @@ -373,7 +373,7 @@ static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; static volatile unsigned int n_children = 0; static unsigned int max_children = 0; -static int child_timeout = 300; /* number of seconds to wait for +static int child_timeout = 0; /* number of seconds to wait for * a child to die. Set to 0 to * wait forever */ From fedora-extras-commits at redhat.com Fri Jul 29 16:39:08 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:39:08 -0400 Subject: rpms/clamav/FC-4 clamav-0.86.2-timeout.patch,NONE,1.1 Message-ID: <200507291639.j6TGd89K001923@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/clamav/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1890/FC-4 Added Files: clamav-0.86.2-timeout.patch Log Message: synced with devel/ clamav-0.86.2-timeout.patch: --- NEW FILE clamav-0.86.2-timeout.patch --- --- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout +++ clamav-0.86.2/clamav-milter/clamav-milter.c @@ -373,7 +373,7 @@ static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; static volatile unsigned int n_children = 0; static unsigned int max_children = 0; -static int child_timeout = 300; /* number of seconds to wait for +static int child_timeout = 0; /* number of seconds to wait for * a child to die. Set to 0 to * wait forever */ From fedora-extras-commits at redhat.com Fri Jul 29 16:40:52 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:40:52 -0400 Subject: common tobuild,1.2159,1.2160 Message-ID: <200507291640.j6TGeqjH002035@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2018 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-4 clamav-0_86_2-4_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2159 retrieving revision 1.2160 diff -u -r1.2159 -r1.2160 --- tobuild 29 Jul 2005 16:30:58 -0000 1.2159 +++ tobuild 29 Jul 2005 16:40:50 -0000 1.2160 @@ -57,3 +57,4 @@ jrb rpms/at-poke/devel at-poke-0_2_2-1 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 development +ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 From fedora-extras-commits at redhat.com Fri Jul 29 16:41:32 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 12:41:32 -0400 Subject: common tobuild,1.2160,1.2161 Message-ID: <200507291641.j6TGfWOV002098@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2080 Modified Files: tobuild Log Message: request build of rpms/clamav/devel clamav-0_86_2-4_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2160 retrieving revision 1.2161 diff -u -r1.2160 -r1.2161 --- tobuild 29 Jul 2005 16:40:50 -0000 1.2160 +++ tobuild 29 Jul 2005 16:41:30 -0000 1.2161 @@ -58,3 +58,4 @@ jrb rpms/at-poke/devel at-poke-0_2_2-2 devel jrb rpms/at-poke/devel at-poke-0_2_2-2 development ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 +ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel From skvidal at phy.duke.edu Fri Jul 29 16:48:21 2005 From: skvidal at phy.duke.edu (seth vidal) Date: Fri, 29 Jul 2005 12:48:21 -0400 Subject: common tobuild,1.2159,1.2160 In-Reply-To: <200507291640.j6TGeqjH002035@cvs-int.fedora.redhat.com> References: <200507291640.j6TGeqjH002035@cvs-int.fedora.redhat.com> Message-ID: <1122655701.6197.31.camel@cutter> On Fri, 2005-07-29 at 12:40 -0400, Enrico Scholz wrote: > Author: ensc > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2018 > > Modified Files: > tobuild > Log Message: > request build of rpms/clamav/FC-4 clamav-0_86_2-4_fc4 for fc4 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2159 > retrieving revision 1.2160 > diff -u -r1.2159 -r1.2160 > --- tobuild 29 Jul 2005 16:30:58 -0000 1.2159 > +++ tobuild 29 Jul 2005 16:40:50 -0000 1.2160 > @@ -57,3 +57,4 @@ > jrb rpms/at-poke/devel at-poke-0_2_2-1 devel > jrb rpms/at-poke/devel at-poke-0_2_2-2 devel > jrb rpms/at-poke/devel at-poke-0_2_2-2 development > +ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 > Enrico, Please download the plague-client package and try out the 'make plague' option from extras cvs. you can get the plague-client and instructions here: http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup thanks -sv From fedora-extras-commits at redhat.com Fri Jul 29 16:49:48 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 12:49:48 -0400 Subject: rpms/bluefish/devel bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE Message-ID: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2217 Modified Files: bluefish.spec sources .cvsignore Removed Files: bluefish.desktop Log Message: * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag - add libgnomeui support as per upstream package (#161234, #163804) - add project desktop entry - desktop entry munging not needed Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bluefish.spec 23 May 2005 00:21:12 -0000 1.11 +++ bluefish.spec 29 Jul 2005 16:49:46 -0000 1.12 @@ -1,13 +1,13 @@ Name: bluefish -Version: 1.0 -Release: 4 +Version: 1.0.2 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 @@ -15,6 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 +BuildRequires: libgnomeui >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -32,7 +33,6 @@ %build -sed -i "s/ICONDIR\/bluefish-icon.png/bluefish-icon.png/g;" data/bluefish.desktop.in %configure --disable-update-databases make %{?_smp_mflags} @@ -47,6 +47,10 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop +desktop-file-install --vendor fedora --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish-project.desktop %clean @@ -67,7 +71,8 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-bluefish.desktop +%{_datadir}/applications/fedora-bluefish-project.desktop %{_datadir}/application-registry/* %{_datadir}/bluefish %{_datadir}/mime/packages/bluefish.xml @@ -76,6 +81,13 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-1 +- update to 1.0.2 +- add dist tag +- add libgnomeui support as per upstream package (#161234, #163804) +- add project desktop entry +- desktop entry munging not needed + * Sun May 22 2005 Jeremy Katz - 1.0-4 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 00:56:52 -0000 1.4 +++ sources 29 Jul 2005 16:49:46 -0000 1.5 @@ -1 +1 @@ -3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 +281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 +++ .cvsignore 29 Jul 2005 16:49:46 -0000 1.5 @@ -1 +1 @@ -bluefish-1.0.tar.bz2 +bluefish-1.0.2.tar.bz2 --- bluefish.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 16:50:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:21 -0400 Subject: rpms/gxemul - New directory Message-ID: <200507291650.j6TGoL5x002345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/gxemul Log Message: Directory /cvs/extras/rpms/gxemul added to the repository From fedora-extras-commits at redhat.com Fri Jul 29 16:50:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:21 -0400 Subject: rpms/gxemul/devel - New directory Message-ID: <200507291650.j6TGoLGC002348@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/gxemul/devel Log Message: Directory /cvs/extras/rpms/gxemul/devel added to the repository From fedora-extras-commits at redhat.com Fri Jul 29 16:50:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:40 -0400 Subject: rpms/gxemul Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507291650.j6TGoeCv002404@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2370 Added Files: Makefile import.log Log Message: Setup of module gxemul --- NEW FILE Makefile --- # Top level Makefile for module gxemul all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 29 16:50:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:50:41 -0400 Subject: rpms/gxemul/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507291650.j6TGofbo002410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2370/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gxemul --- NEW 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 Jul 29 16:51:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:51:28 -0400 Subject: rpms/gxemul/devel gxemul.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507291651.j6TGphuZ002478@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2438/devel Modified Files: .cvsignore sources Added Files: gxemul.spec Log Message: auto-import gxemul-0.3.4-1 on branch devel from gxemul-0.3.4-1.src.rpm --- NEW FILE gxemul.spec --- Name: gxemul Version: 0.3.4 Release: 1%{?dist} License: BSD Group: Development/Tools Summary: Instruction-level machine emulator URL: http://gavare.se/gxemul Source0: http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description GXemul is an experimental instruction-level machine emulator. It can be used to run binary code for (among others) MIPS-based machines, regardless of host platform. Several emulation modes are available. For some modes, processors and surrounding hardware components are emulated well enough to let unmodified operating systems (e.g. NetBSD) run as if they were running on a real machine. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" ./configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m755 gxemul $RPM_BUILD_ROOT%{_bindir} install -m644 man/gxemul.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %doc LICENSE HISTORY RELEASE README doc/* %defattr(-,root,root,0755) %{_bindir}/gxemul %{_mandir}/man1/gxemul.* %changelog * Thu Jul 28 2005 Tom "spot" Callaway 0.3.4-1 - initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gxemul/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2005 16:50:39 -0000 1.1 +++ .cvsignore 29 Jul 2005 16:51:26 -0000 1.2 @@ -0,0 +1 @@ +gxemul-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gxemul/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2005 16:50:39 -0000 1.1 +++ sources 29 Jul 2005 16:51:26 -0000 1.2 @@ -0,0 +1 @@ +dbf7ef59d2bb8f1e3082d0fa5fb434af gxemul-0.3.4.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 16:51:28 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:51:28 -0400 Subject: rpms/gxemul import.log,1.1,1.2 Message-ID: <200507291651.j6TGpSlU002472@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gxemul In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2438 Modified Files: import.log Log Message: auto-import gxemul-0.3.4-1 on branch devel from gxemul-0.3.4-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gxemul/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Jul 2005 16:50:38 -0000 1.1 +++ import.log 29 Jul 2005 16:51:26 -0000 1.2 @@ -0,0 +1 @@ +gxemul-0_3_4-1:HEAD:gxemul-0.3.4-1.src.rpm:1122655942 From fedora-extras-commits at redhat.com Fri Jul 29 16:52:57 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 12:52:57 -0400 Subject: rpms/bluefish/FC-4 bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE Message-ID: <200507291652.j6TGqviO002697@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2674 Modified Files: bluefish.spec sources .cvsignore Removed Files: bluefish.desktop Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bluefish.spec 23 May 2005 00:21:12 -0000 1.11 +++ bluefish.spec 29 Jul 2005 16:52:55 -0000 1.12 @@ -1,13 +1,13 @@ Name: bluefish -Version: 1.0 -Release: 4 +Version: 1.0.2 +Release: 1%{?dist} Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 @@ -15,6 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 +BuildRequires: libgnomeui >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -32,7 +33,6 @@ %build -sed -i "s/ICONDIR\/bluefish-icon.png/bluefish-icon.png/g;" data/bluefish.desktop.in %configure --disable-update-databases make %{?_smp_mflags} @@ -47,6 +47,10 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop +desktop-file-install --vendor fedora --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish-project.desktop %clean @@ -67,7 +71,8 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-bluefish.desktop +%{_datadir}/applications/fedora-bluefish-project.desktop %{_datadir}/application-registry/* %{_datadir}/bluefish %{_datadir}/mime/packages/bluefish.xml @@ -76,6 +81,13 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-1 +- update to 1.0.2 +- add dist tag +- add libgnomeui support as per upstream package (#161234, #163804) +- add project desktop entry +- desktop entry munging not needed + * Sun May 22 2005 Jeremy Katz - 1.0-4 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 00:56:52 -0000 1.4 +++ sources 29 Jul 2005 16:52:55 -0000 1.5 @@ -1 +1 @@ -3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 +281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 +++ .cvsignore 29 Jul 2005 16:52:55 -0000 1.5 @@ -1 +1 @@ -bluefish-1.0.tar.bz2 +bluefish-1.0.2.tar.bz2 --- bluefish.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 16:57:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 12:57:01 -0400 Subject: owners owners.list,1.36,1.37 Message-ID: <200507291657.j6TGv1qI002771@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2753 Modified Files: owners.list Log Message: gxemul Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- owners.list 28 Jul 2005 20:09:22 -0000 1.36 +++ owners.list 29 Jul 2005 16:56:58 -0000 1.37 @@ -270,6 +270,7 @@ Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gwget|GUI Download manager using wget|fedora at leemhuis.info|extras-qa at fedoraproject.org| +Fedora Extras|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|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| From fedora-extras-commits at redhat.com Fri Jul 29 16:59:35 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 12:59:35 -0400 Subject: rpms/bluefish/FC-3 bluefish.spec, 1.8, 1.9 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE Message-ID: <200507291659.j6TGxZmw002809@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2788 Modified Files: bluefish.spec sources .cvsignore Removed Files: bluefish.desktop Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bluefish.spec 20 Feb 2005 16:45:59 -0000 1.8 +++ bluefish.spec 29 Jul 2005 16:59:33 -0000 1.9 @@ -1,20 +1,22 @@ Name: bluefish -Version: 1.0 -Release: 2 -Summary: A GTK2 web development application for experienced users. +Version: 1.0.2 +Release: 1%{?dist} + +Summary: GTK2 web development application for experienced users Group: Development/Tools License: GPL URL: http://bluefish.openoffice.nl/ -Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-1.0.tar.bz2 +Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: aspell-devel >= 0.5 -BuildRequires: desktop-file-utils -BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: gettext BuildRequires: gnome-vfs2-devel -BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: pcre-devel >= 3.9 +BuildRequires: gtk2-devel >= 2.0.6 +BuildRequires: libgnomeui >= 2.6 +BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info Requires(postun): desktop-file-utils @@ -31,7 +33,6 @@ %build -sed -i "s/ICONDIR\/bluefish-icon.png/bluefish-icon.png/g;" data/bluefish.desktop.in %configure --disable-update-databases make %{?_smp_mflags} @@ -46,6 +47,10 @@ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish.desktop +desktop-file-install --vendor fedora --delete-original \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/bluefish-project.desktop %clean @@ -66,7 +71,8 @@ %defattr(-,root,root,-) %doc COPYING %{_bindir}/bluefish -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/fedora-bluefish.desktop +%{_datadir}/applications/fedora-bluefish-project.desktop %{_datadir}/application-registry/* %{_datadir}/bluefish %{_datadir}/mime/packages/bluefish.xml @@ -75,6 +81,19 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-1 +- update to 1.0.2 +- add dist tag +- add libgnomeui support as per upstream package (#161234, #163804) +- add project desktop entry +- desktop entry munging not needed + +* Sun May 22 2005 Jeremy Katz - 1.0-4 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Feb 20 2005 Phillip Compton 1.0-2 - Fix for absolute path to icon in desktop entry. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2005 00:56:52 -0000 1.4 +++ sources 29 Jul 2005 16:59:33 -0000 1.5 @@ -1 +1 @@ -3f92c1ca80da129c0eff0d2fbde69cb3 bluefish-1.0.tar.bz2 +281d72f5c45c913671c36bc6b7b45445 bluefish-1.0.2.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2005 00:56:52 -0000 1.4 +++ .cvsignore 29 Jul 2005 16:59:33 -0000 1.5 @@ -1 +1 @@ -bluefish-1.0.tar.bz2 +bluefish-1.0.2.tar.bz2 --- bluefish.desktop DELETED --- From fedora-extras-commits at redhat.com Fri Jul 29 17:09:15 2005 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Fri, 29 Jul 2005 13:09:15 -0400 Subject: common tobuild,1.2161,1.2162 Message-ID: <200507291709.j6TH9FbT004058@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4041 Modified Files: tobuild Log Message: request build of rpms/clamav/FC-3 clamav-0_86_2-4_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2161 retrieving revision 1.2162 diff -u -r1.2161 -r1.2162 --- tobuild 29 Jul 2005 16:41:30 -0000 1.2161 +++ tobuild 29 Jul 2005 17:09:12 -0000 1.2162 @@ -59,3 +59,4 @@ jrb rpms/at-poke/devel at-poke-0_2_2-2 development ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel +ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 From fedora-extras-commits at redhat.com Fri Jul 29 17:24:14 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 29 Jul 2005 13:24:14 -0400 Subject: common tobuild,1.2162,1.2163 Message-ID: <200507291724.j6THOEdX004108@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4091 Modified Files: tobuild Log Message: cleanup Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2162 retrieving revision 1.2163 diff -u -r1.2162 -r1.2163 --- tobuild 29 Jul 2005 17:09:12 -0000 1.2162 +++ tobuild 29 Jul 2005 17:24:12 -0000 1.2163 @@ -48,7 +48,6 @@ ixs rpms/scmxx/FC-4 scmxx-0_8_0-1_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_fc3 fc3 ryo rpms/scim/FC-4 scim-1_4_0-2_fc4 fc4 -jamatos rpms/pygsl/devel pygsl-0_3_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-3_fc3 fc3 ensc rpms/clamav/FC-4 clamav-0_86_2-3_fc4 fc4 jfontain rpms/moodss/devel moodss-20_3-1_fc5 devel From fedora-extras-commits at redhat.com Fri Jul 29 17:25:25 2005 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Fri, 29 Jul 2005 13:25:25 -0400 Subject: owners owners.list,1.37,1.38 Message-ID: <200507291725.j6THPPH1004136@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4119 Modified Files: owners.list Log Message: pygsl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- owners.list 29 Jul 2005 16:56:58 -0000 1.37 +++ owners.list 29 Jul 2005 17:25:23 -0000 1.38 @@ -682,6 +682,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|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|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| From fedora-extras-commits at redhat.com Fri Jul 29 17:53:20 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 13:53:20 -0400 Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.2, 1.3 perl-DBD-SQLite.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200507291753.j6THrKSX004301@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4279 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.09. This new version can use an external SQLite library (>= 3.1.3). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 05:00:52 -0000 1.2 +++ .cvsignore 29 Jul 2005 17:53:17 -0000 1.3 @@ -1 +1 @@ -DBD-SQLite-1.08.tar.gz +DBD-SQLite-1.09.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-DBD-SQLite.spec 12 Jun 2005 15:37:05 -0000 1.3 +++ perl-DBD-SQLite.spec 29 Jul 2005 17:53:17 -0000 1.4 @@ -1,12 +1,12 @@ Name: perl-DBD-SQLite -Version: 1.08 -Release: 2%{?dist} +Version: 1.09 +Release: 1%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ -Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/DBD/DBD-SQLite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 @@ -21,6 +21,8 @@ a fast transaction capable RDBMS working for your perl project you simply have to install this module, and nothing else. +As of version 1.09 it can use the external SQLite library (>= 3.1.3). + %prep %setup -q -n DBD-SQLite-%{version} @@ -56,6 +58,10 @@ %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. +- This new version can use an external SQLite library (>= 3.1.3). + * Sun Jun 12 2005 Jose Pedro Oliveira - 1.08-2 - temporary maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 05:00:52 -0000 1.2 +++ sources 29 Jul 2005 17:53:17 -0000 1.3 @@ -1 +1 @@ -589a0497eaf4c855ad2a214950cba217 DBD-SQLite-1.08.tar.gz +02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:22:36 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 14:22:36 -0400 Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.4,1.5 Message-ID: <200507291822.j6TIMaP8005615@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5598 Modified Files: perl-DBD-SQLite.spec Log Message: Build requires sqlite-devel Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-DBD-SQLite.spec 29 Jul 2005 17:53:17 -0000 1.4 +++ perl-DBD-SQLite.spec 29 Jul 2005 18:22:34 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -10,6 +10,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 +# if sqlite >= 3.1.3 then +# perl-DBD-SQLite uses the external library +# else +# perl-DBD-SQLite is self-contained (uses the sqlite local copy) +BuildRequires: sqlite-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -51,13 +56,17 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD/SQLite.pm %{_mandir}/man3/*.3* %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 +- Build requirement added: sqlite-devel. +- Doc file added: Changes. + * Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 - Update to 1.09. - This new version can use an external SQLite library (>= 3.1.3). From fedora-extras-commits at redhat.com Fri Jul 29 18:39:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 14:39:23 -0400 Subject: rpms/QuantLib/devel QuantLib.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200507291839.j6TIdNpn005877@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821/devel Modified Files: QuantLib.spec sources Log Message: new version Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/devel/QuantLib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- QuantLib.spec 1 Jul 2005 17:23:01 -0000 1.8 +++ QuantLib.spec 29 Jul 2005 18:39:21 -0000 1.9 @@ -1,8 +1,8 @@ %define docdir %{_datadir}/doc/QuantLib-%{version} Name: QuantLib -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 0.3.10-1 +- Bump for new release + * Sat Jun 25 2005 Colin Charles 0.3.9-2 - Fix download URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/QuantLib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2005 14:54:59 -0000 1.3 +++ sources 29 Jul 2005 18:39:21 -0000 1.4 @@ -1,2 +1,3 @@ e823bc1201127c6d12b685185b64f0a4 QuantLib-0.3.8.tar.gz f47d72e7d2aa8746dbcfbb6971d55643 QuantLib-0.3.9.tar.gz +836a714490219cc6806961b62c8c975b QuantLib-0.3.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:39:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 14:39:18 -0400 Subject: rpms/QuantLib/FC-3 QuantLib.spec,1.8,1.9 sources,1.3,1.4 Message-ID: <200507291839.j6TIdmU6005887@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821/FC-3 Modified Files: QuantLib.spec sources Log Message: new version Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-3/QuantLib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 +++ QuantLib.spec 29 Jul 2005 18:39:15 -0000 1.9 @@ -1,8 +1,8 @@ %define docdir %{_datadir}/doc/QuantLib-%{version} Name: QuantLib -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 0.3.10-1 +- Bump for new release + * Sat Jun 25 2005 Colin Charles 0.3.9-2 - Fix download URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2005 14:49:46 -0000 1.3 +++ sources 29 Jul 2005 18:39:15 -0000 1.4 @@ -1,2 +1,3 @@ e823bc1201127c6d12b685185b64f0a4 QuantLib-0.3.8.tar.gz f47d72e7d2aa8746dbcfbb6971d55643 QuantLib-0.3.9.tar.gz +836a714490219cc6806961b62c8c975b QuantLib-0.3.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:39:18 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 14:39:18 -0400 Subject: rpms/QuantLib/FC-4 .cvsignore, 1.3, 1.4 QuantLib.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200507291839.j6TIdmti005892@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/QuantLib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5821/FC-4 Modified Files: .cvsignore QuantLib.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 Jun 2005 14:54:59 -0000 1.3 +++ .cvsignore 29 Jul 2005 18:39:16 -0000 1.4 @@ -1,2 +1,3 @@ QuantLib-0.3.8.tar.gz QuantLib-0.3.9.tar.gz +QuantLib-0.3.10.tar.gz Index: QuantLib.spec =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/QuantLib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- QuantLib.spec 1 Jul 2005 17:22:55 -0000 1.8 +++ QuantLib.spec 29 Jul 2005 18:39:16 -0000 1.9 @@ -1,8 +1,8 @@ %define docdir %{_datadir}/doc/QuantLib-%{version} Name: QuantLib -Version: 0.3.9 -Release: 2%{?dist} +Version: 0.3.10 +Release: 1%{?dist} Summary: A software framework for quantitative finance License: BSD Group: System Environment/Libraries @@ -106,6 +106,9 @@ %{docdir}/QuantLib-%{version}-docs-refman.ps %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 0.3.10-1 +- Bump for new release + * Sat Jun 25 2005 Colin Charles 0.3.9-2 - Fix download URL Index: sources =================================================================== RCS file: /cvs/extras/rpms/QuantLib/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 Jun 2005 14:54:59 -0000 1.3 +++ sources 29 Jul 2005 18:39:16 -0000 1.4 @@ -1,2 +1,3 @@ e823bc1201127c6d12b685185b64f0a4 QuantLib-0.3.8.tar.gz f47d72e7d2aa8746dbcfbb6971d55643 QuantLib-0.3.9.tar.gz +836a714490219cc6806961b62c8c975b QuantLib-0.3.10.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:48:38 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 14:48:38 -0400 Subject: rpms/perl-DBD-SQLite/FC-3 .cvsignore, 1.2, 1.3 perl-DBD-SQLite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507291849.j6TIn8Xq006093@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052/FC-3 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 05:00:52 -0000 1.2 +++ .cvsignore 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -DBD-SQLite-1.08.tar.gz +DBD-SQLite-1.09.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/perl-DBD-SQLite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite.spec 12 Jun 2005 05:00:52 -0000 1.2 +++ perl-DBD-SQLite.spec 29 Jul 2005 18:48:36 -0000 1.3 @@ -1,15 +1,20 @@ -Name: perl-DBD-SQLite -Version: 1.08 +Name: perl-DBD-SQLite +Version: 1.09 Release: 2%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ -Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/DBD/DBD-SQLite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 +# if sqlite >= 3.1.3 then +# perl-DBD-SQLite uses the external library +# else +# perl-DBD-SQLite is self-contained (uses the sqlite local copy) +BuildRequires: sqlite-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,6 +26,8 @@ a fast transaction capable RDBMS working for your perl project you simply have to install this module, and nothing else. +As of version 1.09 it can use the external SQLite library (>= 3.1.3). + %prep %setup -q -n DBD-SQLite-%{version} @@ -49,13 +56,21 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD/SQLite.pm %{_mandir}/man3/*.3* %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 +- Build requirement added: sqlite-devel. +- Doc file added: Changes. + +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. +- This new version can use an external SQLite library (>= 3.1.3). + * Sun Jun 12 2005 Jose Pedro Oliveira - 1.08-2 - temporary maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 05:00:52 -0000 1.2 +++ sources 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -589a0497eaf4c855ad2a214950cba217 DBD-SQLite-1.08.tar.gz +02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 18:48:38 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 14:48:38 -0400 Subject: rpms/perl-DBD-SQLite/FC-4 .cvsignore, 1.2, 1.3 perl-DBD-SQLite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200507291849.j6TIn8fv006098@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6052/FC-4 Modified Files: .cvsignore perl-DBD-SQLite.spec sources Log Message: Update to 1.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2005 05:00:52 -0000 1.2 +++ .cvsignore 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -DBD-SQLite-1.08.tar.gz +DBD-SQLite-1.09.tar.gz Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/perl-DBD-SQLite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-DBD-SQLite.spec 12 Jun 2005 05:00:52 -0000 1.2 +++ perl-DBD-SQLite.spec 29 Jul 2005 18:48:36 -0000 1.3 @@ -1,15 +1,20 @@ -Name: perl-DBD-SQLite -Version: 1.08 +Name: perl-DBD-SQLite +Version: 1.09 Release: 2%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ -Source0: ftp://ftp.cpan.org/pub/CPAN/modules/by-module/DBD/DBD-SQLite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-DBI >= 1.03 +# if sqlite >= 3.1.3 then +# perl-DBD-SQLite uses the external library +# else +# perl-DBD-SQLite is self-contained (uses the sqlite local copy) +BuildRequires: sqlite-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -21,6 +26,8 @@ a fast transaction capable RDBMS working for your perl project you simply have to install this module, and nothing else. +As of version 1.09 it can use the external SQLite library (>= 3.1.3). + %prep %setup -q -n DBD-SQLite-%{version} @@ -49,13 +56,21 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/DBD/SQLite.pm %{_mandir}/man3/*.3* %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-2 +- Build requirement added: sqlite-devel. +- Doc file added: Changes. + +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.09-1 +- Update to 1.09. +- This new version can use an external SQLite library (>= 3.1.3). + * Sun Jun 12 2005 Jose Pedro Oliveira - 1.08-2 - temporary maintainership. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2005 05:00:52 -0000 1.2 +++ sources 29 Jul 2005 18:48:36 -0000 1.3 @@ -1 +1 @@ -589a0497eaf4c855ad2a214950cba217 DBD-SQLite-1.08.tar.gz +02cde1aba9cc2d8474666d8258d8256d DBD-SQLite-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 19:06:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:06:55 -0400 Subject: rpms/gambas/FC-4 gambas.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200507291907.j6TJ7emU007417@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348/FC-4 Modified Files: gambas.spec sources Log Message: New version: 1.0.9 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambas.spec 11 Jul 2005 20:33:00 -0000 1.5 +++ gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.7-gcc4.patch +Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 +- bump for 1.0.9 + * Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 - bump for another new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jul 2005 20:33:00 -0000 1.3 +++ sources 29 Jul 2005 19:06:53 -0000 1.4 @@ -1,2 +1,3 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 +888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 19:07:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:07:09 -0400 Subject: rpms/gambas/FC-3 .cvsignore, 1.2, 1.3 gambas.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200507291907.j6TJ7dOk007411@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348/FC-3 Modified Files: .cvsignore gambas.spec sources Log Message: New version: 1.0.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/.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 29 Jul 2005 19:06:53 -0000 1.3 @@ -1 +1,2 @@ gambas-1.0.6.tar.bz2 +gambas-1.0.9.tar.bz2 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambas.spec 11 Jul 2005 20:32:59 -0000 1.5 +++ gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.7-gcc4.patch +Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 +- bump for 1.0.9 + * Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 - bump for another new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jul 2005 20:32:59 -0000 1.3 +++ sources 29 Jul 2005 19:06:53 -0000 1.4 @@ -1,2 +1,3 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 +888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 19:06:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:06:56 -0400 Subject: rpms/gambas/devel gambas.spec,1.5,1.6 sources,1.3,1.4 Message-ID: <200507291907.j6TJ7eP9007418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7348/devel Modified Files: gambas.spec sources Log Message: New version: 1.0.9 Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gambas.spec 11 Jul 2005 20:33:01 -0000 1.5 +++ gambas.spec 29 Jul 2005 19:06:54 -0000 1.6 @@ -1,6 +1,6 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -13,7 +13,7 @@ ExcludeArch: x86_64 # Code is not endian clean. ExcludeArch: ppc -Patch0: gambas-1.0.7-gcc4.patch +Patch0: gambas-1.0.9-gcc4.patch Patch1: gambas-1.0.6-dont-make-links.patch Patch2: gambas-1.0.6-noopt.patch @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 +- bump for 1.0.9 + * Mon Jul 11 2005 Tom "spot" Callaway 1.0.8-1 - bump for another new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jul 2005 20:33:01 -0000 1.3 +++ sources 29 Jul 2005 19:06:54 -0000 1.4 @@ -1,2 +1,3 @@ 608772c93233eea4e488ba3bd1c2ac83 gambas-1.0.6.tar.bz2 730b690c72689e26888698233fdef726 gambas-1.0.8.tar.bz2 +888494096dfb4f497dcfed58179980fa gambas-1.0.9.tar.bz2 From fedora-extras-commits at redhat.com Fri Jul 29 19:16:16 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:16:16 -0400 Subject: rpms/gambas/FC-3 gambas-1.0.9-gcc4.patch,NONE,1.1 Message-ID: <200507291916.j6TJGGqb007666@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7639/FC-3 Added Files: gambas-1.0.9-gcc4.patch Log Message: Missing patch. gambas-1.0.9-gcc4.patch: --- NEW FILE gambas-1.0.9-gcc4.patch --- --- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500 @@ -57,7 +57,7 @@ { /* BM */ FILE *file = THIS_FILE; - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (!feof(file)) nmemb=fread(buffer,size,nmemb,file); @@ -70,7 +70,7 @@ int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (THIS_FILE) { @@ -111,12 +111,12 @@ { CCURL_stop(_object); ftp_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1); @@ -127,7 +127,7 @@ curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL); ftp_reset(THIS); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -177,7 +177,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -209,7 +209,7 @@ return; } - THIS_FILE=fopen(STRING(SourceFile),"r"); + THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r"); if (!THIS_FILE) { GB.Error("Unable to open file for reading"); @@ -234,12 +234,12 @@ char *tmp=NULL; GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21"))); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; strcpy(tmp,"ftp://127.0.0.1:21"); tmp=NULL; GB.Alloc((void**)&tmp,7); strcpy(tmp,"ftp://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC); --- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500 @@ -133,7 +133,7 @@ if (THIS_STATUS==6) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; GB.Ref(THIS); GB.Post(CCURL_raise_connect,(long)THIS); } @@ -335,14 +335,14 @@ GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80"))); strcpy(tmp,"http://127.0.0.1:80"); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0); tmp=NULL; GB.Alloc((void**)&tmp,8); strcpy(tmp,"http://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; END_METHOD @@ -378,12 +378,12 @@ { CCURL_stop(_object); http_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } @@ -410,7 +410,7 @@ THIS->ReturnString=NULL; } http_reset(_object); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -437,7 +437,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -500,7 +500,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); --- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500 @@ -170,20 +170,20 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } switch ( ErrCode ) { case CURLE_OK: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=0; + THIS_STATUS_NOCAST=NULL; GB.Ref(THIS); GB.Post(CCURL_raise_finished,(long)THIS); break; default: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=-1*(1000+ErrCode); + THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode)); GB.Ref(THIS); GB.Post(CCURL_raise_error,(long)THIS); break; @@ -200,16 +200,16 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } if (THIS_CURL) { curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); curl_easy_cleanup(THIS_CURL); - THIS_CURL=NULL; + THIS_CURL_NOCAST=NULL; } - THIS_STATUS=0; + THIS_STATUS_NOCAST=0; } void CCURL_init_post(void) @@ -362,7 +362,7 @@ GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char)); strcpy(tmp,GB.ToZeroString(PROP(GB_STRING))); Adv_correct_url(&tmp,THIS_PROTOCOL); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; END_PROPERTY @@ -380,9 +380,9 @@ BEGIN_METHOD_VOID(CCURL_new) THIS->stream.desc=NULL; - THIS_CURL=NULL; - THIS_URL=NULL; - THIS_FILE=NULL; + THIS_CURL_NOCAST=NULL; + THIS_URL_NOCAST=NULL; + THIS_FILE_NOCAST=NULL; GB.StoreVariant(NULL, (void *)&THIS->tag); Adv_user_NEW (&THIS->user); GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL); --- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct From fedora-extras-commits at redhat.com Fri Jul 29 19:16:17 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:16:17 -0400 Subject: rpms/gambas/FC-4 gambas-1.0.9-gcc4.patch,NONE,1.1 Message-ID: <200507291916.j6TJGHKU007673@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7639/FC-4 Added Files: gambas-1.0.9-gcc4.patch Log Message: Missing patch. gambas-1.0.9-gcc4.patch: --- NEW FILE gambas-1.0.9-gcc4.patch --- --- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500 @@ -57,7 +57,7 @@ { /* BM */ FILE *file = THIS_FILE; - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (!feof(file)) nmemb=fread(buffer,size,nmemb,file); @@ -70,7 +70,7 @@ int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (THIS_FILE) { @@ -111,12 +111,12 @@ { CCURL_stop(_object); ftp_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1); @@ -127,7 +127,7 @@ curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL); ftp_reset(THIS); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -177,7 +177,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -209,7 +209,7 @@ return; } - THIS_FILE=fopen(STRING(SourceFile),"r"); + THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r"); if (!THIS_FILE) { GB.Error("Unable to open file for reading"); @@ -234,12 +234,12 @@ char *tmp=NULL; GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21"))); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; strcpy(tmp,"ftp://127.0.0.1:21"); tmp=NULL; GB.Alloc((void**)&tmp,7); strcpy(tmp,"ftp://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC); --- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500 @@ -133,7 +133,7 @@ if (THIS_STATUS==6) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; GB.Ref(THIS); GB.Post(CCURL_raise_connect,(long)THIS); } @@ -335,14 +335,14 @@ GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80"))); strcpy(tmp,"http://127.0.0.1:80"); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0); tmp=NULL; GB.Alloc((void**)&tmp,8); strcpy(tmp,"http://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; END_METHOD @@ -378,12 +378,12 @@ { CCURL_stop(_object); http_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } @@ -410,7 +410,7 @@ THIS->ReturnString=NULL; } http_reset(_object); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -437,7 +437,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -500,7 +500,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); --- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500 @@ -170,20 +170,20 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } switch ( ErrCode ) { case CURLE_OK: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=0; + THIS_STATUS_NOCAST=NULL; GB.Ref(THIS); GB.Post(CCURL_raise_finished,(long)THIS); break; default: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=-1*(1000+ErrCode); + THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode)); GB.Ref(THIS); GB.Post(CCURL_raise_error,(long)THIS); break; @@ -200,16 +200,16 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } if (THIS_CURL) { curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); curl_easy_cleanup(THIS_CURL); - THIS_CURL=NULL; + THIS_CURL_NOCAST=NULL; } - THIS_STATUS=0; + THIS_STATUS_NOCAST=0; } void CCURL_init_post(void) @@ -362,7 +362,7 @@ GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char)); strcpy(tmp,GB.ToZeroString(PROP(GB_STRING))); Adv_correct_url(&tmp,THIS_PROTOCOL); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; END_PROPERTY @@ -380,9 +380,9 @@ BEGIN_METHOD_VOID(CCURL_new) THIS->stream.desc=NULL; - THIS_CURL=NULL; - THIS_URL=NULL; - THIS_FILE=NULL; + THIS_CURL_NOCAST=NULL; + THIS_URL_NOCAST=NULL; + THIS_FILE_NOCAST=NULL; GB.StoreVariant(NULL, (void *)&THIS->tag); Adv_user_NEW (&THIS->user); GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL); --- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct From fedora-extras-commits at redhat.com Fri Jul 29 19:16:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:16:22 -0400 Subject: rpms/gambas/devel gambas-1.0.9-gcc4.patch,NONE,1.1 Message-ID: <200507291916.j6TJGMg7007695@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7639/devel Added Files: gambas-1.0.9-gcc4.patch Log Message: Missing patch. gambas-1.0.9-gcc4.patch: --- NEW FILE gambas-1.0.9-gcc4.patch --- --- gambas-1.0.6/src/lib/net/curl/CFtpClient.c.BAD 2005-06-02 01:08:05.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.c 2005-06-02 01:09:04.000000000 -0500 @@ -57,7 +57,7 @@ { /* BM */ FILE *file = THIS_FILE; - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (!feof(file)) nmemb=fread(buffer,size,nmemb,file); @@ -70,7 +70,7 @@ int ftp_write_curl(void *buffer, size_t size, size_t nmemb, void *_object) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; if (THIS_FILE) { @@ -111,12 +111,12 @@ { CCURL_stop(_object); ftp_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } curl_easy_setopt(THIS_CURL, CURLOPT_VERBOSE,1); @@ -127,7 +127,7 @@ curl_easy_setopt(THIS_CURL, CURLOPT_URL,THIS_URL); ftp_reset(THIS); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -177,7 +177,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -209,7 +209,7 @@ return; } - THIS_FILE=fopen(STRING(SourceFile),"r"); + THIS_FILE_NOCAST=fopen(STRING(SourceFile),"r"); if (!THIS_FILE) { GB.Error("Unable to open file for reading"); @@ -234,12 +234,12 @@ char *tmp=NULL; GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("ftp://127.0.0.1:21"))); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; strcpy(tmp,"ftp://127.0.0.1:21"); tmp=NULL; GB.Alloc((void**)&tmp,7); strcpy(tmp,"ftp://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; Adv_user_SETAUTH (&THIS->user,CURLAUTH_BASIC); --- gambas-1.0.6/src/lib/net/curl/CCurl.h.BAD 2005-06-02 00:30:42.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.h 2005-06-02 00:56:02.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CCURL *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CCURL *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CCURL *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CCURL *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CCURL *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CCURL *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CCURL *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.h.BAD 2005-06-02 01:00:01.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.h 2005-06-02 01:01:14.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CHTTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CHTTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CHTTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CHTTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CHTTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct --- gambas-1.0.6/src/lib/net/curl/CHttpClient.c.BAD 2005-06-02 01:01:18.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CHttpClient.c 2005-06-02 01:04:08.000000000 -0500 @@ -133,7 +133,7 @@ if (THIS_STATUS==6) { - THIS_STATUS=4; + THIS_STATUS_NOCAST=4; GB.Ref(THIS); GB.Post(CCURL_raise_connect,(long)THIS); } @@ -335,14 +335,14 @@ GB.Alloc((void**)&tmp,sizeof(char)*(1+strlen("http://127.0.0.1:80"))); strcpy(tmp,"http://127.0.0.1:80"); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; GB.NewString(&THIS->sUserAgent,"Gambas Http/1.0",0); tmp=NULL; GB.Alloc((void**)&tmp,8); strcpy(tmp,"http://"); - THIS_PROTOCOL=tmp; + THIS_PROTOCOL_NOCAST=tmp; END_METHOD @@ -378,12 +378,12 @@ { CCURL_stop(_object); http_reset(_object); - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } } else { - THIS_CURL=curl_easy_init(); + THIS_CURL_NOCAST=curl_easy_init(); } @@ -410,7 +410,7 @@ THIS->ReturnString=NULL; } http_reset(_object); - THIS_STATUS=6; + THIS_STATUS_NOCAST=6; THIS->stream.desc=&CurlStream; } @@ -437,7 +437,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); @@ -500,7 +500,7 @@ GB.Error("Still active"); return; } - THIS_FILE=fopen(STRING(TargetHost),"w"); + THIS_FILE_NOCAST=fopen(STRING(TargetHost),"w"); if (!THIS_FILE) { GB.Error("Unable to open file for writing"); --- gambas-1.0.6/src/lib/net/curl/CCurl.c.BAD 2005-06-02 00:29:54.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CCurl.c 2005-06-02 00:57:36.000000000 -0500 @@ -170,20 +170,20 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } switch ( ErrCode ) { case CURLE_OK: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=0; + THIS_STATUS_NOCAST=NULL; GB.Ref(THIS); GB.Post(CCURL_raise_finished,(long)THIS); break; default: curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); - THIS_STATUS=-1*(1000+ErrCode); + THIS_STATUS_NOCAST=(int)(-1*(1000+ErrCode)); GB.Ref(THIS); GB.Post(CCURL_raise_error,(long)THIS); break; @@ -200,16 +200,16 @@ if (THIS_FILE) { fclose(THIS_FILE); - THIS_FILE=NULL; + THIS_FILE_NOCAST=NULL; } if (THIS_CURL) { curl_multi_remove_handle(CCURL_multicurl,THIS_CURL); curl_easy_cleanup(THIS_CURL); - THIS_CURL=NULL; + THIS_CURL_NOCAST=NULL; } - THIS_STATUS=0; + THIS_STATUS_NOCAST=0; } void CCURL_init_post(void) @@ -362,7 +362,7 @@ GB.Alloc((void**)&tmp,(strlen(GB.ToZeroString(PROP(GB_STRING)))+1)*sizeof(char)); strcpy(tmp,GB.ToZeroString(PROP(GB_STRING))); Adv_correct_url(&tmp,THIS_PROTOCOL); - THIS_URL=tmp; + THIS_URL_NOCAST=tmp; END_PROPERTY @@ -380,9 +380,9 @@ BEGIN_METHOD_VOID(CCURL_new) THIS->stream.desc=NULL; - THIS_CURL=NULL; - THIS_URL=NULL; - THIS_FILE=NULL; + THIS_CURL_NOCAST=NULL; + THIS_URL_NOCAST=NULL; + THIS_FILE_NOCAST=NULL; GB.StoreVariant(NULL, (void *)&THIS->tag); Adv_user_NEW (&THIS->user); GB.New ((void**)&THIS->proxy,GB.FindClass(".Proxy"),NULL,NULL); --- gambas-1.0.6/src/lib/net/curl/CFtpClient.h.BAD 2005-06-02 01:06:02.000000000 -0500 +++ gambas-1.0.6/src/lib/net/curl/CFtpClient.h 2005-06-02 01:06:43.000000000 -0500 @@ -45,6 +45,12 @@ #define THIS_FILE ((char*)(((CFTPCLIENT *)_object)->stream._free[3])) #define THIS_PROTOCOL ((char*)(((CFTPCLIENT *)_object)->stream._free[4])) +#define THIS_STATUS_NOCAST (((CFTPCLIENT *)_object)->stream._free[0]) +#define THIS_CURL_NOCAST (((CFTPCLIENT *)_object)->stream._free[1]) +#define THIS_URL_NOCAST (((CFTPCLIENT *)_object)->stream._free[2]) +#define THIS_FILE_NOCAST (((CFTPCLIENT *)_object)->stream._free[3]) +#define THIS_PROTOCOL_NOCAST (((CFTPCLIENT *)_object)->stream._free[4]) + #endif typedef struct From fedora-extras-commits at redhat.com Fri Jul 29 19:17:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:17:30 -0400 Subject: rpms/gambas/devel gambas.spec,1.6,1.7 Message-ID: <200507291917.j6TJHUI7007748@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/devel Modified Files: gambas.spec Log Message: bump release for new tag Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambas.spec 29 Jul 2005 19:06:54 -0000 1.6 +++ gambas.spec 29 Jul 2005 19:17:28 -0000 1.7 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 +- put in correct patch + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 - bump for 1.0.9 From fedora-extras-commits at redhat.com Fri Jul 29 19:17:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:17:25 -0400 Subject: rpms/gambas/FC-3 gambas.spec,1.6,1.7 Message-ID: <200507291917.j6TJHt9P007751@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/FC-3 Modified Files: gambas.spec Log Message: bump release for new tag Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-3/gambas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 +++ gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 +- put in correct patch + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 - bump for 1.0.9 From fedora-extras-commits at redhat.com Fri Jul 29 19:17:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:17:25 -0400 Subject: rpms/gambas/FC-4 gambas.spec,1.6,1.7 Message-ID: <200507291918.j6TJHtFT007754@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gambas/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7701/FC-4 Modified Files: gambas.spec Log Message: bump release for new tag Index: gambas.spec =================================================================== RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gambas.spec 29 Jul 2005 19:06:53 -0000 1.6 +++ gambas.spec 29 Jul 2005 19:17:23 -0000 1.7 @@ -1,7 +1,7 @@ Name: gambas Summary: IDE based on a basic interpreter with object extensions Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -121,6 +121,9 @@ %{_datadir}/gambas/examples %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-2 +- put in correct patch + * Fri Jul 29 2005 Tom "spot" Callaway 1.0.9-1 - bump for 1.0.9 From fedora-extras-commits at redhat.com Fri Jul 29 19:27:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 15:27:37 -0400 Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.5, 1.6 perl-Gtk2.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507291927.j6TJRbAh007957@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922/FC-4 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.083 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jun 2005 16:22:00 -0000 1.5 +++ .cvsignore 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -Gtk2-1.082.tar.gz +Gtk2-1.083.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Gtk2.spec 27 Jun 2005 16:22:00 -0000 1.9 +++ perl-Gtk2.spec 29 Jul 2005 19:27:35 -0000 1.10 @@ -1,12 +1,12 @@ Name: perl-Gtk2 -Version: 1.082 +Version: 1.083 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries License: LGPL URL: http://search.cpan.org/dist/Gtk2/ -Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.082.tar.gz +Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-%{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" @@ -60,6 +59,9 @@ %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.083-1 +- Update to 1.083. + * Mon Jun 27 2005 Jose Pedro Oliveira - 1.082-1 - Update to 1.082. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jun 2005 16:22:00 -0000 1.5 +++ sources 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -6a36c224d0a8f4792c206458c2845a8e Gtk2-1.082.tar.gz +4ccec16a8a87bbf0b058c92ac44d60ae Gtk2-1.083.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 19:27:37 2005 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 29 Jul 2005 15:27:37 -0400 Subject: rpms/perl-Gtk2/devel .cvsignore, 1.5, 1.6 perl-Gtk2.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200507291927.j6TJRb84007965@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922/devel Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.083 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Jun 2005 16:22:01 -0000 1.5 +++ .cvsignore 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -Gtk2-1.082.tar.gz +Gtk2-1.083.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Gtk2.spec 27 Jun 2005 16:22:01 -0000 1.9 +++ perl-Gtk2.spec 29 Jul 2005 19:27:35 -0000 1.10 @@ -1,12 +1,12 @@ Name: perl-Gtk2 -Version: 1.082 +Version: 1.083 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library Group: Development/Libraries License: LGPL URL: http://search.cpan.org/dist/Gtk2/ -Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.082.tar.gz +Source0: http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-%{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" @@ -60,6 +59,9 @@ %changelog +* Fri Jul 29 2005 Jose Pedro Oliveira - 1.083-1 +- Update to 1.083. + * Mon Jun 27 2005 Jose Pedro Oliveira - 1.082-1 - Update to 1.082. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Jun 2005 16:22:01 -0000 1.5 +++ sources 29 Jul 2005 19:27:35 -0000 1.6 @@ -1 +1 @@ -6a36c224d0a8f4792c206458c2845a8e Gtk2-1.082.tar.gz +4ccec16a8a87bbf0b058c92ac44d60ae Gtk2-1.083.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 19:36:26 2005 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 29 Jul 2005 15:36:26 -0400 Subject: common Makefile.common,1.27,1.28 Message-ID: <200507291936.j6TJaQbY008099@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8053 Modified Files: Makefile.common Log Message: say what source file is being downloaded (#160142) Index: Makefile.common =================================================================== RCS file: /cvs/extras/common/Makefile.common,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.common 29 Jul 2005 03:41:29 -0000 1.27 +++ Makefile.common 29 Jul 2005 19:36:24 -0000 1.28 @@ -132,6 +132,7 @@ # Retrieve the sources we do not have in CVS $(SOURCEFILES): #FORCE @mkdir -p $(SOURCEDIR) + @echo "Downloading $@..." @if [ ! -e "$@" ] ; then $(CLIENT) $(REPOSITORY)/$(NAME)/$@/$(get_sources_md5)/$@ ; fi @if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi @if test "$$(md5sum $@ | awk '{print $$1}')" != "$(get_sources_md5)" ; then \ From fedora-extras-commits at redhat.com Fri Jul 29 19:42:02 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:42:02 -0400 Subject: rpms/blacs/devel blacs-shared.patch,NONE,1.1 blacs.spec,1.7,1.8 Message-ID: <200507291942.j6TJg27L008343@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/devel Modified Files: blacs.spec Added Files: blacs-shared.patch Log Message: actually add the patch. :P blacs-shared.patch: --- NEW FILE blacs-shared.patch --- --- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 +++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 @@ -88,12 +88,14 @@ make $(BLACSCINIT) $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) $(RANLIB) $(BLACSLIB) + ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) $(BLACSFINIT) : $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSFINIT) $(BLACSCINIT) : @@ -101,6 +103,7 @@ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSCINIT) # ------------------ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- blacs.spec 12 Jul 2005 19:46:29 -0000 1.7 +++ blacs.spec 29 Jul 2005 19:42:00 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 +- bump for new tag + * Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 - split static lib and .so into -devel package - fix Bmake files for shared library support From fedora-extras-commits at redhat.com Fri Jul 29 19:41:56 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:41:56 -0400 Subject: rpms/blacs/FC-3 blacs-shared.patch,NONE,1.1 blacs.spec,1.7,1.8 Message-ID: <200507291942.j6TJgQ8e008410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-3 Modified Files: blacs.spec Added Files: blacs-shared.patch Log Message: actually add the patch. :P blacs-shared.patch: --- NEW FILE blacs-shared.patch --- --- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 +++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 @@ -88,12 +88,14 @@ make $(BLACSCINIT) $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) $(RANLIB) $(BLACSLIB) + ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) $(BLACSFINIT) : $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSFINIT) $(BLACSCINIT) : @@ -101,6 +103,7 @@ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSCINIT) # ------------------ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- blacs.spec 12 Jul 2005 19:46:23 -0000 1.7 +++ blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 +- bump for new tag + * Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 - split static lib and .so into -devel package - fix Bmake files for shared library support From fedora-extras-commits at redhat.com Fri Jul 29 19:41:57 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 15:41:57 -0400 Subject: rpms/blacs/FC-4 blacs-shared.patch,NONE,1.1 blacs.spec,1.7,1.8 Message-ID: <200507291942.j6TJgRwN008413@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8287/FC-4 Modified Files: blacs.spec Added Files: blacs-shared.patch Log Message: actually add the patch. :P blacs-shared.patch: --- NEW FILE blacs-shared.patch --- --- blacs/BLACS/SRC/MPI/Makefile.BAD 2005-06-27 07:12:21.252897368 -0500 +++ blacs/BLACS/SRC/MPI/Makefile 2005-06-27 07:14:23.144367048 -0500 @@ -88,12 +88,14 @@ make $(BLACSCINIT) $(ARCH) $(ARCHFLAGS) $(BLACSLIB) $(Fintobj) $(Cintobj) $(RANLIB) $(BLACSLIB) + ( mkdir tmp ; cp $(BLACSLIB) tmp ; cd tmp ; ar x $(BLACSLIB) ; ld -shared -o $(BLACSdir)/$(BLACSLIBS).0.0 *.o *.C -soname=$(BLACSLIBS) ; cd .. ) $(BLACSFINIT) : $(CC) -o Cblacs_pinfo.o -c $(CCFLAGS) $(BLACSDEFS) -DCallFromC -DMainInF77 \ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInF77 blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSFINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSFINITS) -o $(BLACSdir)/$(BLACSFINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSFINIT) $(BLACSCINIT) : @@ -101,6 +103,7 @@ blacs_pinfo_.c $(CC) -c $(CCFLAGS) $(BLACSDEFS) -DMainInC blacs_pinfo_.c $(ARCH) $(ARCHFLAGS) $(BLACSCINIT) blacs_pinfo_.o Cblacs_pinfo.o + $(CC) -shared -Wl,-soname=$(BLACSCINITS) -o $(BLACSdir)/$(BLACSCINITS).0.0 blacs_pinfo_.o Cblacs_pinfo.o $(RANLIB) $(BLACSCINIT) # ------------------ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- blacs.spec 12 Jul 2005 19:46:24 -0000 1.7 +++ blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 +- bump for new tag + * Mon Jun 27 2005 Tom "spot" Callaway 1.1-10 - split static lib and .so into -devel package - fix Bmake files for shared library support From fedora-extras-commits at redhat.com Fri Jul 29 19:50:54 2005 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 29 Jul 2005 15:50:54 -0400 Subject: rpms/hdf/devel hdf.spec,1.1,1.2 Message-ID: <200507291950.j6TJosto008744@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8727 Modified Files: hdf.spec Log Message: Exclude ppc/ppc64 Index: hdf.spec =================================================================== RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf.spec 25 Jul 2005 18:07:39 -0000 1.1 +++ hdf.spec 29 Jul 2005 19:50:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: hdf Version: 4.2r1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran +ExcludeArch: ppc ppc64 %description HDF is a general purpose library and file format for storing scientific data. @@ -70,6 +71,9 @@ %{_libdir}/%{name}/ %changelog +* Fri Jul 29 2005 Orion Poplawski 4.2r1-3 +- Exclude ppc/ppc64 - HDF does not recognize it + * Wed Jul 20 2005 Orion Poplawski 4.2r1-2 - Fix BuildRequires to have autoconf From rc040203 at freenet.de Fri Jul 29 20:06:52 2005 From: rc040203 at freenet.de (Ralf Corsepius) Date: Fri, 29 Jul 2005 22:06:52 +0200 Subject: rpms/bluefish/devel bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE In-Reply-To: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> References: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> Message-ID: <1122667612.4941.164.camel@mccallum.corsepiu.local> On Fri, 2005-07-29 at 12:49 -0400, Paul Howarth wrote: > Author: pghmcfc > @@ -15,6 +15,7 @@ > BuildRequires: gettext > BuildRequires: gnome-vfs2-devel > BuildRequires: gtk2-devel >= 2.0.6 > +BuildRequires: libgnomeui >= 2.6 Why libgnomeui? Shouldn't that be libgnomeui-devel? Ralf From paul at city-fan.org Fri Jul 29 21:11:19 2005 From: paul at city-fan.org (Paul Howarth) Date: Fri, 29 Jul 2005 22:11:19 +0100 Subject: rpms/bluefish/devel bluefish.spec, 1.11, 1.12 sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 bluefish.desktop, 1.4, NONE In-Reply-To: <1122667612.4941.164.camel@mccallum.corsepiu.local> References: <200507291649.j6TGnm7s002242@cvs-int.fedora.redhat.com> <1122667612.4941.164.camel@mccallum.corsepiu.local> Message-ID: <1122671480.2851.108.camel@laurel.intra.city-fan.org> On Fri, 2005-07-29 at 22:06 +0200, Ralf Corsepius wrote: > On Fri, 2005-07-29 at 12:49 -0400, Paul Howarth wrote: > > Author: pghmcfc > > > @@ -15,6 +15,7 @@ > > BuildRequires: gettext > > BuildRequires: gnome-vfs2-devel > > BuildRequires: gtk2-devel >= 2.0.6 > > +BuildRequires: libgnomeui >= 2.6 > Why libgnomeui? Shouldn't that be libgnomeui-devel? Yes, it should. Good spot. I'd better let upstream know because the same mistake is in their spec file. Paul. -- Paul Howarth From fedora-extras-commits at redhat.com Fri Jul 29 21:13:46 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 17:13:46 -0400 Subject: rpms/bluefish/devel bluefish.spec,1.12,1.13 Message-ID: <200507292113.j6TLDlL0003594@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3577 Modified Files: bluefish.spec Log Message: wrong buildrequire Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/devel/bluefish.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bluefish.spec 29 Jul 2005 16:49:46 -0000 1.12 +++ bluefish.spec 29 Jul 2005 21:13:44 -0000 1.13 @@ -1,6 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK2 web development application for experienced users @@ -15,7 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libgnomeui >= 2.6 +BuildRequires: libgnomeui-devel >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -81,6 +81,9 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-2 +- buildrequire libgnomeui-devel, not libgnomeui + * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag From fedora-extras-commits at redhat.com Fri Jul 29 21:15:14 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 17:15:14 -0400 Subject: rpms/bluefish/FC-4 bluefish.spec,1.12,1.13 Message-ID: <200507292115.j6TLFEgm003677@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3660 Modified Files: bluefish.spec Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-4/bluefish.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bluefish.spec 29 Jul 2005 16:52:55 -0000 1.12 +++ bluefish.spec 29 Jul 2005 21:15:12 -0000 1.13 @@ -1,6 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK2 web development application for experienced users @@ -15,7 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libgnomeui >= 2.6 +BuildRequires: libgnomeui-devel >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -81,6 +81,9 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-2 +- buildrequire libgnomeui-devel, not libgnomeui + * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag From fedora-extras-commits at redhat.com Fri Jul 29 21:16:08 2005 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 29 Jul 2005 17:16:08 -0400 Subject: rpms/bluefish/FC-3 bluefish.spec,1.9,1.10 Message-ID: <200507292116.j6TLG89v003784@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/bluefish/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3738 Modified Files: bluefish.spec Log Message: resync with devel Index: bluefish.spec =================================================================== RCS file: /cvs/extras/rpms/bluefish/FC-3/bluefish.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bluefish.spec 29 Jul 2005 16:59:33 -0000 1.9 +++ bluefish.spec 29 Jul 2005 21:16:06 -0000 1.10 @@ -1,6 +1,6 @@ Name: bluefish Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK2 web development application for experienced users @@ -15,7 +15,7 @@ BuildRequires: gettext BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: libgnomeui >= 2.6 +BuildRequires: libgnomeui-devel >= 2.6 BuildRequires: pcre-devel >= 3.9 Requires(post): desktop-file-utils Requires(post): shared-mime-info @@ -81,6 +81,9 @@ %changelog +* Fri Jul 29 2005 Paul Howarth - 1.0.2-2 +- buildrequire libgnomeui-devel, not libgnomeui + * Fri Jul 29 2005 Paul Howarth - 1.0.2-1 - update to 1.0.2 - add dist tag From fedora-extras-commits at redhat.com Fri Jul 29 22:08:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:08:25 -0400 Subject: rpms/blacs/devel Bmake.inc, 1.2, 1.3 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.8, 1.9 Message-ID: <200507292208.j6TM8P2D005194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/devel Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: Fix INTFACE for gfortran, ppc Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc 12 Jul 2005 19:46:29 -0000 1.2 +++ Bmake.inc 29 Jul 2005 22:08:23 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc.64bit 12 Jul 2005 19:46:29 -0000 1.2 +++ Bmake.inc.64bit 29 Jul 2005 22:08:23 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- blacs.spec 29 Jul 2005 19:42:00 -0000 1.8 +++ blacs.spec 29 Jul 2005 22:08:23 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,6 +54,11 @@ cp -f %{SOURCE2} . %endif +# I'm not sure why ppc is different here. :/ +%ifarch ppc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C" ./Bmake.inc +%endif + %build cd BLACS/ make mpi @@ -107,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 +- fix INTFACE for FC-4+ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 - bump for new tag From fedora-extras-commits at redhat.com Fri Jul 29 22:08:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:08:22 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.8,1.9 Message-ID: <200507292208.j6TM8qft005197@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/FC-3 Modified Files: blacs.spec Log Message: Fix INTFACE for gfortran, ppc Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 +++ blacs.spec 29 Jul 2005 22:08:20 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 +- fix INTFACE for FC-4+ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 - bump for new tag From fedora-extras-commits at redhat.com Fri Jul 29 22:08:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:08:23 -0400 Subject: rpms/blacs/FC-4 Bmake.inc, 1.2, 1.3 Bmake.inc.64bit, 1.2, 1.3 blacs.spec, 1.8, 1.9 Message-ID: <200507292209.j6TM8u4s005204@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5137/FC-4 Modified Files: Bmake.inc Bmake.inc.64bit blacs.spec Log Message: Fix INTFACE for gfortran, ppc Index: Bmake.inc =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc 12 Jul 2005 19:46:24 -0000 1.2 +++ Bmake.inc 29 Jul 2005 22:08:21 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: Bmake.inc.64bit =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/Bmake.inc.64bit,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Bmake.inc.64bit 12 Jul 2005 19:46:24 -0000 1.2 +++ Bmake.inc.64bit 29 Jul 2005 22:08:21 -0000 1.3 @@ -101,7 +101,7 @@ # setting for your platform, compile and run BLACS/INSTALL/xintface. # Choices are: Add_, NoChange, UpCase, or f77IsF2C. # --------------------------------------------------------------------------- - INTFACE = -Df77IsF2C + INTFACE = -DAdd_ # ------------------------------------------------------------------------ # Allows the user to vary the topologies that the BLACS default topologies Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- blacs.spec 29 Jul 2005 19:41:54 -0000 1.8 +++ blacs.spec 29 Jul 2005 22:08:21 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,6 +54,11 @@ cp -f %{SOURCE2} . %endif +# I'm not sure why ppc is different here. :/ +%ifarch ppc +sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C" ./Bmake.inc +%endif + %build cd BLACS/ make mpi @@ -107,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 +- fix INTFACE for FC-4+ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-11 - bump for new tag From fedora-extras-commits at redhat.com Fri Jul 29 22:13:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:13:36 -0400 Subject: rpms/blacs/devel blacs.spec,1.9,1.10 Message-ID: <200507292213.j6TMDa5I005365@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314/devel Modified Files: blacs.spec Log Message: I will learn to type correctly. I will learn to type correctly. :/ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blacs.spec 29 Jul 2005 22:08:23 -0000 1.9 +++ blacs.spec 29 Jul 2005 22:13:34 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C" ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +- Fix typo in fix. :/ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 - fix INTFACE for FC-4+ From fedora-extras-commits at redhat.com Fri Jul 29 22:13:31 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:13:31 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.9,1.10 Message-ID: <200507292214.j6TME1ng005371@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314/FC-4 Modified Files: blacs.spec Log Message: I will learn to type correctly. I will learn to type correctly. :/ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blacs.spec 29 Jul 2005 22:08:21 -0000 1.9 +++ blacs.spec 29 Jul 2005 22:13:29 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C" ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +- Fix typo in fix. :/ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 - fix INTFACE for FC-4+ From fedora-extras-commits at redhat.com Fri Jul 29 22:13:30 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:13:30 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.9,1.10 Message-ID: <200507292214.j6TME0hk005370@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5314/FC-3 Modified Files: blacs.spec Log Message: I will learn to type correctly. I will learn to type correctly. :/ Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- blacs.spec 29 Jul 2005 22:08:20 -0000 1.9 +++ blacs.spec 29 Jul 2005 22:13:28 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -15,7 +15,7 @@ Source7: http://www.netlib.org/blacs/cblacsqref.ps Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit -BuildRequires: gcc-g77 +BuildRequires: gcc-gfortran # Lam before 7.1.1-5 is missing: # -shared library support # -fPIC compilation flag @@ -54,6 +54,11 @@ cp -f %{SOURCE2} . %endif +# I'm not sure why ppc is different here. :/ +%ifarch ppc +sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc +%endif + %build cd BLACS/ make mpi @@ -107,6 +112,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +- Fix typo in fix. :/ + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 - fix INTFACE for FC-4+ From fedora-extras-commits at redhat.com Fri Jul 29 22:17:08 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:17:08 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.10,1.11 Message-ID: <200507292217.j6TMH9VR005565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496/FC-3 Modified Files: blacs.spec Log Message: You ever hear the one about a monkey, a 67 Volkswagon Bug, and a pineapple upside down cake? Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blacs.spec 29 Jul 2005 22:13:28 -0000 1.10 +++ blacs.spec 29 Jul 2005 22:17:06 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:17:10 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:17:10 -0400 Subject: rpms/blacs/devel blacs.spec,1.10,1.11 Message-ID: <200507292217.j6TMHApb005580@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496/devel Modified Files: blacs.spec Log Message: You ever hear the one about a monkey, a 67 Volkswagon Bug, and a pineapple upside down cake? Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blacs.spec 29 Jul 2005 22:13:34 -0000 1.10 +++ blacs.spec 29 Jul 2005 22:17:08 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:17:09 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:17:09 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.10,1.11 Message-ID: <200507292217.j6TMH9YM005574@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5496/FC-4 Modified Files: blacs.spec Log Message: You ever hear the one about a monkey, a 67 Volkswagon Bug, and a pineapple upside down cake? Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- blacs.spec 29 Jul 2005 22:13:29 -0000 1.10 +++ blacs.spec 29 Jul 2005 22:17:07 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE =-Df77IsF2C"/g' ./Bmake.inc +sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-13 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:23:44 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 29 Jul 2005 18:23:44 -0400 Subject: rpms/quilt/FC-4 .cvsignore, 1.3, 1.4 quilt.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507292223.j6TMNimC005800@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5740/FC-4 Modified Files: .cvsignore quilt.spec sources Log Message: Update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 17:11:45 -0000 1.3 +++ .cvsignore 29 Jul 2005 22:23:42 -0000 1.4 @@ -1 +1 @@ -quilt-0.40.tar.gz +quilt-0.42.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/quilt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- quilt.spec 7 Jun 2005 03:12:30 -0000 1.6 +++ quilt.spec 29 Jul 2005 22:23:42 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.40 -Release: 3%{?dist} +Version: 0.42 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc README README.MAIL quilt.pdf -%doc AUTHORS BUGS COPYING TODO +%doc AUTHORS COPYING TODO %{_bindir}/guards %{_bindir}/quilt %{_datadir}/quilt/ @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 29 2005 - jwboyer at jdub.homelinux.org 0.42-1 +- Update to latest upstream + * Mon Jun 6 2005 - jwboyer at jdub.homelinux.org 0.40-3 - Remove hardcoded dist tags - Bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 17:11:45 -0000 1.3 +++ sources 29 Jul 2005 22:23:42 -0000 1.4 @@ -1 +1 @@ -12305c1b114e9ca0a31980117b65a903 quilt-0.40.tar.gz +c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 22:23:45 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 29 Jul 2005 18:23:45 -0400 Subject: rpms/quilt/devel .cvsignore, 1.3, 1.4 quilt.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507292223.j6TMNjrl005808@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5740/devel Modified Files: .cvsignore quilt.spec sources Log Message: Update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 17:11:45 -0000 1.3 +++ .cvsignore 29 Jul 2005 22:23:43 -0000 1.4 @@ -1 +1 @@ -quilt-0.40.tar.gz +quilt-0.42.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- quilt.spec 7 Jun 2005 03:11:52 -0000 1.6 +++ quilt.spec 29 Jul 2005 22:23:43 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.40 -Release: 3%{?dist} +Version: 0.42 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc README README.MAIL quilt.pdf -%doc AUTHORS BUGS COPYING TODO +%doc AUTHORS COPYING TODO %{_bindir}/guards %{_bindir}/quilt %{_datadir}/quilt/ @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 29 2005 - jwboyer at jdub.homelinux.org 0.42-1 +- Update to latest upstream + * Mon Jun 6 2005 - jwboyer at jdub.homelinux.org 0.40-3 - Remove hardcoded dist tags - Bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 17:11:45 -0000 1.3 +++ sources 29 Jul 2005 22:23:43 -0000 1.4 @@ -1 +1 @@ -12305c1b114e9ca0a31980117b65a903 quilt-0.40.tar.gz +c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 22:23:43 2005 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 29 Jul 2005 18:23:43 -0400 Subject: rpms/quilt/FC-3 .cvsignore, 1.3, 1.4 quilt.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200507292224.j6TMODTH005813@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/quilt/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5740/FC-3 Modified Files: .cvsignore quilt.spec sources Log Message: Update to 0.42 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 3 May 2005 17:16:37 -0000 1.3 +++ .cvsignore 29 Jul 2005 22:23:41 -0000 1.4 @@ -1 +1 @@ -quilt-0.40.tar.gz +quilt-0.42.tar.gz Index: quilt.spec =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/quilt.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- quilt.spec 7 Jun 2005 03:13:09 -0000 1.6 +++ quilt.spec 29 Jul 2005 22:23:41 -0000 1.7 @@ -6,8 +6,8 @@ Summary: Scripts for working with series of patches License: GPL Group: Development/Tools -Version: 0.40 -Release: 3%{?dist} +Version: 0.42 +Release: 1%{?dist} Source: http://savannah.nongnu.org/download/quilt/quilt-%{version}.tar.gz URL: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ %files -f %{name}.lang %defattr(-, root, root) %doc README README.MAIL quilt.pdf -%doc AUTHORS BUGS COPYING TODO +%doc AUTHORS COPYING TODO %{_bindir}/guards %{_bindir}/quilt %{_datadir}/quilt/ @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Fri Jul 29 2005 - jwboyer at jdub.homelinux.org 0.42-1 +- Update to latest upstream + * Mon Jun 6 2005 - jwboyer at jdub.homelinux.org 0.40-3 - Remove hardcoded dist tags - Bump release Index: sources =================================================================== RCS file: /cvs/extras/rpms/quilt/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 3 May 2005 17:16:37 -0000 1.3 +++ sources 29 Jul 2005 22:23:41 -0000 1.4 @@ -1 +1 @@ -12305c1b114e9ca0a31980117b65a903 quilt-0.40.tar.gz +c07d43f24f4a473cab4519732647086b quilt-0.42.tar.gz From fedora-extras-commits at redhat.com Fri Jul 29 22:27:24 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:27:24 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.11,1.12 Message-ID: <200507292227.j6TMRs2D005941@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894/FC-3 Modified Files: blacs.spec Log Message: ...and then the monkey says, well at least I'm not a Republican! Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blacs.spec 29 Jul 2005 22:17:06 -0000 1.11 +++ blacs.spec 29 Jul 2005 22:27:22 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc +sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:27:25 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:27:25 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.11,1.12 Message-ID: <200507292227.j6TMRtug005944@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894/FC-4 Modified Files: blacs.spec Log Message: ...and then the monkey says, well at least I'm not a Republican! Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blacs.spec 29 Jul 2005 22:17:07 -0000 1.11 +++ blacs.spec 29 Jul 2005 22:27:23 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc +sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From fedora-extras-commits at redhat.com Fri Jul 29 22:27:26 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 18:27:26 -0400 Subject: rpms/blacs/devel blacs.spec,1.11,1.12 Message-ID: <200507292227.j6TMRuFZ005947@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5894/devel Modified Files: blacs.spec Log Message: ...and then the monkey says, well at least I'm not a Republican! Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- blacs.spec 29 Jul 2005 22:17:08 -0000 1.11 +++ blacs.spec 29 Jul 2005 22:27:24 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -56,7 +56,7 @@ # I'm not sure why ppc is different here. :/ %ifarch ppc -sed -i 's/INTFACE =*/INTFACE = -Df77IsF2C"/g' ./Bmake.inc +sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc %endif %build @@ -112,7 +112,7 @@ %{_libdir}/libmpiblacs*.so %changelog -* Fri Jul 29 2005 Tom "spot" Callaway 1.1-14 +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ * Fri Jul 29 2005 Tom "spot" Callaway 1.1-12 From ivazquez at ivazquez.net Fri Jul 29 23:09:38 2005 From: ivazquez at ivazquez.net (Ignacio Vazquez-Abrams) Date: Fri, 29 Jul 2005 19:09:38 -0400 Subject: APPROVED: lzo2 Message-ID: <1122678578.302.7.camel@ignacio.lan> lzo2: Data compression library with very fast (de)compression LZO is a portable lossless data compression library written in ANSI C. It offers pretty fast compression and very fast decompression. Decompression requires no memory. In addition there are slower compression levels achieving a quite competitive compression ratio while still decompressing at this very high speed. Reviewer: Ignacio Vazquez-Abrams Maintainer: Alexander Dalloz -- Ignacio Vazquez-Abrams http://fedora.ivazquez.net/ gpg --keyserver hkp://subkeys.pgp.net --recv-key 38028b72 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part URL: From fedora-extras-commits at redhat.com Fri Jul 29 23:26:41 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:26:41 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.10,1.11 Message-ID: <200507292326.j6TNQfIB007412@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7395 Modified Files: scim-anthy.spec Log Message: - prereq scim xinput.d script - count scim-ja_JP providers before removing xinput.d alternative Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-anthy.spec 29 Jul 2005 14:31:26 -0000 1.10 +++ scim-anthy.spec 29 Jul 2005 23:26:39 -0000 1.11 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -12,6 +12,8 @@ Provides: scim-ja_JP Requires: anthy BuildRequires: scim-devel anthy-devel +# for alternatives in install scripts +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim %description Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input. @@ -40,22 +42,18 @@ %post -%{_sbindir}/alternatives --install /etc/X11/xinit/xinput.d/ja_JP xinput-ja_JP /etc/X11/xinit/xinput.d/scim 90 +%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim 85 %postun -if [ "$1" = 0 ] -then - if ! rpm -q --whatprovides scim-ja_JP - then - %{_sbindir}/alternatives --remove xinput-ja_JP /etc/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ] - then - %{_sbindir}/alternatives --auto xinput-ja_JP - fi - fi +if [ "$1" = "0" -a `rpm -q --whatprovides scim-ja_JP 2>/dev/null | wc -l` = 1 ]; then + %{_sbindir}/alternatives --remove xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim + if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]; then + %{_sbindir}/alternatives --auto xinput-ja_JP + fi fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO @@ -64,9 +62,17 @@ %changelog +* Fri Jul 29 2005 Jens Petersen +- prereq scim xinput.d script +- count scim-ja_JP providers before removing xinput.d alternative + +* Fri Jul 29 2005 Ryo Dairiki +- add xinput.d alternatives setup in %%post and %%postun +- provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if + no other scim-ja_JP left + * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release -- add xinput-scim entry (Ryo Diairki) * Tue Jul 26 2005 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 release From fedora-extras-commits at redhat.com Fri Jul 29 23:30:46 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:30:46 -0400 Subject: rpms/scim/FC-3 xinput-scim,1.2,1.3 Message-ID: <200507292330.j6TNUmpY007462@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7445 Modified Files: xinput-scim Log Message: really don't set XMODIFIERS in xinput.d script ;) Index: xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/xinput-scim,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xinput-scim 20 Jun 2005 14:33:06 -0000 1.2 +++ xinput-scim 29 Jul 2005 23:30:44 -0000 1.3 @@ -1,4 +1,3 @@ -XMODIFIERS=@im=SCIM XIM=SCIM XIM_PROGRAM=scim XIM_ARGS="-d" From fedora-extras-commits at redhat.com Fri Jul 29 23:37:56 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:37:56 -0400 Subject: rpms/scim/FC-4 scim.spec,1.10,1.11 Message-ID: <200507292337.j6TNbvBm007515@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7498 Modified Files: scim.spec Log Message: - own the system xinput.d dir Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim.spec 29 Jul 2005 13:56:11 -0000 1.10 +++ scim.spec 29 Jul 2005 23:37:54 -0000 1.11 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 3%{?dist} +Release: 2.1%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -95,7 +95,7 @@ %doc AUTHORS COPYING NEWS README ChangeLog TODO %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* -%{_sysconfdir}/X11/xinit/xinput.d/scim +%{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* %{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 @@ -117,7 +117,10 @@ %changelog -* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 +* Sat Jul 30 2005 Jens Petersen - 1.4.0-2.1 +- own the system xinput.d dir + +* Fri Jul 29 2005 Jens Petersen - sync with Core - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now From fedora-extras-commits at redhat.com Fri Jul 29 23:43:09 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 29 Jul 2005 19:43:09 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.11,1.12 Message-ID: <200507292343.j6TNhANw007613@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7596 Modified Files: scim-anthy.spec Log Message: tag changelog Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim-anthy.spec 29 Jul 2005 23:26:39 -0000 1.11 +++ scim-anthy.spec 29 Jul 2005 23:43:07 -0000 1.12 @@ -62,7 +62,7 @@ %changelog -* Fri Jul 29 2005 Jens Petersen +* Sat Jul 30 2005 Jens Petersen - 0.5.3-2 - prereq scim xinput.d script - count scim-ja_JP providers before removing xinput.d alternative From fedora-extras-commits at redhat.com Sat Jul 30 01:29:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:38 -0400 Subject: rpms/perl-Exporter-Lite - New directory Message-ID: <200507300129.j6U1TcpA010189@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10165/perl-Exporter-Lite Log Message: Directory /cvs/extras/rpms/perl-Exporter-Lite added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:29:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:39 -0400 Subject: rpms/perl-Exporter-Lite/devel - New directory Message-ID: <200507300129.j6U1Td4T010194@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10165/perl-Exporter-Lite/devel Log Message: Directory /cvs/extras/rpms/perl-Exporter-Lite/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:29:54 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:54 -0400 Subject: rpms/perl-Exporter-Lite Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300129.j6U1Ts7O010241@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10210 Added Files: Makefile import.log Log Message: Setup of module perl-Exporter-Lite --- NEW FILE Makefile --- # Top level Makefile for module perl-Exporter-Lite all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 01:29:55 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:29:55 -0400 Subject: rpms/perl-Exporter-Lite/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300129.j6U1Tt6N010246@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10210/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Exporter-Lite --- NEW 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 Jul 30 01:30:12 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:30:12 -0400 Subject: rpms/perl-Exporter-Lite import.log,1.1,1.2 Message-ID: <200507300130.j6U1Uhup010311@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10276 Modified Files: import.log Log Message: auto-import perl-Exporter-Lite-0.01-2 on branch devel from perl-Exporter-Lite-0.01-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Exporter-Lite/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 01:29:52 -0000 1.1 +++ import.log 30 Jul 2005 01:30:10 -0000 1.2 @@ -0,0 +1 @@ +perl-Exporter-Lite-0_01-2:HEAD:perl-Exporter-Lite-0.01-2.src.rpm:1122687067 From fedora-extras-commits at redhat.com Sat Jul 30 01:30:13 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:30:13 -0400 Subject: rpms/perl-Exporter-Lite/devel perl-Exporter-Lite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300130.j6U1UhRR010315@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Exporter-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10276/devel Modified Files: .cvsignore sources Added Files: perl-Exporter-Lite.spec Log Message: auto-import perl-Exporter-Lite-0.01-2 on branch devel from perl-Exporter-Lite-0.01-2.src.rpm --- NEW FILE perl-Exporter-Lite.spec --- Name: perl-Exporter-Lite Version: 0.01 Release: 2%{?dist} Summary: Lightweight exporting of variables Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Exporter-Lite/ Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Exporter-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Exporter-Lite-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{perl_vendorlib}/Exporter %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 0.01-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.01-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exporter-Lite/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 01:29:53 -0000 1.1 +++ .cvsignore 30 Jul 2005 01:30:11 -0000 1.2 @@ -0,0 +1 @@ +Exporter-Lite-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exporter-Lite/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 01:29:53 -0000 1.1 +++ sources 30 Jul 2005 01:30:11 -0000 1.2 @@ -0,0 +1 @@ +e45c93513ecb22e183748592069bdaf8 Exporter-Lite-0.01.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 01:35:40 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:35:40 -0400 Subject: rpms/perl-SQL-Abstract/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300135.j6U1ZeUw010479@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10447/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-SQL-Abstract --- NEW 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 Jul 30 01:35:39 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:35:39 -0400 Subject: rpms/perl-SQL-Abstract Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300135.j6U1ZdD8010474@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10447 Added Files: Makefile import.log Log Message: Setup of module perl-SQL-Abstract --- NEW FILE Makefile --- # Top level Makefile for module perl-SQL-Abstract all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 01:36:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:36:01 -0400 Subject: rpms/perl-SQL-Abstract import.log,1.1,1.2 Message-ID: <200507300136.j6U1a1g9010589@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10511 Modified Files: import.log Log Message: auto-import perl-SQL-Abstract-1.19-2 on branch devel from perl-SQL-Abstract-1.19-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 01:35:37 -0000 1.1 +++ import.log 30 Jul 2005 01:35:58 -0000 1.2 @@ -0,0 +1 @@ +perl-SQL-Abstract-1_19-2:HEAD:perl-SQL-Abstract-1.19-2.src.rpm:1122687415 From fedora-extras-commits at redhat.com Sat Jul 30 01:36:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:36:01 -0400 Subject: rpms/perl-SQL-Abstract/devel perl-SQL-Abstract.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300136.j6U1a1H2010596@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10511/devel Modified Files: .cvsignore sources Added Files: perl-SQL-Abstract.spec Log Message: auto-import perl-SQL-Abstract-1.19-2 on branch devel from perl-SQL-Abstract-1.19-2.src.rpm --- NEW FILE perl-SQL-Abstract.spec --- Name: perl-SQL-Abstract Version: 1.19 Release: 2%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/SQL-Abstract Source0: http://search.cpan.org/CPAN/authors/id/N/NW/NWIGER/SQL-Abstract-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n SQL-Abstract-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/SQL %{_mandir}/man3/*.3* %changelog * Fri Jul 8 2005 Tom "spot" Callaway 1.19-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.19-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 01:35:38 -0000 1.1 +++ .cvsignore 30 Jul 2005 01:35:59 -0000 1.2 @@ -0,0 +1 @@ +SQL-Abstract-1.19.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 01:35:38 -0000 1.1 +++ sources 30 Jul 2005 01:35:59 -0000 1.2 @@ -0,0 +1 @@ +d0e937d2f7781ed56c4ba855ee4ab47a SQL-Abstract-1.19.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 01:38:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:04 -0400 Subject: rpms/perl-Test-MockModule - New directory Message-ID: <200507300138.j6U1c4sT010989@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965/perl-Test-MockModule Log Message: Directory /cvs/extras/rpms/perl-Test-MockModule added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:38:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:04 -0400 Subject: rpms/perl-Test-MockModule/devel - New directory Message-ID: <200507300138.j6U1c4kP010994@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10965/perl-Test-MockModule/devel Log Message: Directory /cvs/extras/rpms/perl-Test-MockModule/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 01:38:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:20 -0400 Subject: rpms/perl-Test-MockModule Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300138.j6U1cKmR011041@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11010 Added Files: Makefile import.log Log Message: Setup of module perl-Test-MockModule --- NEW FILE Makefile --- # Top level Makefile for module perl-Test-MockModule all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 01:38:21 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:21 -0400 Subject: rpms/perl-Test-MockModule/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300138.j6U1cLYc011046@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11010/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Test-MockModule --- NEW 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 Jul 30 01:38:43 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:43 -0400 Subject: rpms/perl-Test-MockModule import.log,1.1,1.2 Message-ID: <200507300139.j6U1dERQ011108@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074 Modified Files: import.log Log Message: auto-import perl-Test-MockModule-0.05-3 on branch devel from perl-Test-MockModule-0.05-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockModule/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 01:38:18 -0000 1.1 +++ import.log 30 Jul 2005 01:38:41 -0000 1.2 @@ -0,0 +1 @@ +perl-Test-MockModule-0_05-3:HEAD:perl-Test-MockModule-0.05-3.src.rpm:1122687578 From fedora-extras-commits at redhat.com Sat Jul 30 01:38:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:38:44 -0400 Subject: rpms/perl-Test-MockModule/devel perl-Test-MockModule.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300139.j6U1dEu9011110@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Test-MockModule/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/devel Modified Files: .cvsignore sources Added Files: perl-Test-MockModule.spec Log Message: auto-import perl-Test-MockModule-0.05-3 on branch devel from perl-Test-MockModule-0.05-3.src.rpm --- NEW FILE perl-Test-MockModule.spec --- Name: perl-Test-MockModule Version: 0.05 Release: 3%{?dist} Summary: Override subroutines in a module for unit testing Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Test-MockModule/ Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMONFLK/Test-MockModule-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1, perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Test-MockModule-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Test %{_mandir}/man3/*.3* %changelog * Wed Jul 27 2005 Tom "spot" Callaway 0.05-3 - add missing BuildRequires * 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-Test-MockModule/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 01:38:19 -0000 1.1 +++ .cvsignore 30 Jul 2005 01:38:42 -0000 1.2 @@ -0,0 +1 @@ +Test-MockModule-0.05.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockModule/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 01:38:19 -0000 1.1 +++ sources 30 Jul 2005 01:38:42 -0000 1.2 @@ -0,0 +1 @@ +1b013aeeb221f83e7f325a2f98169296 Test-MockModule-0.05.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 01:45:20 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 21:45:20 -0400 Subject: owners owners.list,1.38,1.39 Message-ID: <200507300145.j6U1jKFn011362@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11341 Modified Files: owners.list Log Message: Add new entries for perl-Exporter-Lite, perl-SQL-Abstract, perl-Test-MockModule Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- owners.list 29 Jul 2005 17:25:23 -0000 1.38 +++ owners.list 30 Jul 2005 01:45:18 -0000 1.39 @@ -527,6 +527,7 @@ Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|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-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 @@ -588,6 +589,7 @@ 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-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-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -597,6 +599,7 @@ 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-Manifest|Test case module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Memory-Cycle|Check for memory leaks and circular memory references|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Jul 30 02:31:38 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 22:31:38 -0400 Subject: rpms/blacs/devel blacs.spec,1.12,1.13 Message-ID: <200507300231.j6U2VcSr012945@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898/devel Modified Files: blacs.spec Log Message: ppc hack not needed. Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blacs.spec 29 Jul 2005 22:27:24 -0000 1.12 +++ blacs.spec 30 Jul 2005 02:31:36 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,11 +54,6 @@ cp -f %{SOURCE2} . %endif -# I'm not sure why ppc is different here. :/ -%ifarch ppc -sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc -%endif - %build cd BLACS/ make mpi @@ -112,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 +- remove ppc hack + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ From fedora-extras-commits at redhat.com Sat Jul 30 02:31:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 22:31:32 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.12,1.13 Message-ID: <200507300232.j6U2W2GG012948@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898/FC-3 Modified Files: blacs.spec Log Message: ppc hack not needed. Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blacs.spec 29 Jul 2005 22:27:22 -0000 1.12 +++ blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,11 +54,6 @@ cp -f %{SOURCE2} . %endif -# I'm not sure why ppc is different here. :/ -%ifarch ppc -sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc -%endif - %build cd BLACS/ make mpi @@ -112,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 +- remove ppc hack + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ From fedora-extras-commits at redhat.com Sat Jul 30 02:31:32 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 22:31:32 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.12,1.13 Message-ID: <200507300232.j6U2W2s2012951@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12898/FC-4 Modified Files: blacs.spec Log Message: ppc hack not needed. Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blacs.spec 29 Jul 2005 22:27:23 -0000 1.12 +++ blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -54,11 +54,6 @@ cp -f %{SOURCE2} . %endif -# I'm not sure why ppc is different here. :/ -%ifarch ppc -sed -i -e 's/INTFACE = -DAdd_/INTFACE = -Df77IsF2C/g' ./Bmake.inc -%endif - %build cd BLACS/ make mpi @@ -112,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 +- remove ppc hack + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-15 - Fix typo in fix. :/ From jpo at di.uminho.pt Sat Jul 30 02:45:26 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 30 Jul 2005 03:45:26 +0100 Subject: APPROVED: perl-Lingua-EN-Inflect Message-ID: <42EAE9C6.3050905@di.uminho.pt> Name : perl-Lingua-EN-Inflect Version : 1.89 Release : 3 Summary : Convert singular to plural, select "a" or "an" Maintainer: Tom "spot" Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Sat Jul 30 02:46:54 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 30 Jul 2005 03:46:54 +0100 Subject: APPROVED: perl-Lingua-EN-Inflect-Number Message-ID: <42EAEA1E.2050605@di.uminho.pt> Name : perl-Lingua-EN-Inflect-Number Version : 1.1 Release : 3 Summary : Force number of words to singular or plural Maintainer: Tom "spot" Callaway Reviewer: Jose Pedro Oliveira -- 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 jpo at di.uminho.pt Sat Jul 30 03:08:06 2005 From: jpo at di.uminho.pt (=?ISO-8859-1?Q?Jos=E9_Pedro_Oliveira?=) Date: Sat, 30 Jul 2005 04:08:06 +0100 Subject: APPROVED: perl-CGI-Simple Message-ID: <42EAEF16.1090807@di.uminho.pt> Name : perl-CGI-Simple Version : 0.077 Release : 3 Summary : Simple totally OO CGI interface that is CGI.pm compliant Maintainer: Tom "spot" Callaway Reviewer: Jose Pedro Oliveira -- 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 Jul 30 03:09:03 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:03 -0400 Subject: rpms/perl-CGI-Simple - New directory Message-ID: <200507300309.j6U393UR014218@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14194/perl-CGI-Simple Log Message: Directory /cvs/extras/rpms/perl-CGI-Simple added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:09:04 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:04 -0400 Subject: rpms/perl-CGI-Simple/devel - New directory Message-ID: <200507300309.j6U394mc014223@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-serv14194/perl-CGI-Simple/devel Log Message: Directory /cvs/extras/rpms/perl-CGI-Simple/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:09:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:15 -0400 Subject: rpms/perl-CGI-Simple Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300309.j6U39F3n014273@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14239 Added Files: Makefile import.log Log Message: Setup of module perl-CGI-Simple --- NEW FILE Makefile --- # Top level Makefile for module perl-CGI-Simple all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- From fedora-extras-commits at redhat.com Sat Jul 30 03:09:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:15 -0400 Subject: rpms/perl-CGI-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300309.j6U39FSE014272@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-serv14239/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-CGI-Simple --- NEW FILE .cvsignore --- ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- From fedora-extras-commits at redhat.com Sat Jul 30 03:09:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:36 -0400 Subject: rpms/perl-CGI-Simple import.log,1.1,1.2 Message-ID: <200507300309.j6U39abg014334@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-CGI-Simple In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14303 Modified Files: import.log Log Message: auto-import perl-CGI-Simple-0.077-4 on branch devel from perl-CGI-Simple-0.077-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 03:09:12 -0000 1.1 +++ import.log 30 Jul 2005 03:09:34 -0000 1.2 @@ -0,0 +1 @@ +perl-CGI-Simple-0_077-4:HEAD:perl-CGI-Simple-0.077-4.src.rpm:1122693031 From fedora-extras-commits at redhat.com Sat Jul 30 03:09:36 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:09:36 -0400 Subject: rpms/perl-CGI-Simple/devel perl-CGI-Simple.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300309.j6U39aGD014341@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-serv14303/devel Modified Files: .cvsignore sources Added Files: perl-CGI-Simple.spec Log Message: auto-import perl-CGI-Simple-0.077-4 on branch devel from perl-CGI-Simple-0.077-4.src.rpm --- NEW FILE perl-CGI-Simple.spec --- Name: perl-CGI-Simple Version: 0.077 Release: 4%{?dist} Summary: Simple totally OO CGI interface that is CGI.pm compliant Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Cgi-Simple/ Source0: http://search.cpan.org/CPAN/authors/id/J/JF/JFREEMAN/Cgi-Simple-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Cgi-Simple-%{version} chmod -x Changes README cgi-simple_vs_cgi-pm.html Simple.pm Simple/*.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README cgi-simple_vs_cgi-pm.html %{perl_vendorlib}/CGI %{_mandir}/man3/*.3* %changelog * Fri Jul 29 2005 Tom "spot" Callaway 0.077-4 - cleanup chmod -x * Wed Jul 27 2005 Tom "spot" Callaway 0.077-3 - add missing documentation - fix URL * Fri Jul 8 2005 Tom "spot" Callaway 0.077-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 0.077-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 03:09:13 -0000 1.1 +++ .cvsignore 30 Jul 2005 03:09:34 -0000 1.2 @@ -0,0 +1 @@ +Cgi-Simple-0.077.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-CGI-Simple/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 03:09:13 -0000 1.1 +++ sources 30 Jul 2005 03:09:34 -0000 1.2 @@ -0,0 +1 @@ +5b947fe84b30a2c8ed050550f73b39a9 Cgi-Simple-0.077.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 03:11:48 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:11:48 -0400 Subject: rpms/perl-Lingua-EN-Inflect - New directory Message-ID: <200507300311.j6U3Bm4r014442@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14418/perl-Lingua-EN-Inflect Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:11:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:11:49 -0400 Subject: rpms/perl-Lingua-EN-Inflect/devel - New directory Message-ID: <200507300311.j6U3Bnns014447@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14418/perl-Lingua-EN-Inflect/devel Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:12:00 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:00 -0400 Subject: rpms/perl-Lingua-EN-Inflect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507300312.j6U3C0x7014494@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14463 Added Files: Makefile import.log Log Message: Setup of module perl-Lingua-EN-Inflect --- NEW FILE Makefile --- # Top level Makefile for module perl-Lingua-EN-Inflect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 03:12:01 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:01 -0400 Subject: rpms/perl-Lingua-EN-Inflect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300312.j6U3C1pk014499@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14463/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Lingua-EN-Inflect --- NEW 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 Jul 30 03:12:22 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:22 -0400 Subject: rpms/perl-Lingua-EN-Inflect import.log,1.1,1.2 Message-ID: <200507300312.j6U3CNDN014561@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527 Modified Files: import.log Log Message: auto-import perl-Lingua-EN-Inflect-1.89-3 on branch devel from perl-Lingua-EN-Inflect-1.89-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 03:11:58 -0000 1.1 +++ import.log 30 Jul 2005 03:12:20 -0000 1.2 @@ -0,0 +1 @@ +perl-Lingua-EN-Inflect-1_89-3:HEAD:perl-Lingua-EN-Inflect-1.89-3.src.rpm:1122693197 From fedora-extras-commits at redhat.com Sat Jul 30 03:12:23 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:12:23 -0400 Subject: rpms/perl-Lingua-EN-Inflect/devel perl-Lingua-EN-Inflect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300312.j6U3CNpp014563@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527/devel Modified Files: .cvsignore sources Added Files: perl-Lingua-EN-Inflect.spec Log Message: auto-import perl-Lingua-EN-Inflect-1.89-3 on branch devel from perl-Lingua-EN-Inflect-1.89-3.src.rpm --- NEW FILE perl-Lingua-EN-Inflect.spec --- Name: perl-Lingua-EN-Inflect Version: 1.89 Release: 3%{?dist} Summary: Convert singular to plural, select "a" or "an" Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Lingua-EN-Inflect/ Source0: http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Lingua-EN-Inflect-%{version} chmod -x Changes README lib/Lingua/EN/Inflect.pm %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Lingua/ %{_mandir}/man3/*.3* %changelog * Fri Jul 29 2005 Tom "spot" Callaway 1.89-3 - chmod -x files that don't need to be executable (hooray upstream) - own Lingua directory correctly * Fri Jul 8 2005 Tom "spot" Callaway 1.89-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.89-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 03:11:59 -0000 1.1 +++ .cvsignore 30 Jul 2005 03:12:21 -0000 1.2 @@ -0,0 +1 @@ +Lingua-EN-Inflect-1.89.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 03:11:59 -0000 1.1 +++ sources 30 Jul 2005 03:12:21 -0000 1.2 @@ -0,0 +1 @@ +ca864087a32754a8185d30fa677121ea Lingua-EN-Inflect-1.89.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 03:13:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:34 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number - New directory Message-ID: <200507300313.j6U3DYuN015004@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14981/perl-Lingua-EN-Inflect-Number Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:13:34 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:34 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number/devel - New directory Message-ID: <200507300313.j6U3DYJX015009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14981/perl-Lingua-EN-Inflect-Number/devel Log Message: Directory /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 03:13:49 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:49 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200507300313.j6U3DnCs015060@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15029 Added Files: Makefile import.log Log Message: Setup of module perl-Lingua-EN-Inflect-Number --- NEW FILE Makefile --- # Top level Makefile for module perl-Lingua-EN-Inflect-Number all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 03:13:50 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:13:50 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507300313.j6U3Dolj015065@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15029/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Lingua-EN-Inflect-Number --- NEW 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 Jul 30 03:14:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:14:15 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number import.log,1.1,1.2 Message-ID: <200507300314.j6U3EjiU015137@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15096 Modified Files: import.log Log Message: auto-import perl-Lingua-EN-Inflect-Number-1.1-3 on branch devel from perl-Lingua-EN-Inflect-Number-1.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 03:13:47 -0000 1.1 +++ import.log 30 Jul 2005 03:14:13 -0000 1.2 @@ -0,0 +1 @@ +perl-Lingua-EN-Inflect-Number-1_1-3:HEAD:perl-Lingua-EN-Inflect-Number-1.1-3.src.rpm:1122693307 From fedora-extras-commits at redhat.com Sat Jul 30 03:14:15 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:14:15 -0400 Subject: rpms/perl-Lingua-EN-Inflect-Number/devel perl-Lingua-EN-Inflect-Number.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507300314.j6U3El9L015141@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15096/devel Modified Files: .cvsignore sources Added Files: perl-Lingua-EN-Inflect-Number.spec Log Message: auto-import perl-Lingua-EN-Inflect-Number-1.1-3 on branch devel from perl-Lingua-EN-Inflect-Number-1.1-3.src.rpm --- NEW FILE perl-Lingua-EN-Inflect-Number.spec --- Name: perl-Lingua-EN-Inflect-Number Version: 1.1 Release: 3%{?dist} Summary: Force number of words to singular or plural Group: Development/Libraries License: Distributable #License: GPL or Artistic URL: http://search.cpan.org/dist/Lingua-EN-Inflect-Number/ Source0: http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Lingua::EN::Inflect) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. %prep %setup -q -n Lingua-EN-Inflect-Number-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/Lingua/EN/Inflect %{_mandir}/man3/*.3* %changelog * Fri Jul 29 2005 Tom "spot" Callaway 1.1-3 - remove superfluous Requires: perl(Lingua::EN::Inflect) - set License to Distributable until we know better * Fri Jul 8 2005 Tom "spot" Callaway 1.1-2 - cleanups * Wed Jul 6 2005 Tom "spot" Callaway 1.1-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 03:13:48 -0000 1.1 +++ .cvsignore 30 Jul 2005 03:14:13 -0000 1.2 @@ -0,0 +1 @@ +Lingua-EN-Inflect-Number-1.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 03:13:48 -0000 1.1 +++ sources 30 Jul 2005 03:14:13 -0000 1.2 @@ -0,0 +1 @@ +bcee940ef603da93e7da11d8eecad409 Lingua-EN-Inflect-Number-1.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 03:17:44 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 29 Jul 2005 23:17:44 -0400 Subject: owners owners.list,1.39,1.40 Message-ID: <200507300317.j6U3HiFB015339@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15322 Modified Files: owners.list Log Message: perl-CGI-Simple, perl-Lingua-EN-Inflect, perl-Lingua-EN-Inflect-Number Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- owners.list 30 Jul 2005 01:45:18 -0000 1.39 +++ owners.list 30 Jul 2005 03:17:42 -0000 1.40 @@ -511,6 +511,7 @@ Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-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-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-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org| 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 @@ -562,6 +563,8 @@ Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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-Mail-Alias|For bugs related to the perl-Mail-Alias component|anvil at livna.org|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-MailTools|MailTools 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 Sat Jul 30 04:14:24 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 30 Jul 2005 00:14:24 -0400 Subject: common tobuild,1.2163,1.2164 Message-ID: <200507300414.j6U4EOp2016851@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16834 Modified Files: tobuild Log Message: request build of rpms/proj/FC-4 proj-4_4_9-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2163 retrieving revision 1.2164 diff -u -r1.2163 -r1.2164 --- tobuild 29 Jul 2005 17:24:12 -0000 1.2163 +++ tobuild 30 Jul 2005 04:14:22 -0000 1.2164 @@ -59,3 +59,4 @@ ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 +smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 30 04:30:48 2005 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 30 Jul 2005 00:30:48 -0400 Subject: common tobuild,1.2164,1.2165 Message-ID: <200507300430.j6U4UmHk016962@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16948 Modified Files: tobuild Log Message: Remove proj for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2164 retrieving revision 1.2165 diff -u -r1.2164 -r1.2165 --- tobuild 30 Jul 2005 04:14:22 -0000 1.2164 +++ tobuild 30 Jul 2005 04:30:46 -0000 1.2165 @@ -15,7 +15,6 @@ thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-1_fc5 devel ixs rpms/perl-Crypt-Blowfish/devel perl-Crypt-Blowfish-2_09-2_fc5 devel thias rpms/gkrellm-freq/devel gkrellm-freq-0_1_1-2_fc5 devel -smccann rpms/proj/devel proj-4_4_9-1_fc5 devel ensc rpms/util-vserver/devel util-vserver-0_30_208-1_fc5 devel adrian rpms/nexuiz-data/devel nexuiz-data-1_1-1 devel thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel From fedora-extras-commits at redhat.com Sat Jul 30 06:12:24 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 02:12:24 -0400 Subject: rpms/scim/FC-4 scim.spec,1.11,1.12 Message-ID: <200507300612.j6U6COEA019353@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19336 Modified Files: scim.spec Log Message: disable ld verion script Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scim.spec 29 Jul 2005 23:37:54 -0000 1.11 +++ scim.spec 30 Jul 2005 06:12:22 -0000 1.12 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 2.1%{?dist} +Release: 2.2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -43,7 +43,8 @@ %build -%configure --disable-static --disable-ld-version-script +%configure --disable-static +# --disable-ld-version-script make %{?_smp_mflags} @@ -117,6 +118,9 @@ %changelog +* Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.2 +- disable ld-version-script, which used to enabled due to broken configure file + * Sat Jul 30 2005 Jens Petersen - 1.4.0-2.1 - own the system xinput.d dir From fedora-extras-commits at redhat.com Sat Jul 30 06:13:08 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 02:13:08 -0400 Subject: rpms/scim/FC-3 scim.spec,1.9,1.10 Message-ID: <200507300613.j6U6D8JZ019376@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19359 Modified Files: scim.spec Log Message: disable ld version script Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim.spec 29 Jul 2005 13:55:49 -0000 1.9 +++ scim.spec 30 Jul 2005 06:13:06 -0000 1.10 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 3%{?dist} +Release: 2.2%{?dist} Summary: Smart Common Input Method platform License: LGPL @@ -43,7 +43,8 @@ %build -%configure --disable-static --disable-ld-version-script +%configure --disable-static +# --disable-ld-version-script make %{?_smp_mflags} @@ -95,7 +96,7 @@ %doc AUTHORS COPYING NEWS README ChangeLog TODO %dir %{_sysconfdir}/scim %config(noreplace) %{_sysconfdir}/scim/* -%{_sysconfdir}/X11/xinit/xinput.d/scim +%{_sysconfdir}/X11/xinit/xinput.d %{_bindir}/* %{_libdir}/libscim*.so.* %{_libdir}/scim-1.0 @@ -117,7 +118,13 @@ %changelog -* Fri Jul 29 2005 Jens Petersen - 1.4.0-3 +* Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.2 +- disable ld-version-script, which used to enabled due to broken configure file + +* Sat Jul 30 2005 Jens Petersen - 1.4.0-2.1 +- own the system xinput.d dir + +* Fri Jul 29 2005 Jens Petersen - sync with Core - remove xinput alternatives settings out to IME packages - drop the old Chinese manual from docs for now From fedora-extras-commits at redhat.com Sat Jul 30 06:50:13 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 02:50:13 -0400 Subject: rpms/glunarclock/FC-4 glunarclock-0.32.4-bug149711.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.7, 1.8 sources, 1.4, 1.5 glunarclock-0.32.2-i18n_macro.patch, 1.1, NONE glunarclock-configure.in.patch, 1.1, NONE Message-ID: <200507300650.j6U6oDgD019502@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19478 Modified Files: .cvsignore glunarclock.spec sources Added Files: glunarclock-0.32.4-bug149711.patch Removed Files: glunarclock-0.32.2-i18n_macro.patch glunarclock-configure.in.patch Log Message: sync with devel update/fix glunarclock-0.32.4-bug149711.patch: --- NEW FILE glunarclock-0.32.4-bug149711.patch --- diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c --- glunarclock-0.32.4-orig/src/glunarclock.c 2005-04-06 12:51:29.000000000 +0200 +++ glunarclock-0.32.4/src/glunarclock.c 2005-07-25 00:39:56.000000000 +0200 @@ -154,14 +154,14 @@ gtk_toggle_button_get_active (toggle), NULL); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_dialog (GtkWidget *widget, MoonApplet *moon) { diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c --- glunarclock-0.32.4-orig/src/moondata.c 2005-01-04 18:28:43.000000000 +0100 +++ glunarclock-0.32.4/src/moondata.c 2005-07-25 00:39:55.000000000 +0200 @@ -219,14 +219,14 @@ mod_time(&moondata.LAT); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_data_dialog (GtkWidget *widget, MoonApplet *moon) { @@ -280,10 +280,10 @@ /* gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */ /* format_time(buf, size, moondata.NewMoon*24.0); */ - g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon); + g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon); gtk_label_set_text(GTK_LABEL(mw.flm), buf); - g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon)); + g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon)); gtk_label_set_text(GTK_LABEL(mw.nwm), buf); /* g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2005 16:42:01 -0000 1.4 +++ .cvsignore 30 Jul 2005 06:50:11 -0000 1.5 @@ -1,2 +1,2 @@ glunarclock-0.32.2-autoreconf.patch.bz2 -glunarclock-0.32.2.tar.gz +glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/glunarclock.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- glunarclock.spec 15 Apr 2005 00:38:26 -0000 1.7 +++ glunarclock.spec 30 Jul 2005 06:50:11 -0000 1.8 @@ -1,14 +1,12 @@ Name: glunarclock -Version: 0.32.2 -Release: 4 +Version: 0.32.4 +Release: 1%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz -Patch0: glunarclock-configure.in.patch -Patch1: glunarclock-0.32.2-autoreconf.patch.bz2 +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch2: glunarclock-0.32.2-i18n_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,12 +31,6 @@ %prep %setup -q -%ifarch x86_64 -# patch0 is normally only needed if you want to recreate patch1 -%patch0 -# was created after autoreconf -f -i and removing autom4te.cache/ -%patch1 -p1 -%endif %patch2 -p1 -b .i18n_macro %build @@ -95,6 +87,12 @@ %changelog +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-1 +- Update to 0.32.4. +- Fix compiler warnings bug #149711. +- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether + they are still needed. + * Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 - Add patch2 to fix build for FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 16:42:01 -0000 1.4 +++ sources 30 Jul 2005 06:50:11 -0000 1.5 @@ -1,2 +1,2 @@ 3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 -3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz +63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz --- glunarclock-0.32.2-i18n_macro.patch DELETED --- --- glunarclock-configure.in.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 30 06:51:21 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 02:51:21 -0400 Subject: rpms/glunarclock/devel glunarclock.spec,1.8,1.9 Message-ID: <200507300651.j6U6pLFo019563@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546 Modified Files: glunarclock.spec Log Message: Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- glunarclock.spec 24 Jul 2005 23:14:59 -0000 1.8 +++ glunarclock.spec 30 Jul 2005 06:51:18 -0000 1.9 @@ -7,8 +7,6 @@ License: GPL URL: http://glunarclock.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -#Patch0: glunarclock-configure.in.patch -#Patch1: glunarclock-0.32.2-autoreconf.patch.bz2 Patch2: glunarclock-0.32.2-i18n_macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -33,12 +31,6 @@ %prep %setup -q -#%ifarch x86_64 -# patch0 is normally only needed if you want to recreate patch1 -#%patch0 -# was created after autoreconf -f -i and removing autom4te.cache/ -#%patch1 -p1 -#%endif %patch2 -p1 -b .i18n_macro %build From fedora-extras-commits at redhat.com Sat Jul 30 07:02:09 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 03:02:09 -0400 Subject: common tobuild,1.2165,1.2166 Message-ID: <200507300702.j6U72Wh0020765@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20748 Modified Files: tobuild Log Message: request build of rpms/scim/FC-4 scim-1_4_0-2_2_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2165 retrieving revision 1.2166 diff -u -r1.2165 -r1.2166 --- tobuild 30 Jul 2005 04:30:46 -0000 1.2165 +++ tobuild 30 Jul 2005 07:02:04 -0000 1.2166 @@ -59,3 +59,4 @@ ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 +ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 From fedora-extras-commits at redhat.com Sat Jul 30 07:04:58 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 03:04:58 -0400 Subject: common tobuild,1.2166,1.2167 Message-ID: <200507300705.j6U75ScD020799@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20782 Modified Files: tobuild Log Message: request build of rpms/scim/FC-3 scim-1_4_0-2_2_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2166 retrieving revision 1.2167 diff -u -r1.2166 -r1.2167 --- tobuild 30 Jul 2005 07:02:04 -0000 1.2166 +++ tobuild 30 Jul 2005 07:04:56 -0000 1.2167 @@ -60,3 +60,4 @@ ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 +ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 From fedora-extras-commits at redhat.com Sat Jul 30 07:18:30 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 03:18:30 -0400 Subject: rpms/glunarclock/FC-4 glunarclock-0.32.2-i18n_macro.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 glunarclock.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200507300718.j6U7IU0Q020878@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20852 Modified Files: .cvsignore glunarclock.spec sources Added Files: glunarclock-0.32.2-i18n_macro.patch Log Message: put back a needed patch glunarclock-0.32.2-i18n_macro.patch: Index: glunarclock-0.32.2-i18n_macro.patch =================================================================== RCS file: glunarclock-0.32.2-i18n_macro.patch diff -N glunarclock-0.32.2-i18n_macro.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ glunarclock-0.32.2-i18n_macro.patch 30 Jul 2005 07:18:28 -0000 1.3 @@ -0,0 +1,11 @@ +diff -Nur glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c glunarclock-0.32.2/screen-exec/egg-screen-help.c +--- glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c 2003-03-10 13:02:08.000000000 +0100 ++++ glunarclock-0.32.2/screen-exec/egg-screen-help.c 2005-04-15 02:29:09.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Jul 2005 06:50:11 -0000 1.5 +++ .cvsignore 30 Jul 2005 07:18:28 -0000 1.6 @@ -1,2 +1 @@ -glunarclock-0.32.2-autoreconf.patch.bz2 glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/glunarclock.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- glunarclock.spec 30 Jul 2005 06:50:11 -0000 1.8 +++ glunarclock.spec 30 Jul 2005 07:18:28 -0000 1.9 @@ -1,13 +1,14 @@ Name: glunarclock Version: 0.32.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch2: glunarclock-0.32.2-i18n_macro.patch +Patch0: glunarclock-0.32.2-i18n_macro.patch +Patch1: glunarclock-0.32.4-bug149711.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -31,7 +32,9 @@ %prep %setup -q -%patch2 -p1 -b .i18n_macro +%patch0 -p1 -b .i18n_macro +%patch1 -p1 -b .bug149711 + %build %configure @@ -87,11 +90,10 @@ %changelog -* Mon Jul 25 2005 Michael Schwendt - 0.32.4-1 +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 - Update to 0.32.4. - Fix compiler warnings bug #149711. -- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether - they are still needed. +- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2). * Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 - Add patch2 to fix build for FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Jul 2005 06:50:11 -0000 1.5 +++ sources 30 Jul 2005 07:18:28 -0000 1.6 @@ -1,2 +1 @@ -3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 07:19:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 03:19:38 -0400 Subject: rpms/glunarclock/devel .cvsignore, 1.5, 1.6 glunarclock.spec, 1.9, 1.10 sources, 1.5, 1.6 glunarclock-configure.in.patch, 1.1, NONE Message-ID: <200507300719.j6U7JcPC020953@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20932 Modified Files: .cvsignore glunarclock.spec sources Removed Files: glunarclock-configure.in.patch Log Message: put back a needed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 Jul 2005 23:14:59 -0000 1.5 +++ .cvsignore 30 Jul 2005 07:19:36 -0000 1.6 @@ -1,2 +1 @@ -glunarclock-0.32.2-autoreconf.patch.bz2 glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/glunarclock.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- glunarclock.spec 30 Jul 2005 06:51:18 -0000 1.9 +++ glunarclock.spec 30 Jul 2005 07:19:36 -0000 1.10 @@ -1,13 +1,14 @@ Name: glunarclock Version: 0.32.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch2: glunarclock-0.32.2-i18n_macro.patch +Patch0: glunarclock-0.32.2-i18n_macro.patch +Patch1: glunarclock-0.32.4-bug149711.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -31,7 +32,9 @@ %prep %setup -q -%patch2 -p1 -b .i18n_macro +%patch0 -p1 -b .i18n_macro +%patch1 -p1 -b .bug149711 + %build %configure @@ -87,11 +90,10 @@ %changelog -* Mon Jul 25 2005 Michael Schwendt - 0.32.4-1 +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 - Update to 0.32.4. - Fix compiler warnings bug #149711. -- Disable x86_64 autoreconf patches (from 0.32.2-2) to see whether - they are still needed. +- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2). * Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 - Add patch2 to fix build for FC4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Jul 2005 23:14:59 -0000 1.5 +++ sources 30 Jul 2005 07:19:36 -0000 1.6 @@ -1,2 +1 @@ -3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz --- glunarclock-configure.in.patch DELETED --- From jwboyer at jdub.homelinux.org Sat Jul 30 13:04:37 2005 From: jwboyer at jdub.homelinux.org (Josh Boyer) Date: Sat, 30 Jul 2005 08:04:37 -0500 Subject: common tobuild,1.2163,1.2164 In-Reply-To: <200507300414.j6U4EOp2016851@cvs-int.fedora.redhat.com> References: <200507300414.j6U4EOp2016851@cvs-int.fedora.redhat.com> Message-ID: <1122728677.4755.9.camel@yoda.jdub.homelinux.org> On Sat, 2005-07-30 at 00:14 -0400, Shawn McCann wrote: > Author: smccann > > Update of /cvs/extras/common > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16834 > > Modified Files: > tobuild > Log Message: > request build of rpms/proj/FC-4 proj-4_4_9-1_fc4 for fc4 > > > Index: tobuild > =================================================================== > RCS file: /cvs/extras/common/tobuild,v > retrieving revision 1.2163 > retrieving revision 1.2164 > diff -u -r1.2163 -r1.2164 > --- tobuild 29 Jul 2005 17:24:12 -0000 1.2163 > +++ tobuild 30 Jul 2005 04:14:22 -0000 1.2164 > @@ -59,3 +59,4 @@ > ensc rpms/clamav/FC-4 clamav-0_86_2-4_fc4 fc4 > ensc rpms/clamav/devel clamav-0_86_2-4_fc5 devel > ensc rpms/clamav/FC-3 clamav-0_86_2-4_fc3 fc3 > +smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 The tobuild file no longer works. Please use 'make plague' after reading: http://www.fedoraproject.org/wiki/Extras/BuildSystemClientSetup josh From fedora-extras-commits at redhat.com Sat Jul 30 13:49:47 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 09:49:47 -0400 Subject: rpms/scim/FC-4 .cvsignore,1.3,1.4 Message-ID: <200507301349.j6UDnlft028781@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28764 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 May 2005 01:35:21 -0000 1.3 +++ .cvsignore 30 Jul 2005 13:49:44 -0000 1.4 @@ -1 +1,2 @@ scim-1.2.3.tar.gz +update-scim-locale From fedora-extras-commits at redhat.com Sat Jul 30 13:51:17 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 09:51:17 -0400 Subject: rpms/scim/FC-4 .cvsignore,1.4,1.5 Message-ID: <200507301351.j6UDpLxf028816@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28799 Modified Files: .cvsignore Log Message: Add update-scim-locale script Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jul 2005 13:49:44 -0000 1.4 +++ .cvsignore 30 Jul 2005 13:51:15 -0000 1.5 @@ -1,2 +1 @@ scim-1.2.3.tar.gz -update-scim-locale From fedora-extras-commits at redhat.com Sat Jul 30 14:29:02 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:29:02 -0400 Subject: rpms/scim/FC-4 update-xinput-scim,NONE,1.1 scim.spec,1.12,1.13 Message-ID: <200507301429.j6UET2xh030111@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30093 Modified Files: scim.spec Added Files: update-xinput-scim Log Message: Import update-xinput-scim --- NEW FILE update-xinput-scim --- #!/usr/bin/python # please someone put good comments on this script. import os, sys, re alternatives_bin = "/usr/sbin/alternatives" locale_bin = "locale" readlink_bin = "readlink" rpm_bin = "rpm" sysconf_dir = "/etc" alternatives_dir = sysconf_dir + "/alternatives" xinput_dir = sysconf_dir + "/X11/xinit/xinput.d" xinput_scim = xinput_dir + "/scim" default_priority = 85 # FIXME I'm not sure if this is correct valid_locale_pattern = re.compile("^[a-z][a-z]_[A-Z][A-Z]$") script_name = "update-scim-locale" authorization_rejected_message = script_name + ": you must be root to run this script" invalid_locale_message = script_name + ": invalid locale" too_few_arguments_message = script_name + ": too few arguments" unknwon_command_message = script_name + ": unknown command" # FIXME authorization_rejected_returncode = 1 invalid_locale_returncode = 2 too_few_arguments_returncode = 3 unknwon_command_returncode = 4 locales = [] def check_authorization(): uid = os.getuid() if uid != 0: print authorization_rejected_message sys.exit(authorization_rejected_returncode) def load_locales(): (fi, fo) = os.popen2(locale_bin + " --all") for locale in fo: locale = locale.strip() if valid_locale_pattern.match(locale) and not locale in locales: locales.append(locale) fi.close() fo.close() def check_locale(locale): if len(locales) == 0: load_locales() if not locale in locales: print invalid_locale_message + " :" + locale sys.exit(invalid_locale_returncode) def install_alternative(locale, priority): check_locale(locale) if priority == -1: priority = default_priority xinput_locale = "xinput-" + locale os.system(alternatives_bin + " --install %s/%s %s " %(xinput_dir, locale, xinput_locale) + xinput_scim + " %s" %priority) def remove_alternative(locale): check_locale(locale) scim_locale = "scim-" + locale xinput_locale = "xinput-" + locale (fi, fo) = os.popen2(rpm_bin + " -q --whatprovides " + scim_locale + " 2>/dev/null | wc -l") input_method_count = int(fo.readline()) fi.close() fo.close() if input_method_count <= 1: # there is no more input method for this locale os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim) # check the current input method (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) current_xinput = fo.readline() fi.close() fo.close() if current_xinput == xinput_scim: # change the input method, as scim won't support this locale anymore. os.system(alternatives_bin + " --auto " + xinput_locale) # FIXME def main(): args = sys.argv if len(args) == 1: print too_few_arguments_message sys.exit(too_few_arguments_returncode) if args[1] == "install": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] if len(args) >= 4: priority = args[3] else: priority = -1 install_alternative(locale, priority) elif args[1] == "remove": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] remove_alternative(locale) else: print unknown_command_message + ": " + args[1] sys.exit(unknwon_command_returncode) # main check_authorization() main() Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim.spec 30 Jul 2005 06:12:22 -0000 1.12 +++ scim.spec 30 Jul 2005 14:28:59 -0000 1.13 @@ -9,6 +9,7 @@ URL: http://www.scim-im.org/ Source0: http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz Source1: xinput-scim +Source2: update-xinput-scim BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: %{_bindir}/update-gtk-immodules @@ -72,6 +73,9 @@ mkdir -pm 755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim +# install update-xinput-scim script. +install -pm 644 ${SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim + %find_lang %{name} @@ -118,6 +122,9 @@ %changelog +* Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.3 +- add update-xinput-scim + * Sat Jul 30 2005 Ryo Dairiki - 1.4.0-2.2 - disable ld-version-script, which used to enabled due to broken configure file From fedora-extras-commits at redhat.com Sat Jul 30 14:29:43 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:29:43 -0400 Subject: rpms/scim/FC-4 scim.spec,1.13,1.14 Message-ID: <200507301429.j6UEThJI030135@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30118 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scim.spec 30 Jul 2005 14:28:59 -0000 1.13 +++ scim.spec 30 Jul 2005 14:29:41 -0000 1.14 @@ -1,7 +1,7 @@ Name: scim Version: 1.4.0 # must be less than the release number of scim in Core -Release: 2.2%{?dist} +Release: 2.3%{?dist} Summary: Smart Common Input Method platform License: LGPL From fedora-extras-commits at redhat.com Sat Jul 30 14:47:52 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:47:52 -0400 Subject: rpms/scim/FC-4 scim.spec,1.14,1.15 Message-ID: <200507301447.j6UElqlN030189@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30172 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim.spec 30 Jul 2005 14:29:41 -0000 1.14 +++ scim.spec 30 Jul 2005 14:47:50 -0000 1.15 @@ -74,7 +74,7 @@ install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim # install update-xinput-scim script. -install -pm 644 ${SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim +install -pm 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim %find_lang %{name} From fedora-extras-commits at redhat.com Sat Jul 30 14:56:37 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:56:37 -0400 Subject: rpms/scim/FC-4 scim.spec,1.15,1.16 Message-ID: <200507301456.j6UEub3D030230@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30210 Modified Files: scim.spec Log Message: Index: scim.spec =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/scim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim.spec 30 Jul 2005 14:47:50 -0000 1.15 +++ scim.spec 30 Jul 2005 14:56:35 -0000 1.16 @@ -74,7 +74,7 @@ install -pm 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim # install update-xinput-scim script. -install -pm 644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim +install -pm 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/update-xinput-scim %find_lang %{name} From fedora-extras-commits at redhat.com Sat Jul 30 14:58:10 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:58:10 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.12,1.13 Message-ID: <200507301458.j6UEwAW5030262@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30245 Modified Files: scim-anthy.spec Log Message: Modify to use update-xinput-scim script Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-anthy.spec 29 Jul 2005 23:43:07 -0000 1.12 +++ scim-anthy.spec 30 Jul 2005 14:58:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: scim-anthy Version: 0.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -42,15 +42,12 @@ %post -%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinput.d/ja_JP xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim 85 +%{_libdir}/scim-1.0/update-xinput-scim install ja_JP %postun -if [ "$1" = "0" -a `rpm -q --whatprovides scim-ja_JP 2>/dev/null | wc -l` = 1 ]; then - %{_sbindir}/alternatives --remove xinput-ja_JP %{_sysconfdir}/X11/xinit/xinput.d/scim - if [ `readlink %{_sysconfdir}/alternatives/xinput-ja_JP` = "%{_sysconfdir}/X11/xinit/xinput.d/scim" ]; then - %{_sbindir}/alternatives --auto xinput-ja_JP - fi +if [ "$1" = "0"]; then + %{_libdir}/scim-1.0/update-xinput-scim remove ja_JP fi @@ -62,6 +59,9 @@ %changelog +* Sat Jul 30 2005 Ryo Dairiki - 0.5.3-3 +- modify to use update-xinput-scim script + * Sat Jul 30 2005 Jens Petersen - 0.5.3-2 - prereq scim xinput.d script - count scim-ja_JP providers before removing xinput.d alternative From fedora-extras-commits at redhat.com Sat Jul 30 14:59:51 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 10:59:51 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.13,1.14 Message-ID: <200507301459.j6UExpAJ030296@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30277 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scim-anthy.spec 30 Jul 2005 14:58:08 -0000 1.13 +++ scim-anthy.spec 30 Jul 2005 14:59:49 -0000 1.14 @@ -13,7 +13,7 @@ Requires: anthy BuildRequires: scim-devel anthy-devel # for alternatives in install scripts -PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description Scim-anthy is a SCIM IMEngine module for anthy to support Japanese input. From fedora-extras-commits at redhat.com Sat Jul 30 15:05:33 2005 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Sat, 30 Jul 2005 11:05:33 -0400 Subject: extras-buildsys/server UserInterface.py,1.36,1.37 Message-ID: <200507301506.j6UF64ub031438@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31421 Modified Files: UserInterface.py Log Message: make sure resolve_target looks at the master targets, too, not just the aliases Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- UserInterface.py 29 Jul 2005 07:13:53 -0000 1.36 +++ UserInterface.py 30 Jul 2005 15:05:19 -0000 1.37 @@ -83,7 +83,11 @@ for master_target in client_target_map.keys(): if not target_dict.has_key(master_target): # make sure we build it continue # if not, move along + + if target_dict.has_key(resolved_target): # it's one of the masters + return resolved_target + # do the aliases for alias in client_target_map[master_target]: if resolved_target.lower() == alias.lower(): return master_target From fedora-extras-commits at redhat.com Sat Jul 30 15:08:31 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 11:08:31 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.14,1.15 Message-ID: <200507301508.j6UF8V7g031479@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31450 Modified Files: scim-anthy.spec Log Message: Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- scim-anthy.spec 30 Jul 2005 14:59:49 -0000 1.14 +++ scim-anthy.spec 30 Jul 2005 15:08:29 -0000 1.15 @@ -46,7 +46,7 @@ %postun -if [ "$1" = "0"]; then +if [ "$1" = "0" ]; then %{_libdir}/scim-1.0/update-xinput-scim remove ja_JP fi From fedora-extras-commits at redhat.com Sat Jul 30 16:26:35 2005 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sat, 30 Jul 2005 12:26:35 -0400 Subject: rpms/fontforge/devel .cvsignore, 1.6, 1.7 fontforge.spec, 1.10, 1.11 sources, 1.6, 1.7 fontforge-20040618-docview.patch, 1.1, NONE Message-ID: <200507301626.j6UGQZO4000357@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/fontforge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv336 Modified Files: .cvsignore fontforge.spec sources Removed Files: fontforge-20040618-docview.patch Log Message: * Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc5 - Update to 20050729 - Remove .docview patch, looking for HTMLview is upstream so no longer needed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 10 May 2005 19:31:10 -0000 1.6 +++ .cvsignore 30 Jul 2005 16:26:33 -0000 1.7 @@ -4,3 +4,5 @@ fontforge_htdocs-20050310.tgz fontforge_full-20050502.tgz fontforge_htdocs-20050503.tgz +fontforge_full-20050729.tgz +fontforge_htdocs-20050729.tgz Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fontforge.spec 10 May 2005 19:31:10 -0000 1.10 +++ fontforge.spec 30 Jul 2005 16:26:33 -0000 1.11 @@ -1,15 +1,14 @@ Name: fontforge Version: 0.0 -Release: 2.20050502.fc4 +Release: 2.20050729.fc5 Summary: Outline and bitmap font editor Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20050729.tgz Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050503.tgz -Patch1: fontforge-20040618-docview.patch +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050729.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -31,8 +30,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050502 -%patch1 -p2 -b .docview +%setup -q -n %{name}-20050729 mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -102,6 +100,10 @@ %changelog +* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc5 +- Update to 20050729 +- Remove .docview patch, looking for HTMLview is upstream so no longer needed + * Tue May 10 2005 Owen Taylor - 0.0-2.20050502.fc4 - Update to 20050502 - Fix the build to look for the docs where we install them Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 May 2005 19:31:10 -0000 1.6 +++ sources 30 Jul 2005 16:26:33 -0000 1.7 @@ -1,2 +1,2 @@ -6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz -1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz +81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz +3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz --- fontforge-20040618-docview.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 30 16:39:31 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 30 Jul 2005 12:39:31 -0400 Subject: rpms/loudmouth/FC-4 loudmouth.spec,1.4,1.5 Message-ID: <200507301639.j6UGdVSK000460@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv443 Modified Files: loudmouth.spec Log Message: * Sat Jul 30 2005 Brian Pepple - 0.90 - Fix description. Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/FC-4/loudmouth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- loudmouth.spec 13 May 2005 14:40:55 -0000 1.4 +++ loudmouth.spec 30 Jul 2005 16:39:29 -0000 1.5 @@ -2,7 +2,7 @@ Name: loudmouth Version: 0.90 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -24,7 +24,6 @@ Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. -7%{?dist} %package devel Summary: Development files for Loudmouth @@ -85,6 +84,9 @@ %changelog +* Sat Jul 30 2005 Brian Pepple - 0.90 +- Fix description. + * Fri May 13 2005 Brian Pepple - 0.90-2 - Add dist tag. From fedora-extras-commits at redhat.com Sat Jul 30 16:40:03 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 30 Jul 2005 12:40:03 -0400 Subject: rpms/loudmouth/devel loudmouth.spec,1.4,1.5 Message-ID: <200507301640.j6UGe3Ew000488@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/loudmouth/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471 Modified Files: loudmouth.spec Log Message: * Sat Jul 30 2005 Brian Pepple - 0.90-4 - Fix description. Index: loudmouth.spec =================================================================== RCS file: /cvs/extras/rpms/loudmouth/devel/loudmouth.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- loudmouth.spec 13 May 2005 14:40:55 -0000 1.4 +++ loudmouth.spec 30 Jul 2005 16:40:01 -0000 1.5 @@ -2,7 +2,7 @@ Name: loudmouth Version: 0.90 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Loudmouth is a Jabber programming library written in C Group: System Environment/Libraries @@ -24,7 +24,6 @@ Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol. It's designed to be easy to get started with and yet extensible to let you do anything the Jabber protocol allows. -7%{?dist} %package devel Summary: Development files for Loudmouth @@ -85,6 +84,9 @@ %changelog +* Sat Jul 30 2005 Brian Pepple - 0.90-4 +- Fix description. + * Fri May 13 2005 Brian Pepple - 0.90-2 - Add dist tag. From fedora-extras-commits at redhat.com Sat Jul 30 16:44:57 2005 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sat, 30 Jul 2005 12:44:57 -0400 Subject: rpms/fontforge/FC-4 fontforge.spec,1.10,1.11 sources,1.6,1.7 Message-ID: <200507301644.j6UGiveM000530@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/fontforge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv511 Modified Files: fontforge.spec sources Log Message: * Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc4 - Update to 20050729 - Remove .docview patch, looking for HTMLview is upstream so no longer needed Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/fontforge.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- fontforge.spec 10 May 2005 19:31:10 -0000 1.10 +++ fontforge.spec 30 Jul 2005 16:44:54 -0000 1.11 @@ -6,10 +6,9 @@ Group: Applications/Publishing License: BSD URL: http://fontforge.sourceforge.net/ -Source0: http://dl.sf.net/fontforge/fontforge_full-20050502.tgz +Source0: http://dl.sf.net/fontforge/fontforge_full-20050729.tgz Source1: fontforge.desktop -Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050503.tgz -Patch1: fontforge-20040618-docview.patch +Source2: http://dl.sf.net/fontforge/fontforge_htdocs-20050729.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -31,8 +30,7 @@ (Type2) and CID-keyed fonts. %prep -%setup -q -n %{name}-20050502 -%patch1 -p2 -b .docview +%setup -q -n %{name}-20050729 mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -102,6 +100,10 @@ %changelog +* Sat Jul 30 2005 Owen Taylor - 0.0-2.20050729.fc4 +- Update to 20050729 +- Remove .docview patch, looking for HTMLview is upstream so no longer needed + * Tue May 10 2005 Owen Taylor - 0.0-2.20050502.fc4 - Update to 20050502 - Fix the build to look for the docs where we install them Index: sources =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 10 May 2005 19:31:10 -0000 1.6 +++ sources 30 Jul 2005 16:44:54 -0000 1.7 @@ -1,2 +1,2 @@ -6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz -1f8de0694c7955ee8de268e70ab70e37 fontforge_htdocs-20050503.tgz +81d8097c49ec559475664e6e26ecfb38 fontforge_full-20050729.tgz +3d42637f467c0344bb952cbc2b657aaa fontforge_htdocs-20050729.tgz From fedora-extras-commits at redhat.com Sat Jul 30 16:45:42 2005 From: fedora-extras-commits at redhat.com (Owen Taylor (otaylor)) Date: Sat, 30 Jul 2005 12:45:42 -0400 Subject: rpms/fontforge/FC-4 fontforge.spec,1.11,1.12 Message-ID: <200507301645.j6UGjgGf000587@cvs-int.fedora.redhat.com> Author: otaylor Update of /cvs/extras/rpms/fontforge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv570 Modified Files: fontforge.spec Log Message: Fix version Index: fontforge.spec =================================================================== RCS file: /cvs/extras/rpms/fontforge/FC-4/fontforge.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- fontforge.spec 30 Jul 2005 16:44:54 -0000 1.11 +++ fontforge.spec 30 Jul 2005 16:45:40 -0000 1.12 @@ -1,6 +1,6 @@ Name: fontforge Version: 0.0 -Release: 2.20050502.fc4 +Release: 2.20050729.fc4 Summary: Outline and bitmap font editor Group: Applications/Publishing From fedora-extras-commits at redhat.com Sat Jul 30 17:21:05 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:05 -0400 Subject: rpms/krecipes - New directory Message-ID: <200507301721.j6UHL5uI001907@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1887/krecipes Log Message: Directory /cvs/extras/rpms/krecipes added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 17:21:05 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:05 -0400 Subject: rpms/krecipes/devel - New directory Message-ID: <200507301721.j6UHL5t9001912@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1887/krecipes/devel Log Message: Directory /cvs/extras/rpms/krecipes/devel added to the repository From fedora-extras-commits at redhat.com Sat Jul 30 17:21:17 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:17 -0400 Subject: rpms/krecipes Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200507301721.j6UHLHeW001959@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1932 Added Files: Makefile import.log Log Message: Setup of module krecipes --- NEW FILE Makefile --- # Top level Makefile for module krecipes all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Jul 30 17:21:18 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:21:18 -0400 Subject: rpms/krecipes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200507301721.j6UHLISN001964@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1932/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module krecipes --- NEW 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 Jul 30 17:23:14 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:23:14 -0400 Subject: rpms/krecipes import.log,1.1,1.2 Message-ID: <200507301723.j6UHNiqL002043@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2003 Modified Files: import.log Log Message: auto-import krecipes-0.8.1-1.fc4 on branch devel from krecipes-0.8.1-1.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/krecipes/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Jul 2005 17:21:15 -0000 1.1 +++ import.log 30 Jul 2005 17:23:12 -0000 1.2 @@ -0,0 +1 @@ +krecipes-0_8_1-1_fc4:HEAD:krecipes-0.8.1-1.fc4.src.rpm:1122744149 From fedora-extras-commits at redhat.com Sat Jul 30 17:23:14 2005 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Sat, 30 Jul 2005 13:23:14 -0400 Subject: rpms/krecipes/devel krecipes-gcc4.patch, NONE, 1.1 krecipes.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200507301723.j6UHNEA0002036@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/krecipes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2003/devel Modified Files: .cvsignore sources Added Files: krecipes-gcc4.patch krecipes.spec Log Message: auto-import krecipes-0.8.1-1.fc4 on branch devel from krecipes-0.8.1-1.fc4.src.rpm krecipes-gcc4.patch: --- NEW FILE krecipes-gcc4.patch --- --- kmymoney2-0.7.4/configure 2005-07-18 10:49:10.000000000 -0500 +++ kmymoney2-0.7.4.temp/configure 2005-07-24 11:49:09.000000000 -0500 @@ -4230,93 +4230,6 @@ - echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 -echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6 - - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef __GNUC__ -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 -choke me -#endif -#endif - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - kde_bad_compiler=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -kde_bad_compiler=yes - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 -echo "${ECHO_T}$kde_bad_compiler" >&6 - -if test "$kde_bad_compiler" = "yes"; then - { { echo "$as_me:$LINENO: error: - -This particular compiler version is blacklisted because it -is known to miscompile KDE. Please use a newer version, or -if that is not yet available, choose an older version. - -Please do not report a bug or bother us reporting this -configure error. We know about it, and we introduced -it by intention to avoid untraceable bugs or crashes in KDE. - -" >&5 -echo "$as_me: error: - -This particular compiler version is blacklisted because it -is known to miscompile KDE. Please use a newer version, or -if that is not yet available, choose an older version. - -Please do not report a bug or bother us reporting this -configure error. We know about it, and we introduced -it by intention to avoid untraceable bugs or crashes in KDE. - -" >&2;} - { (exit 1); exit 1; }; } -fi - - if test "$GXX" = "yes" || test "$CXX" = "KCC"; then if test "$kde_use_debug_code" != "no"; then --- NEW FILE krecipes.spec --- Name: krecipes Version: 0.8.1 Release: 1%{?dist} Summary: Krecipes: Your Way to Cook with Tux! Group: Applications/Productivity License: GPL URL: http://krecipes.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/krecipes/krecipes-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel > 3.1, sqlite-devel Requires: kdebase >= 3.1, qt-MySQL, qt-PostgreSQL, sqlite patch0: krecipes-gcc4.patch %description Krecipes is a program that lets you to manage your recipes, create shopping lists, choose a recipe based on available ingredients and plan your menu/diet in advance. Supports MySQL, Postgres and sqlite backends. %prep %setup -q %patch0 -p1 -b .gcc4 %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor=fedora \ --add-category=X-Fedora \ --add-category=Application \ --add-category=Utility \ --add-category=KDE \ --add-category=Qt \ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/krecipes.desktop ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do lang=$(basename $lang_dir) echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc %{_bindir}/krecipes %{_datadir}/applications/fedora-krecipes.desktop %{_datadir}/apps/krecipes %{_datadir}/icons/hicolor/*/apps/* %changelog * Sun Jul 24 2005 - 0.8.1-1%{?dist} - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Jul 2005 17:21:16 -0000 1.1 +++ .cvsignore 30 Jul 2005 17:23:12 -0000 1.2 @@ -0,0 +1 @@ +krecipes-0.8.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/krecipes/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Jul 2005 17:21:16 -0000 1.1 +++ sources 30 Jul 2005 17:23:12 -0000 1.2 @@ -0,0 +1 @@ +f9049384bad2139f049b9b4eadd7239a krecipes-0.8.1.tar.gz From fedora-extras-commits at redhat.com Sat Jul 30 18:18:40 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 30 Jul 2005 14:18:40 -0400 Subject: rpms/moomps/FC-3 moomps.spec,1.6,1.7 Message-ID: <200507301818.j6UIIeiE003528@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3509 Modified Files: moomps.spec Log Message: increased release as I suspect sources weren't tagged right Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-3/moomps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- moomps.spec 1 Jul 2005 23:36:32 -0000 1.6 +++ moomps.spec 30 Jul 2005 18:18:38 -0000 1.7 @@ -1,6 +1,6 @@ Name: moomps Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: Powerful modular monitoring service Group: Applications/System @@ -79,6 +79,9 @@ %changelog +* Sat Jul 30 2005 Jean-Luc Fontaine 0:5.2-2 +- increased release as I suspect sources weren't tagged right + * Sun Jun 26 2005 Jean-Luc Fontaine 0:5.2-1 - 5.2 source release From fedora-extras-commits at redhat.com Sat Jul 30 18:49:55 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 30 Jul 2005 14:49:55 -0400 Subject: rpms/moomps/FC-4 moomps.spec,1.5,1.6 Message-ID: <200507301849.j6UIntrU003667@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3650 Modified Files: moomps.spec Log Message: increased release number to match FC-3 release Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moomps.spec 1 Jul 2005 23:24:54 -0000 1.5 +++ moomps.spec 30 Jul 2005 18:49:53 -0000 1.6 @@ -1,6 +1,6 @@ Name: moomps Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -78,6 +78,9 @@ %changelog +* Sat Jul 30 2005 Jean-Luc Fontaine 5.2-2 +- increased release number to match FC-3 release + * Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 - 5.2 source release From fedora-extras-commits at redhat.com Sat Jul 30 18:50:40 2005 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Sat, 30 Jul 2005 14:50:40 -0400 Subject: rpms/moomps/devel .cvsignore,1.3,1.4 moomps.spec,1.5,1.6 Message-ID: <200507301850.j6UIoegD003731@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3712 Modified Files: .cvsignore moomps.spec Log Message: increased release number to match FC-3 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 May 2005 19:39:10 -0000 1.3 +++ .cvsignore 30 Jul 2005 18:50:37 -0000 1.4 @@ -1 +1 @@ -moomps-5.1.tar.bz2 +moomps-5.2.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- moomps.spec 2 Jul 2005 10:45:36 -0000 1.5 +++ moomps.spec 30 Jul 2005 18:50:37 -0000 1.6 @@ -1,6 +1,6 @@ Name: moomps Version: 5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL @@ -78,6 +78,9 @@ %changelog +* Sat Jul 30 2005 Jean-Luc Fontaine 5.2-2 +- increased release number to match FC-3 release + * Sun Jun 26 2005 Jean-Luc Fontaine 5.2-1 - 5.2 source release From fedora-extras-commits at redhat.com Sat Jul 30 19:18:58 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 15:18:58 -0400 Subject: rpms/glunarclock/FC-3 glunarclock-0.32.2-i18n_macro.patch, NONE, 1.1 glunarclock-0.32.4-bug149711.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glunarclock.spec, 1.4, 1.5 sources, 1.4, 1.5 glunarclock-configure.in.patch, 1.1, NONE Message-ID: <200507301918.j6UJIw33005043@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/glunarclock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5017 Modified Files: .cvsignore glunarclock.spec sources Added Files: glunarclock-0.32.2-i18n_macro.patch glunarclock-0.32.4-bug149711.patch Removed Files: glunarclock-configure.in.patch Log Message: update for FC3 - sync with devel glunarclock-0.32.2-i18n_macro.patch: --- NEW FILE glunarclock-0.32.2-i18n_macro.patch --- diff -Nur glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c glunarclock-0.32.2/screen-exec/egg-screen-help.c --- glunarclock-0.32.2-orig/screen-exec/egg-screen-help.c 2003-03-10 13:02:08.000000000 +0100 +++ glunarclock-0.32.2/screen-exec/egg-screen-help.c 2005-04-15 02:29:09.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include glunarclock-0.32.4-bug149711.patch: --- NEW FILE glunarclock-0.32.4-bug149711.patch --- diff -Nur glunarclock-0.32.4-orig/src/glunarclock.c glunarclock-0.32.4/src/glunarclock.c --- glunarclock-0.32.4-orig/src/glunarclock.c 2005-04-06 12:51:29.000000000 +0200 +++ glunarclock-0.32.4/src/glunarclock.c 2005-07-25 00:39:56.000000000 +0200 @@ -154,14 +154,14 @@ gtk_toggle_button_get_active (toggle), NULL); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_dialog (GtkWidget *widget, MoonApplet *moon) { diff -Nur glunarclock-0.32.4-orig/src/moondata.c glunarclock-0.32.4/src/moondata.c --- glunarclock-0.32.4-orig/src/moondata.c 2005-01-04 18:28:43.000000000 +0100 +++ glunarclock-0.32.4/src/moondata.c 2005-07-25 00:39:55.000000000 +0200 @@ -219,14 +219,14 @@ mod_time(&moondata.LAT); } -static gboolean +static void delete_event (GtkWidget *widget, MoonApplet *moon) { gtk_widget_hide (widget); } -static gboolean +static void close_data_dialog (GtkWidget *widget, MoonApplet *moon) { @@ -280,10 +280,10 @@ /* gtk_label_set_text(GTK_LABEL(mw.ilm), buf); */ /* format_time(buf, size, moondata.NewMoon*24.0); */ - g_snprintf(buf, size, _("%2d%"),(gint)moondata.FullMoon); + g_snprintf(buf, size, _("%2d%%"),(gint)moondata.FullMoon); gtk_label_set_text(GTK_LABEL(mw.flm), buf); - g_snprintf(buf, size, "%2d%",(gint)(moondata.NewMoon)); + g_snprintf(buf, size, "%2d%%",(gint)(moondata.NewMoon)); gtk_label_set_text(GTK_LABEL(mw.nwm), buf); /* g_snprintf(buf, size, _("%8.4f Hours"), moondata.NewMoon*24.0); */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Feb 2005 16:42:01 -0000 1.4 +++ .cvsignore 30 Jul 2005 19:18:56 -0000 1.5 @@ -1,2 +1 @@ -glunarclock-0.32.2-autoreconf.patch.bz2 -glunarclock-0.32.2.tar.gz +glunarclock-0.32.4.tar.gz Index: glunarclock.spec =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-3/glunarclock.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- glunarclock.spec 13 Feb 2005 16:42:01 -0000 1.4 +++ glunarclock.spec 30 Jul 2005 19:18:56 -0000 1.5 @@ -1,15 +1,14 @@ Name: glunarclock -Version: 0.32.2 -Release: 2 -Epoch: 0 +Version: 0.32.4 +Release: 2%{?dist} Summary: GNOME applet that displays the current lunar phase Group: User Interface/Desktops License: GPL URL: http://glunarclock.sourceforge.net/ -Source0: http://download.sourceforge.net/glunarclock/glunarclock-0.32.2.tar.gz -Patch0: glunarclock-configure.in.patch -Patch1: glunarclock-0.32.2-autoreconf.patch.bz2 +Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: glunarclock-0.32.2-i18n_macro.patch +Patch1: glunarclock-0.32.4-bug149711.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel @@ -33,12 +32,9 @@ %prep %setup -q -%ifarch x86_64 -# patch0 is normally only needed if you want to recreate patch1 -%patch0 -# was created after autoreconf -f -i and removing autom4te.cache/ -%patch1 -p1 -%endif +%patch0 -p1 -b .i18n_macro +%patch1 -p1 -b .bug149711 + %build %configure @@ -81,7 +77,7 @@ %files -f glunarclock-0.32.lang %defattr (-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README +%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README %{_sysconfdir}/gconf/schemas/* %{_libexecdir}/* %{_datadir}/glunarclock @@ -94,8 +90,19 @@ %changelog +* Mon Jul 25 2005 Michael Schwendt - 0.32.4-2 +- Update to 0.32.4. +- Fix compiler warnings bug #149711. +- Disable unneeded x86_64 autoreconf patches (from 0.32.2-2). + +* Fri Apr 15 2005 Michael Schwendt - 0.32.2-4 +- Add patch2 to fix build for FC4. + +* Thu Apr 7 2005 Michael Schwendt +- rebuilt + * Sun Feb 13 2005 Thorsten Leemhuis - 0.32.2-2 -- Add autoreconf and configure.in patch to fix x86_64; +- Add autoreconf and configure.in patch to fix x86_64; * Sun Jan 16 2005 Marius L. J??hndal - 0:0.32.2-1 - Updated to 0.32.2. Index: sources =================================================================== RCS file: /cvs/extras/rpms/glunarclock/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Feb 2005 16:42:01 -0000 1.4 +++ sources 30 Jul 2005 19:18:56 -0000 1.5 @@ -1,2 +1 @@ -3ac5e08b5ffa5cd697fe4115d791f4ab glunarclock-0.32.2-autoreconf.patch.bz2 -3ac61aa62af4e0d53c90c18f09ee988f glunarclock-0.32.2.tar.gz +63e1d989581e6bf95cec82ff1bbc56ef glunarclock-0.32.4.tar.gz --- glunarclock-configure.in.patch DELETED --- From fedora-extras-commits at redhat.com Sat Jul 30 20:51:38 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 16:51:38 -0400 Subject: rpms/apg/FC-4 apg-2.3.0b-gen_rand_pass.patch, NONE, 1.1 apg.spec, 1.9, 1.10 Message-ID: <200507302051.j6UKpc7Z006435@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/apg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6415 Modified Files: apg.spec Added Files: apg-2.3.0b-gen_rand_pass.patch Log Message: * Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 - Fix -y segfault (#164698). - Make with CFLAGS and FLAGS to build with RPM optflags to repair debuginfo package. apg-2.3.0b-gen_rand_pass.patch: --- NEW FILE apg-2.3.0b-gen_rand_pass.patch --- diff -Nur apg-2.3.0b-orig/apg.c apg-2.3.0b/apg.c --- apg-2.3.0b-orig/apg.c 2003-08-07 17:40:39.000000000 +0200 +++ apg-2.3.0b/apg.c 2005-07-30 22:48:22.000000000 +0200 @@ -709,7 +709,7 @@ */ char * crypt_passstring (const char *p) { - char salt[10]; + char salt[11]; gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB); return (crypt(p, salt)); } Index: apg.spec =================================================================== RCS file: /cvs/extras/rpms/apg/FC-4/apg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apg.spec 24 Apr 2005 11:28:40 -0000 1.9 +++ apg.spec 30 Jul 2005 20:51:36 -0000 1.10 @@ -2,14 +2,14 @@ Name: apg Version: 2.3.0b -Release: 1.fc4 - +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.adel.nursat.kz/%{name}/ Source0: http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz Source1: apg.xinetd +Patch0: apg-2.3.0b-gen_rand_pass.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,13 +20,14 @@ %prep %setup -q +%patch0 -p1 -b .gen_rand_pass %build # Build server -make %{?_smp_mflags} cliserv +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv # Build standalone files -make %{?_smp_mflags} standalone +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -59,6 +60,11 @@ %{_sysconfdir}/xinetd.d/apgd %changelog +* Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 +- Fix -y segfault (#164698). +- Make with CFLAGS and FLAGS to build with RPM optflags to + repair debuginfo package. + * Fri Apr 22 2005 Oliver Falk - 2.3.0b-1_FC4 - Add FC4 to the release tag, so it's newer than the FC3 package From fedora-extras-commits at redhat.com Sat Jul 30 20:58:04 2005 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 30 Jul 2005 16:58:04 -0400 Subject: rpms/apg/devel apg-2.3.0b-gen_rand_pass.patch, NONE, 1.1 apg.spec, 1.9, 1.10 Message-ID: <200507302058.j6UKw43r006511@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/apg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6491 Modified Files: apg.spec Added Files: apg-2.3.0b-gen_rand_pass.patch Log Message: sync with FC-4 apg-2.3.0b-gen_rand_pass.patch: --- NEW FILE apg-2.3.0b-gen_rand_pass.patch --- diff -Nur apg-2.3.0b-orig/apg.c apg-2.3.0b/apg.c --- apg-2.3.0b-orig/apg.c 2003-08-07 17:40:39.000000000 +0200 +++ apg-2.3.0b/apg.c 2005-07-30 22:48:22.000000000 +0200 @@ -709,7 +709,7 @@ */ char * crypt_passstring (const char *p) { - char salt[10]; + char salt[11]; gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB); return (crypt(p, salt)); } Index: apg.spec =================================================================== RCS file: /cvs/extras/rpms/apg/devel/apg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- apg.spec 24 Apr 2005 11:28:40 -0000 1.9 +++ apg.spec 30 Jul 2005 20:58:02 -0000 1.10 @@ -2,14 +2,14 @@ Name: apg Version: 2.3.0b -Release: 1.fc4 - +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.adel.nursat.kz/%{name}/ Source0: http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz Source1: apg.xinetd +Patch0: apg-2.3.0b-gen_rand_pass.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,13 +20,14 @@ %prep %setup -q +%patch0 -p1 -b .gen_rand_pass %build # Build server -make %{?_smp_mflags} cliserv +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv # Build standalone files -make %{?_smp_mflags} standalone +make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -59,6 +60,11 @@ %{_sysconfdir}/xinetd.d/apgd %changelog +* Sat Jul 30 2005 Michael Schwendt - 2.3.0b-2 +- Fix -y segfault (#164698). +- Make with CFLAGS and FLAGS to build with RPM optflags to + repair debuginfo package. + * Fri Apr 22 2005 Oliver Falk - 2.3.0b-1_FC4 - Add FC4 to the release tag, so it's newer than the FC3 package From fedora-extras-commits at redhat.com Sat Jul 30 23:21:41 2005 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 30 Jul 2005 19:21:41 -0400 Subject: rpms/openvpn/devel openvpn.spec,1.4,1.5 Message-ID: <200507302321.j6UNLfRO010436@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/openvpn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10419 Modified Files: openvpn.spec Log Message: Create/own pid dir. Index: openvpn.spec =================================================================== RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openvpn.spec 30 Jun 2005 17:38:21 -0000 1.4 +++ openvpn.spec 30 Jul 2005 23:21:39 -0000 1.5 @@ -86,6 +86,8 @@ cp plugin/$plugin/README plugin/$plugin.txt done +mkdir -m 755 -p $RPM_BUILD_ROOT%{_var}/run/%{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -119,6 +121,7 @@ %{_datadir}/%{name}/ %{_libdir}/%{name}/ %{_initrddir}/%{name} +%{_var}/run/%{name}/ %config %dir %{_sysconfdir}/%{name}/ %changelog @@ -129,6 +132,7 @@ - Add "processname" header to init script - The init script isn't a config file - Tag contrib, sample-config-files, sample-keys, and sample-scripts as doc +- Create/own pid dir * Sat Jun 25 2005 Steven Pritchard 2.0-1 - Update to 2.0 final From fedora-extras-commits at redhat.com Sun Jul 31 00:30:04 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 20:30:04 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.3,1.4 Message-ID: <200507310030.j6V0U47u011741@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11724 Modified Files: scim-pinyin.spec Log Message: modify to use update-xinput-scim script Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-pinyin.spec 27 Jul 2005 08:12:41 -0000 1.3 +++ scim-pinyin.spec 31 Jul 2005 00:30:02 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-pinyin Version: 0.5.0 -Release: 4%{?dist} +Release: 4.1%{?dist} Summary: Smart Pinyin IMEngine for Smart Common Input Method platform License: GPL @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: scim-pinyin-0.5.0-setup-ambiguity-cast.patch +Provides: scim-zh_CN, scim-zh_TW BuildRequires: scim-devel, gtk2-devel +# for alternatives in install scripts +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim %description @@ -42,10 +45,18 @@ %post /sbin/ldconfig +%{_libdir}/scim-1.0/update-xinput-scim install zh_CN +%{_libdir}/scim-1.0/update-xinput-scim install zh_TW + %postun /sbin/ldconfig +if [ "$1" = "0" ]; then + %{_libdir}/scim-1.0/update-xinput-scim remove zh_CN + %{_libdir}/scim-1.0/update-xinput-scim remove zh_TW +fi + %files -f %{name}.lang %defattr(-,root,root,-) @@ -57,6 +68,9 @@ %changelog +* Sun Jul 31 2005 Ryo Dairiki -0.5.0-4.1 +- Modify to use update-xinput-scim script + * Wed Jul 27 2005 Ryo Dairiki -0.5.0-4 - Rebuild for scim-1.4.0 From fedora-extras-commits at redhat.com Sun Jul 31 01:18:19 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 30 Jul 2005 21:18:19 -0400 Subject: rpms/perl-Tk/devel perl-Tk.spec,1.3,1.4 Message-ID: <200507310118.j6V1IJQc013001@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/perl-Tk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953/devel Modified Files: perl-Tk.spec Log Message: - fix #164716 Index: perl-Tk.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tk/devel/perl-Tk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tk.spec 21 Jun 2005 05:28:20 -0000 1.3 +++ perl-Tk.spec 31 Jul 2005 01:18:17 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.027 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -22,6 +22,7 @@ Requires: perl(:MODULE_COMPAT_%{perlver}) Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::TextReindex) +Provides: perl(Tk) = %{version} %description This a re-port of a perl interface to Tk8.4. @@ -83,6 +84,10 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Sun Jul 31 2005 Andreas Bierfert +804.026-7 +- fix #164716 + * Mon Jun 20 2005 Andreas Bierfert 804.027-6 - some small cleanups From fedora-extras-commits at redhat.com Sun Jul 31 01:18:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 30 Jul 2005 21:18:14 -0400 Subject: rpms/perl-Tk/FC-3 perl-Tk.spec,1.3,1.4 Message-ID: <200507310118.j6V1Ii2l013004@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/perl-Tk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953/FC-3 Modified Files: perl-Tk.spec Log Message: - fix #164716 Index: perl-Tk.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tk/FC-3/perl-Tk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tk.spec 21 Jun 2005 05:26:13 -0000 1.3 +++ perl-Tk.spec 31 Jul 2005 01:18:11 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.027 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -22,6 +22,7 @@ Requires: perl(:MODULE_COMPAT_%{perlver}) Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::TextReindex) +Provides: perl(Tk) = %{version} %description This a re-port of a perl interface to Tk8.4. @@ -83,6 +84,10 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Sun Jul 31 2005 Andreas Bierfert +804.026-7 +- fix #164716 + * Mon Jun 20 2005 Andreas Bierfert 804.027-6 - some small cleanups From fedora-extras-commits at redhat.com Sun Jul 31 01:18:14 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 30 Jul 2005 21:18:14 -0400 Subject: rpms/perl-Tk/FC-4 perl-Tk.spec,1.3,1.4 Message-ID: <200507310118.j6V1IiNV013007@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/perl-Tk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953/FC-4 Modified Files: perl-Tk.spec Log Message: - fix #164716 Index: perl-Tk.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Tk/FC-4/perl-Tk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Tk.spec 21 Jun 2005 05:27:19 -0000 1.3 +++ perl-Tk.spec 31 Jul 2005 01:18:12 -0000 1.4 @@ -3,7 +3,7 @@ Name: perl-Tk Version: 804.027 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl Graphical User Interface ToolKit Group: Development/Libraries @@ -22,6 +22,7 @@ Requires: perl(:MODULE_COMPAT_%{perlver}) Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::TextReindex) +Provides: perl(Tk) = %{version} %description This a re-port of a perl interface to Tk8.4. @@ -83,6 +84,10 @@ %exclude %{perl_vendorarch}/Tk/reindex.pl %changelog +* Sun Jul 31 2005 Andreas Bierfert +804.026-7 +- fix #164716 + * Mon Jun 20 2005 Andreas Bierfert 804.027-6 - some small cleanups From fedora-extras-commits at redhat.com Sun Jul 31 01:41:01 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 21:41:01 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.15,1.16 Message-ID: <200507310141.j6V1f1Tp013211@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13189 Modified Files: scim-anthy.spec Log Message: remove "if" in postun to check whether it is "replaceing" the package Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scim-anthy.spec 30 Jul 2005 15:08:29 -0000 1.15 +++ scim-anthy.spec 31 Jul 2005 01:40:59 -0000 1.16 @@ -46,9 +46,7 @@ %postun -if [ "$1" = "0" ]; then - %{_libdir}/scim-1.0/update-xinput-scim remove ja_JP -fi +%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP %files -f %{name}.lang @@ -67,7 +65,8 @@ - count scim-ja_JP providers before removing xinput.d alternative * Fri Jul 29 2005 Ryo Dairiki -- add xinput.d alternatives setup in %%post and %%postun +- add xinput.d alternatives setup in %%post and %%po +stun - provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if no other scim-ja_JP left From fedora-extras-commits at redhat.com Sun Jul 31 01:43:00 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 21:43:00 -0400 Subject: rpms/scim-pinyin/FC-4 scim-pinyin.spec,1.4,1.5 Message-ID: <200507310143.j6V1h0Ua013236@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-pinyin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13219 Modified Files: scim-pinyin.spec Log Message: Index: scim-pinyin.spec =================================================================== RCS file: /cvs/extras/rpms/scim-pinyin/FC-4/scim-pinyin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-pinyin.spec 31 Jul 2005 00:30:02 -0000 1.4 +++ scim-pinyin.spec 31 Jul 2005 01:42:58 -0000 1.5 @@ -52,10 +52,8 @@ %postun /sbin/ldconfig -if [ "$1" = "0" ]; then - %{_libdir}/scim-1.0/update-xinput-scim remove zh_CN - %{_libdir}/scim-1.0/update-xinput-scim remove zh_TW -fi +%{_libdir}/scim-1.0/update-xinput-scim remove zh_CN +%{_libdir}/scim-1.0/update-xinput-scim remove zh_TW %files -f %{name}.lang From fedora-extras-commits at redhat.com Sun Jul 31 01:47:01 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sat, 30 Jul 2005 21:47:01 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.3,1.4 Message-ID: <200507310147.j6V1l1iq013266@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13249 Modified Files: scim-tables.spec Log Message: modify to use update-xinput-scim script Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tables.spec 27 Jul 2005 08:09:38 -0000 1.3 +++ scim-tables.spec 31 Jul 2005 01:46:59 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tables Version: 0.5.1 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -10,6 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: scim-devel, gtk2-devel +# for alternatives in install scripts +PreReq: %{_sysconfdir}/X11/xinit/xinput.d/scim, %{_libdir}/scim-1.0/update-xinput-scim + %description This package contains the Generic Table IMEngine for SCIM. @@ -18,6 +21,7 @@ Summary: SCIM tables for Chinese Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-zh_CN, scim-zh_TW %description zh This package includes table IM data files for Chinese. @@ -26,6 +30,7 @@ Summary: SCIM tables for Japanese Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-ja_JP %description ja This package includes table IM data files for Japanese. @@ -34,6 +39,7 @@ Summary: SCIM tables for Korean Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-ko_KR %description ko This package includes table IM data files for Korean. @@ -76,9 +82,30 @@ /sbin/ldconfig +%post ja +%{_libdir}/scim-1.0/update-xinput-scim install ja_JP + +%post zh +%{_libdir}/scim-1.0/update-xinput-scim install zh_CN +%{_libdir}/scim-1.0/update-xinput-scim install zh_TW + +%post ko +%{_libdir}/scim-1.0/update-xinput-scim install ko_KR + + %postun /sbin/ldconfig +%postun ja +%{_libdir}/scim-1.0/update-xinput-scim remove ja_JP + +%postun zh +%{_libdir}/scim-1.0/update-xinput-scim remove zh_CN +%{_libdir}/scim-1.0/update-xinput-scim remove zh_TW + +%postun ko +%{_libdir}/scim-1.0/update-xinput-scim remove ko_KR + %files -f %{name}.lang %defattr(-, root, root, -) @@ -158,6 +185,9 @@ %changelog +* Sun Jul 31 2005 Ryo Dairiki -0.5.1-3.1 +- Modify to use update-xinput-scim script + * Wed Jul 27 2005 Ryo Dairiki -0.5.1-3 - Rebuild for scim-1.4.0 From fedora-extras-commits at redhat.com Sun Jul 31 04:23:23 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 31 Jul 2005 00:23:23 -0400 Subject: rpms/scim/FC-4 update-xinput-scim,1.1,1.2 Message-ID: <200507310423.j6V4NNU1016856@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16839 Modified Files: update-xinput-scim Log Message: fix some bug of update-xinput-scim script Index: update-xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/update-xinput-scim,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- update-xinput-scim 30 Jul 2005 14:28:59 -0000 1.1 +++ update-xinput-scim 31 Jul 2005 04:23:21 -0000 1.2 @@ -17,19 +17,20 @@ default_priority = 85 # FIXME I'm not sure if this is correct -valid_locale_pattern = re.compile("^[a-z][a-z]_[A-Z][A-Z]$") +valid_locale_pattern = re.compile("^([a-z][a-z])_[A-Z][A-Z]$") +xinput_locale_pattern = re.compile("^xinput-[a-z][a-z]$|^xinput-[a-z][a-z]_[A-Z][A-Z]$") script_name = "update-scim-locale" authorization_rejected_message = script_name + ": you must be root to run this script" invalid_locale_message = script_name + ": invalid locale" too_few_arguments_message = script_name + ": too few arguments" -unknwon_command_message = script_name + ": unknown command" +unknown_command_message = script_name + ": unknown command" # FIXME authorization_rejected_returncode = 1 invalid_locale_returncode = 2 too_few_arguments_returncode = 3 -unknwon_command_returncode = 4 +unknown_command_returncode = 4 locales = [] @@ -44,9 +45,15 @@ (fi, fo) = os.popen2(locale_bin + " --all") for locale in fo: locale = locale.strip() - if valid_locale_pattern.match(locale) and not locale in locales: - locales.append(locale) - + matches = valid_locale_pattern.match(locale) + if matches: + lang_group = matches.group(1) + if lang_group in locales: + if not locale in locales: + locales.append(locale) + else: + locales.append(lang_group) + locales.append(locale) fi.close() fo.close() @@ -59,7 +66,7 @@ sys.exit(invalid_locale_returncode) -def install_alternative(locale, priority): +def install(locale, priority): check_locale(locale) if priority == -1: priority = default_priority @@ -67,7 +74,7 @@ os.system(alternatives_bin + " --install %s/%s %s " %(xinput_dir, locale, xinput_locale) + xinput_scim + " %s" %priority) -def remove_alternative(locale): +def remove(locale): check_locale(locale) scim_locale = "scim-" + locale xinput_locale = "xinput-" + locale @@ -80,14 +87,30 @@ os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim) # check the current input method (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) - current_xinput = fo.readline() + current_xinput = fo.readline().strip() fi.close() fo.close() if current_xinput == xinput_scim: - # change the input method, as scim won't support this locale anymore. + # change the input method, as scim won't support this locale anymore os.system(alternatives_bin + " --auto " + xinput_locale) +def list(): + xinput_locales = [] + alternatives = os.listdir(alternatives_dir) + for alternative in alternatives: + if xinput_locale_pattern.match(alternative): + xinput_locales.append(alternative) + for xinput_locale in xinput_locales: + (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) + current_xinput = fo.readline().strip() + fi.close() + fo.close() + if current_xinput == xinput_scim: + locale = xinput_locale[7:] + print(locale) + + # FIXME def main(): args = sys.argv @@ -103,16 +126,18 @@ priority = args[3] else: priority = -1 - install_alternative(locale, priority) + install(locale, priority) elif args[1] == "remove": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] - remove_alternative(locale) + remove(locale) + elif args[1] == "list": + list() else: print unknown_command_message + ": " + args[1] - sys.exit(unknwon_command_returncode) + sys.exit(unknown_command_returncode) # main From fedora-extras-commits at redhat.com Sun Jul 31 05:45:38 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 31 Jul 2005 01:45:38 -0400 Subject: rpms/scim/FC-4 update-xinput-scim,1.2,1.3 Message-ID: <200507310545.j6V5jc40018181@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18163 Modified Files: update-xinput-scim Log Message: few more fixes on the script, and add the instruction Index: update-xinput-scim =================================================================== RCS file: /cvs/extras/rpms/scim/FC-4/update-xinput-scim,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- update-xinput-scim 31 Jul 2005 04:23:21 -0000 1.2 +++ update-xinput-scim 31 Jul 2005 05:45:36 -0000 1.3 @@ -19,11 +19,30 @@ # FIXME I'm not sure if this is correct valid_locale_pattern = re.compile("^([a-z][a-z])_[A-Z][A-Z]$") xinput_locale_pattern = re.compile("^xinput-[a-z][a-z]$|^xinput-[a-z][a-z]_[A-Z][A-Z]$") +xinput_current_link_pattern = re.compile("link\s+currently\s+points\s+to\s+(%s/\w+)" %xinput_dir) +xinput_link_pattern = re.compile("(%s/\w+)\s+-\s+priority\s\d+" %xinput_dir) -script_name = "update-scim-locale" +script_name = "update-xinput-scim" +white_space = " " +usage_message = "Usage: \n\n" + \ + " %s install LANG [PRIORITY]\n" %script_name + \ + " %s to install xinput file for LANG with the PRIORITY.\n\n" %white_space + \ + " %s remove LANG\n" %script_name + \ + " %s to remove xinput file for LANG\n" %white_space + \ + " %s only if there is no other IMEngine for LANG in SCIM.\n" %white_space + \ + " %s This will switch IM from SCIM\n" %white_space + \ + " %s if there is no more SCIM IMEngine for this LANG.\n\n" %white_space + \ + " %s list\n" %script_name + \ + " %s to list LANG which currently uses SCIM.\n\n" %white_space + \ + " %s dump\n" %script_name + \ + " %s to dump all locales with xinput entries for SCIM.\n\n" %white_space + \ + " %s help\n" %script_name + \ + " %s to show this instruction.\n" %white_space +read_help_message = "Try \'%s help\' for more information." %script_name authorization_rejected_message = script_name + ": you must be root to run this script" -invalid_locale_message = script_name + ": invalid locale" -too_few_arguments_message = script_name + ": too few arguments" +invalid_locale_message = script_name + ": invalid locale" + "\n" + read_help_message +too_few_arguments_message = script_name + ": too few arguments" + "\n" + read_help_message +too_much_arguments_message = script_name + ": too much arguments" + "\n" + read_help_message unknown_command_message = script_name + ": unknown command" # FIXME @@ -34,6 +53,7 @@ locales = [] + def check_authorization(): uid = os.getuid() if uid != 0: @@ -66,6 +86,30 @@ sys.exit(invalid_locale_returncode) +def readlink(xinput_locale): + current_link = None + (fi, fo) = os.popen2("LANG=C;" + alternatives_bin + " --display " + xinput_locale) + for line in fo: + current_links = xinput_current_link_pattern.findall(line) + if len(current_links) > 0: + current_link = current_links[0] + break + fi.close() + fo.close() + return current_link + + +def dumplinks(xinput_locale): + links = [] + (fi, fo) = os.popen2("LANG=C;" + alternatives_bin + " --display " + xinput_locale) + for line in fo: + links_in_line = xinput_link_pattern.findall(line) + links += links_in_line + fi.close() + fo.close() + return links + + def install(locale, priority): check_locale(locale) if priority == -1: @@ -86,10 +130,7 @@ # there is no more input method for this locale os.system(alternatives_bin + " --remove " + xinput_locale + " " + xinput_scim) # check the current input method - (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) - current_xinput = fo.readline().strip() - fi.close() - fo.close() + current_xinput = readlink(xinput_locale) if current_xinput == xinput_scim: # change the input method, as scim won't support this locale anymore os.system(alternatives_bin + " --auto " + xinput_locale) @@ -102,41 +143,67 @@ if xinput_locale_pattern.match(alternative): xinput_locales.append(alternative) for xinput_locale in xinput_locales: - (fi, fo) = os.popen2(readlink_bin + " %s/%s" %(alternatives_dir, xinput_locale)) - current_xinput = fo.readline().strip() - fi.close() - fo.close() + current_xinput = readlink(xinput_locale) if current_xinput == xinput_scim: locale = xinput_locale[7:] print(locale) +def dump(): + xinput_locales = [] + alternatives = os.listdir(alternatives_dir) + for alternative in alternatives: + if xinput_locale_pattern.match(alternative): + xinput_locales.append(alternative) + for xinput_locale in xinput_locales: + links_for_locale = dumplinks(xinput_locale) + for link in links_for_locale: + if link == xinput_scim: + locale = xinput_locale[7:] + print(locale) + + # FIXME def main(): args = sys.argv if len(args) == 1: print too_few_arguments_message sys.exit(too_few_arguments_returncode) - if args[1] == "install": + command = args[1] + if command.startswith("--"): + command = command[2:] + if command == "install": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) locale = args[2] - if len(args) >= 4: + if len(args) == 4: priority = args[3] + elif len(args) > 4: + print too_much_arguments_message + sys.exit(too_much_arguments_returncode) else: priority = -1 install(locale, priority) - elif args[1] == "remove": + elif command == "remove": if len(args) < 3: print too_few_arguments_message sys.exit(too_few_arguments_returncode) + elif len(args) > 3: + print too_much_arguments_message + sys.exit(too_much_arguments_returncode) locale = args[2] remove(locale) - elif args[1] == "list": + elif command == "list": list() + elif command == "dump": + dump() + elif command == "help": + print usage_message + sys.exit(0) else: print unknown_command_message + ": " + args[1] + print read_help_message sys.exit(unknown_command_returncode) From fedora-extras-commits at redhat.com Sun Jul 31 05:50:44 2005 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Sun, 31 Jul 2005 01:50:44 -0400 Subject: rpms/scim-tables/FC-4 scim-tables.spec,1.4,1.5 Message-ID: <200507310550.j6V5oiN1018211@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18191 Modified Files: scim-tables.spec Log Message: some fixes around the update-xinput-scim script Index: scim-tables.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tables/FC-4/scim-tables.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tables.spec 31 Jul 2005 01:46:59 -0000 1.4 +++ scim-tables.spec 31 Jul 2005 05:50:42 -0000 1.5 @@ -48,6 +48,7 @@ Summary: SCIM tables for some additional languages Group: System Environment/Libraries Requires: scim-tables = %{version} +Provides: scim-am_ET, scim-ar, scim-vi_VN, scim-ru_RU %description additional This package includes table IM data files for additional languages, @@ -92,6 +93,12 @@ %post ko %{_libdir}/scim-1.0/update-xinput-scim install ko_KR +%post additional +%{_libdir}/scim-1.0/update-xinput-scim install am_ET +%{_libdir}/scim-1.0/update-xinput-scim install ar +%{_libdir}/scim-1.0/update-xinput-scim install vi_VN +%{_libdir}/scim-1.0/update-xinput-scim install ru_RU + %postun /sbin/ldconfig @@ -106,6 +113,12 @@ %postun ko %{_libdir}/scim-1.0/update-xinput-scim remove ko_KR +%postun additional +%{_libdir}/scim-1.0/update-xinput-scim remove am_ET +%{_libdir}/scim-1.0/update-xinput-scim remove ar +%{_libdir}/scim-1.0/update-xinput-scim remove vi_VN +%{_libdir}/scim-1.0/update-xinput-scim remove ru_RU + %files -f %{name}.lang %defattr(-, root, root, -) From fedora-extras-commits at redhat.com Sun Jul 31 06:53:52 2005 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Sun, 31 Jul 2005 02:53:52 -0400 Subject: rpms/scim-anthy/FC-4 scim-anthy.spec,1.16,1.17 Message-ID: <200507310653.j6V6rqNf019540@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19521 Modified Files: scim-anthy.spec Log Message: fixup changelog Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scim-anthy.spec 31 Jul 2005 01:40:59 -0000 1.16 +++ scim-anthy.spec 31 Jul 2005 06:53:50 -0000 1.17 @@ -65,10 +65,9 @@ - count scim-ja_JP providers before removing xinput.d alternative * Fri Jul 29 2005 Ryo Dairiki -- add xinput.d alternatives setup in %%post and %%po -stun +- add xinput.d alternatives setup in %%post and %%postun - provide scim-ja_JP and only uninstall xinput.d-ja_JP alternative if - no other scim-ja_JP left + no scim-ja_JP left * Fri Jul 29 2005 Jens Petersen - 0.5.3-1 - update to 0.5.3 release From fedora-extras-commits at redhat.com Sun Jul 31 10:15:12 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 31 Jul 2005 06:15:12 -0400 Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sylpheed-claws.spec, 1.17, 1.18 Message-ID: <200507311015.j6VAFC84028432@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-serv28409 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - upgrade to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Jul 2005 07:41:46 -0000 1.7 +++ .cvsignore 31 Jul 2005 10:15:10 -0000 1.8 @@ -1 +1 @@ -sylpheed-claws-1.9.12.tar.bz2 +sylpheed-claws-1.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jul 2005 07:41:46 -0000 1.8 +++ sources 31 Jul 2005 10:15:10 -0000 1.9 @@ -1 +1 @@ -c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 +afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed-claws.spec 7 Jul 2005 10:20:35 -0000 1.17 +++ sylpheed-claws.spec 31 Jul 2005 10:15:10 -0000 1.18 @@ -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.12 -Release: 2%{?dist} +Version: 1.9.13 +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.12.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -20,10 +20,11 @@ BuildRequires: pilot-link-devel BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel -BuildRequires: gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8 +BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel +BuildRequires: libetpan-devel Requires: spamassassin Requires: dillo @@ -57,14 +58,11 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --with-gpgme-prefix=%{_libdir}/gpgme03 \ --program-suffix="-claws" %{__make} %{?_smp_mflags} - %{__make} check - %install %{__rm} -rf ${RPM_BUILD_ROOT} %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir} @@ -83,11 +81,9 @@ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png - %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -113,8 +109,15 @@ %dir %{_includedir}/sylpheed-claws/ %{_includedir}/sylpheed-claws/* %{_libdir}/pkgconfig/sylpheed-claws.pc +%{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Sun Jul 31 2005 Andreas Bierfert +1.9.13-1 +- upgrade +- switch s/gpgme03/gpgme/ +- need libetpan + * Thu Jul 07 2005 Andreas Bierfert 1.9.12-2 - add some doc From fedora-extras-commits at redhat.com Sun Jul 31 10:16:30 2005 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 31 Jul 2005 06:16:30 -0400 Subject: rpms/sylpheed-claws/devel .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 sylpheed-claws.spec, 1.17, 1.18 Message-ID: <200507311016.j6VAGUkC028469@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28444 Modified Files: .cvsignore sources sylpheed-claws.spec Log Message: - upgrade to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 6 Jul 2005 07:42:42 -0000 1.7 +++ .cvsignore 31 Jul 2005 10:16:28 -0000 1.8 @@ -1 +1 @@ -sylpheed-claws-1.9.12.tar.bz2 +sylpheed-claws-1.9.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jul 2005 07:42:42 -0000 1.8 +++ sources 31 Jul 2005 10:16:28 -0000 1.9 @@ -1 +1 @@ -c7cdfe6ac9afacd680cb8fe58eb9da79 sylpheed-claws-1.9.12.tar.bz2 +afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sylpheed-claws.spec 7 Jul 2005 10:22:37 -0000 1.17 +++ sylpheed-claws.spec 31 Jul 2005 10:16:28 -0000 1.18 @@ -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.12 -Release: 2%{?dist} +Version: 1.9.13 +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.12.tar.bz2 +Source0: http://dl.sf.net/sylpheed-claws/sylpheed-claws-1.9.13.tar.bz2 Source1: sylpheed-claws.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison @@ -20,10 +20,11 @@ BuildRequires: pilot-link-devel BuildRequires: gdk-pixbuf-devel BuildRequires: clamav-devel -BuildRequires: gnupg >= 1.2.1, gpgme03-devel >= 0.3.16-8 +BuildRequires: gnupg >= 1.2.1, gpgme-devel >= 0.4.5 BuildRequires: desktop-file-utils startup-notification-devel BuildRequires: pkgconfig BuildRequires: gettext-devel +BuildRequires: libetpan-devel Requires: spamassassin Requires: dillo @@ -57,14 +58,11 @@ --disable-mathml-viewer-plugin \ --enable-aspell \ --disable-dependency-tracking \ - --with-gpgme-prefix=%{_libdir}/gpgme03 \ --program-suffix="-claws" %{__make} %{?_smp_mflags} - %{__make} check - %install %{__rm} -rf ${RPM_BUILD_ROOT} %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir} @@ -83,11 +81,9 @@ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -%{__install} %{_builddir}/%{name}-%{version}/sylpheed.png \ +%{__install} %{_builddir}/%{name}-%{version}/sylpheed-claws.png \ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png -%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/sylpheed{,-claws}.png - %clean %{__rm} -rf ${RPM_BUILD_ROOT} @@ -113,8 +109,15 @@ %dir %{_includedir}/sylpheed-claws/ %{_includedir}/sylpheed-claws/* %{_libdir}/pkgconfig/sylpheed-claws.pc +%{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Sun Jul 31 2005 Andreas Bierfert +1.9.13-1 +- upgrade +- switch s/gpgme03/gpgme/ +- need libetpan + * Thu Jul 07 2005 Andreas Bierfert 1.9.12-2 - add some doc From fedora-extras-commits at redhat.com Sun Jul 31 11:17:34 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 31 Jul 2005 07:17:34 -0400 Subject: common tobuild,1.2167,1.2168 Message-ID: <200507311117.j6VBHYtZ029804@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29787 Modified Files: tobuild Log Message: Clean up some successful builds. Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2167 retrieving revision 1.2168 diff -u -r1.2167 -r1.2168 --- tobuild 30 Jul 2005 07:04:56 -0000 1.2167 +++ tobuild 31 Jul 2005 11:17:32 -0000 1.2168 @@ -20,13 +20,6 @@ thias rpms/lighttpd/devel lighttpd-1_3_15-1_fc5 devel thomasvs rpms/liboggz/devel liboggz-0_9_2-1_fc5 devel icon rpms/libxml++/devel libxml++-2_10_0-1_fc5 devel -scop rpms/lft/devel lft-2_31-3 devel -scop rpms/dvb-apps/devel dvb-apps-1_1_0-1_fc5 devel -scop rpms/gdome2/devel gdome2-0_8_1-1_fc5 devel -scop rpms/rpmlint/devel rpmlint-0_70-4_fc5 devel -scop rpms/bash-completion/devel bash-completion-20050721-1_fc5 devel -scop rpms/perl-ExtUtils-XSBuilder/devel perl-ExtUtils-XSBuilder-0_27-2_fc5 devel -scop rpms/libapreq2/FC-4 libapreq2-2_06-1_fc4 fc4 scop rpms/libapreq2/devel libapreq2-2_06-1_fc5 devel abompard rpms/ulogd/devel ulogd-1_23-2_fc5 devel abompard rpms/showimg/devel showimg-0_9_4_1-4_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 12:38:21 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:38:21 -0400 Subject: rpms/unison/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 unison.spec, 1.11, 1.12 Message-ID: <200507311238.j6VCcLPR031119@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31098 Modified Files: .cvsignore sources unison.spec Log Message: new version 2.12.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Feb 2005 00:16:24 -0000 1.2 +++ .cvsignore 31 Jul 2005 12:38:19 -0000 1.3 @@ -1 +1 @@ -unison-2.10.2.tar.gz +unison-2.12.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2005 00:16:24 -0000 1.2 +++ sources 31 Jul 2005 12:38:19 -0000 1.3 @@ -1 +1 @@ -a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz +c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/unison.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- unison.spec 27 May 2005 14:28:00 -0000 1.11 +++ unison.spec 31 Jul 2005 12:38:19 -0000 1.12 @@ -1,15 +1,14 @@ Name: unison -Version: 2.10.2 -Release: 7 +Version: 2.12.0 +Release: 0%{?dist} Summary: File-synchronization tool Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz Source1: unison.png -Patch0: unison-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex BuildRequires: desktop-file-utils @@ -25,11 +24,9 @@ %prep %setup -q -%patch0 -p1 %build -make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2 -#(cd doc; make) +make NATIVE=true UISTYLE=gtk2 %install rm -rf $RPM_BUILD_ROOT @@ -71,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 +- New Version 2.12.0 + * Fri May 27 2005 Toshio Kuratomi - 2.10.2-7 - Bump and rebuild with new ocaml and new lablgtk From fedora-extras-commits at redhat.com Sun Jul 31 12:39:28 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:39:28 -0400 Subject: rpms/unison/FC-4 unison-fix.patch,1.1,NONE Message-ID: <200507311239.j6VCdSft031174@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159 Removed Files: unison-fix.patch Log Message: removed fix --- unison-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 31 12:39:59 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:39:59 -0400 Subject: rpms/unison/FC-4 unison.spec,1.12,1.13 Message-ID: <200507311239.j6VCdxCd031230@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31213 Modified Files: unison.spec Log Message: Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/FC-4/unison.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- unison.spec 31 Jul 2005 12:38:19 -0000 1.12 +++ unison.spec 31 Jul 2005 12:39:57 -0000 1.13 @@ -1,6 +1,6 @@ Name: unison Version: 2.12.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: File-synchronization tool From fedora-extras-commits at redhat.com Sun Jul 31 12:40:54 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:40:54 -0400 Subject: common tobuild,1.2168,1.2169 Message-ID: <200507311240.j6VCesge031292@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31275 Modified Files: tobuild Log Message: request build of rpms/unison/FC-4 unison-2_12_0-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2168 retrieving revision 1.2169 diff -u -r1.2168 -r1.2169 --- tobuild 31 Jul 2005 11:17:32 -0000 1.2168 +++ tobuild 31 Jul 2005 12:40:52 -0000 1.2169 @@ -54,3 +54,4 @@ smccann rpms/proj/FC-4 proj-4_4_9-1_fc4 fc4 ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 +gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 31 12:42:20 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:42:20 -0400 Subject: rpms/unison/devel sources, 1.2, 1.3 unison.spec, 1.11, 1.12 unison-fix.patch, 1.1, NONE Message-ID: <200507311242.j6VCgKWW031322@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/unison/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31303 Modified Files: sources unison.spec Removed Files: unison-fix.patch Log Message: new version 2.12.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/unison/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Feb 2005 00:16:24 -0000 1.2 +++ sources 31 Jul 2005 12:42:18 -0000 1.3 @@ -1 +1 @@ -a93cf03d4221ab6bab8b758b0325a9d5 unison-2.10.2.tar.gz +c2b818e77e95951b5db0b95272e385a2 unison-2.12.0.tar.gz Index: unison.spec =================================================================== RCS file: /cvs/extras/rpms/unison/devel/unison.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- unison.spec 27 May 2005 14:28:00 -0000 1.11 +++ unison.spec 31 Jul 2005 12:42:18 -0000 1.12 @@ -1,15 +1,14 @@ Name: unison -Version: 2.10.2 -Release: 7 +Version: 2.12.0 +Release: 1%{?dist} Summary: File-synchronization tool Group: Applications/File License: GPL URL: http://www.cis.upenn.edu/~bcpierce/unison -Source: http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz +Source: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-2.12.0.tar.gz Source1: unison.png -Patch0: unison-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex BuildRequires: desktop-file-utils @@ -25,11 +24,9 @@ %prep %setup -q -%patch0 -p1 %build -make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2 -#(cd doc; make) +make NATIVE=true UISTYLE=gtk2 %install rm -rf $RPM_BUILD_ROOT @@ -71,6 +68,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Jul 31 2005 Gerard Milmeister - 2.12.0-0 +- New Version 2.12.0 + * Fri May 27 2005 Toshio Kuratomi - 2.10.2-7 - Bump and rebuild with new ocaml and new lablgtk --- unison-fix.patch DELETED --- From fedora-extras-commits at redhat.com Sun Jul 31 12:42:51 2005 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 31 Jul 2005 08:42:51 -0400 Subject: common tobuild,1.2169,1.2170 Message-ID: <200507311242.j6VCgpfQ031384@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31367 Modified Files: tobuild Log Message: request build of rpms/unison/devel unison-2_12_0-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2169 retrieving revision 1.2170 diff -u -r1.2169 -r1.2170 --- tobuild 31 Jul 2005 12:40:52 -0000 1.2169 +++ tobuild 31 Jul 2005 12:42:48 -0000 1.2170 @@ -55,3 +55,4 @@ ryo rpms/scim/FC-4 scim-1_4_0-2_2_fc4 fc4 ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 +gemi rpms/unison/devel unison-2_12_0-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 13:51:42 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 31 Jul 2005 09:51:42 -0400 Subject: rpms/blacs/devel blacs.spec,1.13,1.14 Message-ID: <200507311352.j6VDqCv2000324@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/devel Modified Files: blacs.spec Log Message: fix FC-3 spec file Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blacs.spec 30 Jul 2005 02:31:36 -0000 1.13 +++ blacs.spec 31 Jul 2005 13:51:40 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Sun Jul 31 2005 Tom "spot" Callaway 1.1-17 +- fix g77 for FC-3 spec + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 - remove ppc hack From fedora-extras-commits at redhat.com Sun Jul 31 13:51:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 31 Jul 2005 09:51:41 -0400 Subject: rpms/blacs/FC-3 blacs.spec,1.13,1.14 Message-ID: <200507311352.j6VDqBNM000320@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-3 Modified Files: blacs.spec Log Message: fix FC-3 spec file Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 +++ blacs.spec 31 Jul 2005 13:51:39 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -15,7 +15,7 @@ Source7: http://www.netlib.org/blacs/cblacsqref.ps Source8: http://www.netlib.org/blacs/lawn94.ps Source9: Bmake.inc.64bit -BuildRequires: gcc-gfortran +BuildRequires: gcc-g77 # Lam before 7.1.1-5 is missing: # -shared library support # -fPIC compilation flag @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Sun Jul 31 2005 Tom "spot" Callaway 1.1-17 +- fix g77 for FC-3 spec + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 - remove ppc hack From fedora-extras-commits at redhat.com Sun Jul 31 13:51:41 2005 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sun, 31 Jul 2005 09:51:41 -0400 Subject: rpms/blacs/FC-4 blacs.spec,1.13,1.14 Message-ID: <200507311352.j6VDqCRu000323@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/blacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32740/FC-4 Modified Files: blacs.spec Log Message: fix FC-3 spec file Index: blacs.spec =================================================================== RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blacs.spec 30 Jul 2005 02:31:30 -0000 1.13 +++ blacs.spec 31 Jul 2005 13:51:39 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Basic Linear Algebra Communication Subprograms Name: blacs Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/blacs @@ -107,6 +107,9 @@ %{_libdir}/libmpiblacs*.so %changelog +* Sun Jul 31 2005 Tom "spot" Callaway 1.1-17 +- fix g77 for FC-3 spec + * Fri Jul 29 2005 Tom "spot" Callaway 1.1-16 - remove ppc hack From fedora-extras-commits at redhat.com Sun Jul 31 14:25:49 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:25:49 -0400 Subject: rpms/dejavu-fonts import.log,1.2,1.3 Message-ID: <200507311426.j6VEQJio001687@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1651 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1 on branch devel from dejavu-fonts-1.12-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 23 Jun 2005 19:10:11 -0000 1.2 +++ import.log 31 Jul 2005 14:25:47 -0000 1.3 @@ -1 +1,2 @@ dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802 +dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 From fedora-extras-commits at redhat.com Sun Jul 31 14:25:49 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:25:49 -0400 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.2, 1.3 dejavu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507311426.j6VEQKWe001692@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1651/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-1.12-1 on branch devel from dejavu-fonts-1.12-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jun 2005 19:10:12 -0000 1.2 +++ .cvsignore 31 Jul 2005 14:25:47 -0000 1.3 @@ -1 +1 @@ -dejavu-ttf-1.11.tar.gz +dejavu-ttf-1.12.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejavu-fonts.spec 23 Jun 2005 19:10:12 -0000 1.1 +++ dejavu-fonts.spec 31 Jul 2005 14:25:47 -0000 1.2 @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/dejavu Name: dejavu-fonts -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: DejaVu Fonts Group: User Interface/X @@ -62,6 +62,9 @@ %changelog +* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 +- 1.12 + * Thu Jun 23 2005 Nicolas Mailhot 1.11-1 - 1.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jun 2005 19:10:12 -0000 1.2 +++ sources 31 Jul 2005 14:25:47 -0000 1.3 @@ -1 +1 @@ -7dc69c0afc8fd28b74720413d17e78f4 dejavu-ttf-1.11.tar.gz +93117ca13aa3a81d6579013029ef975d dejavu-ttf-1.12.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:28:13 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:28:13 -0400 Subject: rpms/dejavu-fonts import.log,1.3,1.4 Message-ID: <200507311428.j6VESh0m001808@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1772 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-4 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 31 Jul 2005 14:25:47 -0000 1.3 +++ import.log 31 Jul 2005 14:28:11 -0000 1.4 @@ -1,2 +1,3 @@ dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802 dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 +dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 From fedora-extras-commits at redhat.com Sun Jul 31 14:28:13 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:28:13 -0400 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.2, 1.3 dejavu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507311428.j6VESib1001813@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1772/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-4 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jun 2005 19:10:12 -0000 1.2 +++ .cvsignore 31 Jul 2005 14:28:11 -0000 1.3 @@ -1 +1 @@ -dejavu-ttf-1.11.tar.gz +dejavu-ttf-1.12.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejavu-fonts.spec 23 Jun 2005 19:10:12 -0000 1.1 +++ dejavu-fonts.spec 31 Jul 2005 14:28:11 -0000 1.2 @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/dejavu Name: dejavu-fonts -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: DejaVu Fonts Group: User Interface/X @@ -62,6 +62,9 @@ %changelog +* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 +- 1.12 + * Thu Jun 23 2005 Nicolas Mailhot 1.11-1 - 1.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jun 2005 19:10:12 -0000 1.2 +++ sources 31 Jul 2005 14:28:11 -0000 1.3 @@ -1 +1 @@ -7dc69c0afc8fd28b74720413d17e78f4 dejavu-ttf-1.11.tar.gz +93117ca13aa3a81d6579013029ef975d dejavu-ttf-1.12.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:33:25 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:33:25 -0400 Subject: rpms/dejavu-fonts import.log,1.4,1.5 Message-ID: <200507311433.j6VEXtIa001940@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1901 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-3 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 31 Jul 2005 14:28:11 -0000 1.4 +++ import.log 31 Jul 2005 14:33:23 -0000 1.5 @@ -1,3 +1,4 @@ dejavu-fonts-1_11-1:HEAD:dejavu-fonts-1.11-1.src.rpm:1119553802 dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 +dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 From fedora-extras-commits at redhat.com Sun Jul 31 14:33:26 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:33:26 -0400 Subject: rpms/dejavu-fonts/FC-3 .cvsignore, 1.2, 1.3 dejavu-fonts.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200507311434.j6VEXuu1001945@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1901/FC-3 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-1.12-1 on branch FC-3 from dejavu-fonts-1.12-1.src.rpm update to 1.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Jun 2005 19:10:12 -0000 1.2 +++ .cvsignore 31 Jul 2005 14:33:24 -0000 1.3 @@ -1 +1 @@ -dejavu-ttf-1.11.tar.gz +dejavu-ttf-1.12.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dejavu-fonts.spec 23 Jun 2005 19:10:12 -0000 1.1 +++ dejavu-fonts.spec 31 Jul 2005 14:33:24 -0000 1.2 @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/dejavu Name: dejavu-fonts -Version: 1.11 +Version: 1.12 Release: 1%{?dist} Summary: DejaVu Fonts Group: User Interface/X @@ -62,6 +62,9 @@ %changelog +* Sun Jul 31 2005 Nicolas Mailhot 1.12-1 +- 1.12 + * Thu Jun 23 2005 Nicolas Mailhot 1.11-1 - 1.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Jun 2005 19:10:12 -0000 1.2 +++ sources 31 Jul 2005 14:33:24 -0000 1.3 @@ -1 +1 @@ -7dc69c0afc8fd28b74720413d17e78f4 dejavu-ttf-1.11.tar.gz +93117ca13aa3a81d6579013029ef975d dejavu-ttf-1.12.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:48:47 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:48:47 -0400 Subject: rpms/dejavu-fonts import.log,1.5,1.6 Message-ID: <200507311448.j6VEmlPG002090@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2073 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1.fc4 on branch FC-4 from dejavu-fonts-1.12-1.fc4.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 31 Jul 2005 14:33:23 -0000 1.5 +++ import.log 31 Jul 2005 14:48:45 -0000 1.6 @@ -2,3 +2,4 @@ dejavu-fonts-1_12-1:HEAD:dejavu-fonts-1.12-1.src.rpm:1122819936 dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 +dejavu-fonts-1_12-1_fc4:FC-4:dejavu-fonts-1.12-1.fc4.src.rpm:1122821314 From fedora-extras-commits at redhat.com Sun Jul 31 14:50:12 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 10:50:12 -0400 Subject: rpms/dejavu-fonts import.log,1.6,1.7 Message-ID: <200507311450.j6VEoCkU002167@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2150 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1.fc3 on branch FC-3 from dejavu-fonts-1.12-1.fc3.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 31 Jul 2005 14:48:45 -0000 1.6 +++ import.log 31 Jul 2005 14:50:10 -0000 1.7 @@ -3,3 +3,4 @@ dejavu-fonts-1_12-1:FC-4:dejavu-fonts-1.12-1.src.rpm:1122820081 dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 dejavu-fonts-1_12-1_fc4:FC-4:dejavu-fonts-1.12-1.fc4.src.rpm:1122821314 +dejavu-fonts-1_12-1_fc3:FC-3:dejavu-fonts-1.12-1.fc3.src.rpm:1122821399 From fedora-extras-commits at redhat.com Sun Jul 31 14:50:52 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 31 Jul 2005 10:50:52 -0400 Subject: rpms/liferea/FC-4 .cvsignore, 1.8, 1.9 liferea.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200507311450.j6VEoqNv002234@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2213 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Jul 31 2005 Brian Pepple - 0.9.5-1 - Update to 0.9.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jul 2005 21:58:57 -0000 1.8 +++ .cvsignore 31 Jul 2005 14:50:50 -0000 1.9 @@ -1 +1 @@ -liferea-0.9.4.tar.gz +liferea-0.9.5.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- liferea.spec 22 Jul 2005 21:58:57 -0000 1.13 +++ liferea.spec 31 Jul 2005 14:50:50 -0000 1.14 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -39,7 +39,7 @@ %build -%configure --disable-schemas-install \ +%configure --disable-schemas-install \ %if %{with_dbus} --enable-dbus=yes %else @@ -92,6 +92,9 @@ %changelog +* Sun Jul 31 2005 Brian Pepple - 0.9.5-1 +- Update to 0.9.5. + * Fri Jul 22 2005 Brian Pepple - 0.9.4-1 - Update to 0.9.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 21:58:57 -0000 1.9 +++ sources 31 Jul 2005 14:50:50 -0000 1.10 @@ -1 +1 @@ -91994fb89c107230ef3b15708aa31209 liferea-0.9.4.tar.gz +562c84cd394fd2faf7944990613117ca liferea-0.9.5.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 14:55:43 2005 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 31 Jul 2005 10:55:43 -0400 Subject: rpms/liferea/devel .cvsignore, 1.8, 1.9 liferea.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200507311455.j6VEthbj002304@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283 Modified Files: .cvsignore liferea.spec sources Log Message: * Sun Jul 31 2005 Brian Pepple - 0.9.5-2 - Update to 0.9.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jul 2005 21:57:07 -0000 1.8 +++ .cvsignore 31 Jul 2005 14:55:41 -0000 1.9 @@ -1 +1 @@ -liferea-0.9.4.tar.gz +liferea-0.9.5.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- liferea.spec 22 Jul 2005 21:57:07 -0000 1.13 +++ liferea.spec 31 Jul 2005 14:55:41 -0000 1.14 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 0.9.4 +Version: 0.9.5 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -92,6 +92,9 @@ %changelog +* Sun Jul 31 2005 Brian Pepple - 0.9.5-2 +- Update to 0.9.5. + * Fri Jul 22 2005 Brian Pepple - 0.9.4-2 - Update to 0.9.4. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 21:57:07 -0000 1.9 +++ sources 31 Jul 2005 14:55:41 -0000 1.10 @@ -1 +1 @@ -91994fb89c107230ef3b15708aa31209 liferea-0.9.4.tar.gz +562c84cd394fd2faf7944990613117ca liferea-0.9.5.tar.gz From fedora-extras-commits at redhat.com Sun Jul 31 15:17:39 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:17:39 -0400 Subject: rpms/dejavu-fonts import.log,1.7,1.8 Message-ID: <200507311517.j6VFHdMo003581@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3564 Modified Files: import.log Log Message: auto-import dejavu-fonts-1.12-1.fc5 on branch devel from dejavu-fonts-1.12-1.fc5.src.rpm update to 1.12 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 31 Jul 2005 14:50:10 -0000 1.7 +++ import.log 31 Jul 2005 15:17:36 -0000 1.8 @@ -4,3 +4,4 @@ dejavu-fonts-1_12-1:FC-3:dejavu-fonts-1.12-1.src.rpm:1122820393 dejavu-fonts-1_12-1_fc4:FC-4:dejavu-fonts-1.12-1.fc4.src.rpm:1122821314 dejavu-fonts-1_12-1_fc3:FC-3:dejavu-fonts-1.12-1.fc3.src.rpm:1122821399 +dejavu-fonts-1_12-1_fc5:HEAD:dejavu-fonts-1.12-1.fc5.src.rpm:1122823030 From fedora-extras-commits at redhat.com Sun Jul 31 15:22:43 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 31 Jul 2005 11:22:43 -0400 Subject: rpms/icu/devel icu-dot.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 icu.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200507311522.j6VFMhrX003705@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/icu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3681 Modified Files: .cvsignore icu.spec sources Added Files: icu-dot.patch Log Message: * Sun Jul 31 2005 Ville Skytt?? - 3.4-0.2.d02 - 3.4-d02. - Don't ship static libraries. icu-dot.patch: --- NEW FILE icu-dot.patch --- --- source/Doxyfile.in~ 2005-06-25 02:13:02.000000000 +0300 +++ source/Doxyfile.in 2005-07-31 17:01:55.000000000 +0300 @@ -201,7 +201,7 @@ #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO +HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = YES UML_LOOK = NO Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/icu/devel/.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 31 Jul 2005 15:22:41 -0000 1.4 @@ -1,2 +1 @@ -icu-3.2.tgz -icu-3.2-patch.tgz +icu4c-3.4-d02.tgz Index: icu.spec =================================================================== RCS file: /cvs/extras/rpms/icu/devel/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 31 Jul 2005 15:22:41 -0000 1.4 @@ -1,18 +1,19 @@ %define gcc32 1 Name: icu -Version: 3.2 -Release: 3 +Version: 3.4 +Release: 0.2.d02 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 +Source0: http://download.sourceforge.net/icu/icu4c-%{version}-d02.tgz +Patch0: %{name}-dot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen graphviz +BuildRequires: doxygen +BuildRequires: graphviz %if %{gcc32} BuildRequires: compat-gcc-32-c++ %endif @@ -53,10 +54,8 @@ %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} +%patch0 %build @@ -65,7 +64,7 @@ %{expand: %%define optflags %(echo %{optflags} | sed -e s/-mtune=/-mcpu=/)} export CC=gcc32 CXX=g++32 %endif -%configure --enable-static --with-data-packaging=library --disable-samples +%configure --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 @@ -119,7 +118,6 @@ %{_mandir}/man1/%{name}-config.1* %{_includedir}/layout %{_includedir}/unicode -%{_libdir}/*.a %{_libdir}/*.so %{_libdir}/%{name} %dir %{_datadir}/%{name} @@ -134,6 +132,10 @@ %changelog +* 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/devel/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 31 Jul 2005 15:22:41 -0000 1.4 @@ -1,2 +1 @@ -55a85d2365338ece483d275119fd990c icu-3.2.tgz -304f6cb1659967c7fbdeebca4f9c0e39 icu-3.2-patch.tgz +009f76a89c008cb9b7d4b1aa77db3a90 icu4c-3.4-d02.tgz From fedora-extras-commits at redhat.com Sun Jul 31 15:23:45 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:23:45 -0400 Subject: common tobuild,1.2170,1.2171 Message-ID: <200507311523.j6VFNj08003743@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3726 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2170 retrieving revision 1.2171 diff -u -r1.2170 -r1.2171 --- tobuild 31 Jul 2005 12:42:48 -0000 1.2170 +++ tobuild 31 Jul 2005 15:23:43 -0000 1.2171 @@ -56,3 +56,4 @@ ryo rpms/scim/FC-3 scim-1_4_0-2_2_fc3 fc3 gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 gemi rpms/unison/devel unison-2_12_0-1_fc5 devel +nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 15:37:52 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:37:52 -0400 Subject: common tobuild,1.2171,1.2172 Message-ID: <200507311537.j6VFbq0u003783@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3766 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2171 retrieving revision 1.2172 diff -u -r1.2171 -r1.2172 --- tobuild 31 Jul 2005 15:23:43 -0000 1.2171 +++ tobuild 31 Jul 2005 15:37:50 -0000 1.2172 @@ -57,3 +57,4 @@ gemi rpms/unison/FC-4 unison-2_12_0-1_fc4 fc4 gemi rpms/unison/devel unison-2_12_0-1_fc5 devel nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel +nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 31 15:41:42 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:41:42 -0400 Subject: common tobuild,1.2172,1.2173 Message-ID: <200507311541.j6VFfgn4003818@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3801 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 for fc3 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2172 retrieving revision 1.2173 diff -u -r1.2172 -r1.2173 --- tobuild 31 Jul 2005 15:37:50 -0000 1.2172 +++ tobuild 31 Jul 2005 15:41:40 -0000 1.2173 @@ -58,3 +58,4 @@ gemi rpms/unison/devel unison-2_12_0-1_fc5 devel nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 +nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 From fedora-extras-commits at redhat.com Sun Jul 31 15:49:49 2005 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sun, 31 Jul 2005 11:49:49 -0400 Subject: common tobuild,1.2173,1.2174 Message-ID: <200507311549.j6VFnn7e003861@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3844 Modified Files: tobuild Log Message: request build of rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2173 retrieving revision 1.2174 diff -u -r1.2173 -r1.2174 --- tobuild 31 Jul 2005 15:41:40 -0000 1.2173 +++ tobuild 31 Jul 2005 15:49:47 -0000 1.2174 @@ -59,3 +59,4 @@ nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 +nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel From fedora-extras-commits at redhat.com Sun Jul 31 15:58:14 2005 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sun, 31 Jul 2005 11:58:14 -0400 Subject: fedora-security/audit fc4,1.33,1.34 Message-ID: <200507311558.j6VFwE1K003887@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3870 Modified Files: fc4 Log Message: Lots of fc4 updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- fc4 28 Jul 2005 09:30:21 -0000 1.33 +++ fc4 31 Jul 2005 15:58:12 -0000 1.34 @@ -3,10 +3,18 @@ ** are items that need attention +****-**** ** backport (NetworkManager) [since FEDORA-2005-680] 2005-2395 ** firefox -2005-2370 backport (kdenetwork) [since FEDORA-2005-624] -2005-2369 backport (kdenetwork) [since FEDORA-2005-624] +2005-2370 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 +2005-2369 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-2368 VULNERABLE (vim) +2005-2367 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2366 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2365 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2364 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2363 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2362 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] +2005-2361 version (ethereal, fixed 0.10.12) [since FEDORA-2005-655] 2005-2335 backport (fetchmail) [since FEDORA-2005-613] 2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605] 2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619] @@ -49,7 +57,7 @@ 2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518] 2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437] 2005-1913 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510] -2005-1852 backport (kdenetwork) [since FEDORA-2005-624] +2005-1852 version (kdenetwork, fixed 3.4.2) [since FEDORA-2005-670] was backport since FEDORA-2005-624 2005-1849 backport (zlib, fixed 1.2.3) [since FEDORA-2005-626] 2005-1831 ignore (sudo) unsubstantiated report 2005-1769 VULNERABLE (squirrelmail, fixed 1.4.5) From fedora-extras-commits at redhat.com Sun Jul 31 17:08:31 2005 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 31 Jul 2005 13:08:31 -0400 Subject: rpms/freedroidrpg/devel freedroidrpg-lvalue.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 freedroidrpg.desktop, 1.2, 1.3 freedroidrpg.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200507311708.j6VH8VUL006395@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6369 Modified Files: .cvsignore freedroidrpg.desktop freedroidrpg.spec sources Added Files: freedroidrpg-lvalue.patch Log Message: * Sun Jul 31 2005 Ville Skytt?? - 0.9.13-0.2.rc2 - 0.9.13rc2. - Apply upstream lvalue cast fix. - Update desktop entry categories. freedroidrpg-lvalue.patch: --- NEW FILE freedroidrpg-lvalue.patch --- --- freedroid/FreeDroid/src/map.c 2005/07/11 08:11:35 1.326 +++ freedroid/FreeDroid/src/map.c 2005/07/18 18:18:18 1.327 @@ -2408,7 +2408,7 @@ /* read MapData */ for (i = 0; i < loadlevel->ylen; i++) - if ( ( (char*)loadlevel -> map[i] = strtok ( NULL, "\n") ) == NULL) + if ( ( loadlevel -> map[i] = (void *)strtok ( NULL, "\n") ) == NULL) return NULL; /* Get Waypoints */ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 04:23:35 -0000 1.3 +++ .cvsignore 31 Jul 2005 17:08:29 -0000 1.4 @@ -1 +1 @@ -freedroidrpg-0.9.12.tar.bz2 +freedroidrpg-0.9.13-rc2.tar.bz2 Index: freedroidrpg.desktop =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- freedroidrpg.desktop 8 Nov 2004 04:23:35 -0000 1.2 +++ freedroidrpg.desktop 31 Jul 2005 17:08:29 -0000 1.3 @@ -6,4 +6,4 @@ Terminal=false Type=Application Encoding=UTF-8 -Categories=Application;Game;ArcadeGame; +Categories=Game;ArcadeGame;RolePlaying; Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- freedroidrpg.spec 10 Jun 2005 06:30:53 -0000 1.9 +++ freedroidrpg.spec 31 Jul 2005 17:08:29 -0000 1.10 @@ -1,13 +1,14 @@ Name: freedroidrpg -Version: 0.9.12 -Release: 5 +Version: 0.9.13 +Release: 0.2.rc2 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}.tar.bz2 +Source0: http://download.sf.net/freedroid/%{name}-%{version}-rc2.tar.bz2 Source1: %{name}.desktop +Patch0: %{name}-lvalue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel @@ -27,7 +28,8 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}-rc2 +%patch0 -p2 %build @@ -46,10 +48,11 @@ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -convert graphics/paraicon.bmp \ +convert -resize 48x48 graphics/droids/001.png \ $RPM_BUILD_ROOT%{_datadir}/pixmaps/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 find $RPM_BUILD_ROOT%{_datadir}/games/freedroidrpg -type f | xargs chmod -x @@ -68,6 +71,11 @@ %changelog +* Sun Jul 31 2005 Ville Skytt?? - 0.9.13-0.2.rc2 +- 0.9.13rc2. +- Apply upstream lvalue cast fix. +- Update desktop entry categories. + * Thu Jun 9 2005 Ville Skytt?? - 0.9.12-5 - Rebuild for FC4+ with compat-gcc-32 due to crashy gcc4 experience (#152498). - Build with dependency tracking disabled. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 04:23:35 -0000 1.3 +++ sources 31 Jul 2005 17:08:29 -0000 1.4 @@ -1 +1 @@ -5b8b8e74e641c73645a7597ca8515707 freedroidrpg-0.9.12.tar.bz2 +eda34581d784cbd1db59ebc46208880e freedroidrpg-0.9.13-rc2.tar.bz2 From fedora-extras-commits at redhat.com Sun Jul 31 18:42:49 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 31 Jul 2005 14:42:49 -0400 Subject: rpms/inadyn/FC-4 inadyn.spec,1.11,1.12 sources,1.2,1.3 Message-ID: <200507311842.j6VIgnEd007929@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/inadyn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7910 Modified Files: inadyn.spec sources Log Message: Description: New upstream release. Index: inadyn.spec =================================================================== RCS file: /cvs/extras/rpms/inadyn/FC-4/inadyn.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- inadyn.spec 8 Jul 2005 18:23:04 -0000 1.11 +++ inadyn.spec 31 Jul 2005 18:42:47 -0000 1.12 @@ -1,6 +1,7 @@ Name: inadyn -Version: 1.90 -Release: 11%{?dist} + +Version: 1.95 +Release: 1%{dist} Summary: Dynamic DNS Client @@ -31,18 +32,19 @@ %setup -q -c %build -make -f makefile.linux CFLAGS="$RPM_OPT_FLAGS" +cd inadyn +make CFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sbindir} -install -m 0755 bin/inadyn $RPM_BUILD_ROOT%{_sbindir} +install -m 0755 inadyn/bin/linux/inadyn $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 0644 man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p -m 0644 man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install -p -m 0644 inadyn/man/inadyn.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -p -m 0644 inadyn/man/inadyn.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} install -p -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} @@ -74,13 +76,16 @@ %files %defattr(-,root,root,-) -%doc readme.html +%doc inadyn/readme.html %{_sbindir}/inadyn %{_mandir}/man*/* %attr(0755,root,root) %{_initrddir}/inadyn %config %{_sysconfdir}/inadyn.conf %changelog +* Wed Jul 20 2005 Jochen Schmitt 1.95-1 +- New upstream release + * Tue May 3 2005 Jochen Schmitt 1.90-11 - Move note from README.Fedora to %%description Index: sources =================================================================== RCS file: /cvs/extras/rpms/inadyn/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Apr 2005 19:42:23 -0000 1.2 +++ sources 31 Jul 2005 18:42:47 -0000 1.3 @@ -1 +1 @@ -65552d4a34f825aa7f214775bdeac1cc inadyn.v1.90.zip +3d4c912ba9678284d330de043b7d05cb inadyn.v1.95.zip From fedora-extras-commits at redhat.com Sun Jul 31 18:43:29 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 31 Jul 2005 14:43:29 -0400 Subject: common tobuild,1.2174,1.2175 Message-ID: <200507311843.j6VIhT8B007996@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7979 Modified Files: tobuild Log Message: request build of rpms/inadyn/FC-4 inadyn-1_95-1_fc4 for fc4 Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2174 retrieving revision 1.2175 diff -u -r1.2174 -r1.2175 --- tobuild 31 Jul 2005 15:49:47 -0000 1.2174 +++ tobuild 31 Jul 2005 18:43:27 -0000 1.2175 @@ -60,3 +60,4 @@ nim rpms/dejavu-fonts/FC-4 dejavu-fonts-1_12-1_fc4 fc4 nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel +s4504kr rpms/inadyn/FC-4 inadyn-1_95-1_fc4 fc4 From fedora-extras-commits at redhat.com Sun Jul 31 18:45:14 2005 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 31 Jul 2005 14:45:14 -0400 Subject: common tobuild,1.2175,1.2176 Message-ID: <200507311845.j6VIjEBH008056@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8039 Modified Files: tobuild Log Message: request build of rpms/kyum/devel kyum-0_7_5-1 for devel Index: tobuild =================================================================== RCS file: /cvs/extras/common/tobuild,v retrieving revision 1.2175 retrieving revision 1.2176 diff -u -r1.2175 -r1.2176 --- tobuild 31 Jul 2005 18:43:27 -0000 1.2175 +++ tobuild 31 Jul 2005 18:45:12 -0000 1.2176 @@ -61,3 +61,4 @@ nim rpms/dejavu-fonts/FC-3 dejavu-fonts-1_12-1_fc3 fc3 nim rpms/dejavu-fonts/devel dejavu-fonts-1_12-1_fc5 devel s4504kr rpms/inadyn/FC-4 inadyn-1_95-1_fc4 fc4 +s4504kr rpms/kyum/devel kyum-0_7_5-1 devel
    + <%=aj['arch']%>:  <%=aj['builder_addr']%> > + Status:  <%=aj['status']%>/<%=aj['builder_status']%> <% - if aj['endtime'] != 0: + # Only show build times for successful jobs + if aj['endtime'] != 0 and aj['builder_status'] == 'done': aj_time = (int(aj['endtime']) - int(aj['starttime'])) / 60 %> - Build Time:  <%=aj_time%> minutes -
    @@ -85,6 +86,7 @@